release v2.0.0 #4

Merged
crimsen merged 481 commits from develop into master 2024-01-18 15:15:08 +00:00
4 changed files with 562 additions and 544 deletions
Showing only changes of commit cf1a5cc922 - Show all commits

View File

@ -17,24 +17,24 @@
"dependencies": {
"axios": "^0.21.1",
"cordova": "^10.0.0",
"pinia": "^2.0.0-alpha.13",
"quasar": "^2.0.0-beta.13"
"pinia": "^2.0.0-alpha.18",
"quasar": "^2.0.0-beta.17"
},
"devDependencies": {
"@quasar/app": "^3.0.0-beta.18",
"@quasar/app": "^3.0.0-beta.25",
"@quasar/extras": "^1.10.4",
"@quasar/quasar-app-extension-qcalendar": "4.0.0-alpha.4",
"@types/node": "^12.20.10",
"@quasar/quasar-app-extension-qcalendar": "4.0.0-alpha.8",
"@types/node": "^12.20.13",
"@types/webpack": "^5.28.0",
"@types/webpack-env": "^1.16.0",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"eslint": "^7.25.0",
"@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.24.0",
"eslint": "^7.26.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-vue": "^7.9.0",
"eslint-webpack-plugin": "^2.5.4",
"prettier": "^2.2.1",
"typescript": "^4.2.4",
"prettier": "^2.3.0",
"typescript": "^4.2.3",
"vuedraggable": "^4.0.1"
},
"prettier": {

View File

@ -36,7 +36,7 @@ export const useBalanceStore = defineStore({
}),
getters: {
balance() {
balance(): BalancesResponse | undefined {
const mainStore = useMainStore();
return this.balances.find((v) => v.userid === mainStore.user?.userid);
},

View File

@ -25,18 +25,18 @@ export const useMainStore = defineStore({
session: loadCurrentSession(),
user: loadUser(),
notifications: [] as Array<FG_Plugin.Notification>,
shortcuts: [] as FG_Plugin.MenuLink[],
shortcuts: [] as Array<FG_Plugin.MenuLink>,
}),
getters: {
loggedIn() {
loggedIn(): boolean {
return this.session !== undefined;
},
currentUser() {
currentUser(): FG.User {
if (this.user === undefined) throw 'Not logged in, this should not be called';
return this.user;
},
permissions() {
permissions(): string[] {
return this.user?.permissions || [];
},
},

1076
yarn.lock

File diff suppressed because it is too large Load Diff