-
+
-
-
+
+
-
-
-
+
+
+
+ There are no players here
+
+
-
+
-
-
+
+
diff --git a/components/league/index.vue b/app/components/league/index.vue
similarity index 100%
rename from components/league/index.vue
rename to app/components/league/index.vue
diff --git a/components/league/snapshot.vue b/app/components/league/snapshot.vue
similarity index 100%
rename from components/league/snapshot.vue
rename to app/components/league/snapshot.vue
diff --git a/app/components/overlay/drawer.vue b/app/components/overlay/drawer.vue
new file mode 100644
index 0000000..1f7311c
--- /dev/null
+++ b/app/components/overlay/drawer.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ title }}
+ {{ badge }}
+
+
+ ESC
+
+
+
+
+
+
+
+
+
+
diff --git a/app/components/overlay/modal.vue b/app/components/overlay/modal.vue
new file mode 100644
index 0000000..8e6eebc
--- /dev/null
+++ b/app/components/overlay/modal.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/team.vue b/app/components/team.vue
similarity index 100%
rename from components/team.vue
rename to app/components/team.vue
diff --git a/components/ui/confirmation.vue b/app/components/ui/confirmation.vue
similarity index 100%
rename from components/ui/confirmation.vue
rename to app/components/ui/confirmation.vue
diff --git a/app/composables/data/useLeagueActions.ts b/app/composables/data/useLeagueActions.ts
new file mode 100644
index 0000000..7d64f92
--- /dev/null
+++ b/app/composables/data/useLeagueActions.ts
@@ -0,0 +1,23 @@
+import { useMutation, useQueryClient } from '@tanstack/vue-query'
+
+export const useLeagueActions = () => {
+ const queryClient = useQueryClient()
+
+ const duplicate = () => {
+ return useMutation({
+ mutationFn: async (leagueId: number) => {
+ const res = await $fetch('/api/account/league/duplicate', {
+ method: 'POST',
+ body: { id: leagueId },
+ })
+
+ return res
+ },
+ onSuccess: ({ account }) => {
+ queryClient.invalidateQueries({ queryKey: ['account', account.hash] })
+ },
+ })
+ }
+
+ return { duplicate }
+}
diff --git a/composables/queries/useSnapshot.ts b/app/composables/data/useSnapshot.ts
similarity index 100%
rename from composables/queries/useSnapshot.ts
rename to app/composables/data/useSnapshot.ts
diff --git a/composables/index.ts b/app/composables/index.ts
similarity index 100%
rename from composables/index.ts
rename to app/composables/index.ts
diff --git a/app/composables/useDialog.ts b/app/composables/useDialog.ts
new file mode 100644
index 0000000..ef5a42f
--- /dev/null
+++ b/app/composables/useDialog.ts
@@ -0,0 +1,52 @@
+import { useModal } from 'vue-final-modal'
+import { DialogConfirm } from '#components'
+
+type CallbackFn = () => void | Promise
+interface DialogInstance {
+ onConfirm: (fn: CallbackFn) => DialogInstance
+ onDismiss: (fn: CallbackFn) => DialogInstance
+ open: () => DialogInstance
+}
+export const useDialog = () => {
+ const confirm = (
+ options: Omit['$props'], 'onClose' | 'onDismiss' | 'onConfirm' | 'class'>
+ ) => {
+ let confirmCallback: CallbackFn = () => {}
+ let dismissCallback: CallbackFn = () => {}
+
+ const modal = useModal({
+ component: DialogConfirm,
+ })
+
+ const dialogInstance: DialogInstance = {
+ onConfirm: (fn: CallbackFn) => {
+ confirmCallback = fn
+ return dialogInstance
+ },
+ onDismiss: (fn: CallbackFn) => {
+ dismissCallback = fn
+ return dialogInstance
+ },
+ open: () => {
+ modal.open()
+
+ return dialogInstance
+ },
+ }
+
+ modal.patchOptions({
+ attrs: {
+ ...options,
+ onConfirm: () => confirmCallback(),
+ onDismiss: () => dismissCallback(),
+ onClose: () => {
+ modal.close()
+ },
+ },
+ })
+
+ return dialogInstance
+ }
+
+ return { confirm }
+}
diff --git a/composables/useMethodology.ts b/app/composables/useMethodology.ts
similarity index 100%
rename from composables/useMethodology.ts
rename to app/composables/useMethodology.ts
diff --git a/app/composables/useOverlay.ts b/app/composables/useOverlay.ts
new file mode 100644
index 0000000..649a8c2
--- /dev/null
+++ b/app/composables/useOverlay.ts
@@ -0,0 +1,64 @@
+import { useModal, type UseModalOptions } from 'vue-final-modal'
+import { defu } from 'defu'
+
+type CallbackFn = () => void | Promise
+type CallbackWithPayloadFn = (payload?: any) => void | Promise
+
+export const useOverlay = () => {
+ const createOverlay = (
+ component: UseModalOptions['component'],
+ options?: Omit, 'component'>
+ ) => {
+ let dismissCallback: CallbackFn = () => {}
+ let closeCallback: CallbackWithPayloadFn = () => {}
+
+ const defaultOptions = defu(options, {})
+
+ const modal = useModal({
+ component,
+ })
+
+ const patchModal = (options?: UseModalOptions) => {
+ const mergedOptions = defu, UseModalOptions[]>(options, defaultOptions, {
+ component,
+ attrs: {
+ onDismiss: () => {
+ dismissCallback()
+ modal.close()
+ },
+ onClose: (payload: any) => {
+ closeCallback(payload)
+ modal.close()
+ },
+ } as any,
+ })
+
+ modal.patchOptions(mergedOptions)
+ }
+
+ const dialogInstance = {
+ onClose: (fn: CallbackWithPayloadFn) => {
+ closeCallback = fn
+ patchModal()
+ return dialogInstance
+ },
+ onDismiss: (fn: CallbackFn) => {
+ dismissCallback = fn
+ patchModal()
+
+ return dialogInstance
+ },
+ open: (options?: UseModalOptions) => {
+ patchModal(options)
+
+ modal.open()
+
+ return dialogInstance
+ },
+ }
+
+ return dialogInstance
+ }
+
+ return { createOverlay }
+}
diff --git a/composables/useTeamShuffle.ts b/app/composables/useTeamShuffle.ts
similarity index 100%
rename from composables/useTeamShuffle.ts
rename to app/composables/useTeamShuffle.ts
diff --git a/composables/utils/index.ts b/app/composables/utils/index.ts
similarity index 100%
rename from composables/utils/index.ts
rename to app/composables/utils/index.ts
diff --git a/composables/utils/useLatest.ts b/app/composables/utils/useLatest.ts
similarity index 100%
rename from composables/utils/useLatest.ts
rename to app/composables/utils/useLatest.ts
diff --git a/layouts/default.vue b/app/layouts/default.vue
similarity index 95%
rename from layouts/default.vue
rename to app/layouts/default.vue
index 27ba653..a580636 100644
--- a/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -5,7 +5,7 @@
-
+
Project by
diff --git a/app/pages/[account].vue b/app/pages/[account].vue
new file mode 100644
index 0000000..ea225a2
--- /dev/null
+++ b/app/pages/[account].vue
@@ -0,0 +1,293 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ isEditing ? 'Hide' : 'Edit' }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/vue-slicksort.ts b/app/plugins/vue-slicksort.ts
similarity index 100%
rename from plugins/vue-slicksort.ts
rename to app/plugins/vue-slicksort.ts
diff --git a/bun.lockb b/bun.lockb
new file mode 100755
index 0000000..89c6941
Binary files /dev/null and b/bun.lockb differ
diff --git a/composables/queries/useAccount.ts b/composables/queries/useAccount.ts
deleted file mode 100644
index b47bc87..0000000
--- a/composables/queries/useAccount.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useQuery, useMutation } from '@tanstack/vue-query'
-
-export const useAccount = () => {
- const get = (hash: string) => {
- return useQuery({
- queryKey: ['account', hash],
- queryFn: async () => {
- const { data } = await useFetch('/api/account', {
- query: { hash },
- })
-
- return data.value
- },
- })
- }
-
- const create = () => {
- return useMutation({
- mutationFn: async () => {
- const res = await $fetch('/api/account/', {
- method: 'POST',
- })
-
- return res
- },
- })
- }
-
- return { get, create }
-}
diff --git a/composables/queries/useLeague.ts b/composables/queries/useLeague.ts
deleted file mode 100644
index 626daaa..0000000
--- a/composables/queries/useLeague.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { useQuery, useMutation, useQueryClient } from '@tanstack/vue-query'
-import type { League, Player, Snapshot } from '@prisma/client'
-
-export const useLeague = () => {
- const queryClient = useQueryClient()
-
- const get = (id: Ref
) => {
- return useQuery({
- queryKey: ['league', id] as const,
- enabled: () => !!id.value,
- queryFn: async ({ queryKey }) => {
- const [_key, id] = queryKey
-
- const data = await $fetch('/api/account/league', {
- query: { leagueId: id },
- })
-
- return data
- },
- })
- }
-
- const create = () => {
- return useMutation({
- mutationFn: async (league: Partial) => {
- const res = await $fetch('/api/account/league/', {
- method: 'POST',
- body: league,
- })
-
- return res
- },
- onSuccess: ({ account }) => {
- queryClient.invalidateQueries({ queryKey: ['account', account?.hash] })
- },
- })
- }
-
- const update = () => {
- return useMutation({
- mutationFn: async ({ id, updatedLeague }: { id: number; updatedLeague: any }) => {
- const res = await $fetch('/api/account/league/:id/', {
- method: 'put',
- body: { id, updatedLeague },
- })
-
- return res
- },
- onSuccess: ({ id, account }) => {
- queryClient.invalidateQueries({ queryKey: ['league', id] })
- queryClient.invalidateQueries({ queryKey: ['account', account?.hash] })
- },
- })
- }
-
- const duplicate = () => {
- return useMutation({
- mutationFn: async (leagueId: number) => {
- const res = await $fetch('/api/account/league/duplicate', {
- method: 'POST',
- body: { id: leagueId },
- })
-
- return res
- },
- onSuccess: ({ account }) => {
- queryClient.invalidateQueries({ queryKey: ['account', account.hash] })
- },
- })
- }
-
- const del = () => {
- return useMutation({
- mutationFn: async (leagueId: number) => {
- const res = await $fetch('/api/account/league/:id/', {
- method: 'DELETE',
- params: { id: leagueId },
- })
-
- return res
- },
- onSuccess: ({ account, id }) => {
- queryClient.invalidateQueries({ queryKey: ['account', account.hash] })
- queryClient.removeQueries({ queryKey: ['league', id] })
- },
- })
- }
-
- return { get, create, del, duplicate, update }
-}
diff --git a/config/formkit.config.ts b/config/formkit.config.ts
deleted file mode 100644
index adfe884..0000000
--- a/config/formkit.config.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { defineFormKitConfig } from '@formkit/vue'
-import { generateClasses } from '@formkit/themes'
-
-export default defineFormKitConfig({
- theme: 'genesis',
- config: {
- classes: generateClasses({
- text: {
- wrapper: '!max-w-full',
- },
- }),
- },
-})
diff --git a/config/tailwind.config.ts b/config/tailwind.config.ts
index 2f96ea9..41001ab 100644
--- a/config/tailwind.config.ts
+++ b/config/tailwind.config.ts
@@ -3,7 +3,6 @@ import defaultColors from 'tailwindcss/colors'
import defaultTheme from 'tailwindcss/defaultTheme'
export default >{
- content: ['./config/formkit.config.ts'],
theme: {
extend: {
fontFamily: {
diff --git a/enum/data-status.ts b/enum/data-status.ts
deleted file mode 100644
index 67a391a..0000000
--- a/enum/data-status.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum DataStatus {
- DEFAULT = 'default',
- PENDING = 'pending',
- ERROR = 'error',
- SUCCESS = 'success',
-}
diff --git a/interfaces.ts b/interfaces.ts
deleted file mode 100644
index 5c1038d..0000000
--- a/interfaces.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface Rules {
- goaliesFirst?: boolean
- noBestGolieAndPlayer?: boolean
- keepGoalies?: boolean
- stefanMode?: boolean
- beniMode?: boolean
-}
-
-export interface Config {
- leagueName: string
- teamCount: number
- rules: Rules
-}
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 9acb9d1..2e14226 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,11 +1,25 @@
export default defineNuxtConfig({
- modules: ['@nuxtjs/google-fonts', '@vueuse/nuxt', '@nuxt/ui', '@floatie/widget-nuxt', '@formkit/nuxt'],
+ future: {
+ compatibilityVersion: 4,
+ },
+ compatibilityDate: '2024-10-26',
+ modules: [
+ '@nuxt/ui',
+ '@vueuse/nuxt',
+ '@floatie/widget-nuxt',
+ '@hebilicious/vue-query-nuxt',
+ '@vue-final-modal/nuxt',
+ '@vee-validate/nuxt',
+ ],
typescript: {
typeCheck: process.env.NODE_ENV === 'production',
},
runtimeConfig: {
public: {
logrocketAppId: '',
+ site: {
+ url: '',
+ },
},
},
appConfig: {
@@ -14,33 +28,29 @@ export default defineNuxtConfig({
},
},
imports: {
- dirs: ['./composables/queries', './enum'],
+ dirs: ['../.generated/vue-query', './composables/data'],
},
/**
* Module configurations
**/
- googleFonts: {
- families: {
- Inter: {
- wght: [100, 200, 300, 400, 500, 600, 700, 800, 900],
- },
- },
- },
- tailwindcss: {
- configPath: '~/config/tailwind.config.ts',
- },
- ui: {
- global: true,
- icons: ['ph'],
- },
+
colorMode: {
preference: 'light',
},
- floatie: {
- clientKey: process.env.NUXT_PUBLIC_FLOATIE_CLIENT_KEY,
- },
- formkit: {
- autoImport: true,
- configFile: './config/formkit.config.ts',
+ vueQuery: {
+ vueQueryPluginOptions: {
+ enableDevtoolsV6Plugin: true,
+ queryClientConfig: {
+ defaultOptions: {
+ queries: {
+ staleTime: 300000, // 5 minutes
+ },
+ },
+ },
+ },
},
+
+ // floatie: {
+ // clientKey: process.env.NUXT_PUBLIC_FLOATIE_CLIENT_KEY,
+ // },
})
diff --git a/package.json b/package.json
index 508f2a4..666b0fb 100644
--- a/package.json
+++ b/package.json
@@ -3,18 +3,19 @@
"private": true,
"type": "module",
"engines": {
- "node": "20.x",
- "pnpm": "9.x"
+ "node": "22.x"
+ },
+ "zenstack": {
+ "schema": "./prisma/schema.zmodel"
},
- "packageManager": "pnpm@9.4.0",
"scripts": {
"build": "prisma generate && prisma migrate deploy && nuxt build",
- "dev": "prisma migrate dev && nuxt dev",
+ "clean": "nuxt cleanup && rm -rf node_modules .generated .nuxt",
+ "dev": "nuxt dev",
"start": "node .output/server/index.mjs",
"generate": "nuxt generate",
"preview": "nuxt preview",
- "postinstall": "prisma generate",
- "prisma": "prisma",
+ "postinstall": "zenstack generate && nuxt prepare",
"playwright": "playwright",
"docker:up": "docker-compose up -d",
"docker:down": "docker-compose down",
@@ -22,6 +23,11 @@
"test:db": "pnpm docker:down && pnpm docker:up",
"test:dev": "dotenv -e .env.test -- prisma migrate dev && nuxt dev --dotenv .env.test",
"test:ci": "dotenv -e .env.test -- prisma migrate dev && nuxt build --dotenv .env.test && nuxt preview --dotenv .env.test",
+ "prisma": "prisma",
+ "zenstack": "zenstack",
+ "db:repl": "zenstack repl",
+ "db:generate": "zenstack generate",
+ "db:migrate": "prisma migrate",
"playwright:ui": "playwright test --ui",
"dotenv": "dotenv"
},
@@ -29,33 +35,39 @@
"schema": "server/prisma/schema.prisma"
},
"devDependencies": {
- "@nuxtjs/google-fonts": "3.2.0",
- "@playwright/test": "^1.40.1",
+ "@playwright/test": "^1.48.2",
"@types/lodash-es": "4.17.12",
"@types/msgpack-lite": "^0.1.11",
- "@types/node": "^20.10.0",
- "@vueuse/core": "^10.6.1",
- "@vueuse/nuxt": "^10.6.1",
- "dotenv-cli": "^7.3.0",
- "nuxt": "3.12.2",
- "prisma": "^5.6.0",
- "vue-tsc": "^1.8.24"
+ "@types/node": "^22.8.1",
+ "@vueuse/core": "^11.1.0",
+ "@vueuse/nuxt": "^11.1.0",
+ "@zenstackhq/tanstack-query": "^2.7.4",
+ "dotenv-cli": "^7.4.2",
+ "nuxt": "^3.13.2",
+ "prisma": "^5.21.1",
+ "vue-tsc": "^2.1.8",
+ "zenstack": "2.7.4"
},
"dependencies": {
- "@floatie/widget-nuxt": "^2.1.1",
- "@formkit/nuxt": "^1.3.2",
- "@formkit/themes": "^1.3.2",
- "@iconify-json/ph": "^1.1.8",
- "@nuxt/ui": "npm:@nuxt/ui-edge@latest",
- "@prisma/client": "^5.6.0",
- "@tanstack/vue-query": "^5.9.0",
- "@vueuse/components": "10.11.0",
- "@vueuse/router": "^10.6.1",
+ "@floatie/widget-nuxt": "^3.0.5",
+ "@hebilicious/vue-query-nuxt": "^0.3.0",
+ "@iconify-json/ph": "^1.2.1",
+ "@nuxt/ui": "^3.0.0-alpha.7",
+ "@prisma/client": "^5.21.1",
+ "@tanstack/vue-query": "^5.59.16",
+ "@vee-validate/nuxt": "^4.14.6",
+ "@vee-validate/zod": "^4.14.6",
+ "@vue-final-modal/nuxt": "^1.0.3",
+ "@vueuse/components": "11.1.0",
+ "@vueuse/router": "^11.1.0",
+ "@zenstackhq/runtime": "2.7.4",
+ "@zenstackhq/server": "^2.7.4",
"html2canvas": "^1.4.1",
"lodash-es": "4.17.21",
- "nanoid": "^5.0.3",
- "ts-node": "^10.9.1",
- "typescript": "^5.3.2",
- "vue-slicksort": "^2.0.5"
+ "nanoid": "^5.0.7",
+ "ts-node": "^10.9.2",
+ "typescript": "^5.6.3",
+ "vue-slicksort": "^2.0.5",
+ "zod": "^3.23.8"
}
-}
+}
\ No newline at end of file
diff --git a/pages/[account].vue b/pages/[account].vue
deleted file mode 100644
index 627b4c1..0000000
--- a/pages/[account].vue
+++ /dev/null
@@ -1,347 +0,0 @@
-
-
-
-
-
-
- Are you sure you want to remove
- "{{ league?.name }}"
- league?
-
-
-
-
-
-
-
-
Add a new league
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ isEditing ? 'Hide' : 'Edit' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ league?.name }}
-
-
-
-
-
-
-