More integration.

flex/flex/home/static/home/main.css

@@ -11,14 +11,30 @@ title {
 body {
     margin: 0;
     padding: 0;
-    position: absolute;
+    position: relative;
     height: 100%;
     width: 100%;
-    /*background-image: url(pics/indexbg.jpg);*/
+    background-image: url(http://www.mulierchile.com/nike-running-wallpapers/nike-running-wallpapers-005.jpg);
+    /*background-image: url('pics/indexbg.jpg');*/
     background-repeat: no-repeat;
     background-size: cover;
 }
-
+div.navbar {
+  background: black;
+  width: 100%;
+  height: 50px;
+  color: white;
+  display: flex;
+  align-items: right;
+  justify-content: center;
+  padding-left: 425px;
+  position: absolute;
+}
+.navbar .item{
+  color: white;
+  font-size: 35px;
+  margin-left:
+}
 div.input {
     margin: 0;
     position: absolute;
@@ -28,9 +44,9 @@ div.input {
 }
 
 p.title {
-    margin: 0;
+    margin: 10;
     padding: 0;
-    height: 100px;
+    height: 120px;
     width: 70%;
     text-align: center;
     position: absolute;
@@ -39,9 +55,13 @@ p.title {
     margin-right: -50%;
     transform: translate(-50%, -50%);
     font-family: 'Open Sans Condensed', sans-serif;
-    font-size: 150px;
-    color: papayawhip;
+    font-size: 200px;
+    color: #C0C0C0;
+    margin-top: 150px;
+    text-shadow: 0px 0px 2px #000;
 }
+
+
 font.title {
     margin: 0;
     padding-top: 5px;
@@ -57,14 +77,43 @@ font.title {
     font-size: 20px;
     color: yellow;
 }
-
+.subtitle{
+  margin: 10;
+  padding: 0;
+  height: 35px;
+  text-align: center;
+  position: absolute;
+  top: 12%;
+  left: 50%;
+  margin-right: -50%;
+  transform: translate(-50%, -50%);
+  font-family: 'Open Sans Condensed', sans-serif;
+  font-size: 50px;
+  color: #546E7A;
+  margin-top:330px;
+}
+html, html a {
+    -webkit-font-smoothing: antialiased;
+    text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+}
+p.legibility {
+  text-rendering: optimizeLegibility;
+}
+p.speed {
+  text-rendering: optimizeSpeed;
+}
+body {
+  text-rendering: optimizeLegibility;
+}
 p.inputs   {
     color: dimgray;
     margin: 0;
     padding: 5px;
     border-radius: 8px;
-    background-color: papayawhip;
-    height: 110px;
+    background-color: #BDBDBD;
+    opacity: .5;
+
+    height: 150px;
     width: 100%;
     text-align: center;
     position: fixed;
@@ -80,16 +129,19 @@ p.inputs   {
     font-size: 40px;
 }
 button {
-    margin: 0;
+    margin: 10px;
     font-family: 'Open Sans Condensed', sans-serif;
     font-size: 20px;
-    background-color: darkblue;
+    letter-spacing: 2px;
+    font-style: oblique;
+    background-color: #00B8D4;
     color: white;
-    height: 35px;
+    height: 45px;
     width: 150px;
-    padding: 0 5px 0 5px;
+    padding: 0px 5px 10px 3px;
     border: none;
     box-shadow: 3px 3px 2px #888888;
+
 }
 button:hover {
     font-size: 19px;
@@ -98,3 +150,12 @@ button:hover {
    box-shadow:         inset 0 0 10px #000000;
     cursor: pointer;
 }
+#begin{
+  color: white;
+  font-size: 25px;
+}
+.nav {
+  position: fixed;
+  top: 0;
+  background-color: blue;
+}

flex/flex/home/templates/home/home.html

@@ -10,36 +10,67 @@
 
     <script type="text/javascript" src="jquery-3.1.1.min.js"></script>
 
+
+    <link href="https://fonts.googleapis.com/css?family=Rubik" rel="stylesheet">
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+	<!-- Optional theme -->
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+
+	<!-- Latest compiled and minified JavaScript -->
+	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+
     <link rel="stylesheet" type="text/css" href="{% static '/home/main.css' %}">
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300" rel="stylesheet">
 </head>
+
+
+
+
 <body>
-	<h1>FLEX - health</h1>
 	<br><br>
 
+  <div class="container-fluid">
+    <div class="row nav">
+      <div class="col-sm-5">
+      </div>
+      <div class="col-sm-7">
+      </div>
+    </div>
+  </div>
+</div>
+</div>
     <div class="input">
-	        <p class="title">Reflex
-	        <font color="yellow" class="title">Accomplishing goals in a better way</font>
+        <p class="title">ReFleX
+        <p class="subtitle">Compete With <font color = "#00897B"><font-size = 40px><b>You</b></font></font></font>
         </p>
+
+
 			{% if request.user.is_authenticated %}
-		        <p class="inputs"> Welcome, {{ request.user.username }}
+		        <p class="inputs">
 	            <br>
-		            <a href="{% url 'logout' %}"><button id="begin">End Process</button></a>
+	            <a href="{% url 'logout' %}"><button id="begin">LOGOUT</button></a>
 	            <br>
-		        </p>
 		    {% else %}
-		       	<p class="inputs">Welcome to Reflex Fitness!
+		       	<p class="inputs">
 	            <br>
-		            <a href="{% url 'signin' %}"><button id="begin">Begin Process</button></a>
+	            <a href="{% url 'signin' %}"><button id="begin">BEGIN</button></a>
 	            <br>
-		        </p>
 		    {% endif %}
+
+
+        <!--p class="inputs">
+            <br>
+            <a href="{% url 'logout' %}"><button id="begin">BEGIN</button></a>
+            <br>
+        </p-->
+    </div>
     </div>
 
-    {{ r }}
+
+    <script type="text/javascript" src="indexJs.js"></script>
 
 
     <script type="text/javascript" src="{% static '/home/indexJs.js' %}"></script>
 </body>
 </html>
-</html>

flex/flex/home/templates/registration/logged_out.html

@@ -1,6 +1,29 @@
-{% block content %}
-<p>Logged out!</p>  
+<head>
+	{% load static %}
+	<link rel="shortcut icon" href="pics/Airplane.ico" />
+	<title>Flex</title>
+	<link rel="stylesheet" type="text/css" href="{% static '/home/main.css' %}">
 
-<button><a href="{% url 'home'%}">Home</a></button><br>
-<button><a href="{% url 'signin'%}">Sign-in</a></button>
-{% endblock %}
+    <script type="text/javascript" src="jquery-3.1.1.min.js"></script>
+
+
+    <link href="https://fonts.googleapis.com/css?family=Rubik" rel="stylesheet">
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+	<!-- Optional theme -->
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+
+	<!-- Latest compiled and minified JavaScript -->
+	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+
+    <link rel="stylesheet" type="text/css" href="{% static '/home/main.css' %}">
+</head>
+<body>
+	{% block content %}
+	<p>Logged out!</p>  
+
+	<button id="begin"><a href="{% url 'home'%}">Home</a></button><br>
+	<button id="begin"><a href="{% url 'signin'%}">Sign-in</a></button>
+	{% endblock %}
+</body>

flex/flex/home/views.py

@@ -28,6 +28,7 @@ def user_login(request):
 	auth_user = authenticate(request, username=username, password=password)
 	if auth_user is not None:
 		login(request, auth_user)
+		#return HttpResponse(request.user.username)
 		return redirect('home') # -----------
 	else:
 		return HttpResponse("Unable to log in. User not found. <br>Please check superuser for more details.")