Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

review #74

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: python
sudo: enabled
services:
- mysql
python:
- "3.5"
env:
global:
- TRAVIS=true
before_install:
- mysql -e 'CREATE DATABASE IF NOT EXISTS wechat_ticket;'
- mv configs.example.json configs.json
# command to install dependencies
install:
- pip install -r requirements.txt

script:
python manage.py test
5 changes: 4 additions & 1 deletion WeChatTicket/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@
WECHAT_APPID = CONFIGS['WECHAT_APPID']
WECHAT_SECRET = CONFIGS['WECHAT_SECRET']

ALLOWED_HOSTS = []
ALLOWED_HOSTS = [
'd4a939f0.ngrok.io',
'localhost'
]


# Application definition
Expand Down
1 change: 1 addition & 0 deletions WeChatTicket/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"""
from django.conf.urls import url, include
from django.contrib import admin
from django.contrib.auth import authenticate, login

from wechat.views import CustomWeChatView
from WeChatTicket.views import StaticFileView
Expand Down
4 changes: 4 additions & 0 deletions adminpage/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
from django.contrib import admin
from wechat.models import *

# Register your models here.

admin.site.register(Activity)
admin.site.register(Ticket)
2 changes: 1 addition & 1 deletion adminpage/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from django.db import models

# Create your models here.
# Create your models here.
15 changes: 13 additions & 2 deletions adminpage/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
# -*- coding: utf-8 -*-
#


from adminpage.views import *
from django.conf.urls import url

__author__ = "Epsirom"


urlpatterns = []
urlpatterns = [
url(r'^login/?$',adminLogin.as_view()),
url(r'^logout/?$',adminLogout.as_view()),
url(r'^activity/list/?$',activityList.as_view()),
url(r'^activity/create/?$',activityCreate.as_view()),
url(r'^activity/delete/?$',activityDelete.as_view()),
url(r'^image/upload/?$',imageUpload.as_view()),
url(r'^activity/detail/?$',activityDetail.as_view()),
url(r'^activity/menu/?$',activityMenu.as_view()),
url(r'^activity/checkin/?$',activityCheckin.as_view()),
]
Loading