-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into production
- Loading branch information
Showing
9 changed files
with
89 additions
and
8 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
public/build/assets/site-ccef6fc8.css → public/build/assets/site-7ae2871b.css
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <div class="space-y-5 md:space-y-8"> | ||
| <div class="space-y-3"> | ||
| <h2 class="text-2xl font-bold md:text-3xl dark:text-gray-200 dark:before:bg-gray-600"> {!! $page->title !!}</h2> | ||
| <br> | ||
| @if($page->projector === false and $page->recorder === false and $page->room ===false and empty($page->projector_status) and empty($page->recorder_status) and empty($page->room_status)) | ||
| <p class="text-lg text-gray-800 dark:text-gray-200 dark:before:bg-gray-600">{!! $page->content !!}</p> | ||
| @endif | ||
|
|
||
| <!-- Projector --> | ||
| @if($page->projector) | ||
| <span class="bg-red-100 text-red-800 text-xs font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">{{__("Projector")}}</span> | ||
| <p class="text-lg text-gray-800 dark:text-gray-200 dark:before:bg-gray-600">{{__("There is a malfunction with the projector")}}</p> | ||
| <br> | ||
| @elseif(!empty($page->projector_status)) | ||
| <span class="bg-yellow-100 text-yellow-800 text-xs font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-yellow-400 border border-yellow-400">{{__("Projector")}}</span> | ||
| <p class="text-lg text-gray-800 dark:text-gray-200 dark:before:bg-gray-600">{!! $page->projector_status !!}</p> | ||
| <br> | ||
| @endif | ||
| <!-- Recorder --> | ||
| @if($page->recorder) | ||
| <span class="bg-red-100 text-red-800 text-xs font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">{{__("Recorder")}}</span> | ||
| <p class="text-lg text-gray-800 dark:text-gray-200 dark:before:bg-gray-600">{{__("There is a malfunction with the recorder")}}</p> | ||
| <br> | ||
| @elseif(!empty($page->recorder_status)) | ||
| <span class="bg-yellow-100 text-yellow-800 text-xs font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-yellow-400 border border-yellow-400">{{__("Recorder")}}</span> | ||
| <p class="text-lg text-gray-800 dark:text-gray-200 dark:before:bg-gray-600">{!! $page->recorder_status !!}</p> | ||
| <br> | ||
| @endif | ||
| <!-- Room --> | ||
| @if($page->room) | ||
| <span class="bg-red-100 text-red-800 text-xs font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">{{__("Room")}}</span> | ||
| <p class="text-lg text-gray-800 dark:text-gray-200 dark:before:bg-gray-600">{{__("There is a malfunction with the room")}}</p> | ||
| @elseif(!empty($page->room_status)) | ||
| <span class="bg-yellow-100 text-yellow-800 text-xs font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-yellow-400 border border-yellow-400">{{__("Room")}}</span> | ||
| <p class="text-lg text-gray-800 dark:text-gray-200 dark:before:bg-gray-600">{!! $page->room_status !!}</p> | ||
| @endif | ||
|
|
||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| @extends('layouts.app') | ||
| @include('dsvheader') | ||
| @include('navbar.navbar') | ||
| <!-- News --> | ||
| <div class="py-8 px-4 mx-auto max-w-2xl lg:py-16"> | ||
| <div class="max-w-2xl"> | ||
| <div class="flex justify-between items-center mb-6"> | ||
| <div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3"> | ||
| <div class="grow"> | ||
| <div class="flex justify-between items-center gap-x-2"> | ||
| <div> | ||
| <div class="inline-block"> | ||
| <div class="sm:mb-1 block text-start"> | ||
| <span class="text-xs text-gray-800 dark:text-gray-200"> | ||
| Reported by: {!! $page->author->name ?? 'DMC' !!} | ||
| </span> | ||
| </div> | ||
| </div> | ||
| <ul class="text-xs text-gray-500"> | ||
| <li class="inline-block relative pe-6 last:pe-0 last-of-type:before:hidden before:absolute before:top-1/2 before:end-2 | ||
| before:-translate-y-1/2 before:w-1 before:h-1 before:bg-gray-300 before:rounded-full dark:text-gray-400 dark:before:bg-gray-600"> | ||
| {!! $page->date !!} | ||
| </li> | ||
| <li class="inline-block relative pe-6 last:pe-0 last-of-type:before:hidden before:absolute before:top-1/2 before:end-2 before:-translate-y-1/2 | ||
| before:w-1 before:h-1 before:bg-gray-300 before:rounded-full dark:text-gray-400 dark:before:bg-gray-600"> | ||
| <span class="bg-blue-100 text-blue-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300">{{$page->collection}}</span> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <!-- Content --> | ||
| @nocache('rooms.partials.room') | ||
| <!-- End Content --> | ||
| </div> | ||
| </div> | ||
| @include('layouts.darktoggler') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters