Fincom on AWS

committee/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
-from models import Committee
+
+from committee.models import Committee
 
 # Register your models here.
 admin.site.register(Committee)

committee/urls.py

@@ -1,5 +1,6 @@
 from django.conf.urls import url
-from . import views
+
+from committee import views
 
 urlpatterns = [
     url(r'^$', views.edit, name='edit'),

committee/views.py

@@ -2,7 +2,8 @@ from django.shortcuts import HttpResponse, HttpResponseRedirect
 from django.template import loader
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User, Group
-from models import Committee
+
+from committee.models import Committee
 
 @login_required
 def edit(request):
@@ -68,4 +69,4 @@ def remove_fincom(request):
         user.groups.remove(Group.objects.filter(name='Fincom')[0])
         user.save()
 
-    return HttpResponseRedirect('/committees')
+    return HttpResponseRedirect('/committees')

fincom/settings.py

@@ -28,7 +28,7 @@ DEBUG = True
 
 ALLOWED_HOSTS = [
     'localhost',
-    'dtd-fincom.herokuapp.com',
+    'fincom.frat.tech',
     'fincom.delt.space',
 ]
 
@@ -98,10 +98,10 @@ WSGI_APPLICATION = 'fincom.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'dbu9ujb6cnhc3n',
-        'USER': 'dexgqmkgoabqyd',
-        'PASSWORD': os.environ['DBPASSWD'],
-        'HOST': 'ec2-50-19-89-124.compute-1.amazonaws.com',
+        'NAME': 'fincom',
+        'USER': 'fincom',
+        'PASSWORD': 'fincom',
+        'HOST': '127.0.0.1',
         'PORT': '5432',
     }
 }
@@ -139,7 +139,7 @@ AUTH_PASSWORD_VALIDATORS = [
 SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = os.environ['SOCIAL_AUTH_GOOGLE_OAUTH2_KEY']
 SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = os.environ['SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET']
 SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = ['andrew.cmu.edu', 'alumni.cmu.edu']
-SOCIAL_AUTH_GOOGLE_OAUTH2_AUTH_EXTRA_ARGUMENTS = {'hd': 'andrew.cmu.edu' }
+SOCIAL_AUTH_GOOGLE_OAUTH2_AUTH_EXTRA_ARGUMENTS = {'hd': '*' }
 SOCIAL_AUTH_LOGIN_REDIRECT_URL = '/items/'
 LOGIN_URL = '/login/google-oauth2/'
 

fincom/urls.py

@@ -15,14 +15,14 @@ Including another URLconf
 """
 from django.conf.urls import include, url
 from django.contrib import admin
-from . import views
+
+from fincom import views
 
 urlpatterns = [
     url(r'^$', views.index, name='index'),
     url(r'^logout$', views.user_logout, name='logout'),
     url(r'^items/', include('items.urls')),
     url(r'^committees/', include('committee.urls')),
-    url('.well-known/acme-challenge/tVQ35BIrm7ybiASBxRMHG2CAO44x-I2BVMqcrv_yJ2k', views.encrypt, name='encrypt'),
     url('', include('social_django.urls', namespace='social')),
     url(r'^admin/', admin.site.urls),
 ]

fincom/views.py

@@ -9,9 +9,6 @@ def index(request):
     template = loader.get_template('fincom/index.html')
     return HttpResponse(template.render({}, request))
 
-def encrypt(request):
-    return HttpResponse('tVQ35BIrm7ybiASBxRMHG2CAO44x-I2BVMqcrv_yJ2k.g4Ct3egntTJZl1LOzJH8v9Ri24BQ7blYjcbzPucJVE4', request)
-
 def user_logout(request):
     logout(request)
 

items/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from  models import Item
+from  items.models import Item
 
 # Register your models here.
 admin.site.register(Item)

items/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-from . import views
+from items import views
 
 urlpatterns = [
     url(r'^$', views.list, name='list'),

items/views.py

@@ -4,8 +4,9 @@ from django.utils import timezone
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
-from models import Item
+
 from committee.models import Committee
+from items.models import Item
 
 def isAuthorised(request, item):
     return (request.user == item.committee.chair