continuing events stuff

Author: lieselwd

app/Http/Controllers/Events/EventController.php

@@ -36,6 +36,11 @@ public function viewEvent($slug)
     {
         $event = Event::where('slug', $slug)->firstOrFail();
         $updates = $event->updates;
+        if (Auth::check() && ControllerApplication::where('user_id', Auth::id())->where('event_id', $event->id))
+        {
+            $app = ControllerApplication::where('user_id', Auth::id())->where('event_id', $event->id)->first();
+            return view('events.view', compact('event', 'updates', 'app'));
+        }
         return view('events.view', compact('event', 'updates'));
     }
 

app/Models/Events/ControllerApplication.php

@@ -38,7 +38,7 @@ public function discord_webhook()
             /*
              * The image location for the senders image
              */
-            "avatar_url" => asset('img/iconwhitebg.png'),
+            "avatar_url" => "https://resources.ganderoceanic.com/media/img/brand/sqr/ZQO_SQ_BLUE.png",
             /*
              * Whether or not to read the message in Text-to-speech
              */
@@ -78,7 +78,7 @@ public function discord_webhook()
                     // Footer object
                     "footer" => [
                         "text" => "Gander Oceanic Core",
-                        "icon_url" => asset('img/iconwhitebg.png')
+                        "icon_url" => "https://resources.ganderoceanic.com/media/img/brand/sqr/ZQO_SQ_BLUE.png"
                     ],
 
                     // Field array of objects

resources/views/admin/events/view.blade.php

@@ -40,6 +40,8 @@
             {{$event->html()}}
             <br>
             <h4>Updates</h4>
+            <a href="#" class="btn-sm btn bg-czqo-blue-light">New Update</a>
+            <br>
             @if (count($updates) == 0)
                 None yet!
             @else

resources/views/events/index.blade.php

@@ -25,6 +25,11 @@
                 </div>
             </div>
             @endforeach
+            @if(count($events) < 1)
+            <div class="col-md-6">
+                No events scheduled. Check back soon!
+            </div>
+            @endif
         </div>
         <div class="d-none d-sm-block">
         <h5 class="mt-4"><a data-toggle="collapse" data-target="#pastEvents">View Past Events <i class="fas fa-caret-down"></i></a></h5>

resources/views/events/view.blade.php

@@ -16,7 +16,7 @@
             <a href="{{route('events.index')}}" class="white-text" style="font-size: 1.2em;"> <i class="fas fa-arrow-left"></i> All Events</a>
         </div>
     </div>
-    <div class="card card-image rounded-0 blue" style="@if($event->image_url)background-image: url({{$event->image_url}});@endif background-size: cover; background-position: center;">
+    <div class="card card-image rounded-0 blue jarallax" style="@if($event->image_url)background-image: url({{$event->image_url}});@endif background-size: cover; background-position: center;">
         <div class="text-white text-left py-1 px-4 mask rgba-blue-grey-strong">
             <div class="container">
                 <div class="py-5">
@@ -73,7 +73,7 @@
                     <form id="app-form" method="POST" action="{{route('events.controllerapplication.ajax')}}">
                         @csrf
                         <input type="hidden" name="event_id" value={{$event->id}}>
-                        <p>Submit an application to the Events Coordinator to control during this event through this form.</p>
+                        <p>Submit an application to control during this event through this form.</p>
                         <label for="">Availability start time (zulu)</label>
                         <input type="datetime" name="availability_start" class="form-control flatpickr" id="availability_start">
                         <label class="mt-2" for="">Availability end time (zulu)</label>
@@ -107,6 +107,10 @@
                 <br>
                 <h4 class="font-weight-bold blue-text my-3">Apply to control</h4>
                 <p>You have already applied. Contact the Events and Marketing Director to change times, or cancel.</p>
+                <h6 class="font-weight-bold">Your Availability</h6>
+                <p>{{$app->start_availability_timestamp}} to {{$app->end_availability_timestamp}}</p>
+                <h6 class="font-weight-bold">Comments</h6>
+                <p>{{$app->comments}}</p>
                 @endif
                 <br>
                 <h4 class="font-weight-bold blue-text my-3">Updates</h4>

resources/views/index.blade.php

@@ -30,6 +30,7 @@
                     <h4><a href="#blueBannerMid" id="discoverMore" class="white-text" style="transition:fade 0.4s;">Find out more&nbsp;&nbsp;<i class="fas fa-arrow-down"></i></a></h4>
                 </div>
             </div>
+            @if($nextEvent)
             <div class="container white-text">
                 <p style="font-size: 1.4em;" class="font-weight-bold">
                     <a href="{{route('events.view', $nextEvent->slug)}}" class="white-text">
@@ -38,6 +39,7 @@
                 </p>
                 <p style="font-size: 1.2em;">{{$nextEvent->start_timestamp_pretty()}}</p>
             </div>
+            @endif
         </div>
     </div>
     <div class="container-fluid py-4 blue" id="blueBannerMid">