From 4c97dedc941696c128335df962de0c6630d6d024 Mon Sep 17 00:00:00 2001 From: maxperei Date: Sun, 23 Apr 2017 21:09:27 +0200 Subject: [PATCH] improving | sqlite3 suppr | see MongoEngine/django-mongoengine#65 --- README.md | 7 +++++- db.sqlite3 | Bin 143360 -> 0 bytes primoprim/settings.py | 31 ++++++++++++++++++--------- primoprim/urls.py | 5 ++++- somnium/admin.py | 10 ++++++++- somnium/templates/somnium/index.html | 2 +- 6 files changed, 41 insertions(+), 14 deletions(-) delete mode 100644 db.sqlite3 diff --git a/README.md b/README.md index 81b2726..a6759c9 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,9 @@ ___ - Python 3.5.2 - Django 1.9.1 - PyMongo 3.4.0 -- MongoEngine 0.12.0 \ No newline at end of file +- MongoEngine 0.12.0 + +___ + +`mongod --dbpath /usr/local/mongodb/data/db/` +`python manage.py runserver` diff --git a/db.sqlite3 b/db.sqlite3 deleted file mode 100644 index db0bcaef8ac0210bd8d057d76c3388a28f3061e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143360 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 bD>}XC_W~}Gp4Fn{uWjuQAu`msrxpD__TXOz diff --git a/primoprim/settings.py b/primoprim/settings.py index 1edc8f0..e0f1e39 100644 --- a/primoprim/settings.py +++ b/primoprim/settings.py @@ -11,8 +11,6 @@ """ import os -import sys -import mongoengine # Build paths inside the project like this: os.path.join(BASE_DIR, ...) @@ -28,6 +26,12 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True +ADMINS = ( + ('Max Perei', 'hello@maxperei.info'), +) + +MANAGERS = ADMINS + ALLOWED_HOSTS = ['127.0.0.1', 'local.dev', 'localhost'] # Application definition @@ -48,6 +52,12 @@ 'somnium.apps.SomniumConfig', ] +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', +# 'django.contrib.staticfiles.finders.DefaultStorageFinder', +) + MIDDLEWARE_CLASSES = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -82,7 +92,6 @@ WSGI_APPLICATION = 'primoprim.wsgi.application' - # Database # https://docs.djangoproject.com/en/1.9/ref/settings/#databases @@ -98,17 +107,19 @@ DATABASES = { 'default': { - # 'ENGINE': 'django.db.backends.dummy' - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + 'ENGINE': 'django.db.backends.dummy' } } -# AUTHENTICATION_BACKENDS = ( -# 'mongoengine.django.auth.MongoEngineBackend', -# ) +AUTH_USER_MODEL = 'mongo_auth.MongoUser' + +AUTHENTICATION_BACKENDS = ( + 'django_mongoengine.mongo_auth.backends.MongoEngineBackend', +) + +SESSION_ENGINE = 'django_mongoengine.sessions' -#SESSION_ENGINE = 'mongoengine.django.sessions' +SESSION_SERIALIZER = 'django_mongoengine.sessions.BSONSerializer' # Password validation # https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators diff --git a/primoprim/urls.py b/primoprim/urls.py index 16b0e2e..d310b1b 100644 --- a/primoprim/urls.py +++ b/primoprim/urls.py @@ -15,8 +15,11 @@ """ from django.conf.urls import url, include from django.contrib import admin +from django_mongoengine import mongo_admin + +admin.autodiscover() urlpatterns = [ url(r'^', include('somnium.urls')), - url(r'^admin/', admin.site.urls), + url(r'^admin/', mongo_admin.site.urls), ] diff --git a/somnium/admin.py b/somnium/admin.py index 8c38f3f..3e9f624 100644 --- a/somnium/admin.py +++ b/somnium/admin.py @@ -1,3 +1,11 @@ -from django.contrib import admin +from django_mongoengine import mongo_admin as admin +from .models import Artist, Performance # Register your models here. +# @admin.register(Artist) +class ArtistAdmin(admin.DocumentAdmin): + pass + +# @admin.register(Performance) +class PerformanceAdmin(admin.DocumentAdmin): + pass diff --git a/somnium/templates/somnium/index.html b/somnium/templates/somnium/index.html index 5eec6ff..8f52415 100644 --- a/somnium/templates/somnium/index.html +++ b/somnium/templates/somnium/index.html @@ -4,6 +4,6 @@ \ No newline at end of file