Update develop with main (testing purposes)

.env.example

@@ -2,7 +2,8 @@ APP_NAME=FramedJustForYou
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://framedjustforyou.test
+APP_URL=https://framedjustforyou.test
+CLOUDFRONT_URL=
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
@@ -11,7 +12,7 @@ LOG_LEVEL=debug
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=laravel
+DB_DATABASE=framed
 DB_USERNAME=root
 DB_PASSWORD=
 
@@ -57,3 +58,6 @@ VITE_PUSHER_HOST="${PUSHER_HOST}"
 VITE_PUSHER_PORT="${PUSHER_PORT}"
 VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
 VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+GOOGLE_API_KEY=
+GOOGLE_PLACE_ID=

.github/workflows/deploy.yml

@@ -1,19 +1,24 @@
-name: Deployment
+name: Deploy
 
-on: [ push ]
+on:
+  push:
+    branches:
+      - main
 
 jobs:
   deployment:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+
+    environment: production
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.3'
           extensions: zip, sqlite3
           coverage: none
 
@@ -29,9 +34,9 @@ jobs:
         run: npm ci
 
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Copy .env
         run: php -r "file_exists('.env') || copy('.env.production.example', '.env');"
@@ -43,26 +48,11 @@ jobs:
         run: |
           npm run build
 
-      - name: Clear Cache
-        run: |
-          php artisan cache:clear
-          php artisan route:clear
-          php artisan view:clear
-          php artisan config:clear
-
-      - name: Build ZIP Deployment Package
-        if: github.ref == 'refs/heads/main'
-        run: zip -r deploy.zip ./ -x "node_modules/*" -x "vendor/*" -x "tests/*"
+      - name: Run Tests
+        run: ./vendor/bin/phpunit
 
-      - name: Deploy to Elastic Beanstalk
-        if: github.ref == 'refs/heads/main'
-        uses: einaregilsson/beanstalk-deploy@v18
-        with:
-          aws_access_key: ${{ secrets.AWS_ACCESS_KEY }}
-          aws_secret_key: ${{ secrets.AWS_SECRET_KEY }}
-          application_name: "FramedJust4You"
-          environment_name: FramedJust4You-env
-          existing_bucket_name: ${{ secrets.AWS_BUCKET_NAME }}
-          region: ap-southeast-2
-          version_label: ${{ github.sha }}
-          deployment_package: deploy.zip
+      - name: Deploy to Laravel Cloud
+        if: success()
+        run: |
+          curl -X POST ${{ secrets.CLOUD_DEPLOY_HOOK }} \
+          -H "Content-Type: application/json" \

README.md

@@ -3,11 +3,13 @@
 <a href="https://github.com/SethSharp/FramedJustForYou/actions"><img src="https://github.com/laravel/framework/workflows/tests/badge.svg" alt="Build Status"></a>
 </p>
 
-Is a locally owned and operated business on the Gold Coast since 1997. After news of the old sites provider coming to an end, I put my hand up to help resolve this by creating a new and modern website. With more information and a greater improvement to the previous site. This new design and infrawstructure is a major upgrade and has provided an awesome learning experience: 
+Is a locally owned and operated business on the Gold Coast since 1997. After news of the old site provider coming to an end, I put my hand up to help resolve this by creating a new and modern website. With more information and a greater improvement to the previous site. This new design and infrastructure is a major upgrade and has provided an awesome learning experience: 
 
 1. Working with a client and gathering requirements
-2. Implementing best practises in a production environment
-3. Learning heaps of new techniques and technology to achieve
+2. Implementing best practices in a production environment
+3. Learning more about AWS
+4. Learning heaps of new techniques
+5. Solving new problems
 
 
 Full Production site [here](https://www.framedjustforyou.com.au)

app/Exceptions/Handler.php

@@ -3,6 +3,7 @@
 namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Inertia\Inertia;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -27,4 +28,15 @@ public function register(): void
             //
         });
     }
+
+    public function render($request, Throwable $e)
+    {
+        $response = parent::render($request, $e);
+        $status = $response->status();
+
+        return match ($status) {
+            404 => response()->view('errors.404', [], 404),
+            default => $response
+        };
+    }
 }

app/Http/Controllers/Public/ShowAboutController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers\Public;
+
+use Illuminate\View\View;
+use App\Http\Controllers\Controller;
+
+class ShowAboutController extends Controller
+{
+    public function __invoke(): View
+    {
+        return view('pages/about', [
+            'team' => config('framed.team')
+        ]);
+    }
+}

app/Http/Controllers/Public/ShowHomeController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Public;
+
+use Illuminate\View\View;
+use App\Support\Traits\GoogleApi;
+use App\Http\Controllers\Controller;
+
+class ShowHomeController extends Controller
+{
+    use GoogleApi;
+
+    public function __invoke(): View
+    {
+        return view('pages/home', [
+            'reviews' => $this->getRecentReviews()
+        ]);
+    }
+}

app/Http/Kernel.php

@@ -21,6 +21,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \App\Http\Middleware\StrictTransportSecurity::class
     ];
 
     /**
@@ -36,13 +37,22 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\HandleInertiaRequests::class,
+            \Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets::class,
+        ],
+
+        'public' => [
+            \App\Http\Middleware\EncryptCookies::class,
+            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+            \Illuminate\Session\Middleware\StartSession::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            \App\Http\Middleware\VerifyCsrfToken::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets::class,
         ],
 
         'api' => [
             // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
-            \Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
+            \Illuminate\Routing\Middleware\ThrottleRequests::class . ':api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];

app/Http/Middleware/StrictTransportSecurity.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class StrictTransportSecurity
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        $response = $next($request);
+
+        $response->headers->set('Strict-Transport-Security', 'max-age=63072000; includeSubDomains; preload');
+
+        return $response;
+    }
+}

app/Support/CacheKeys.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Support;
+
+class CacheKeys
+{
+    public static function googleReviews(): string
+    {
+        return 'google-reviews';
+    }
+}