diff --git a/.gitignore b/.gitignore index e46def6..6b081fe 100644 --- a/.gitignore +++ b/.gitignore @@ -274,7 +274,7 @@ dmypy.json # pytype static type analyzer .pytype/ - +000*.py # Cython debug symbols cython_debug/ diff --git a/README.MD b/README.MD index ba615b6..6611524 100644 --- a/README.MD +++ b/README.MD @@ -14,5 +14,14 @@ new project with django_vue 3. 后端采用redis，mysql - +django-admin startproject mysite + +python manage.py startapp polls +python manage.py migrate +python manage.py makemigrations polls +python manage.py sqlmigrate polls 0001 + +python manage.py createsuperuser +admin:kingsome +pengtao:tt123456 \ No newline at end of file diff --git a/myops/settings.py b/myops/settings.py index dc1b85b..819744b 100644 --- a/myops/settings.py +++ b/myops/settings.py @@ -15,7 +15,6 @@ from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ @@ -27,78 +26,38 @@ DEBUG = True ALLOWED_HOSTS = [] - # Application definition -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', -] +INSTALLED_APPS = ['polls.apps.PollsConfig', 'django.contrib.admin', 'django.contrib.auth', + 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', ] -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] +MIDDLEWARE = ['django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] ROOT_URLCONF = 'myops.urls' TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [BASE_DIR / 'templates'], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] + {'BACKEND': 'django.template.backends.django.DjangoTemplates', 'DIRS': [BASE_DIR / 'templates'], 'APP_DIRS': True, + 'OPTIONS': {'context_processors': ['django.template.context_processors.debug', + 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', ], }, }, ] WSGI_APPLICATION = 'myops.wsgi.application' - # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - +DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3', 'NAME': BASE_DIR / 'db.sqlite3', }} # Password validation # https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - +AUTH_PASSWORD_VALIDATORS = [{'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', }, + {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', }, + {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', }, + {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', }, ] # Internationalization # https://docs.djangoproject.com/en/3.2/topics/i18n/ @@ -113,7 +72,6 @@ USE_L10N = True USE_TZ = True - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ diff --git a/myops/urls.py b/myops/urls.py index 3a4b6b5..694cc20 100644 --- a/myops/urls.py +++ b/myops/urls.py @@ -14,8 +14,6 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path +from django.urls import path, include -urlpatterns = [ - path('admin/', admin.site.urls), -] +urlpatterns = [path('admin/', admin.site.urls), path('polls/', include('polls.urls'))] diff --git a/polls/__init__.py b/polls/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/polls/admin.py b/polls/admin.py new file mode 100644 index 0000000..684e8b6 --- /dev/null +++ b/polls/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin + +# Register your models here. +from django.contrib import admin +from .models import Question + +admin.site.register(Question) diff --git a/polls/apps.py b/polls/apps.py new file mode 100644 index 0000000..5a5f94c --- /dev/null +++ b/polls/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class PollsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'polls' diff --git a/polls/migrations/__init__.py b/polls/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/polls/models.py b/polls/models.py new file mode 100644 index 0000000..ec012fd --- /dev/null +++ b/polls/models.py @@ -0,0 +1,26 @@ +from django.db import models + +# Create your models here. +from django.db import models +import datetime +from django.utils import timezone + + +class Question(models.Model): + question_text = models.CharField(max_length=200) + pub_date = models.DateTimeField('date published') + + def __str__(self): + return self.question_text + + def was_published_recently(self): + return self.pub_date >= timezone.now() - datetime.timedelta(days=1) + + +class Choice(models.Model): + question = models.ForeignKey(Question, on_delete=models.CASCADE) + choice_text = models.CharField(max_length=200) + votes = models.IntegerField(default=0) + + def __str__(self): + return self.choice_text diff --git a/polls/templates/polls/detail.html b/polls/templates/polls/detail.html new file mode 100644 index 0000000..35e519f --- /dev/null +++ b/polls/templates/polls/detail.html @@ -0,0 +1,18 @@ + + + + + Title + + +

+ {{ question.question_text }} +

> + + + + \ No newline at end of file diff --git a/polls/templates/polls/index.html b/polls/templates/polls/index.html new file mode 100644 index 0000000..8578001 --- /dev/null +++ b/polls/templates/polls/index.html @@ -0,0 +1,18 @@ + + + + + Title + + +{% if latest_question_list %} + +{% else %} +

No polls are available.

+{% endif %} + + \ No newline at end of file diff --git a/polls/tests.py b/polls/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/polls/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/polls/urls.py b/polls/urls.py new file mode 100644 index 0000000..5a54ced --- /dev/null +++ b/polls/urls.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +from django.urls import path + +from . import views + +urlpatterns = [path('', views.index, name='index'), path('/', views.detail, name='detail'), + path('/results/', views.results, name='results'), + path('/vote/', views.vote, name='vote')] diff --git a/polls/views.py b/polls/views.py new file mode 100644 index 0000000..0f00cf7 --- /dev/null +++ b/polls/views.py @@ -0,0 +1,41 @@ +from django.shortcuts import render, get_object_or_404 + +# Create your views here. +from django.http import HttpResponse +from django.template import loader +from .models import Question +from django.http import Http404 + + +# def index(request): +# latest_question_list = Question.objects.order_by('-pub_date')[:5] +# template = loader.get_template('polls/index.html') +# context = {'latest_question_list': latest_question_list, } +# return HttpResponse(template.render(context, request)) + +def index(request): + latest_question_list = Question.objects.order_by('-pub_date')[:5] + context = {'latest_question_list': latest_question_list} + return render(request, 'polls/index.html', context) + + +def detail(request, question_id): + # try: + # question = Question.objects.get(pk=question_id) + # except Question.DoesNotExist: + # raise Http404('question does not exist') + question = get_object_or_404(Question, pk=question_id) + return render(request, 'polls/detail.html', {'question': question}) + + +# def detail(request, question_id): +# return HttpResponse("You 're looking at question %s." % question_id) + + +def results(request, question_id): + response = "you `re looking at the results of question %s." + return HttpResponse(response % question_id) + + +def vote(request, question_id): + return HttpResponse("you 're voting on question %s." % question_id)