v 0.0.4

static/css/custom.css

@@ -0,0 +1,137 @@
+
+/* Colors */
+.site-primary {
+    color: #AA2E24 !important;
+}
+.site-secondary {
+    color: #54565A !important;
+}
+.site-text-light {
+    color: #FFFFFF !important;
+}
+.site-text-dark {
+    color: #54565A !important;
+}
+.site-bg-secondary {
+    background: #54565A !important;
+}
+
+.white-link {
+    color: #ffffff;
+    text-decoration: none;
+    border-bottom: 0;
+}
+.white-link:hover {
+    color: #ffffff;
+    text-decoration: none;
+    border-bottom: 1px solid white;
+}
+.flex-align-center-all {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-flex-align: center;
+    -ms-flex-align: center;
+    -webkit-align-items: center;
+    align-items: center;
+}
+a.caret {
+  color: #222222;
+}
+a.icon-only {
+  color: #222222;
+  text-decoration: none;
+}
+h1 {
+  font-size: 2em;
+}
+h2 {
+  font-size: 1.5em;
+}
+h3 {
+  font-size: 1.25em;
+}
+.uk-container {
+  max-width: 1270px;
+}
+.header-style {
+  font-size: 34px;
+  margin: 0;
+  padding: 0;
+  line-height: 1;
+  font-family: "Open Sans", sans-serif;
+  font-weight: 600;
+  letter-spacing: 3px;
+  color:#54565A;
+}
+.header-line-left {
+  padding-left: 10px;
+  border-left: 4px solid #b31b1b;
+  height: 35px;
+}
+.header-line-right {
+  padding-right: 10px;
+  border-left: 4px solid #b31b1b;
+  height: 35px;
+}
+.top-bar {
+    background-color: white;
+}
+.top-bar ul {
+    background-color: white;
+}
+.top-bar a, a:hover {
+    color: #222222;
+}
+.top-bar a:after {
+    border-color: #222222 transparent transparent !important;
+}
+a.custom-card,
+a.custom-card:hover {
+  color: inherit;
+  text-decoration: none;
+}
+a.custom-link,
+a.custom-link:hover {
+  color: inherit;
+  text-decoration: none;
+}
+.card {
+    height: 100%;
+}
+.material-icons.md-18 { font-size: 18px; }
+.material-icons.md-24 { font-size: 24px; }
+.material-icons.md-36 { font-size: 36px; }
+.material-icons.md-48 { font-size: 48px; }
+.material-icons.md-dark { color: #54565A; }
+.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
+.material-icons.md-light { color: rgba(255, 255, 255, 1); }
+.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
+
+.square {
+  position: relative;
+  width: 2rem;
+}
+
+.square:after {
+  content: "";
+  display: block;
+  padding-bottom: 100%;
+}
+
+.content {
+  position: absolute;
+  text-align: center;
+  vertical-align: middle;
+  /*  Line height must match .square width  */
+  line-height: 2rem;
+  width: 100%;
+  height: 100%;
+  font-weight: 700;
+  font-size: 1.50rem;
+}
+.display-inline {
+    display: inline !important;
+}

templates/tracker/common_meal_list.html

@@ -0,0 +1,48 @@
+{% extends 'tracker/base.html' %}
+{% block content %}
+{% if messages %}
+<ul class="messages">
+    {% for message in messages %}
+    <li
+            {% if message.tags %} class="{{ message.tags }}" {% endif %}>{{ message }}
+    </li>
+    {% endfor %}
+</ul>
+{% endif %}
+    <div class="row">
+        <div class="col">
+            {% include 'tracker/graph_navs.html' %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            <a class="float-right" href="{% url 'add_common_meal' %}"><span class="material-icons md-48 md-dark">add_circle</span></a>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            <div class= "card-group">
+            {% for meal in common_meals %}
+                <div class="card">
+                    <div class="card-body">
+                        <div class="card-title"><h1>{{ meal.name }}</h1></div>
+                        <p class="card-text">
+                            <b>Fat</b>: {{ meal.fat }}<br/>
+                            <b>Carbohydrates</b>: {{ meal.carbohydrates }}<br/>
+                            <b>Protein</b>: {{ meal.protein }}<br/>
+                            <b>Comment</b>: {{ meal.comments }}<br/>
+                        </p>
+                    </div>
+                    <div class="card-footer">
+                        <div class="float-right">
+                            <a href="{% url 'edit_common_meal' meal.id %}"><span class="material-icons">edit</span></a>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+            </div>
+        </div>
+    </div>
+
+
+{% endblock content %}

templates/tracker/graph_navs.html

@@ -1,6 +1,9 @@
 <ul class="nav nav-pills">
   <li class="nav-item">
     <a class="nav-link {% if page == 'index' %}active{% endif %}" href="{% url 'index' %}">Home</a>
+  </li>
+    <li class="nav-item">
+    <a class="nav-link {% if page == 'common' %}active{% endif %}" href="{% url 'common_meal_list' %}">Common Meals</a>
   </li>
   <li class="nav-item">
     <a class="nav-link {% if page == 'sugar_graph' %}active{% endif %}" href="{% url 'sugar_graph' %}">Sugar Levels</a>

templates/tracker/index.html

@@ -11,11 +11,15 @@
 </ul>
 {% endif %}
     {% include 'tracker/graph_navs.html' %}
-
-    <div class="btn-group-vertical">
-    <a class="btn btn-primary" href="{% url 'add_sugar_level' %}">Add Sugar Level</a>
-    <a class="btn btn-primary" href="{% url 'add_meal' %}">Add Meal</a>
-    <a class="btn btn-secondary" href="{% url 'add_common_meal' %}">Add Common Meal</a>
+    <div class="row">
+        <div class="col">
+            <div class="btn-group-horizontal">
+                <a class="btn btn-secondary" href="{% url 'add_sugar_level' %}"><span class="material-icons">linear_scale</span><br/>Add Sugar Level</a>
+                <a class="btn btn-secondary" href="{% url 'add_meal' %}"><span class="material-icons">restaurant_menu</span><br/>Add Meal</a>
+            </div>
+        </div>
     </div>
 
+
+
 {% endblock content %}

templates/tracker/meal_graph.html

@@ -47,7 +47,7 @@
                 },
                 horizontalLine: [{
                         y: 15,
-                        style: "rgba(255, 0, 0, .4)",
+                        style: "rgba(153, 255, 0, .4)",
                         text: "Carb Max"
                     }],
               responsive: true,

templates/tracker/meal_sugar_graph.html

@@ -47,9 +47,10 @@
                 horizontalLine: [{
                         y: 130,
                         style: "rgba(255, 0, 0, .4)",
-                        text: "varb max"
+                        text: "Carb max"
                     },  {
                         y: 80,
+                        style: "rgba(255, 0, 0, .4)",
                         text: "min"
                 }],
               responsive: true,

tracker/urls.py

@@ -9,15 +9,18 @@
     path('logout/', views.logout_base),
     path('sugar/new', views.add_sugar_level, name='add_sugar_level'),
     path('meal/new/', views.add_meal, name='add_meal'),
-    path('meal/common/new', views.add_common_meal, name='add_common_meal'),
+    # common meals
+    path('meal/common/list/', views.common_meal_list, name='common_meal_list'),
+    path('meal/common/new/', views.add_common_meal, name='add_common_meal'),
+    path('meal/common/edit/<int:common_meal_id>/', views.edit_common_meal, name='edit_common_meal'),
     # charts
-    path('chart/sugar', views.sugar_graph, name='sugar_graph'),
-    path('chart/meal', views.meal_graph, name='meal_graph'),
-    path('chart/meal-sugar', views.meal_sugar_graph, name='meal_sugar_graph'),
+    path('chart/sugar/', views.sugar_graph, name='sugar_graph'),
+    path('chart/meal/', views.meal_graph, name='meal_graph'),
+    path('chart/meal-sugar/', views.meal_sugar_graph, name='meal_sugar_graph'),
     # charts API
-    path('api/chart/levels', views.sugar_chart, name='sugar_chart'),
-    path('api/chart/meals', views.meal_chart, name='meal_chart'),
-    path('api/chart/mix', views.mix_chart, name='mix_chart'),
+    path('api/chart/levels/', views.sugar_chart, name='sugar_chart'),
+    path('api/chart/meals/', views.meal_chart, name='meal_chart'),
+    path('api/chart/mix/', views.mix_chart, name='mix_chart'),
     # JSon Responses
     path('get/meal/<int:meal_id>/', views.get_meal_info, name='get_meal_info'),
 ]

tracker/views.py

@@ -188,29 +188,6 @@ def add_meal(request):
     return render(request, 'tracker/meal_form.html', context)
 
 
-def add_common_meal(request):
-    current_user = request.user
-
-    context = dict(title=SYSTEM_TITLE,
-                   page='index',
-                   app_page='meal',
-                   fullname=current_user.first_name + ' ' + current_user.last_name,
-                   )
-    form = CommonMealForm(request.POST or None)
-    if request.method == 'POST':
-        if form.is_valid():
-            f = form.save(commit=False)
-            f.user = current_user
-            form.save()
-            return HttpResponseRedirect(reverse('index'))
-
-    context['form'] = form
-    context['form_title'] = 'Add a Common Meal'
-    context['button_title'] = 'Add'
-
-    return render(request, 'tracker/generic_form.html', context)
-
-
 @login_required
 def sugar_graph(request):
 
@@ -269,3 +246,68 @@ def get_meal_info(request, meal_id):
         'carbohydrates': meal.carbohydrates,
         'protein': meal.proteins,
     })
+
+
+# common meals
+@login_required
+def common_meal_list(request):
+    current_user = request.user
+
+    context = dict(title=SYSTEM_TITLE,
+                   page='common',
+                   app_page='list',
+                   fullname=current_user.first_name + ' ' + current_user.last_name,
+                   )
+
+    context['common_meals'] = CommonMeals.objects.filter(trash=False, active=True, user=current_user)
+
+    return render(request, 'tracker/common_meal_list.html', context)
+
+
+@login_required
+def add_common_meal(request):
+    current_user = request.user
+
+    context = dict(title=SYSTEM_TITLE,
+                   page='index',
+                   app_page='meal',
+                   fullname=current_user.first_name + ' ' + current_user.last_name,
+                   )
+    form = CommonMealForm(request.POST or None)
+    if request.method == 'POST':
+        if form.is_valid():
+            f = form.save(commit=False)
+            f.user = current_user
+            form.save()
+            return HttpResponseRedirect(reverse('common_meal_list'))
+
+    context['form'] = form
+    context['form_title'] = 'Add a Common Meal'
+    context['button_title'] = 'Add'
+
+    return render(request, 'tracker/generic_form.html', context)
+
+
+@login_required
+def edit_common_meal(request, common_meal_id):
+    current_user = request.user
+
+    context = dict(title=SYSTEM_TITLE,
+                   page='index',
+                   app_page='meal',
+                   fullname=current_user.first_name + ' ' + current_user.last_name,
+                   )
+    instance = get_object_or_404(CommonMeals, id=common_meal_id)
+    form = CommonMealForm(request.POST or None, instance=instance)
+    if request.method == 'POST':
+        if form.is_valid():
+            f = form.save(commit=False)
+            f.user = current_user
+            form.save()
+            return HttpResponseRedirect(reverse('common_meal_list'))
+
+    context['form'] = form
+    context['form_title'] = 'Edit a Common Meal'
+    context['button_title'] = 'Save'
+
+    return render(request, 'tracker/generic_form.html', context)