feat: adds golf theme

Justintime50 · Dec 12, 2024 · f049ded · f049ded
1 parent 3096dc5
commit f049ded
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # CHANGELOG
 
-## v3.1.0 (2024-12-11)
+## v3.1.0 (2024-12-12)
 
 - Adds PHP 8.4 support
 - Docker Swarm support (changes made to configuration and tooling)
 - S3 file support for images
+- Adds `golf` theme
 - New auth view layouts
 - Bumps Docker image with improved PHP-FPM throughput
 - Bumps dependencies

diff --git a/src/justfile b/src/justfile
@@ -53,7 +53,7 @@ lint-css-fix:
 
 # Fix JS linting
 lint-js-fix:
-    eslint resources/js/*.js --fix
+    npx eslint resources/js/*.js --fix
 
 # Migrates the database
 migrate:

diff --git a/src/resources/sass/themes/_theme.scss b/src/resources/sass/themes/_theme.scss
@@ -24,8 +24,13 @@ input[type="email"],
 input[type="password"],
 textarea,
 select {
-  background-color: $font-color !important;
-  color: $background-color-accent !important;
+  background-color: $background-color-accent !important;
+  color: $font-color !important;
+}
+
+input::placeholder,
+textarea::placeholder {
+  color: rgba($font-color, 0.6) !important;
 }
 
 hr {

diff --git a/src/resources/sass/themes/golf.scss b/src/resources/sass/themes/golf.scss
@@ -0,0 +1,10 @@
+// Golf Theme Colors
+$background-color: #d1e7dd;
+$background-color-accent: #e9ecef;
+$accent-color: #479f76;
+$interaction-color: #198754;
+$font-color: #212529;
+$danger-color: #dc3545;
+
+// Import Theme Elements
+@import 'theme';
diff --git a/src/resources/views/admin.blade.php b/src/resources/views/admin.blade.php
@@ -15,28 +15,31 @@
 
             <label for="title">Comments</label>
             <select class="form-select" name="comments">
-                <option value="1" <?php if ($settings->comments == 1) {
-                    echo 'selected';
-                } ?>>On</option>
-                <option value="0" <?php if ($settings->comments == 0) {
-                    echo 'selected';
-                } ?>>Off</option>
+                <option value="1" @if ($settings->comments == 1) {{ 'selected' }} @endif>
+                    On
+                </option>
+                <option value="0" @if ($settings->comments == 0) {{ 'selected' }} @endif>
+                    Off
+                </option>
             </select>
 
             <label for="title">Blog Theme</label>
             <select class="form-select" name="theme">
-                <option value="1" <?php if ($settings->theme == 1) {
-                    echo 'selected';
-                } ?>>Light</option>
-                <option value="2" <?php if ($settings->theme == 2) {
-                    echo 'selected';
-                } ?>>Dark</option>
-                <option value="3" <?php if ($settings->theme == 3) {
-                    echo 'selected';
-                } ?>>Midnight</option>
-                <option value="4" <?php if ($settings->theme == 4) {
-                    echo 'selected';
-                } ?>>Amethyst</option>
+                <option value="1" @if ($settings->theme == 1) {{ 'selected' }} @endif>
+                    Light
+                </option>
+                <option value="2" @if ($settings->theme == 2) {{ 'selected' }} @endif>
+                    Dark
+                </option>
+                <option value="3" @if ($settings->theme == 3) {{ 'selected' }} @endif>
+                    Midnight
+                </option>
+                <option value="4" @if ($settings->theme == 4) {{ 'selected' }} @endif>
+                    Amethyst
+                </option>
+                <option value="5" @if ($settings->theme == 5) {{ 'selected' }} @endif>
+                    Golf
+                </option>
             </select>
 
             <input class="btn btn-primary mt-3"

diff --git a/src/resources/views/layouts/app.blade.php b/src/resources/views/layouts/app.blade.php
@@ -20,6 +20,8 @@
         @vite(['resources/sass/themes/midnight.scss'])
     @elseif ($settings->theme == 4)
         @vite(['resources/sass/themes/amethyst.scss'])
+    @elseif ($settings->theme == 5)
+        @vite(['resources/sass/themes/golf.scss'])
     @endif
 </head>
 
@@ -30,8 +32,13 @@
                 <a class="navbar-brand" href="/">
                     {{ $settings->title }}
                 </a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar"
-                    aria-controls="navbar" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
+                <button class="navbar-toggler"
+                        data-bs-toggle="collapse"
+                        data-bs-target="#navbar"
+                        type="button"
+                        aria-controls="navbar"
+                        aria-expanded="false"
+                        aria-label="{{ __('Toggle navigation') }}">
                     <span class="navbar-toggler-icon"></span>
                 </button>
 
@@ -63,8 +70,14 @@
                             <a class="nav-link" href="/posts">Posts</a>
 
                             <li class="nav-item dropdown">
-                                <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button"
-                                    data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
+                                <a class="nav-link dropdown-toggle"
+                                   id="navbarDropdown"
+                                   data-bs-toggle="dropdown"
+                                   href="#"
+                                   role="button"
+                                   aria-haspopup="true"
+                                   aria-expanded="false"
+                                   v-pre>
                                     {{ Auth::user()->name }} <span class="caret"></span>
                                 </a>
 
@@ -75,13 +88,17 @@
                                         <a class="dropdown-item" href="/comments">Comments</a>
                                         <a class="dropdown-item" href="/admin">Admin</a>
                                     @endif
-                                    <a class="dropdown-item" href="/logout"
-                                        onclick="event.preventDefault();
+                                    <a class="dropdown-item"
+                                       href="/logout"
+                                       onclick="event.preventDefault();
                                                      document.getElementById('logout-form').submit();">
                                         {{ __('Logout') }}
                                     </a>
 
-                                    <form id="logout-form" action="/logout" method="POST" class="pa-display-none">
+                                    <form class="pa-display-none"
+                                          id="logout-form"
+                                          action="/logout"
+                                          method="POST">
                                         @csrf
                                     </form>
                                 </div>

diff --git a/src/vite.config.js b/src/vite.config.js
@@ -5,11 +5,12 @@ export default defineConfig({
     plugins: [
         laravel({
             input: [
+                "resources/js/app.js",
                 "resources/sass/app.scss",
                 "resources/sass/themes/amethyst.scss",
                 "resources/sass/themes/dark.scss",
+                "resources/sass/themes/golf.scss",
                 "resources/sass/themes/midnight.scss",
-                "resources/js/app.js",
             ],
             refresh: true,
         }),