Merge pull request #33 from codions/develop

Develop

.dockerignore

@@ -18,4 +18,4 @@ node_modules
 storage/framework/cache/**
 storage/framework/sessions/**
 storage/framework/views/**
-.docker/storage
+docker/storage

.github/workflows/docker-publish.yaml → .github/workflows/build-publish.yaml

@@ -1,4 +1,4 @@
-name: Docker Build/Publish CI
+name: Build/Publish CI
 
 on:
   push:
@@ -26,6 +26,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Install dependencies and build
+        run: |
+          npm install
+          npm run build
+
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME
 

.gitignore

@@ -14,10 +14,10 @@ npm-debug.log
 yarn-error.log
 /.idea
 /.vscode
-# /public/css/*
-# /public/js/*
-# /public/build/*
-# /public/mix-manifest.json
+/public/css/*
+/public/js/*
+/public/build/*
+/public/mix-manifest.json
 .php-cs-fixer.cache
 rr
 .rr.yaml

app/View/Components/Layouts/Error.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\View\Components\Layouts;
+
+use Illuminate\View\Component;
+use Illuminate\View\View;
+
+class Error extends Component
+{
+    public ?string $logo;
+
+    /**
+     * Get the view / contents that represents the component.
+     */
+    public function render(): View
+    {
+        $this->logo = app(\App\Settings\ColorSettings::class)->logo;
+
+        return view('layouts.error');
+    }
+}

resources/views/errors/403.blade.php

@@ -0,0 +1,21 @@
+<x-layouts.error>
+    <div class="flex flex-col items-center">
+        <h1 class="font-bold text-blue-600 text-9xl">{{ __('403') }}</h1>
+
+        <h6 class="mb-2 text-2xl font-bold text-center text-gray-800 md:text-3xl">
+            {{ __('Forbidden') }}
+        </h6>
+
+        <p class="mb-8 text-center text-gray-500 md:text-lg">
+            @if(isset($exception) && $exception->getMessage())
+                {{ $exception?->getMessage() }}
+            @else
+                {{ __('You don\'t have permission to access this resource.') }}
+            @endif
+        </p>
+
+        <a href="/" class="outline-none inline-flex justify-center items-center group transition-all ease-in duration-150 focus:ring-2 focus:ring-offset-2 hover:shadow-sm disabled:opacity-80 disabled:cursor-not-allowed rounded gap-x-2 text-base px-4 py-2     ring-primary-500 text-white bg-primary-500 hover:bg-primary-600 hover:ring-primary-600
+dark:ring-offset-slate-800 dark:bg-primary-700 dark:ring-primary-700
+dark:hover:bg-primary-600 dark:hover:ring-primary-600 mt-3 w-full">{{ __('Go home') }}</a>
+    </div>
+</x-layouts.error>

resources/views/errors/500.blade.php

@@ -0,0 +1,21 @@
+<x-layouts.error>
+    <div class="flex flex-col items-center">
+        <h1 class="font-bold text-blue-600 text-9xl">{{ __('500') }}</h1>
+
+        <h6 class="mb-2 text-2xl font-bold text-center text-gray-800 md:text-3xl">
+            {{ __('Internal Server Error') }}
+        </h6>
+
+        <p class="mb-8 text-center text-gray-500 md:text-lg">
+            @if(isset($exception) && $exception->getMessage())
+                {{ $exception?->getMessage() }}
+            @else
+                {{ __('The server encountered an unexpected condition that prevented it from fulfilling the request.') }}
+            @endif
+        </p>
+
+        <a href="/" class="outline-none inline-flex justify-center items-center group transition-all ease-in duration-150 focus:ring-2 focus:ring-offset-2 hover:shadow-sm disabled:opacity-80 disabled:cursor-not-allowed rounded gap-x-2 text-base px-4 py-2     ring-primary-500 text-white bg-primary-500 hover:bg-primary-600 hover:ring-primary-600
+dark:ring-offset-slate-800 dark:bg-primary-700 dark:ring-primary-700
+dark:hover:bg-primary-600 dark:hover:ring-primary-600 mt-3 w-full">{{ __('Go home') }}</a>
+    </div>
+</x-layouts.error>

resources/views/errors/503.blade.php

@@ -0,0 +1,27 @@
+@push('header_scripts')
+    <script>
+        setTimeout(function() {
+        location.reload();
+        }, 10000);
+    </script>
+@endpush
+
+<x-layouts.error>
+    <div class="flex flex-col items-center">
+        <div role="status" class="mb-2">
+            <svg aria-hidden="true" class="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+            </svg>
+            <span class="sr-only">Loading...</span>
+        </div>
+
+        <h1 class="mb-2 text-2xl font-bold text-center text-gray-800 md:text-3xl">
+            {{ __('Temporarily Unavailable') }}
+        </h1>
+
+        <p class="mb-8 text-center text-gray-500 md:text-lg">
+            {{ __('We are currently updating the system. Please wait a few seconds and try again.') }}
+        </p>
+    </div>
+</x-layouts.error>

resources/views/layouts/error.blade.php

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>{{ config('app.name', 'Laravel') }}</title>
+        @vite(['resources/css/app.css'])
+        @stack('header_scripts')
+    </head>
+    <body class="font-sans text-gray-900 antialiased">
+        <div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100 dark:bg-gray-900">
+            <div>
+                @php $logo = !is_null($logo) ? asset('storage/'.$logo) : '/images/logos/logo-color.png' @endphp
+                <a  href="/">
+                    <img src="{{ $logo }}" alt="{{ config('app.name') }}"class="h-10 fill-current text-gray-500"/>
+                </a>
+            </div>
+
+            <div class="w-full sm:max-w-md mt-6 px-6 py-4 bg-white dark:bg-gray-800 shadow-md overflow-hidden sm:rounded-lg">
+                {{ $slot }}
+            </div>
+        </div>
+        @stack('footer_scripts')
+    </body>
+</html>