From dc314bb2bc574184e06766f7c8a7b9ff988e063e Mon Sep 17 00:00:00 2001
From: victor <vict3459@edu.sde.dk>
Date: Mon, 23 Nov 2020 12:53:19 +0100
Subject: [PATCH] v1.4.8j Fix manifest and meta tags NO

---
 skolehjem/public/manifest.json                    | 15 +++++++++------
 skolehjem/resources/views/admin/index.blade.php   |  6 +++---
 .../resources/views/app/layout/base.blade.php     |  4 +++-
 .../resources/views/app/news/index.blade.php      |  4 ++--
 .../resources/views/app/users/index.blade.php     |  5 ++++-
 .../resources/views/app/users/login.blade.php     | 14 +++++++++++++-
 6 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/skolehjem/public/manifest.json b/skolehjem/public/manifest.json
index 54119cc..922dd3c 100644
--- a/skolehjem/public/manifest.json
+++ b/skolehjem/public/manifest.json
@@ -1,15 +1,18 @@
 {
-    "name": "Syddansk Erhverskollegie App",
     "short_name": "Ekapp",
-    "lang": "da-DK",
-    "start_url": "/users/login.blade.php",
+    "name": "Syddansk Erhverskollegie App",
+    "description": "App for sde's Erhverskollegie ",
+    "start_url": "/login",
+    "background_color": "#00788a",
     "display": "standalone",
+    "scope": "/",
     "theme_color": "#00788a",
+    "orientation": "portrait-primary",
     "icons": [
         {
-            "src": "appIcon.svg",
-            "sizes": "192x192",
-            "type": "images/svg"
+            "src": "/images/icons/appIcon.svg",
+            "type": "image/svg",
+            "sizes": "150x150"
         }
     ]
 }
diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php
index 6e7fccd..3ba9446 100644
--- a/skolehjem/resources/views/admin/index.blade.php
+++ b/skolehjem/resources/views/admin/index.blade.php
@@ -147,14 +147,14 @@
             </div>
             <h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\Guide::all()) }}</h1>
         </div>
-        <table class="tbl mt-1">
+        <table class="tbl mt-1 ">
             <tr>
                 <th class="text-white text-center letterSpaceTable" style="background-color: #152f4b;">Seneste Vejledninger</th>
             </tr>
             @if(count(\App\Guide::all()) > 0)
                 @for($i = 0; $i < 10 && $i < count(\App\Guide::query()->orderByDesc("id")->get()); $i++)
-                    <tr class="letterSpaceTable">
-                        <td class="fixOverflow">{!!  \App\Helpers::closetags(substr(ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)), 0, 45) ) !!}</td>
+                    <tr class="letterSpaceTable" style="overflow: hidden">
+                        <td>{!!  \App\Helpers::closetags(substr(ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)), 0, 45) ) !!}</td>
                     </tr>
                 @endfor
             @else
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php
index 887d2f2..1f088d5 100644
--- a/skolehjem/resources/views/app/layout/base.blade.php
+++ b/skolehjem/resources/views/app/layout/base.blade.php
@@ -42,7 +42,7 @@
         <img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
     @endif
     <button class="ml-auto btn-sde-blue" style="border: none; font-size: 20px; outline: none;" id="toggle">
-        <i id="icon" class="fas fa-bars" style="color: black;"></i>
+        <i id="icon" class="fas fa-bars" style="color: white;"></i>
     </button>
 </header>
 <div class="d-none bg-sde-blue col" id="menu">
@@ -114,6 +114,8 @@
 </style>
 @yield("content")
 <script src="{{ mix("/js/app.js") }}"></script>
+<script src="/js/serviceWorkerRegistration.js"></script>
+<!--We have a service worker on the login pages, dont know if he works on the rest of the website, it looks like he does :) -->
 @if(request()->cookie("mode") == "dark")
     <script type="text/javascript">
         function toggleMenu(menu) {
diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php
index 5f19a0a..e1031d8 100644
--- a/skolehjem/resources/views/app/news/index.blade.php
+++ b/skolehjem/resources/views/app/news/index.blade.php
@@ -164,7 +164,7 @@
                         </div>
                         @if($new->resource_id !== null)
                             <div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');"></div>
-                            <div class="information">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} | {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}} </div>
+                            <div class="information">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }}  <span class="dot"></span> {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}} </div>
                             <div class="container">
                                 {!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!}
                                 <div class="row" style="justify-content: space-between; padding-top: 12px;  border-top: 1px solid rgba(0, 0, 0, .2);">
@@ -180,7 +180,7 @@
                         @else
                             <div class="container">
                                 {!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!}
-                                <div class="information2">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} | {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}} </div>
+                                <div class="information2">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }}  <span class="dot"></span> {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}} </div>
                                 <div class="row" style="justify-content: space-between; padding-top: 12px;  border-top: 1px solid rgba(0, 0, 0, .2);">
                                     @if (count(\App\UserEvent::query()->where('event_id', '=', $new->arrangement_id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
                                         <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $new->arrangement_id }}, this)" >{{__('msg.afmeld')}}</a>
diff --git a/skolehjem/resources/views/app/users/index.blade.php b/skolehjem/resources/views/app/users/index.blade.php
index 85379d2..47f0903 100644
--- a/skolehjem/resources/views/app/users/index.blade.php
+++ b/skolehjem/resources/views/app/users/index.blade.php
@@ -1,6 +1,9 @@
 @extends('app.layout.base')
 
 @section('content')
+
+    <!--Kan i huske at vi nogen gange så det gammel gui, ja det er så det her-->
+    <!--
     <main id="main" style="justify-content: space-between;">
         <div class="d-flex col block-container mt-2">
             <a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">{{ __('msg.menuplan') }}</a>
@@ -21,7 +24,7 @@
                 <img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
             </a>
         </div>
-    </main>
+    </main>-->
 @endsection
 
 @section('scripts')
diff --git a/skolehjem/resources/views/app/users/login.blade.php b/skolehjem/resources/views/app/users/login.blade.php
index bb48d3f..fdc4b47 100644
--- a/skolehjem/resources/views/app/users/login.blade.php
+++ b/skolehjem/resources/views/app/users/login.blade.php
@@ -6,7 +6,19 @@
 
 @section("content")
     <main style="background-color: #00788a; height: 100%;">
-        <link rel="manifest" href="/manifest.json">
+        <!--Make the app open in fullscreen-->
+        <link rel="manifest" href="manifest.json">
+        <meta name="mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="application-name" content="Ekapp">
+        <meta name="apple-mobile-web-app-title" content="Ekapp">
+        <meta name="theme-color" content="00788a">
+        <meta name="msapplication-navbutton-color" content="00788a">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+        <meta name="msapplication-starturl" content="/users/login.blade.php">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <link rel="icon" type="images/svg" sizes="192x192" href="appIcon.svg">
+        <link rel="apple-touch-icon" type="images/svg" sizes="192x192" href="appIcon.svg">
         <link rel="stylesheet" type="text/css" href="/../../../css/addtohomescreen.css">
         <script src="/../../../js/addtohomescreen.js"></script>