#44 Move Piwik privacy policy to blade

MGHollander · Sep 22, 2023 · cbdb4a8 · cbdb4a8
1 parent f39c38a
commit cbdb4a8
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 72 deletions.
diff --git a/app/Http/Controllers/PrivacyController.php b/app/Http/Controllers/PrivacyController.php
@@ -15,11 +15,11 @@ class PrivacyController extends Controller
      * Display a listing of the resource.
      *
      * @param Request $request
-     * @return \Inertia\Response
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Foundation\Application
      */
-    public function __invoke(): Response
+    public function __invoke(): \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Foundation\Application
     {
-        return Inertia::render('Privacy');
+        return view('privacy');
     }
 
 }
diff --git a/resources/js/Layouts/Default.vue b/resources/js/Layouts/Default.vue
@@ -351,7 +351,7 @@ watchEffect(() => {
       <footer>
         <div class="py-2">
           <div class="mx-auto max-w-7xl sm:px-6 lg:px-8">
-            <Link :href="route('privacy')" class="text-gray-900 hover:text-gray-500">Privacy</Link>
+            <a :href="route('privacy')" class="text-gray-900 hover:text-gray-500">Privacy</a>
           </div>
         </div>
       </footer>

diff --git a/resources/js/Pages/Privacy.vue b/resources/js/Pages/Privacy.vue
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -1,40 +1,11 @@
-<!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+@extends('layout')
 
-    <title inertia>{{ config('app.name', 'Laravel') }}</title>
-
-    <!-- Fonts -->
-    <link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
-
-    <!-- Favicons -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-    <link rel="manifest" href="/site.webmanifest">
-    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#047857">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="theme-color" content="#ffffff">
-
-    @if(isset($open_graph) && is_array($open_graph))
-        @foreach($open_graph as $key => $value)
-            <meta property="og:{{ $key }}" content="{{ $value }}"/>
-        @endforeach
-    @endif
-
-    <!-- Scripts -->
+@section('head')
     @routes
     @vite('resources/js/app.js')
     @inertiaHead
-</head>
-<body class="font-sans antialiased min-w-80">
-{{-- @formatter:off --}}
-@production
-<script type="text/javascript">(function(window, document, dataLayerName, id) {window[dataLayerName]=window[dataLayerName]||[],window[dataLayerName].push({start:(new Date).getTime(),event:"stg.start"});var scripts=document.getElementsByTagName('script')[0],tags=document.createElement('script');function stgCreateCookie(a,b,c){var d="";if(c){var e=new Date;e.setTime(e.getTime()+24*c*60*60*1e3),d="; expires="+e.toUTCString();f="; SameSite=Strict"}document.cookie=a+"="+b+d+f+"; path=/"}var isStgDebug=(window.location.href.match("stg_debug")||document.cookie.match("stg_debug"))&&!window.location.href.match("stg_disable_debug");stgCreateCookie("stg_debug",isStgDebug?1:"",isStgDebug?14:-1);var qP=[];dataLayerName!=="dataLayer"&&qP.push("data_layer_name="+dataLayerName),isStgDebug&&qP.push("stg_debug");var qPString=qP.length>0?("?"+qP.join("&")):"";tags.async=!0,tags.src="https://koken-maruc-nl.containers.piwik.pro/"+id+".js"+qPString,scripts.parentNode.insertBefore(tags,scripts);!function(a,n,i){a[n]=a[n]||{};for(var c=0;c<i.length;c++)!function(i){a[n][i]=a[n][i]||{},a[n][i].api=a[n][i].api||function(){var a=[].slice.call(arguments,0);"string"==typeof a[0]&&window[dataLayerName].push({event:n+"."+i+":"+a[0],parameters:[].slice.call(arguments,1)})}}(i[c])}(window,"ppms",["tm","cm"]);})(window, document, 'dataLayer', 'b84fa7e9-60bf-4ccf-b2fb-ab92d7230e3e');</script>
-@endproduction
-{{-- @formatter:on --}}
-@inertia
-</body>
-</html>
+@endsection
+
+@section('content')
+    @inertia
+@endsection
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    @section('title')
+        <title inertia>{{ config('app.name', 'Laravel') }}</title>
+    @endsection
+
+    <!-- Fonts -->
+    <link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
+
+    <!-- Favicons -->
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#047857">
+    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="theme-color" content="#ffffff">
+
+    @if(isset($open_graph) && is_array($open_graph))
+        @foreach($open_graph as $key => $value)
+            <meta property="og:{{ $key }}" content="{{ $value }}"/>
+        @endforeach
+    @endif
+
+    @yield('head')
+</head>
+<body class="font-sans antialiased min-w-80">
+@include('piwik')
+@yield('content')
+</body>
+</html>
diff --git a/resources/views/piwik.blade.php b/resources/views/piwik.blade.php
@@ -0,0 +1,6 @@
+
+{{-- @formatter:off --}}
+{{--@production--}}
+<script type="text/javascript">(function(window, document, dataLayerName, id) {window[dataLayerName]=window[dataLayerName]||[],window[dataLayerName].push({start:(new Date).getTime(),event:"stg.start"});var scripts=document.getElementsByTagName('script')[0],tags=document.createElement('script');function stgCreateCookie(a,b,c){var d="";if(c){var e=new Date;e.setTime(e.getTime()+24*c*60*60*1e3),d="; expires="+e.toUTCString();f="; SameSite=Strict"}document.cookie=a+"="+b+d+f+"; path=/"}var isStgDebug=(window.location.href.match("stg_debug")||document.cookie.match("stg_debug"))&&!window.location.href.match("stg_disable_debug");stgCreateCookie("stg_debug",isStgDebug?1:"",isStgDebug?14:-1);var qP=[];dataLayerName!=="dataLayer"&&qP.push("data_layer_name="+dataLayerName),isStgDebug&&qP.push("stg_debug");var qPString=qP.length>0?("?"+qP.join("&")):"";tags.async=!0,tags.src="https://koken-maruc-nl.containers.piwik.pro/"+id+".js"+qPString,scripts.parentNode.insertBefore(tags,scripts);!function(a,n,i){a[n]=a[n]||{};for(var c=0;c<i.length;c++)!function(i){a[n][i]=a[n][i]||{},a[n][i].api=a[n][i].api||function(){var a=[].slice.call(arguments,0);"string"==typeof a[0]&&window[dataLayerName].push({event:n+"."+i+":"+a[0],parameters:[].slice.call(arguments,1)})}}(i[c])}(window,"ppms",["tm","cm"]);})(window, document, 'dataLayer', 'b84fa7e9-60bf-4ccf-b2fb-ab92d7230e3e');</script>
+{{--@endproduction--}}
+{{-- @formatter:on --}}