From 20c3880721cd0f0bd0a2b48a1463b49c514a849b Mon Sep 17 00:00:00 2001 From: Rémy Raes Date: Sat, 14 Jan 2023 01:18:48 +0100 Subject: refactor: Mods view (#134) * feat: add UI skeleton for new mods interface * fix: only apply app menu style to app menu items * feat: add menu skeleton * feat: add thunderstore mods view into mods view * refactor: remove thunderstore mods view from router + menu bar * refactor: move search input into mods view * fix: adjust ts mods container padding * refactor: center pagination components * refactor: rework media queries to adapt cards container width * fix: set mods view navigation min-width * refactor: compute mods container width with CSS variables * refactor: remove horizontal padding around ts mods container This will allow them to take much screen space. * feat: Thunderstore mods container is larger * feat: add layouts for 5 to 8 Thunderstore mod columns * feat: add some space to separate navigation menu subparts * fix: move search pagination reset in ThunderstoreModsView component * feat: retrieve Thunderstore mod categories when fetching mods * feat: add mod categories selector component * feat: mod categories selector now filters Thunderstore mods * fix: reset pagination index if needed when selecting mod categories * fix: first mod does not appear anymore while selecting any mod category First mod's categories array was used as an accumulator (in a reduce call) to regroup all mod categories; we now use an empty array as initial value for the accumulator. * feat: add a selector component to sort mods * feat: set sort selector default value on view mount * fix: set default sorting select value as selected in dropdown list * feat: add date_updated field to ThunderstoreMod type * feat: pass sorting value to ThunderstoreModsView as a prop * feat: mods can be sorted by name and release date * feat: mods can be sorted by most downloaded and top rated * fix: don't display sorting select on local mods view * refactor: remove local mods title * refactor: export local mods view code in dedicated component * refactor: export search value in a search-dedicated store * fix: display "no matching mods" message when no mods match This message was previously displayed only if no mods matched AND search input was not empty; now that we have categories selector, we can have no matching mods with an empty input. * refactor: remove unused input prop * fix: mods can be sorted by rating * refactor: remove unused searchValue computed property * style: adjust SortOptions import * refactor: move selected mod categories into search store module * refactor: move mod sorting into search store module * refactor: export mods menu component to dedicated file * fix: remove compare method initialization * feat: local mods can be filtered with search input * build: add ES2018 lib to typescript compiler options * refactor: remove unused variable * fix: retrieve SortOptions values from string input * refactor: move Thunderstore mods view into dedicated folder * style: add missing trailing newline to SortOptions.d.ts --- src-vue/src/App.vue | 3 +- src-vue/src/components/ModsMenu.vue | 118 +++++++++ src-vue/src/main.ts | 2 - src-vue/src/plugins/modules/search.ts | 19 ++ src-vue/src/plugins/store.ts | 16 ++ src-vue/src/utils/SortOptions.d.ts | 8 + .../src/utils/thunderstore/ThunderstoreMod.d.ts | 2 + src-vue/src/views/ModsView.vue | 128 +++------- src-vue/src/views/ThunderstoreModsView.vue | 240 ------------------ src-vue/src/views/mods/LocalModsView.vue | 122 +++++++++ src-vue/src/views/mods/ThunderstoreModsView.vue | 272 +++++++++++++++++++++ src-vue/tsconfig.json | 2 +- 12 files changed, 592 insertions(+), 340 deletions(-) create mode 100644 src-vue/src/components/ModsMenu.vue create mode 100644 src-vue/src/plugins/modules/search.ts create mode 100644 src-vue/src/utils/SortOptions.d.ts delete mode 100644 src-vue/src/views/ThunderstoreModsView.vue create mode 100644 src-vue/src/views/mods/LocalModsView.vue create mode 100644 src-vue/src/views/mods/ThunderstoreModsView.vue (limited to 'src-vue') diff --git a/src-vue/src/App.vue b/src-vue/src/App.vue index fc6992b7..0ecea16d 100644 --- a/src-vue/src/App.vue +++ b/src-vue/src/App.vue @@ -59,7 +59,6 @@ export default { Play Changelog Mods - Thunderstore Settings Dev @@ -109,7 +108,7 @@ export default { border-color: white; } -.el-menu > .el-menu-item { +#fc__menu_items > .el-menu-item { text-transform: uppercase; border: none !important; font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif; diff --git a/src-vue/src/components/ModsMenu.vue b/src-vue/src/components/ModsMenu.vue new file mode 100644 index 00000000..9b62fcfa --- /dev/null +++ b/src-vue/src/components/ModsMenu.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src-vue/src/main.ts b/src-vue/src/main.ts index 25f1b064..95bea7af 100644 --- a/src-vue/src/main.ts +++ b/src-vue/src/main.ts @@ -6,7 +6,6 @@ import { store } from './plugins/store'; import PlayView from "./views/PlayView.vue"; import ChangelogView from "./views/ChangelogView.vue"; import ModsView from "./views/ModsView.vue"; -import ThunderstoreModsView from "./views/ThunderstoreModsView.vue"; import SettingsView from "./views/SettingsView.vue"; import DeveloperView from "./views/DeveloperView.vue"; import {createRouter, createWebHashHistory} from "vue-router"; @@ -35,7 +34,6 @@ const routes = [ { path: '/', name: 'Main', component: async () => PlayView}, { path: '/changelog', name: 'Changelog', component: async () => ChangelogView}, { path: '/mods', name: 'Mods', component: async () => ModsView}, - { path: '/thunderstoreMods', name: 'Thunderstore mods', component: async () => ThunderstoreModsView}, { path: '/settings', name: 'Settings', component: async () => SettingsView}, { path: '/dev', name: 'Dev', component: async () => DeveloperView} ]; diff --git a/src-vue/src/plugins/modules/search.ts b/src-vue/src/plugins/modules/search.ts new file mode 100644 index 00000000..16260387 --- /dev/null +++ b/src-vue/src/plugins/modules/search.ts @@ -0,0 +1,19 @@ +interface SearchStoreState { + searchValue: string +} + +export const searchModule = { + state: () => ({ + // This is the treated value of search input + searchValue: '', + // Selected mod categories + selectedCategories: [], + sortValue: {label: '', value: ''} + }), + getters: { + searchWords(state: SearchStoreState): string { + return state.searchValue.toLowerCase(); + } + } + } + \ No newline at end of file diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts index edeb13df..2eae843a 100644 --- a/src-vue/src/plugins/store.ts +++ b/src-vue/src/plugins/store.ts @@ -15,6 +15,7 @@ import { router } from "../main"; import ReleaseInfo from "../utils/ReleaseInfo"; import { ThunderstoreMod } from '../utils/thunderstore/ThunderstoreMod'; import { NorthstarMod } from "../utils/NorthstarMod"; +import { searchModule } from './modules/search'; const persistentStore = new Store('flight-core-settings.json'); @@ -33,6 +34,7 @@ export interface FlightCoreStore { releaseNotes: ReleaseInfo[], thunderstoreMods: ThunderstoreMod[], + thunderstoreModsCategories: string[], installed_mods: NorthstarMod[], northstar_is_running: boolean, @@ -48,6 +50,9 @@ export interface FlightCoreStore { let notification_handle: NotificationHandle; export const store = createStore({ + modules: { + search: searchModule + }, state(): FlightCoreStore { return { developer_mode: false, @@ -63,6 +68,7 @@ export const store = createStore({ releaseNotes: [], thunderstoreMods: [], + thunderstoreModsCategories: [], installed_mods: [], northstar_is_running: false, @@ -244,6 +250,16 @@ export const store = createStore({ state.thunderstoreMods = mods.filter((mod: ThunderstoreMod) => { return !removedMods.includes(mod.name) && !mod.is_deprecated; }); + + // Retrieve categories from mods + state.thunderstoreModsCategories = mods + .map((mod: ThunderstoreMod) => mod.categories) + .filter((modCategories: string[]) => modCategories.length !== 0) + .reduce((accumulator: string[], modCategories: string[]) => { + accumulator.push( ...modCategories.filter((cat: string) => !accumulator.includes(cat)) ); + return accumulator; + }, []) + .sort(); }, async loadInstalledMods(state: FlightCoreStore) { let game_install = { diff --git a/src-vue/src/utils/SortOptions.d.ts b/src-vue/src/utils/SortOptions.d.ts new file mode 100644 index 00000000..6bdd0a4a --- /dev/null +++ b/src-vue/src/utils/SortOptions.d.ts @@ -0,0 +1,8 @@ +export enum SortOptions { + NAME_ASC = 'By name (A to Z)', + NAME_DESC = 'By name (Z to A)', + DATE_ASC = 'By date (from oldest)', + DATE_DESC = 'By date (from newest)', + MOST_DOWNLOADED = "Most downloaded", + TOP_RATED = "Top rated" +} diff --git a/src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts b/src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts index 6fddd06f..6387c47e 100644 --- a/src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts +++ b/src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts @@ -3,8 +3,10 @@ import { ThunderstoreModVersion } from "./ThunderstoreModVersion"; export interface ThunderstoreMod { name: string; owner: string; + date_updated: string; rating_score: number; package_url: string; is_deprecated: boolean; versions: ThunderstoreModVersion[]; + categories: string[]; } diff --git a/src-vue/src/views/ModsView.vue b/src-vue/src/views/ModsView.vue index 2f352ded..7c309832 100644 --- a/src-vue/src/views/ModsView.vue +++ b/src-vue/src/views/ModsView.vue @@ -1,112 +1,50 @@ - diff --git a/src-vue/src/views/ThunderstoreModsView.vue b/src-vue/src/views/ThunderstoreModsView.vue deleted file mode 100644 index 5733d30b..00000000 --- a/src-vue/src/views/ThunderstoreModsView.vue +++ /dev/null @@ -1,240 +0,0 @@ - - - - - diff --git a/src-vue/src/views/mods/LocalModsView.vue b/src-vue/src/views/mods/LocalModsView.vue new file mode 100644 index 00000000..470ab4f7 --- /dev/null +++ b/src-vue/src/views/mods/LocalModsView.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src-vue/src/views/mods/ThunderstoreModsView.vue b/src-vue/src/views/mods/ThunderstoreModsView.vue new file mode 100644 index 00000000..aaf15220 --- /dev/null +++ b/src-vue/src/views/mods/ThunderstoreModsView.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src-vue/tsconfig.json b/src-vue/tsconfig.json index d4aefa2c..7f0f0012 100644 --- a/src-vue/tsconfig.json +++ b/src-vue/tsconfig.json @@ -10,7 +10,7 @@ "resolveJsonModule": true, "isolatedModules": true, "esModuleInterop": true, - "lib": ["ESNext", "DOM"], + "lib": ["ESNext", "DOM", "ES2018"], "skipLibCheck": true }, "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"], -- cgit v1.2.3