Merge pull request #153 from FOSSEE/revampv2

Revamp workshop website 

2 files changed, 17 insertions, 33 deletions

diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py
index 46dc9b7..abf58f5 100644
--- a/workshop_portal/settings.py
+++ b/workshop_portal/settings.py
@@ -13,17 +13,17 @@ https://docs.djangoproject.com/en/1.10/ref/settings/
 import os
 import sys
 from local_settings import (
-                    EMAIL_HOST,
-                    EMAIL_PORT,
-                    EMAIL_HOST_USER,
-                    EMAIL_HOST_PASSWORD,
-                    EMAIL_USE_TLS,
-                    SENDER_EMAIL
-                    )
+    EMAIL_HOST,
+    EMAIL_PORT,
+    EMAIL_HOST_USER,
+    EMAIL_HOST_PASSWORD,
+    EMAIL_USE_TLS,
+    SENDER_EMAIL
+)
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
 
@@ -35,7 +35,6 @@ DEBUG = True
 
 ALLOWED_HOSTS = []
 
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -46,20 +45,17 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'workshop_app',
-    'recurrence',
     'statistics_app',
     'teams',
 ]
 
-MIDDLEWARE_CLASSES = [
+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 = 'workshop_portal.urls'
@@ -67,7 +63,7 @@ ROOT_URLCONF = 'workshop_portal.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': ['workshop_app/templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -85,15 +81,14 @@ WSGI_APPLICATION = 'workshop_portal.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
 DATABASES = {
-        'default': {
+    'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
         'TEST': {
             'NAME': 'mytestdatabase',
         },
-        }
     }
-
+}
 
 # Password validation
 # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
@@ -113,7 +108,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/1.10/topics/i18n/
 
@@ -127,7 +121,6 @@ USE_L10N = True
 
 USE_TZ = True
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.10/howto/static-files/
 
@@ -143,7 +136,7 @@ MEDIA_ROOT = os.path.join(BASE_DIR, "workshop_app", "data")
 
 LOG_FOLDER = os.path.join(BASE_DIR, "workshop_app", "logs")
 
-#Email Connection Settings
+# Email Connection Settings
 EMAIL_HOST = EMAIL_HOST
 EMAIL_HOST_USER = EMAIL_HOST_USER
 EMAIL_HOST_PASSWORD = EMAIL_HOST_PASSWORD
@@ -154,12 +147,12 @@ SENDER_EMAIL = SENDER_EMAIL
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-#Change this to the production url
-PRODUCTION_URL = 'your_production_url'
+# Change this to the production url
+PRODUCTION_URL = 'http://localhost:8000'
 
 ADMIN_EMAIL = 'your admin email'
 
-#Set True or False to view/hide
+# Set True or False to view/hide
 SHOW_WORKSHOP_STATS = True
 
 LOGIN_REDIRECT_URL = '/profile'
diff --git a/workshop_portal/urls.py b/workshop_portal/urls.py
index bf603d1..464b98c 100644
--- a/workshop_portal/urls.py
+++ b/workshop_portal/urls.py
@@ -15,19 +15,10 @@ Including another URLconf
 """
 from django.conf.urls import url, include
 from django.contrib import admin
-from workshop_app import views
-#from chatterbot.ext.django_chatterbot import urls as chatterbot_urls
-import django
-
-js_info_dict = {
-    'packages': ('recurrence', ),
-}
 
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^', include('workshop_app.urls')),
-    url(r'^', include('workshop_app.urls_password_reset')),
-    url(r'^', include('statistics_app.urls')),
-
+    url(r'^reset/', include('django.contrib.auth.urls')),
 ]