Merge branch 'master' into feat/user-reg-api

Reviewed-on: #16

app/Http/Controllers/Api/UserController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use App\Http\Requests\StoreUserRequest;
 use Illuminate\Support\Facades\Validator;
 
@@ -28,4 +29,24 @@ class UserController extends Controller
         return response()
                 ->json(['message' => 'Successfully created user ' . $user->firstname]);
     }
+
+    public function getUser(Request $request, $id)
+    {
+        if (!empty($id)){
+            try {
+                # The user exists
+                $user = User::where('uuid', $id)->firstOrfail();
+                return response()
+                    ->json(["status" => true]);
+            } catch (Illuminate\Database\Eloquent\ModelNotFoundException $e) {
+                // The user does not exist
+                return response()
+                    ->json(["status" => false]);
+            }
+        } else {
+            return response()
+                ->json(["status" => "false", "message" => "Please specify UUID"]);
+        }
+        
+    }
 }

package-lock.json

@@ -1,9 +1,13 @@
 {
-    "name": "priceybot",
+    "name": "html",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
+            "dependencies": {
+                "@fontsource/cooper-hewitt": "^5.0.7",
+                "@fortawesome/fontawesome-free": "^6.4.2"
+            },
             "devDependencies": {
                 "@tailwindcss/forms": "^0.5.2",
                 "autoprefixer": "^10.4.2",
@@ -378,6 +382,20 @@
                 "node": ">=12"
             }
         },
+        "node_modules/@fontsource/cooper-hewitt": {
+            "version": "5.0.7",
+            "resolved": "https://registry.npmjs.org/@fontsource/cooper-hewitt/-/cooper-hewitt-5.0.7.tgz",
+            "integrity": "sha512-TDbBV/TJGWeHxuBKIgF+yq1sQcOvRswEF0kwJ07FbEXEWYW4fR3uqrpMrGmlUWQKoMlSgo6EKe+u5dr3rJhrnQ=="
+        },
+        "node_modules/@fortawesome/fontawesome-free": {
+            "version": "6.4.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
+            "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==",
+            "hasInstallScript": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/@jridgewell/gen-mapping": {
             "version": "0.3.3",
             "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",

package.json

@@ -2,9 +2,16 @@
     "private": true,
     "type": "module",
     "scripts": {
-        "dev": "vite --host",
-        "build": "vite build"
+        "dev": "npm run development",
+        "development": "vue-tsc --noEmit && NODE_ENV=development vite build --sourcemap -m development",
+        "watch": "vite build -m development --watch",
+        "prod": "npm run production",
+        "production": "vue-tsc --noEmit && NODE_ENV=production vite build -m production",
+        "lint": "eslint --ext .js,.ts,.vue --fix resources/js"
     },
+    "browserslist": [
+        "last 3 versions"
+    ],
     "devDependencies": {
         "@tailwindcss/forms": "^0.5.2",
         "autoprefixer": "^10.4.2",
@@ -13,5 +20,9 @@
         "postcss": "^8.4.6",
         "tailwindcss": "^3.1.0",
         "vite": "^4.0.0"
+    },
+    "dependencies": {
+        "@fontsource/cooper-hewitt": "^5.0.7",
+        "@fortawesome/fontawesome-free": "^6.4.2"
     }
 }

resources/css/_fonts.scss

@@ -0,0 +1,9 @@
+// Cooper Hewitt
+@import "@fontsource/cooper-hewitt/latin.css";
+
+// Font Awesome
+$fa-font-path: "@fortawesome/fontawesome-free/webfonts";
+@import '@fortawesome/fontawesome-free/scss/fontawesome';
+@import '@fortawesome/fontawesome-free/scss/regular';
+@import '@fortawesome/fontawesome-free/scss/solid';
+@import '@fortawesome/fontawesome-free/scss/brands';

resources/views/components/darkmode.blade.php

@@ -1,5 +1,5 @@
 <div class="flex items-center">
-    <template x-if="darkMode === 'dark'">
+    <div x-show="darkMode === 'dark'">
         <button x-on:click="darkMode = 'light'" class="pl-6">
             <svg xmlns="http://www.w3.org/2000/svg"
                  x-bind:class="{'border-2 border-red/50': darkMode === 'light'}"
@@ -8,8 +8,8 @@
             </svg>
             <span class="sr-only">light</span>
         </button>
-    </template>
-    <template x-if="darkMode !== 'dark'">
+    </div>
+    <div x-show="darkMode !== 'dark'">
         <button x-on:click="darkMode = 'dark'" class="pl-6">
             <svg xmlns="http://www.w3.org/2000/svg"
                  x-bind:class="{'border-2 border-red/50': darkMode === 'dark'}"
@@ -18,5 +18,5 @@
             </svg>
             <span class="sr-only">dark</span>
         </button>
-    </template>
+    </div>
 </div>

resources/views/layouts/app.blade.php

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
+<html x-cloak lang="{{ str_replace('_', '-', app()->getLocale()) }}"
       x-data="{
         darkMode: localStorage.getItem('darkMode') ||
         localStorage.setItem('darkMode', 'system')

resources/views/layouts/guest.blade.php

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
+<html x-cloak lang="{{ str_replace('_', '-', app()->getLocale()) }}"
       x-data="{
         darkMode: localStorage.getItem('darkMode') ||
         localStorage.setItem('darkMode', 'system')

routes/api.php

@@ -20,4 +20,5 @@ Route::middleware(['header.auth', 'throttle:api'])->group(function () {
     Route::post('/sendQuote', [WebHookController::class, 'sendQuote']);
     Route::post('/randomQuote', [WebHookController::class, 'sendRandomQuote']);
     Route::post('/registerUser', [UserController::class, 'registerUser']);
+    Route::get('/getUser/{id}', [UserController::class, 'getUser']);
 });

tailwind.config.js

@@ -46,7 +46,8 @@ export default {
                 'nexi-orange': "rgb(241, 124, 37)",
             },
             fontFamily: {
-                sans: ['Figtree', ...defaultTheme.fontFamily.sans],
+                sans: ['Cooper Hewitt', ...defaultTheme.fontFamily.sans],
+                serif: ['Cooper Hewitt', ...defaultTheme.fontFamily.sans],
             },
         },
     },

vite.config.js

@@ -11,12 +11,4 @@ export default defineConfig({
             refresh: true,
         }),
     ],
-    server: {
-        hmr: {
-            host: '10.6.9.126',
-        },
-        watch: {
-            usePolling: true,
-        },
-    }
 });