add page for previous food logs

relates #14
FAC10 · May 24, 2017 · 3704e73 · 3704e73
1 parent 23591f7
commit 3704e73
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 15 deletions.
diff --git a/calendar.html b/calendar.html
@@ -14,7 +14,7 @@
   <header class="calendar_header">
 
     <div>
-    <a href="./landing.html"><img src="./images/back.png" alt="go back" class="header_home"></a>
+    <a href="./landing.html"><img src="./images/home.png" alt="go back" class="header_home"></a>
     </div>
 
     <div class="header_menu">

diff --git a/css/day.css b/css/day.css
@@ -1,17 +1,33 @@
-* {
-  background: rgb(249, 188, 89);
-  font-family: 'Coming Soon', sans-serif;
-  color: white;
-}
-
-header {
-  text-align: center;
-  margin: 1em 0 1em 0;
-  font-size: 2em;
+.day_header {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 1em 1em 0 1em;
 }
 
 .food-log {
   margin-bottom: 0.5em;
   border-style: solid;
   padding: 0.5em;
 }
+
+.back_button {
+  height: 3em;
+}
+
+.container {
+  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center; 
+}
+
+.header_menu {
+  margin-bottom: none;
+}
+
+.edit {
+  height: 3em;
+  width: auto;
+}
diff --git a/day.html b/day.html
@@ -10,17 +10,27 @@
   <title>Day</title>
 </head>
 <body>
+
+  <header class="day_header">
+    <div><a href="./calendar.html"><img src="images/return.png" alt="go back" class="back_button"></a></div>
+    <div class="header_menu">
+      <img src="images/header_profile.svg" alt="your profile image" class="header_profile_pic"></br>
+      <div class="header_menu_items">
+        <a href="settings.html" class="header_menu_item">Settings</a></br>
+        <a href="./login.html" class="header_menu_item">Log out</a>
+      </div>
+  </header>
+
   <div class="container">
-  <h1 class="day_heading">{Insert Date}</h1>
-    <p>There are no food logs for today.</p>
-    <p>Add an entry</p>
-    <a href="./calendar.html" class="">Back to Calendar</a>
+    <p>There are no entries for today.</p>
+    <a href="./logameal.html"><img src="images/edit.png" alt="edit" class="edit"></a>
   </div>
 
   <!-- <div class="food-log">
     <p>Time: 11:00</p>
     <p>For lunch, I didn't eat anything.</p>
     <p>I didn't eat anything because I didn't feel like I should eat after breakfast.</p>
   </div> -->
+  <script src="js/header_menu.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/images/edit.png b/images/edit.png
diff --git a/images/back.png → images/home.png b/images/back.png → images/home.png
diff --git a/images/return.png b/images/return.png