diff --git a/Dockerfile b/Dockerfile index af83013..b506a23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \  # PHP Extensions RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath gd +RUN chown -R www-data:www-data /var/www/storage /var/www/bootstrap/cache   # Install Composer COPY --from=composer:latest /usr/bin/composer /usr/bin/composer diff --git a/dashboard/bootstrap/app.php b/dashboard/bootstrap/app.php index c3928c5..9f5e292 100644 --- a/dashboard/bootstrap/app.php +++ b/dashboard/bootstrap/app.php @@ -6,13 +6,15 @@  return Application::configure(basePath: dirname(__DIR__)) ->withRouting( - web: __DIR__.'/../routes/web.php', - api: __DIR__.'/../routes/api.php', - commands: __DIR__.'/../routes/console.php', + web: __DIR__ . '/../routes/web.php', + api: __DIR__ . '/../routes/api.php', + commands: __DIR__ . '/../routes/console.php', health: '/up', ) ->withMiddleware(function (Middleware $middleware): void { - // + $middleware->alias([ + 'role' => \App\Http\Middleware\RoleMiddleware::class, + ]); }) ->withExceptions(function (Exceptions $exceptions): void { // diff --git a/dashboard/composer.json b/dashboard/composer.json index 52a3a8a..aad37ad 100644 --- a/dashboard/composer.json +++ b/dashboard/composer.json @@ -12,6 +12,7 @@ }, "require-dev": { "fakerphp/faker": "^1.23", + "laravel/breeze": "^2.4", "laravel/pail": "^1.2.2", "laravel/pint": "^1.24", "laravel/sail": "^1.41", diff --git a/dashboard/composer.lock b/dashboard/composer.lock index 7ba63ad..23b4e2e 100644 --- a/dashboard/composer.lock +++ b/dashboard/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c514d8f7b9fc5970bdd94287905ef584", + "content-hash": "18c3a10710e6e4641721ddfbd649de8d", "packages": [ { "name": "brick/math", @@ -6195,6 +6195,67 @@ }, "time": "2025-04-30T06:54:44+00:00" }, + { + "name": "laravel/breeze", + "version": "v2.4.1", + "source": { + "type": "git", + "url": "https://github.com/laravel/breeze.git", + "reference": "28cefeaf6af20177ddf5cc7b93e87e4ad79d533f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/breeze/zipball/28cefeaf6af20177ddf5cc7b93e87e4ad79d533f", + "reference": "28cefeaf6af20177ddf5cc7b93e87e4ad79d533f", + "shasum": "" + }, + "require": { + "illuminate/console": "^11.0|^12.0|^13.0", + "illuminate/filesystem": "^11.0|^12.0|^13.0", + "illuminate/support": "^11.0|^12.0|^13.0", + "illuminate/validation": "^11.0|^12.0|^13.0", + "php": "^8.2.0", + "symfony/console": "^7.0|^8.0" + }, + "require-dev": { + "laravel/framework": "^11.0|^12.0|^13.0", + "orchestra/testbench-core": "^9.0|^10.0|^11.0", + "phpstan/phpstan": "^2.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Laravel\\Breeze\\BreezeServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Laravel\\Breeze\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Minimal Laravel authentication scaffolding with Blade and Tailwind.", + "keywords": [ + "auth", + "laravel" + ], + "support": { + "issues": "https://github.com/laravel/breeze/issues", + "source": "https://github.com/laravel/breeze" + }, + "time": "2026-03-10T19:59:01+00:00" + }, { "name": "laravel/pail", "version": "v1.2.6", diff --git a/dashboard/package.json b/dashboard/package.json index 7686b29..2ea7e1d 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -7,11 +7,15 @@ "dev": "vite" }, "devDependencies": { + "@tailwindcss/forms": "^0.5.2", "@tailwindcss/vite": "^4.0.0", + "alpinejs": "^3.4.2", + "autoprefixer": "^10.4.2", "axios": "^1.11.0", "concurrently": "^9.0.1", "laravel-vite-plugin": "^2.0.0", - "tailwindcss": "^4.0.0", + "postcss": "^8.4.31", + "tailwindcss": "^3.1.0", "vite": "^7.0.7" } } diff --git a/dashboard/resources/css/app.css b/dashboard/resources/css/app.css index 3e6abea..b5c61c9 100644 --- a/dashboard/resources/css/app.css +++ b/dashboard/resources/css/app.css @@ -1,11 +1,3 @@ -@import 'tailwindcss'; - -@source '../../vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php'; -@source '../../storage/framework/views/*.php'; -@source '../**/*.blade.php'; -@source '../**/*.js'; - -@theme { - --font-sans: 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', - 'Segoe UI Symbol', 'Noto Color Emoji'; -} +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/dashboard/resources/js/app.js b/dashboard/resources/js/app.js index e59d6a0..a8093be 100644 --- a/dashboard/resources/js/app.js +++ b/dashboard/resources/js/app.js @@ -1 +1,7 @@ import './bootstrap'; + +import Alpine from 'alpinejs'; + +window.Alpine = Alpine; + +Alpine.start(); diff --git a/dashboard/resources/views/layouts/app.blade.php b/dashboard/resources/views/layouts/app.blade.php index e086ead..0a471a4 100644 --- a/dashboard/resources/views/layouts/app.blade.php +++ b/dashboard/resources/views/layouts/app.blade.php @@ -1,305 +1,36 @@  - - - - NRML Dashboard -  - -  -  -  -  -  -  - -  -  - -  -  -  - -  - - - - -
 -
 - National Reference Medical Laboratory Surveillance Dashboard -
 -
 - Last update: 12:05 | 2026-03-15 -
 -
 - -
 - -  - Overview -  - - @foreach($programs as $program) - @if($program->code === 'SEQ') -  - SEQ -  - @else -  - {{ $program->code }} -  - @endif - @endforeach - -
 - -  - -
 - -  - -
 -  -  -  -  -
 - -
 -
 -
Select Charts
 -
 - -
 -  -  -
 + +  +  +  +  + + {{ config('app.name', 'Laravel') }} + +  +  +  + +  + @vite(['resources/css/app.css', 'resources/js/app.js']) +  +  +
 + @include('layouts.navigation') + +  + @isset($header) +
 +
 + {{ $header }}
 -
 - -
 - -
 - -
 +  + @endisset  -
 -
 - @yield('content') +  +
 + {{ $slot }} +

 -
 - - @yield('scripts') - -  - - - +   diff --git a/dashboard/routes/web.php b/dashboard/routes/web.php index 4bcbea0..69ac7ac 100644 --- a/dashboard/routes/web.php +++ b/dashboard/routes/web.php @@ -1,17 +1,40 @@ check() + ? redirect()->route('dashboard') + : redirect()->route('login'); + });  +Route::get('/dashboard', function () { + return view('dashboard'); +})->middleware(['auth', 'verified'])->name('dashboard'); + +Route::middleware('auth')->group(function () { + Route::get('/profile', [ProfileController::class, 'edit'])->name('profile.edit'); + Route::patch('/profile', [ProfileController::class, 'update'])->name('profile.update'); + Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy'); + Route::get('/dashboard', [DashboardController::class, 'overview']) + ->name('dashboard'); + Route::get('/dashboard/{code}', [DashboardController::class, 'detail']) + ->name('dashboard.detail'); +}); +Route::middleware(['auth', 'role:admin'])->group(function () { + + Route::get('/admin/users', function () { + return view('admin.users'); + }); + + Route::get('/admin/settings', function () { + return view('admin.settings'); + });  -Route::get('/dashboard/seq', function () { - return view('dashboard.sequencing'); }); -Route::get('/dashboard', [DashboardController::class, 'overview']); -Route::get('/dashboard/{code}', [DashboardController::class, 'detail']);  +require __DIR__ . '/auth.php'; diff --git a/dashboard/vite.config.js b/dashboard/vite.config.js index f35b4e7..421b569 100644 --- a/dashboard/vite.config.js +++ b/dashboard/vite.config.js @@ -1,6 +1,5 @@ import { defineConfig } from 'vite'; import laravel from 'laravel-vite-plugin'; -import tailwindcss from '@tailwindcss/vite';  export default defineConfig({ plugins: [ @@ -8,11 +7,5 @@ export default defineConfig({ input: ['resources/css/app.css', 'resources/js/app.js'], refresh: true, }), - tailwindcss(), ], - server: { - watch: { - ignored: ['**/storage/framework/views/**'], - }, - }, });