diff --git a/.env.development b/.env.development index 6d18388..bae0793 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VITE_APP_VERSION="3.0.24" +VITE_APP_VERSION="3.0.25" VITE_API_URL="http://10.5.7.5:8000/" VITE_API_KEY="your_api_key_should_be_here" VITE_ASSET_PATH="/assets" diff --git a/.env.production b/.env.production index 7f259a5..5acaf04 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ -VITE_APP_VERSION="3.0.24" +VITE_APP_VERSION="3.0.25" VITE_API_URL="https://restfulsleep.phaseii.network" VITE_API_KEY="your_api_key_should_be_here" VITE_ASSET_PATH="https://cdn.phaseii.network/file/PhaseII/web-assets" diff --git a/.laravel-guide/README.md b/.laravel-guide/README.md deleted file mode 100644 index d8140d1..0000000 --- a/.laravel-guide/README.md +++ /dev/null @@ -1,494 +0,0 @@ -# Free Laravel Vue 3.x Tailwind 3.x Dashboard - -[![Vue 3.x Tailwind 3.x admin dashboard demo](https://static.justboil.me/templates/one/repo-styles.png)](https://justboil.github.io/admin-one-vue-tailwind/) - -This guide will help you integrate your Laravel application with [Admin One - free Vue 3 Tailwind 3 Admin Dashboard with dark mode](https://github.com/justboil/admin-one-vue-tailwind). - -**Admin One** is simple, fast and free Vue.js 3.x Tailwind CSS 3.x admin dashboard with Laravel 9.x integration. - -- Built with **Vue.js 3**, **Tailwind CSS 3** framework & **Composition API** -- **Laravel** build tools -- **Laravel Breeze** with **Inertia + Vue** stack -- **SFC** ` - - -``` - -Add route in `routes/web.php`. There's a `/dashboard` route already defined by default, so just replace `Inertia::render('Dashboard')` with `Inertia::render('HomeView')`: - -```php -Route::get('/dashboard', function () { - return Inertia::render('HomeView'); -})->middleware(['auth', 'verified'])->name('dashboard'); -``` - -## Fix router links - -Here we replace RouterLink with Inertia Link. - -### resources/js/menuAside.js and resources/js/menuNavBar.js - -Optionally, you can pass menu via Inertia shared props, so you'll be able to control it with PHP. Here we'd just use JS. - -`to` should be replaced with `route` which specifies route name defined in `routes/web.php`. For external links `href` should be used instead. Here's an example for `menuAside.js`: - -```javascript -export default [ - "General", - [ - { - route: "dashboard", - icon: mdiMonitor, - label: "Dashboard", - }, - // { - // route: "another-route-name", - // icon: mdiMonitor, - // label: "Dashboard 2", - // }, - { - href: "https://example.com/", - icon: mdiMonitor, - label: "Example.com", - }, - ], -]; -``` - -Route names reflect ones defined in `routes/web.php`: - -```php -Route::middleware(['auth:sanctum', 'verified'])->get('/dashboard', function () { - return Inertia::render('Home'); -})->name('dashboard'); - -// Route::middleware(['auth:sanctum', 'verified'])->get('/dashboard-2', function () { -// return Inertia::render('Home2'); -// })->name('another-route-name'); -``` - -Now, let's update vue files, to make them work with route names and Inertia links. - -### resources/js/components/AsideMenuItem.vue - -Replace `RouterLink` imported from `vue-router` with `Link` import in ` -``` - -In ` diff --git a/src/components/CardBoxWidget.vue b/src/components/CardBoxWidget.vue index 4d927e3..fc2f5d3 100644 --- a/src/components/CardBoxWidget.vue +++ b/src/components/CardBoxWidget.vue @@ -11,7 +11,7 @@ defineProps({ default: 0, }, icon: { - type: String, + type: Object, default: null, }, prefix: { diff --git a/src/components/Cards/AkanameCardBox.vue b/src/components/Cards/AkanameCardBox.vue index 810deef..7c2343e 100644 --- a/src/components/Cards/AkanameCardBox.vue +++ b/src/components/Cards/AkanameCardBox.vue @@ -2,7 +2,7 @@ import axios from "axios"; import { watch, ref } from "vue"; import { useRouter } from "vue-router"; -import { mdiLoading } from "@mdi/js"; +import { PhSpinnerBall } from "@phosphor-icons/vue"; import BaseButton from "@/components/BaseButton.vue"; import BaseIcon from "@/components/BaseIcon.vue"; import CardBox from "@/components/CardBox.vue"; @@ -126,7 +126,7 @@ function revert() { /> diff --git a/src/components/Cards/EmblemCardBox.vue b/src/components/Cards/EmblemCardBox.vue index 1670f01..c2659d4 100644 --- a/src/components/Cards/EmblemCardBox.vue +++ b/src/components/Cards/EmblemCardBox.vue @@ -2,7 +2,7 @@ import axios from "axios"; import { watch, ref, reactive } from "vue"; import { useRouter } from "vue-router"; -import { mdiLoading } from "@mdi/js"; +import { PhSpinnerBall } from "@phosphor-icons/vue"; import BaseButton from "@/components/BaseButton.vue"; import BaseIcon from "@/components/BaseIcon.vue"; import CardBox from "@/components/CardBox.vue"; @@ -173,7 +173,7 @@ function revertEmblem() { /> diff --git a/src/components/Cards/GameHeader.vue b/src/components/Cards/GameHeader.vue index aa7f64c..7f51bda 100644 --- a/src/components/Cards/GameHeader.vue +++ b/src/components/Cards/GameHeader.vue @@ -2,13 +2,13 @@ import { ref, watch } from "vue"; import { useRoute } from "vue-router"; import { - mdiHome, - mdiCog, - mdiAccountDetails, - mdiPlaylistMusicOutline, - mdiSwordCross, - mdiFormatListText, -} from "@mdi/js"; + PhHouse, + PhGear, + PhUserList, + PhPlaylist, + PhSword, + PhListStar, +} from "@phosphor-icons/vue"; import BaseButton from "@/components/BaseButton.vue"; import GameTitleLine from "@/components/GameTitleLine.vue"; import { getVideoSource, getCardStyle } from "@/constants/sources"; @@ -41,7 +41,7 @@ function loadRoutes() { label: `${ props.game.shortName ? props.game.shortName : props.game.name } Home`, - icon: mdiHome, + icon: PhHouse, path: `/#/games/${props.game.id}/`, route: "game_page", color: "success", @@ -51,7 +51,7 @@ function loadRoutes() { if (userProfiles.value.some((profile) => profile.game === props.game.id)) { navigationData.push({ label: "My Profile", - icon: mdiAccountDetails, + icon: PhUserList, path: `/#/games/${props.game.id}/profiles/${mainStore.userId}`, route: "game_profile", color: "info", @@ -59,7 +59,7 @@ function loadRoutes() { navigationData.push({ label: "Edit Profile", - icon: mdiCog, + icon: PhGear, path: `/#/games/${props.game.id}/edit`, route: "edit_profile", color: "warning", @@ -68,7 +68,7 @@ function loadRoutes() { if (!props.game.noRivals) { navigationData.push({ label: "Rivals", - icon: mdiSwordCross, + icon: PhSword, path: `/#/games/${props.game.id}/rivals`, route: "game_rivals", color: "danger", @@ -78,7 +78,7 @@ function loadRoutes() { if (!props.game.noScores) { navigationData.push({ label: "My Scores", - icon: mdiPlaylistMusicOutline, + icon: PhPlaylist, path: `/#/games/${props.game.id}/scores/${mainStore.userId}`, color: "info", }); @@ -86,7 +86,7 @@ function loadRoutes() { navigationData.push({ label: "My Records", - icon: mdiFormatListText, + icon: PhListStar, path: `/#/games/${props.game.id}/records/${mainStore.userId}`, route: "personal_records", color: "success", @@ -97,14 +97,14 @@ function loadRoutes() { navigationData.push( { label: "Network Scores", - icon: mdiPlaylistMusicOutline, + icon: PhPlaylist, path: `/#/games/${props.game.id}/scores`, route: "all_scores", color: "info", }, { label: "Network Records", - icon: mdiFormatListText, + icon: PhListStar, path: `/#/games/${props.game.id}/records`, route: "all_records", color: "success", @@ -133,11 +133,11 @@ function loadRoutes() {
-
+
diff --git a/src/components/Cards/QproCardBox.vue b/src/components/Cards/QproCardBox.vue index 8869f9c..abec259 100644 --- a/src/components/Cards/QproCardBox.vue +++ b/src/components/Cards/QproCardBox.vue @@ -2,7 +2,7 @@ import axios from "axios"; import { watch, ref, reactive } from "vue"; import { useRouter } from "vue-router"; -import { mdiLoading } from "@mdi/js"; +import { PhSpinnerBall } from "@phosphor-icons/vue"; import BaseButton from "@/components/BaseButton.vue"; import BaseIcon from "@/components/BaseIcon.vue"; import CardBox from "@/components/CardBox.vue"; @@ -160,7 +160,7 @@ function revert() { /> diff --git a/src/components/Cards/StickerCardBox.vue b/src/components/Cards/StickerCardBox.vue index ba5584e..bfdfdec 100644 --- a/src/components/Cards/StickerCardBox.vue +++ b/src/components/Cards/StickerCardBox.vue @@ -2,7 +2,7 @@ import axios from "axios"; import { watch, ref, reactive } from "vue"; import { useRouter } from "vue-router"; -import { mdiLoading, mdiChevronDown, mdiChevronUp } from "@mdi/js"; +import { PhSpinnerBall, PhCaretDown, PhCaretUp } from "@phosphor-icons/vue"; import BaseButton from "@/components/BaseButton.vue"; import BaseIcon from "@/components/BaseIcon.vue"; import CardBox from "@/components/CardBox.vue"; @@ -170,7 +170,7 @@ function toggleStickerCollapse(index) {
Sticker {{ index + 1 }} @@ -264,7 +264,7 @@ function toggleStickerCollapse(index) { /> diff --git a/src/components/FooterBar.vue b/src/components/FooterBar.vue index 99cea16..4cdc344 100644 --- a/src/components/FooterBar.vue +++ b/src/components/FooterBar.vue @@ -1,6 +1,6 @@ - - diff --git a/src/views/Game/RivalsView.vue b/src/views/Game/RivalsView.vue index 2f99a4c..f541d90 100644 --- a/src/views/Game/RivalsView.vue +++ b/src/views/Game/RivalsView.vue @@ -1,7 +1,7 @@