talksik/Reflex
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More integration.

Browse Source
This commit is contained in:
Karthik Pullela
2018-01-21 00:57:40 -08:00
parent 1d56e56100
commit 06fe65eaa3
119 changed files with 317 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flex/flex/home/templates/home/home.html
+50 -19
View File
@@ -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="input">
<p class="title">Reflex
<font color="yellow" class="title">Accomplishing goals in a better way</font>
</p>
{% if request.user.is_authenticated %}
<p class="inputs"> Welcome, {{ request.user.username }}
<br>
<a href="{% url 'logout' %}"><button id="begin">End Process</button></a>
<br>
</p>
<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
<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">
<br>
<a href="{% url 'logout' %}"><button id="begin">LOGOUT</button></a>
<br>
{% else %}
<p class="inputs">Welcome to Reflex Fitness!
<br>
<a href="{% url 'signin' %}"><button id="begin">Begin Process</button></a>
<br>
</p>
<p class="inputs">
<br>
<a href="{% url 'signin' %}"><button id="begin">BEGIN</button></a>
<br>
{% 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
+28 -5
View File
@@ -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>