Dockerfile CHDIR fix

Dockerfile

@@ -29,10 +29,11 @@ ADD docker/apache.conf /etc/apache2/sites-enabled/000-default.conf
 WORKDIR /var/www/html
 COPY . /var/www/html
 
+WORKDIR /var/www/app
 RUN mkdir -p storage/framework/{sessions,views,cache,cache/data} && \
   chown -R www-data:www-data storage/framework && \
   chmod -R 775 storage
 
-RUN php artisan cache:clear && \
+#RUN php artisan cache:clear && \
-    php artisan config:clear && \
+#    php artisan config:clear && \
-    php artisan view:clear
+#    php artisan view:clear

app/Http/Controllers/ContactController.php

@@ -12,7 +12,17 @@ class ContactController extends Controller
 {
     public function show()
     {
-        return view('contact');
+        $page = $this->API('statisch/contact');
+        if ($page == null) {
+            return abort(404);
+        }
+
+        $page->published = Controller::JsonToDateTime($page->published);
+        if ($page->edited) {
+            $page->edited = Controller::JsonToDateTime($page->edited);
+        }
+
+        return view('contact', ['page' => $page]);
     }
 
     public function submit(Request $request)

resources/views/contact.blade.php

@@ -1,116 +1,98 @@
 @extends('layouts/full')
 
 @section('title')
-    Neem contact op
+Neem contact op
 @endsection
 
+@section('page_class')news_post post_container @endsection
+
 @section('breadcrumb')
-    <ul class="bread_crumb">
+<ul class="bread_crumb">
-        <li><a title="Home" href="/">Home</a></li>
+    <li><a title="Home" href="/">Home</a></li>
-        <li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
+    <li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
-        <li><a title="NH Gooi" href="{{route('contact')}}">NH Gooi</a></li>
+    <li><a title="NH Gooi" href="{{route('contact')}}">NH Gooi</a></li>
-        <li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
+    <li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
-        <li>Neem contact op</li>
+    <li>Neem contact op</li>
-    </ul>
+</ul>
 @endsection
 
 @section('content')
 
-    <div class="page_body">
+<div class="post_body">
-        <div class="row ">
+    <ul class="post_details clearfix">
-	    <div class="col-12 col-md-6">
+        <li class="detail date">
-<p>NH Gooi is de publieke streekomroep van Gooi en Vechtstreek. We houden je 24 uur per dag
+            <i class="fa-regular fa-clock"></i>
-op de hoogte van al het nieuws, betrouwbaar en snel. Dat doen we via een eigen nieuws-
+            {{Formatter::relativeDate($page->published)}} om {{$page->published->format('H:i')}}
-app, onze website en social media, maar ook op radio en televisie. Daarnaast brengen we
+            @if($page->edited && ($page->edited->format('d m H i') != $page->published->format('d m H i')))
-een gevarieerd aanbod van podcasts, radio- en televisieprogramma's.</p>
+            | bijgewerkt:
+            @if($page->edited->format('d m') != $page->published->format('d m'))
+            {{strtolower(Formatter::relativeDate($page->edited))}}
+            @endif
+            om {{$page->edited->format('H:i')}} uur
+            @endif
+        </li>
+        {{-- @if($page->author)
+        <li class="detail author"><i class="fa-solid fa-pen"></i> {{$page->author}}</li>
+        @endif --}}
+    </ul>
 
-<p>Ons team van journalisten en programmamakers bestaat uit betaalde krachten, vrijwilligers
+    <div class="row">
-en stagiaires. We vinden het belangrijk mensen op te leiden en een goede plek te bieden
+        <div class="col-12 col-md-6">
-voor talent.</p>
+            <p>{!!$page->content!!}</p>
-
+        </div>
-<p>De redactie van NH Gooi is journalistiek onafhankelijk en wordt geleid door de chef redactie.</p>
+        <div class="col-12 col-md-6">
-
+            <h3>Contact | Tip de redactie</h3>
-                <h3>Contactinformatie</h3>
+            @if(session('success'))
-
+            <div class="alert alert-success">
-                <p>Neem contact op met NH Gooi, de streekomroep voor Gooi &amp; Vechtstreek.</p>
+                {{ session('success') }}
-
-                <p>Wij zijn te ontvangen in heel Gooi en Eemland. <br>
-                    <a href="{{url('frequenties')}}" class="action_button">
-                        <span class="fa fa-list"></span>
-                        <span>Frequenties</span>
-                    </a>
-                </p>
-
-                <p class="page_margin_top">
-                    <b>NHGooi</b><br>
-                    Postbus 83<br>
-                    1270 AB Huizen<br>
-                    Tel: <a href="tel:+31356424776">035-6424774</a><br>
-                    KvK: 41194132<br>
-                    <br>
-
-                    <b>Bezoekadres / Studio:</b><br>
-                    IJsselmeerstraat 3B<br>
-                    1271 AA Huizen<br><br>
-
-                <p>
-                    <b>NHGooi Radio</b><br>
-                    IJsselmeerstraat 3B<br/>
-                    1271 AA, Huizen<br/>
-                    studio: <a href="tel:+31356424776">035-6424776</a><br/>
-                    KvK: 41194132<br>
-                </p>
             </div>
-            <div class="col-12 col-md-6">
+            @endif
-                <h3>Contactformulier</h3>
-                @if(session('success'))
-                    <div class="alert alert-success">
-                        {{ session('success') }}
-                    </div>
-                @endif
 
-                @if ($errors->any())
+            @if ($errors->any())
-                    <div class="alert alert-danger">
+            <div class="alert alert-danger">
-                        <ul>
+                <ul>
-                            @foreach ($errors->all() as $error)
+                    @foreach ($errors->all() as $error)
-                                <li>{{ $error }}</li>
+                    <li>{{ $error }}</li>
-                            @endforeach
+                    @endforeach
-                        </ul>
+                </ul>
-                    </div>
-                @endif
-
-                <form class="contant-form" action="{{ route('contact.submit') }}" method="POST" enctype="multipart/form-data">
-                    {{ csrf_field() }}
-                    <div class="form-group">
-                        <label for="name">Naam</label>
-                        <input type="text" class="form-control" id="name" name="name" value="{{ old('name') }}" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="email">Email</label>
-                        <input type="email" class="form-control" id="email" name="email" value="{{ old('email') }}" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="message">Bericht</label>
-                        <textarea class="form-control" id="message" name="message" rows="5" required>{{ old('message') }}</textarea>
-                    </div>
-                    <div class="form-group">
-                        <label for="image">Afbeelding (optioneel)</label>
-                        <input type="file" class="form-control-file" id="image" name="image" accept="image/*">
-                    </div>
-                    <div class="form-group">
-                        <label for="video">Video (optioneel)</label>
-                        <input type="file" class="form-control-file" id="video" name="video" accept="video/*">
-                    </div>
-                    <div class="form-group">
-                        {!! FriendlyCaptcha::renderWidget() !!}
-                    </div>
-                    <button type="submit" class="btn action_button">Verstuur</button>
-                </form>
             </div>
+            @endif
+
+            <form class="contant-form" action="{{ route('contact.submit') }}" method="POST"
+                enctype="multipart/form-data">
+                {{ csrf_field() }}
+                <div class="form-group">
+                    <label for="name">Naam</label>
+                    <input type="text" class="form-control" id="name" name="name" value="{{ old('name') }}" required>
+                </div>
+                <div class="form-group">
+                    <label for="email">Email</label>
+                    <input type="email" class="form-control" id="email" name="email" value="{{ old('email') }}"
+                        required>
+                </div>
+                <div class="form-group">
+                    <label for="message">Bericht</label>
+                    <textarea class="form-control" id="message" name="message" rows="5"
+                        required>{{ old('message') }}</textarea>
+                </div>
+                <div class="form-group">
+                    <label for="image">Afbeelding (optioneel)</label>
+                    <input type="file" class="form-control-file" id="image" name="image" accept="image/*">
+                </div>
+                <div class="form-group">
+                    <label for="video">Video (optioneel)</label>
+                    <input type="file" class="form-control-file" id="video" name="video" accept="video/*">
+                </div>
+                <div class="form-group">
+                    {!! FriendlyCaptcha::renderWidget() !!}
+                </div>
+                <button type="submit" class="btn action_button">Verstuur</button>
+            </form>
         </div>
     </div>
+</div>
 @endsection
 
 @push('scripts')
-    {!! FriendlyCaptcha::renderWidgetScripts() !!}
+{!! FriendlyCaptcha::renderWidgetScripts() !!}
-@endpush
+@endpush

resources/views/layouts/master.blade.php

@@ -69,7 +69,7 @@
                     <a class="with_svg_icon" href="{{url('kijk/live')}}"><span>Kijk live tv </span>{!!file_get_contents(__DIR__ . '/../../../public/images/icons/television-2.svg')!!}</a>
                 </li>
                 <li>
-                    <a href="https://wa.me/31888505651" style="{{!isset($searchURL) ? 'margin-top: 3px' : ''}}" target="_blank"><span>Tip de streekredactie </span><i style="margin-top: 2px" class="fa-solid fa-circle-plus"></i></a>
+                    <a href="{{ url('contact') }}"><span>Tip de streekredactie </span><i style="margin-top: 2px" class="fa-solid fa-circle-plus"></i></a>
                 </li>
                 @if(isset($searchURL))
                     <li class="search">