Merge pull request #384 from connorabbas/master

Catch up

Author: connorabbas

.devcontainer/devcontainer.json

@@ -17,6 +17,8 @@
                 "laravel.vscode-laravel",
                 "Vue.volar",
                 "hollowtree.vue-snippets",
+                "dbaeumer.vscode-eslint",
+                "EditorConfig.EditorConfig",
                 "bradlc.vscode-tailwindcss",
                 "eamodio.gitlens",
                 "esbenp.prettier-vscode",

.env.example

@@ -67,5 +67,5 @@ WWWGROUP=1000
 WWWUSER=1000
 
 APP_PORT=8000
-VITE_PORT=5173
+VITE_APP_PORT=5173
 FORWARD_DB_PORT=

.gitignore

@@ -1,23 +1,31 @@
 /.phpunit.cache
-/node_modules
 /bootstrap/ssr
+/node_modules
 /public/build
 /public/hot
 /public/storage
-/public/themes
 /storage/*.key
+/storage/pail
+/resources/js/actions
+/resources/js/routes
+/resources/js/wayfinder
 /vendor
+.DS_Store
 .env
 .env.backup
 .env.production
 .phpactor.json
 .phpunit.result.cache
 Homestead.json
 Homestead.yaml
-auth.json
 npm-debug.log
 yarn-error.log
-components.d.ts
+/auth.json
 /.fleet
 /.idea
-/.vscode
+/.nova
+/.vscode
+/.zed
+
+components.d.ts
+*.tsbuildinfo

.prettierrc.cjs

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Settings;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
@@ -18,10 +17,7 @@ class PasswordController extends Controller
      */
     public function edit(Request $request): Response
     {
-        return Inertia::render('settings/Password', [
-            'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
-            'status' => $request->session()->get('status'),
-        ]);
+        return Inertia::render('settings/Password');
     }
 
     /**

app/Http/Controllers/Settings/PasswordController.php

@@ -10,7 +10,7 @@ services:
       - 'host.docker.internal:host-gateway'
     #ports:
       #- '${APP_PORT:-80}:80' not required using Traefik
-      #- '${VITE_PORT:-5173}:${VITE_PORT:-5173}' Not required if using dev containers (auto forwards port to localhost)
+      #- '${VITE_APP_PORT:-5173}:${VITE_APP_PORT:-5173}' Not required if using dev containers (auto forwards port to localhost)
     environment:
       WWWUSER: '${WWWUSER}'
       LARAVEL_SAIL: 1

docker-compose.local.yml

@@ -1,10 +1,5 @@
-import vue from 'eslint-plugin-vue';
-import {
-    defineConfigWithVueTs,
-    vueTsConfigs,
-} from '@vue/eslint-config-typescript';
-import eslint from '@eslint/js';
-import globals from 'globals';
+import vue from 'eslint-plugin-vue'
+import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'
 
 export default [
     // Global ignores
@@ -17,23 +12,6 @@ export default [
             'bootstrap/ssr',
         ],
     },
-    // JavaScript files
-    {
-        files: ['**/*.js'],
-        ...eslint.configs.recommended,
-        languageOptions: {
-            ecmaVersion: 'latest',
-            sourceType: 'module',
-            globals: {
-                ...globals.browser,
-                ...globals.node,
-                process: 'readonly',
-                module: 'readonly',
-                require: 'readonly',
-                window: 'readonly',
-            },
-        },
-    },
     // Vue and TypeScript files
     ...defineConfigWithVueTs(
         vue.configs['flat/recommended'],
@@ -44,14 +22,13 @@ export default [
                 'vue/attribute-hyphenation': 'off',
                 'vue/v-on-event-hyphenation': 'off',
                 'vue/multi-word-component-names': 'off',
-                'vue/block-lang': 'off',
                 'vue/no-v-html': 'off',
                 'vue/html-indent': ['error', 4],
                 '@typescript-eslint/no-explicit-any': 'off',
                 indent: ['error', 4],
-                semi: ['error', 'always'],
+                semi: ['error', 'never'],
                 'linebreak-style': ['error', 'unix'],
             },
-        }
+        },
     ),
-];
+]