change

.github/workflows/laravel.yml

@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: "8.1"
+                  php-version: "8.2"
             - uses: actions/checkout@v3
             - name: Copy .env
               run: php -r "file_exists('.env') || copy('.env.example', '.env');"

.vscode/settings.json

@@ -2,8 +2,7 @@
     "editor.formatOnType": true,
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
-        // "source.organizeImports": true // <-- when enabled, breaks tinymce required import order
+        "source.fixAll.eslint": "explicit"
     },
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "[vue]": {

composer.json

@@ -8,30 +8,25 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "doctrine/dbal": "^3.5",
-        "guzzlehttp/guzzle": "^7.2",
-        "intervention/image": "^2.7",
-        "laravel/framework": "^10.12",
-        "laravel/sanctum": "^3.2",
+        "inertiajs/inertia-laravel": "^0.6.11",
+        "laravel/framework": "^10.10",
+        "laravel/sanctum": "^3.3",
         "laravel/tinker": "^2.8",
-        "league/flysystem-aws-s3-v3": "^3.12",
-        "owen-it/laravel-auditing": "^13.1",
-        "php-ffmpeg/php-ffmpeg": "^1.1",
-        "square/square": "32.0.0.20231018",
-        "sunspikes/clamav-validator": "*",
-        "thiagoalessio/tesseract_ocr": "^2.12",
-        "vlucas/phpdotenv": "^5.5"
+        "owen-it/laravel-auditing": "^13.5",
+        "spatie/image": "^2.2",
+        "spatie/laravel-permission": "^6.2",
+        "tightenco/ziggy": "^1.8"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.13",
         "fakerphp/faker": "^1.9.1",
-        "itsgoingd/clockwork": "^5.1",
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^7.1",
-        "phpunit/phpunit": "^10.1.3",
+        "nunomaduro/collision": "^7.0",
+        "phpunit/phpunit": "^10.1",
         "spatie/laravel-ignition": "^2.0"
     },
     "autoload": {
@@ -43,14 +38,12 @@
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
-            "Database\\Seeders\\": "database/seeders/",
-            "Faker\\Provider\\": "faker/provider/"
+            "Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/",
-            "Faker\\Provider\\": "faker/provider/"
+            "Tests\\": "tests/"
         }
     },
     "scripts": {
@@ -78,7 +71,8 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true
+            "pestphp/pest-plugin": true,
+            "php-http/discovery": true
         }
     },
     "minimum-stability": "stable",

package.json

@@ -1,36 +1,22 @@
 {
     "private": true,
+    "type": "module",
     "scripts": {
         "dev": "vite",
-        "build": "vite build",
-        "lint": "eslint \"**/*.{js,jsx,.vue}\" --ignore-path .gitignore",
-        "format": "prettier .  --write",
-        "test": "vitest",
-        "knip": "knip",
-        "ls-lint": "npx @ls-lint/ls-lint"
+        "build": "vite build"
     },
     "devDependencies": {
-        "@ls-lint/ls-lint": "^2.2.2",
-        "@typescript-eslint/eslint-plugin": "^6.9.1",
-        "@typescript-eslint/parser": "^6.9.1",
-        "eslint": "^8.52.0",
-        "eslint-config-prettier": "^9.0.0",
-        "eslint-plugin-jsdoc": "^46.6.0",
-        "eslint-plugin-vue": "^9.18.1",
-        "knip": "^2.38.6",
+        "autoprefixer": "^10.4.16",
+        "axios": "^1.6.1",
         "laravel-vite-plugin": "^0.8.0",
-        "lodash": "^4.17.19",
-        "postcss": "^8.4.27",
-        "prettier": "3.0.3",
-        "rollup-plugin-analyzer": "^4.0.0",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.0.4",
-        "unocss": "^0.57.1",
-        "vite": "^4.4.7",
-        "vite-plugin-compression2": "^0.11.0",
-        "vitest": "^0.34.3"
+        "postcss": "^8.4.31",
+        "precss": "^4.0.0",
+        "tailwindcss": "^3.3.5",
+        "vite": "^4.0.0"
     },
     "dependencies": {
+        "@inertiajs/progress": "^0.2.7",
+        "@inertiajs/vue3": "^1.0.14",
         "@tiptap/extension-highlight": "^2.1.8",
         "@tiptap/extension-image": "^2.0.3",
         "@tiptap/extension-link": "^2.0.3",
@@ -43,11 +29,10 @@
         "@tiptap/vue-3": "^2.0.3",
         "@vitejs/plugin-vue": "^4.4.0",
         "dompurify": "^3.0.4",
-        "dotenv": "^16.0.3",
-        "pinia": "^2.0.28",
-        "pinia-plugin-persistedstate": "^3.2.0",
-        "sass": "^1.69.5",
+        "primevue": "^3.46.0",
         "vue": "^3.3.7",
-        "vue-router": "^4.2.2"
+        "vue-loader": "^17.4.2",
+        "vue-toastification": "^2.0.0-rc.5",
+        "ziggy-js": "^1.8.1"
     }
 }

resources/js/components/SMAttachments.vue

@@ -17,7 +17,10 @@
                             :src="getFileIconImagePath(file.name || file.title)"
                             class="h-10 text-center" />
                         <div
-                            v-if="file.security_type != ''"
+                            v-if="
+                                file.security_type !== undefined &&
+                                file.security_type != ''
+                            "
                             class="absolute right--1 top-0 h-4 w-4">
                             <svg
                                 xmlns="http://www.w3.org/2000/svg"
@@ -29,11 +32,14 @@
                         </div>
                     </td>
                     <td class="pl-2 py-4 w-full">
-                        <a :href="file.url" target="_blank">{{
+                        <a rel="nofollow" :href="file.url" target="_blank">{{
                             file.title || file.name
                         }}</a>
                         <p
-                            v-if="file.security_type != ''"
+                            v-if="
+                                file.security_type !== undefined &&
+                                file.security_type != ''
+                            "
                             class="text-xs color-gray">
                             <svg
                                 xmlns="http://www.w3.org/2000/svg"
@@ -49,7 +55,9 @@
                         </p>
                     </td>
                     <td class="pr-2">
-                        <a :href="addQueryParam(file.url, 'download', '1')"
+                        <a
+                            rel="nofollow"
+                            :href="addQueryParam(file.url, 'download', '1')"
                             ><svg
                                 viewBox="0 0 24 24"
                                 fill="none"

resources/js/main.js

@@ -1,12 +1,39 @@
-import Router from "@/router";
-import { createPinia } from "pinia";
-import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
-import { createApp } from "vue";
-import App from "./views/App.vue";
-import "uno.css";
-import "../css/app.scss";
+import { createInertiaApp } from "@inertiajs/vue3";
+import Toast, { POSITION } from "vue-toastification";
+import "vue-toastification/dist/index.css";
+import { createApp, h } from "vue/dist/vue.esm-bundler.js";
+import "./bootstrap";
 
-const pinia = createPinia();
-pinia.use(piniaPluginPersistedstate);
-
-createApp(App).use(pinia).use(Router).mount("#app");
+createInertiaApp({
+    title: (title) => `${title} - STEMMechanics`,
+    progress: {
+        delay: 250,
+        color: "#22C55E",
+        includeCSS: true,
+        showSpinner: false,
+    },
+    resolve: (name) => {
+        const pages = import.meta.glob("./Pages/**/*.vue", { eager: true });
+        return pages[`./Pages/${name}.vue`];
+    },
+    setup({ el, App, props, plugin }) {
+        createApp({ render: () => h(App, props) })
+            .use(plugin)
+            .use(Toast, {
+                position: POSITION.TOP_CENTER,
+                toastClassName: "stemmechanics-toast",
+                transition: "toast",
+                hideProgressBar: true,
+            })
+            .mixin({ methods: { route } })
+            .directive("inject-svg", {
+                mounted(el) {
+                    window.SVGInject(el);
+                },
+                updated(el) {
+                    window.SVGInject(el);
+                },
+            })
+            .mount(el);
+    },
+});

resources/js/views/Minecraft.vue

@@ -64,7 +64,7 @@
             will forever remain etched in the hearts of the Cairns Minecraft
             community.
         </p>
-        <SMAttachments class="mt-8" :attachments="downloads" />
+        <SMAttachments class="mt-8" :model-value="downloads" />
     </div>
 </template>
 

vite.config.ts

@@ -1,52 +1,14 @@
-import vue from "@vitejs/plugin-vue";
-import laravel from "laravel-vite-plugin";
-import analyzer from "rollup-plugin-analyzer";
-import { compression } from "vite-plugin-compression2";
 import { defineConfig } from "vite";
-import Unocss from "unocss/vite";
+import laravel from "laravel-vite-plugin";
+
+import vue from "@vitejs/plugin-vue";
 
 export default defineConfig({
     plugins: [
-        vue({
-            template: {
-                compilerOptions: {
-                    isCustomElement: (tag) => ["ion-icon"].includes(tag),
-                },
-                transformAssetUrls: {
-                    base: null,
-                    includeAbsolute: false,
-                },
-            },
-        }),
-        Unocss({}),
+        vue(),
         laravel({
-            input: ["resources/css/app.scss", "resources/js/main.js"],
+            input: ["resources/css/main.css", "resources/js/main.js"],
             refresh: true,
         }),
-        analyzer({ summaryOnly: true }),
-        compression({
-            include: [/\.(js)$/, /\.(css)$/],
-            // deleteOriginalAssets: true,
-        }),
     ],
-    css: {
-        preprocessorOptions: {
-            scss: {
-                // additionalData: `@import "./resources/css/variables.scss";`,
-            },
-        },
-    },
-    envPrefix: ["VITE_", "APP_URL"],
-    resolve: {
-        alias: {
-            vue: "vue/dist/vue.esm-bundler.js",
-        },
-    },
-    build: {
-        chunkSizeWarningLimit: 500,
-        rollupOptions: {
-            output: {},
-        },
-    },
-    base: "",
 });