From df8eb6c8cb40aefd2125322e779e4d61bd059a4b Mon Sep 17 00:00:00 2001
From: Sebastian <seba4928@edu.sde.dk>
Date: Fri, 26 Jun 2020 13:07:57 +0200
Subject: [PATCH] Finished calendar.js (for now)

---
 skolehjem/public/css/webapp.css                             | 6 +++---
 skolehjem/resources/js/calendar/calendar.js                 | 3 +++
 skolehjem/resources/sass/webapp/_default.scss               | 6 +++---
 .../views/app/washing-reservations/index.blade.php          | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css
index a39e0c1..e9ec7da 100644
--- a/skolehjem/public/css/webapp.css
+++ b/skolehjem/public/css/webapp.css
@@ -6737,11 +6737,11 @@ main {
   color: #99A4AE;
   font-size: 12px;
   font-weight: 700;
-  padding: 12px 3px;
+  padding: 6px 3px;
   text-align: center;
   text-transform: uppercase;
   width: 40px;
-  height: 38px;
+  height: 18px;
 }
 
 @media (min-width: 360px) {
@@ -6765,7 +6765,7 @@ main {
 @media (min-width: 360px) {
   .calendar-table__body .calendar-table__col {
     width: 46px;
-    height: 48px;
+    height: 24px;
   }
 }
 
diff --git a/skolehjem/resources/js/calendar/calendar.js b/skolehjem/resources/js/calendar/calendar.js
index 2d4f350..b7faff0 100644
--- a/skolehjem/resources/js/calendar/calendar.js
+++ b/skolehjem/resources/js/calendar/calendar.js
@@ -31,6 +31,9 @@ const moment = require("moment");
 
 function generateCalendar(weekOffset = 0) {
     const week = (moment().week() + weekOffset);
+
+    document.getElementById("title").innerText = week;
+
     let weekDays = Array.apply(null, Array(7)).map((value, index) => {
         return moment(index, "e").locale("da").startOf("week").weekday(index).format("ddd");
     });
diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss
index 8c38155..02677db 100644
--- a/skolehjem/resources/sass/webapp/_default.scss
+++ b/skolehjem/resources/sass/webapp/_default.scss
@@ -285,11 +285,11 @@ $primary-color: $blue;
             color: $gray;
             font-size: $sm-font-size;
             font-weight: $font-weight--bold;
-            padding: 12px 3px;
+            padding: 6px 3px;
             text-align: center;
             text-transform: uppercase;
             width: 40px;
-            height: 38px;
+            height: 18px;
 
             @include mq(360) {
                 width: 46px;
@@ -309,7 +309,7 @@ $primary-color: $blue;
 
             @include mq(360) {
                 width: 46px;
-                height: 48px;
+                height: 24px;
             }
 
             @include mq(410) {
diff --git a/skolehjem/resources/views/app/washing-reservations/index.blade.php b/skolehjem/resources/views/app/washing-reservations/index.blade.php
index 7dba373..d0749f4 100644
--- a/skolehjem/resources/views/app/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/app/washing-reservations/index.blade.php
@@ -10,11 +10,11 @@
         <div class="col w-100 mt-auto">
             <div class="calendar-container">
                 <div class="calendar-container__header">
-                    <button id="week-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous">
+                    <button id="week-previous" class="calendar-container__btn fas fa-arrow-left" title="Previous">
                         <i class="icon ion-ios-arrow-back"></i>
                     </button>
-                    <h2 id="month" class="calendar-container__title">{Måned} {År}</h2>
-                    <button id="week-next" class="calendar-container__btn calendar-container__btn--right" title="Next">
+                    <h2 id="title" class="calendar-container__title">{Måned} {År}</h2>
+                    <button id="week-next" class="calendar-container__btn fas fa-arrow-right" title="Next">
                         <i class="icon ion-ios-arrow-forward"></i>
                     </button>
                 </div>