Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New #50

Merged
merged 41 commits into from
May 1, 2015
Merged

New #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
550eb32
creating new branch
SeifKeshk Apr 13, 2015
d320e38
new branch
SeifKeshk Apr 13, 2015
53b87fc
new homepage and new design for home, signin & signup
SeifKeshk Apr 13, 2015
5c8746f
client profile updated
SeifKeshk Apr 16, 2015
d383c3e
client schedule
SeifKeshk Apr 17, 2015
736a7af
new updates for client homepage & profile
SeifKeshk Apr 18, 2015
15360f8
new template updates
SeifKeshk Apr 20, 2015
fd29d8e
schedule updates
SeifKeshk Apr 20, 2015
0d7ee86
merging with master
SeifKeshk Apr 20, 2015
2b41cae
1-trainer_home 2- trainer_profile 3-follow me button 4-add workout &…
SeifKeshk Apr 22, 2015
5303621
working on models for tasks #43 #44
NohaGomaa Apr 26, 2015
daad19a
removed extra tabs buttons and pictures
SeifKeshk Apr 27, 2015
83a33ff
Add workouts now working #43
NohaGomaa Apr 28, 2015
55ea1f4
follow request working now
Ericphilippe Apr 29, 2015
d079aac
clients profile and home page updated
SeifKeshk Apr 29, 2015
0aa394d
friendship package
Ericphilippe Apr 29, 2015
e4d7e6c
merging with eric2
SeifKeshk Apr 29, 2015
44167c2
removing lines in profile_trainer
SeifKeshk Apr 29, 2015
e5ca258
views for adding exercises #43
NohaGomaa Apr 29, 2015
75b18a1
updates in trainer home
Ericphilippe Apr 29, 2015
107ebfa
updates in client home
Ericphilippe Apr 29, 2015
c74e9a3
Login page updates
Ericphilippe Apr 29, 2015
e5f0799
Trainer updates
Ericphilippe Apr 29, 2015
413c2a0
register , client_info and trainer_info design
SeifKeshk Apr 29, 2015
d7357b1
Finalizing #43 and updated UserCreateForm for signup
NohaGomaa Apr 30, 2015
be10eaa
add workouts new design , trainer can view client schedule , my clie…
SeifKeshk Apr 30, 2015
13fcf4f
merging with workouts branch
SeifKeshk Apr 30, 2015
fdb8cd9
view schedule method is now working
Ericphilippe Apr 30, 2015
4efdeaf
changes in front-end
Ericphilippe Apr 30, 2015
c0f33fc
merging with branch eric
SeifKeshk Apr 30, 2015
f922528
#45 #37 merging with eric2 and workouts branches, done with view exe…
SeifKeshk Apr 30, 2015
f49c0ec
Merging with branch seif
NohaGomaa Apr 30, 2015
461202d
Resolving merge conflicts
NohaGomaa Apr 30, 2015
a8d8290
Working on #43 #44 updating views and urls
NohaGomaa Apr 30, 2015
cbd3efe
Tasks #43 #44 Done
NohaGomaa May 1, 2015
fc97022
client and trainer can view excercises
SeifKeshk May 1, 2015
94449c0
merging with workouts branch
SeifKeshk May 1, 2015
0414440
resolved syntax error in url.py
SeifKeshk May 1, 2015
e3aa4a9
clients and trainer can view workouts schedule and each exercises
SeifKeshk May 1, 2015
c700558
template and design completed
SeifKeshk May 1, 2015
32ae749
statistics template
SeifKeshk May 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.pyc
*.sqlite3
*.sqlite3
*.back
Binary file added db.sqlite3.back
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions syntax_solutions/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


"""
Django settings for syntax_solutions project.

Expand Down
92 changes: 92 additions & 0 deletions workout_tracker/Templates/add_exercise.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{% load staticfiles %}
{% if user.is_authenticated %}
<a href="/logout/">Logout</a>
{% else %}
<a href="/register/">Sign-Up</a>
<a href="/login/">Login</a>
{% endif %}
<!DOCTYPE HTML>
<html>
<head>
<title>Workout tracker | Home :: w3layouts</title>
<link href="{% static 'css/bootstrap.css'%}" rel='stylesheet' type='text/css' />
<link href="{% static 'css/style.css' %}" rel='stylesheet' type='text/css' />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700' rel='stylesheet' type='text/css'>
<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
<!--<link href="css/style.css" rel="stylesheet" type="text/css" media="all" />-->
<script src="{% static 'js/jquery.min.js' %}"></script>
<script type="text/javascript">
jQuery(document).ready(function($) {
$(".scroll").click(function(event){
event.preventDefault();
$('html,body').animate({scrollTop:$(this.hash).offset().top},1200);
});
});
</script>
<!-- grid-slider -->
<script type="text/javascript" src="{% static 'js/jquery.mousewheel.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery.contentcarousel.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery.easing.1.3.js' %}"></script>
<!-- //grid-slider -->
</head>
<body>
<!-- start menu -->
<div class="menu" id="menu">
<div class="container">
<div class="logo">
<a href="index.html"><img src="{% static 'images/logo.png' %}" alt=""/></a>
</div>
<div class="h_menu4"><!-- start h_menu4 -->
<a class="toggleMenu" href="#">Menu</a>
<ul class="nav">
<li class="active"><a href="/">Home</a></li>
</ul>
<script type="text/javascript" src="{% static 'js/nav.js' %}"></script>
</div><!-- end h_menu4 -->
<div class="clear"></div>
</div>
</div>
<!-- end menu -->
<div class="main">
<div class="container">
<!-- start content-top -->
<div class="row content-top">
<div class="col-md-5">
<img src="{% static 'images/c7.jpg' %}" class="img-responsive" alt=""/>
</div>
<div class="col-md-7 content_left_text">
<title>Add Exercises</title>
</head>

<body>
<h1>Add Exercises</h1>

<form id="exercise_form" method="post" action="/add_exercise/{{workout_id}}"
enctype="multipart/form-data">

{% csrf_token %}

<!-- Display each form. The as_p method wraps each element in a paragraph
(<p>) element. This ensures each element appears on a new line,
making everything look neater. -->
<!--{{ workout_form.as_p }} -->

{% for field in exercise_form %}
<br>
<label style='color:Blue;'>{{ field.label }}</label>
<br>
{{ field }}
{% endfor %}

<!-- Provide a button to click to submit the form. -->
<input type="submit" name="submit" value="Add Another Exercise" />
</form>
</a>
<br>
</p>
</div>
</div>
</div>
68 changes: 60 additions & 8 deletions workout_tracker/Templates/add_workout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,65 @@
{% load staticfiles %}

<!DOCTYPE html>
{% load staticfiles %}
<!DOCTYPE HTML>
<html>
<head>
<title>Add Workouts</title>
<head>
<title>Free Gym Website Template | Home :: w3layouts</title>
<link href="{% static 'css/bootstrap.css'%}" rel='stylesheet' type='text/css' />
<link href="{% static 'css/style.css' %}" rel='stylesheet' type='text/css' />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700' rel='stylesheet' type='text/css'>
<script type="application/x-javascript"> addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); } </script>
<!--<link href="css/style.css" rel="stylesheet" type="text/css" media="all" />-->
<script src="{% static 'js/jquery.min.js' %}"></script>
<script type="text/javascript">
jQuery(document).ready(function($) {
$(".scroll").click(function(event){
event.preventDefault();
$('html,body').animate({scrollTop:$(this.hash).offset().top},1200);
});
});
</script>
<!-- grid-slider -->
<script type="text/javascript" src="{% static 'js/jquery.mousewheel.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery.contentcarousel.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery.easing.1.3.js' %}"></script>
<!-- //grid-slider -->
</head>
<body>
<!-- start menu -->
<div class="menu" id="menu">
<div class="container">
<div class="logo">
<a href="index.html"><img src="{% static 'images/logo.png' %}" alt=""/></a>
</div>
<div class="h_menu4"><!-- start h_menu4 -->
<a class="toggleMenu" href="#">Menu</a>
<ul class="nav">
<li class="active"><a href="/">Home</a></li>
</ul>
<script type="text/javascript" src="{% static 'js/nav.js' %}"></script>
</div><!-- end h_menu4 -->
<div class="clear"></div>
</div>
</div>
<!-- end menu -->
<div class="main">
<div class="container">
<!-- start content-top -->
<div class="row content-top">
<div class="col-md-5">
<img src="{% static 'images/pic1.jpg' %}" class="img-responsive" alt=""/>
</div>
<div class="col-md-7 content_left_text">
<title>Add Workouts</title>
</head>

<body>
<h1>Add Workouts</h1>

<form id="workout_form" method="post" action="/add_workout/"
<form id="workout_form" method="post" action="/add_workout_trainer/{{client_id}}"
enctype="multipart/form-data">

{% csrf_token %}
Expand All @@ -21,13 +71,15 @@ <h1>Add Workouts</h1>

{% for field in workout_form %}
<br>
<label style='color:red;'>{{ field.label }}</label>
<label style='color:black;'>{{ field.label }}</label>
<br>
{{ field }}
{% endfor %}

<!-- Provide a button to click to submit the form. -->
<input type="submit" name="submit" value="Add" />
<input type="submit" name="submit" value="Add Exercises" />
</form>
</body>
</html>
</div>
</div>
</div>
Loading