dish-planner/app
1
0
Fork 0
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: dish-planner:release/v0.5
Branches Tags
dish-planner:main
dish-planner:release/v0.6
dish-planner:release/v0.5
dish-planner:feature/6-livewire
dish-planner:feature/2-production-docker
dish-planner:v0.5
dish-planner:v0.4
dish-planner:v0.3
..
compare: dish-planner:main
Branches Tags
dish-planner:release/v0.6
dish-planner:release/v0.5
dish-planner:main
dish-planner:feature/6-livewire
dish-planner:feature/2-production-docker
dish-planner:v0.5
dish-planner:v0.4
dish-planner:v0.3

No commits in common. "release/v0.5" and "main" have entirely different histories.
release/v0 ... main

9 changed files with 14 additions and 101 deletions
Show stats Expand all files Collapse all files

16
app/Enums/AppModeEnum.php
View file

@ -6,7 +6,6 @@ enum AppModeEnum: string
{
case APP = 'app';
case SAAS = 'saas';
case DEMO = 'demo';
public static function current(): self
{
@ -22,19 +21,4 @@ public function isSaas(): bool
{
return $this === self::SAAS;
}
public function isDemo(): bool
{
return $this === self::DEMO;
}
public function requiresSubscription(): bool
{
return $this === self::SAAS;
}
public function allowsLogout(): bool
{
return $this !== self::DEMO;
}
}

4
app/Http/Controllers/Auth/LoginController.php
View file

@ -34,10 +34,6 @@ public function login(Request $request)
public function logout(Request $request)
{
if (is_mode_demo()) {
return redirect()->route('dashboard');
}
Auth::logout();
$request->session()->invalidate();

35
app/Http/Middleware/DemoMiddleware.php
View file

@ -1,35 +0,0 @@
<?php
namespace App\Http\Middleware;
use App\Models\Planner;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use Symfony\Component\HttpFoundation\Response;
class DemoMiddleware
{
public function handle(Request $request, Closure $next): Response
{
if (! is_mode_demo()) {
return $next($request);
}
if (Auth::check()) {
return $next($request);
}
$planner = Planner::create([
'name' => 'Demo User',
'email' => 'demo-' . Str::uuid() . '@demo.local',
'password' => Hash::make(Str::random(32)),
]);
Auth::login($planner);
return $next($request);
}
}

3
app/Http/Middleware/RequireSubscription.php
View file

@ -2,7 +2,6 @@
namespace App\Http\Middleware;
use App\Enums\AppModeEnum;
use Closure;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
@ -11,7 +10,7 @@ class RequireSubscription
{
public function handle(Request $request, Closure $next): Response
{
if (! AppModeEnum::current()->requiresSubscription()) {
if (is_mode_app()) {
return $next($request);
}

1
app/Models/Planner.php
View file

@ -13,7 +13,6 @@
* @property int $id
* @property static PlannerFactory factory($count = null, $state = [])
* @method static first()
* @method static create(array $array)
*/
class Planner extends Authenticatable
{

14
app/helpers.php
View file

@ -14,18 +14,4 @@ function is_mode_saas(): bool
{
return AppModeEnum::current()->isSaas();
}
}
if (! function_exists('is_mode_demo')) {
function is_mode_demo(): bool
{
return AppModeEnum::current()->isDemo();
}
}
if (! function_exists('allows_logout')) {
function allows_logout(): bool
{
return AppModeEnum::current()->allowsLogout();
}
}

3
bootstrap/app.php
View file

@ -1,6 +1,5 @@
<?php
use App\Http\Middleware\DemoMiddleware;
use App\Http\Middleware\ForceJsonResponse;
use App\Http\Middleware\RequireSaasMode;
use App\Http\Middleware\RequireSubscription;
@ -28,7 +27,7 @@
->withMiddleware(function (Middleware $middleware) {
// Apply ForceJsonResponse only to API routes
$middleware->api(ForceJsonResponse::class);
$middleware->web(DemoMiddleware::class);
$middleware->alias([
'subscription' => RequireSubscription::class,
'saas' => RequireSaasMode::class,

1
config/app.php
View file

@ -39,7 +39,6 @@
*/
'mode' => env('APP_MODE', 'app'),
'demo_subscribe_url' => env('APP_DEMO_SUBSCRIBE_URL', 'https://dishplanner.app'),
/*
|--------------------------------------------------------------------------

38
resources/views/components/layouts/app.blade.php
View file

@ -13,16 +13,6 @@
</head>
<body class="font-sans antialiased bg-gray-600 text-gray-100" x-data="{ mobileMenuOpen: false }">
<div class="min-h-screen">
@if(is_mode_demo())
<!-- Demo Banner -->
<div class="bg-primary text-white text-center py-2 px-4 text-sm sticky top-0 z-[60]">
DEMO MODE.
<a href="{{ config('app.demo_subscribe_url') }}" target="_blank" rel="noopener noreferrer" class="underline font-semibold hover:text-gray-200 ml-1">
Subscribe for only &euro;1 / month &rarr;
</a>
</div>
@endif
<!-- Navigation -->
<nav class="border-b-2 border-secondary shadow-sm z-50 mb-8 bg-gray-700">
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
@ -80,14 +70,12 @@ class="origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg bg-gray-
Billing
</a>
@endif
@if(allows_logout())
<form method="POST" action="{{ route('logout') }}">
@csrf
<button type="submit" class="block w-full text-left px-4 py-2 text-sm text-gray-100 hover:bg-gray-600 hover:text-accent-blue">
Logout
</button>
</form>
@endif
<form method="POST" action="{{ route('logout') }}">
@csrf
<button type="submit" class="block w-full text-left px-4 py-2 text-sm text-gray-100 hover:bg-gray-600 hover:text-accent-blue">
Logout
</button>
</form>
</div>
</div>
</div>
@ -162,14 +150,12 @@ class="block text-2xl font-medium {{ request()->routeIs('schedule.*') ? 'text-ac
Billing
</a>
@endif
@if(allows_logout())
<form method="POST" action="{{ route('logout') }}">
@csrf
<button type="submit" class="text-xl text-danger">
Logout
</button>
</form>
@endif
<form method="POST" action="{{ route('logout') }}">
@csrf
<button type="submit" class="text-xl text-danger">
Logout
</button>
</form>
</div>
@else
<div class="space-y-6 text-center">