Bunch of things. More to do

spencerR1992 · Aug 15, 2016 · 8ec6c20 · 8ec6c20
1 parent a1f43c2
commit 8ec6c20
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 13 deletions.
diff --git a/banded/backend.py b/banded/backend.py
@@ -1,5 +1,10 @@
 from django.contrib.auth.models import User
 
+
+
+'''
+Custom backend to handle authentication with only email and password. 
+'''
 class EmailAuth:
 	def authenticate(self, email = '', password = ''):
 		try:

diff --git a/banded/settings.py b/banded/settings.py
@@ -132,13 +132,11 @@
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.10/howto/static-files/
-STATIC_URL = "https://%s/static/" % AWS_S3_CUSTOM_DOMAIN
-PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
-
-
-
+STATIC_URL = '/static/'
+STATIC_ROOT = os.path.dirname(BASE_DIR)
+STATICFILES_DIRS = (
+     os.path.join(BASE_DIR, "static"), 
+)
 
 
 

diff --git a/banded/views.py b/banded/views.py
@@ -1,10 +1,16 @@
 from django.shortcuts import render
 from django.template.context import RequestContext
 
+
+
+'''
+Holders for testing endpoints. This will eventually only be home to the '/' 
+view.
+
+'''
 def home(request):
 	return render(request, 'home.html')
 
-
 def loginTest(request):
 	return render(request, 'login.html')
 

diff --git a/static/css/base.css b/static/css/base.css
@@ -0,0 +1,3 @@
+.test {
+	font-size: 60px;
+}
diff --git a/static/templates/base.html b/static/templates/base.html
@@ -11,6 +11,7 @@
 		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
 		<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
 		<!-- endblock -->
+		<link rel = 'stylesheet' href = "{% static 'css/base.css' %}">
 	</head>
 
 	<body>

diff --git a/static/templates/login.html b/static/templates/login.html
@@ -3,13 +3,13 @@
 {% if form.errors %} 
 	<p>Error</p>
 {% endif %}
-
+	<h1 class = 'test'>Boom</h1>
 	<form action = '/u/auth' method = 'post'>
 		{% csrf_token %}
 		<label for = 'email'>
 			Email:
 		</label>
-		<input type = 'text' name = 'email' value = '' id = 'email'>
+		<input  type = 'text' name = 'email' value = '' id = 'email'>
 		<label for = 'password'>
 			Password: 
 		</label>

diff --git a/users/views.py b/users/views.py
@@ -4,13 +4,11 @@
 
 # Create your views here.
 
-
+#TODO:remove print statements, and properly handle the redirect. 
 def authorization(request):
 	try:
 		em = request.POST.get('email', '')
-		print 'em: ', em
 		pw = request.POST.get('password', '')
-		print 'pw: ', pw
 		user = authenticate(email = em, password = pw)
 		if user is not None:
 			print 'user successfully logged in'