From bd95993653a1b94d07316e24a0f519d00f9359d6 Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Tue, 4 Dec 2012 16:21:32 -0500 Subject: User can login and logout --- codemash/settings.py | 14 +++++--------- codemash/urls.py | 3 +++ 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'codemash') diff --git a/codemash/settings.py b/codemash/settings.py index 23b1b93..0285da9 100644 --- a/codemash/settings.py +++ b/codemash/settings.py @@ -11,20 +11,15 @@ ADMINS = ( MANAGERS = ADMINS +PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) + DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': '', # Or path to database file if using sqlite3. - # The following settings are not used with sqlite3: - 'USER': '', - 'PASSWORD': '', - 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. - 'PORT': '', # Set to empty string for default. + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(PROJECT_ROOT, "database.db"), } } -PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) - # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. @@ -133,6 +128,7 @@ INSTALLED_APPS = ( # 'django.contrib.admindocs', 'contact', + 'accounts', ) # A sample logging configuration. The only tangible logging diff --git a/codemash/urls.py b/codemash/urls.py index 0431c65..567499c 100644 --- a/codemash/urls.py +++ b/codemash/urls.py @@ -6,6 +6,9 @@ from django.conf.urls import patterns, include, url urlpatterns = patterns('', (r'^contact/', include('contact.urls', namespace='contact')), + (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')), + (r'^accounts/', include('accounts.urls', namespace='account')), + url(r'^$', 'pages.views.home', name='home'), # Uncomment the admin/doc line below to enable admin documentation: -- cgit v1.2.3