🔥 Removed pwa_fix.js (#234)

* Removed pwa_fix.js * Added metatags to welcome-page
Traewelling · Feb 23, 2021 · 3c1ab9e · 3c1ab9e
1 parent cac82c5
commit 3c1ab9e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -15,7 +15,6 @@ window.addEventListener("load", () => {
     require("./components/alert");
     require("./components/notifications-board");
     require("./components/progressbar");
-    require("./components/pwa_fix");
     require("./components/settings");
     require("./components/station-autocomplete");
     require("./components/stationboard");

diff --git a/resources/js/components/pwa_fix.js b/resources/js/components/pwa_fix.js
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -21,16 +21,6 @@
         <link rel="shortcut favicon" href="{{ asset('images/icons/favicon.ico') }}">
         <link rel="shortcut icon" sizes="512x512" href="{{ asset('images/icons/logo512.png') }}">
         <link rel="shortcut icon" sizes="128x128" href="{{ asset('images/icons/logo128.png') }}">
-
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="#c72730">
-        <link rel="apple-touch-icon" sizes="152x152" href="{{ asset('images/icons/touch-icon-ipad.png') }}">
-        <link rel="apple-touch-icon" sizes="180x180" href="{{ asset('images/icons/touch-icon-iphone-retina.png') }}">
-        <link rel="apple-touch-icon" sizes="167x167" href="{{ asset('images/icons/touch-icon-ipad-retina.png') }}">
-
-        <meta name="mobile-web-app-capable" content="yes">
-        <meta name="theme-color" content="#c72730">
-        <meta name="name" content="{{ config('app.name') }}">
         <link rel="author" href="/humans.txt">
         <meta name="copyright" content="Träwelling Team">
         <meta name="description" content="{{__('about.block1')}}">
@@ -41,6 +31,7 @@
         <meta name="DC.Description" content="{{__('about.block1')}}">
         <meta name="DC.Language" content="de">
 
+        @include('layouts.includes.meta-pwa')
         @yield('metadata')
     </head>
     <body>

diff --git a/resources/views/layouts/includes/meta-pwa.blade.php b/resources/views/layouts/includes/meta-pwa.blade.php
@@ -0,0 +1,9 @@
+<meta name="apple-mobile-web-app-capable" content="yes"/>
+<meta name="apple-mobile-web-app-status-bar-style" content="#c72730"/>
+<link rel="apple-touch-icon" sizes="152x152" href="{{ asset('images/icons/touch-icon-ipad.png') }}"/>
+<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('images/icons/touch-icon-iphone-retina.png') }}"/>
+<link rel="apple-touch-icon" sizes="167x167" href="{{ asset('images/icons/touch-icon-ipad-retina.png') }}"/>
+
+<meta name="mobile-web-app-capable" content="yes"/>
+<meta name="theme-color" content="#c72730"/>
+<meta name="name" content="{{ config('app.name') }}"/>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -6,9 +6,6 @@
 
         <title>{{ config('app.name', 'Träwelling') }}</title>
 
-        <meta name="mobile-web-app-capable" content="yes">
-        <meta name="theme-color" content="#c72730">
-        <meta name="name" content="{{ config('app.name') }}">
         <link rel="author" href="/humans.txt">
         <meta name="copyright" content="Träwelling Team">
         <meta name="description" content="{{__('about.block1')}}">
@@ -18,6 +15,7 @@
         <meta name="DC.Rights" content="Träwelling Team">
         <meta name="DC.Description" content="{{__('about.block1')}}">
         <meta name="DC.Language" content="de">
+        @include('layouts.includes.meta-pwa')
 
         <link rel="shortcut favicon" href="{{ asset('images/icons/favicon.ico') }}">
         <link rel="shortcut icon" sizes="512x512" href="{{ asset('images/icons/logo512.png') }}">