Merge pull request #116 from salarx/master

New Updated code with database change to Postgres

Author: sksingh55

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.gitignore

@@ -3,21 +3,11 @@ __pycache__/
 *.py[cod]
 *$py.class
 
-
-# C extensions
-*.so
-
-
-# db file
-
-
-
 # Distribution / packaging
 .Python
 env/
 build/
 develop-eggs/
-dist/
 downloads/
 eggs/
 .eggs/
@@ -33,12 +23,6 @@ var/
 # Swap files
 *.swp
 
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
@@ -54,18 +38,8 @@ coverage.xml
 *,cover
 .hypothesis/
 
-# Translations
-*.mo
-*.pot
-
-
 # Flask stuff:
-instance/
-.webassets-cache
-
-# Django stuff:
-migrations
-db.sqlite3
+instance/.webassets-cache
 
 # PyBuilder
 target/
@@ -89,37 +63,13 @@ ENV/
 # Ignore idea files
 .idea
 
+# VSCode Settings
+.vscode/settings.json
 
-# DS
-.DS_Store
-._.DS_Store
-
-# docs
-docs/_build
-docs/_templates
-
-.tox
-
-# media
-# FusionIIIT/media
-# ignoring settings.py
-# FusionIIIT/Fusion/settings.py
-
-
-# dbinsertscripts
-FusionIIIT/dbinsertscripts
-
-#folders
-FusionIIIT/Include
-FusionIIIT/Scripts
-FusionIIIT/tcl
-
-#folders
-Include
-Scripts
-tcl
+# Node Modules
+node_modules/
 
-*/media/*
+FusionIIIT/static/
+package-lock.json
 
-#db file
-fusion.db
+!.idea

.isort.cfg

@@ -0,0 +1,5 @@
+LOAD DATABASE
+     FROM      sqlite://fusion.db
+     INTO pgsql://admin:hello123@localhost/fusion
+WITH include drop, create tables
+;

.travis.yml

@@ -26,7 +26,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['fusioniiit.azurewebsites.net', '127.0.0.1', 'localhost', '172.27.16.216']
 
 # Google authentication
 SOCIALACCOUNT_PROVIDERS = {
@@ -54,10 +54,10 @@
 
 # email of sender
 
-EMAIL_HOST_USER = 'erp@iiitdmj.ac.in'
+EMAIL_HOST_USER = 'fusion.iiitdmj@gmail.com'
 
 # password of sender
-EMAIL_HOST_PASSWORD = ''
+# EMAIL_HOST_PASSWORD = os.environ['MAIL_PASSWORD']
 
 EMAIL_PORT = 587
 ACCOUNT_EMAIL_REQUIRED = True
@@ -75,9 +75,9 @@
 
 ACCOUNT_EMAIL_SUBJECT_PREFIX = 'Fusion: '
 
-DEFAULT_FROM_EMAIL = 'erp@iiitdmj.ac.in'
+DEFAULT_FROM_EMAIL = 'fusion.iiitdmj@gmail.com'
 
-SERVER_EMAIL = 'erp@iiitdmj.ac.in'
+SERVER_EMAIL = 'fusion.iiitdmj@gmail.com'
 
 ACCOUNT_LOGOUT_REDIRECT_URL = '/accounts/login/'
 ACCOUNT_USERNAME_MIN_LENGTH = 3
@@ -102,6 +102,7 @@
 # Application definition
 
 INSTALLED_APPS = [
+    'whitenoise.runserver_nostatic',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -116,7 +117,7 @@
     'applications.academic_information',
     'applications.leave',
     'applications.library',
-
+    'applications.notifications_extension',
     'applications.gymkhana',
     'applications.office_module',
     'applications.central_mess',
@@ -128,19 +129,19 @@
     'applications.placement_cell',
     'applications.scholarships',
     'applications.visitor_hostel',
+    'allauth',
     'allauth.account',
     'allauth.socialaccount',
-    'allauth',
-    'allauth.socialaccount.providers.google',
+    # 'allauth.socialaccount.providers.google',
     'semanticuiforms',
     'applications.feeds.apps.FeedsConfig',
     'pagedown',
     'markdown_deux',
-
 ]
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -162,7 +163,6 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'applications.globals.context_processor.designation',
             ],
         },
     },
@@ -173,6 +173,8 @@
 
 PROJECT_DIR = os.path.abspath(os.path.dirname(__file__))
 
+# Database template for mysql
+
 # DATABASES = {
 #     'default':
 #         {
@@ -185,13 +187,26 @@
 #         },
 # }
 
+
+# Database template for postgres
+
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(PROJECT_DIR, 'fusion.db'),
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'fusionlab',
+        'HOST': '172.27.16.216',
+        'USER': 'fusion_admin',
+        'PASSWORD': 'hello123',
     }
 }
 
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(PROJECT_DIR, 'fusion.db'),
+#     }
+# }
+
 
 # Password validation
 # https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
@@ -240,14 +255,13 @@
 
 # os.path.join(BASE_DIR, 'static/')
 STATIC_URL = '/static/'
-
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
 MEDIA_URL = '/media/'
 
 ACCOUNT_USERNAME_REQUIRED = False
-ACCOUNT_EMAIL_VERIFICATION = "none"
-SOCIALACCOUNT_QUERY_EMAIL = True
+ACCOUNT_EMAIL_REQUIRED = True
 LOGIN_REDIRECT_URL = "/"
 
 if DEBUG:
@@ -265,3 +279,12 @@
 DJANGO_NOTIFICATIONS_CONFIG = {
 'USE_JSONFIELD':True,
 }
+
+DJANGO_NOTIFICATIONS_CONFIG = {
+'USE_JSONFIELD':True,
+}
+
+CRISPY_TEMPLATE_PACK = 'semantic-ui'
+CRISPY_ALLOWED_TEMPLATE_PACKS = ('semantic-ui')
+DATA_UPLOAD_MAX_NUMBER_FIELDS = 10240
+

FusionIIIT/Fusion/__init__.py

@@ -15,6 +15,7 @@
 """
 
 import notifications.urls
+import debug_toolbar
 from django.conf import settings
 from django.conf.urls import include, url
 from django.conf.urls.static import static
@@ -38,23 +39,14 @@
     url(r'^finance/', include('applications.finance_accounts.urls')),
     url(r'^gymkhana/', include('applications.gymkhana.urls')),
     url(r'^library/', include('applications.library.urls')),
-    url(r'^accounts/', include('allauth.urls')),
+    # url(r'^accounts/', include('allauth.urls')),
     url(r'^ocms/', include('applications.online_cms.urls')),
-    url(r'^login/', auth_views.login, name='login'),
-    url(r'^logout/', auth_views.logout, name='logout'),
-    url(r'^academic-procedures/', include('applications.academic_procedures.urls',
-                                          namespace='procedures')),
+    # url(r'^login/', auth_views.login, name='login'),
+    # url(r'^logout/', auth_views.logout, name='logout'),
+    url(r'^academic-procedures/', include('applications.academic_procedures.urls', namespace='procedures')),
     url(r'^aims/', include('applications.academic_information.urls')),
-    url(r'^notifications/', include(notifications.urls, namespace='notifications')),
-
-]
-if settings.DEBUG:
-    urlpatterns += static(settings.MEDIA_URL,
-                          document_root=settings.MEDIA_ROOT)
-    urlpatterns += static(settings.STATIC_URL,
-                          document_root=settings.STATIC_ROOT)
-
-    import debug_toolbar
-    urlpatterns = [
-        url(r'^__debug__/', include(debug_toolbar.urls)),
-    ] + urlpatterns
+    # url(r'^notifications/', include(notifications.urls, namespace='notifications')),
+    url(r'^notifications/', include('applications.notifications_extension.urls', namespace='notifications')),
+    url(r'^accounts/', include('allauth.urls')),
+    url(r'^__debug__/', include(debug_toolbar.urls)),
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

FusionIIIT/Fusion/fusion.db

@@ -10,7 +10,10 @@
 import os
 
 from django.core.wsgi import get_wsgi_application
+#from dj_static import Cling
 
+# os.environ["DJANGO_SETTINGS_MODULE"] = "Fusion.settings"
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Fusion.settings")
 
+# application = Cling(get_wsgi_application())
 application = get_wsgi_application()