From a109bcb6f4eaf80b8b14746d9c4f7d1474cc8678 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Mon, 12 Aug 2024 23:35:09 +0200 Subject: [PATCH 1/2] chore: migrate to nuxt-ui --- .vscode/settings.json | 8 +- app.config.ts | 29 +- app.vue | 12 - components/DetailPane.vue | 6 +- components/DocumentEditor.vue | 2 +- components/DocumentView.vue | 20 +- components/LandingPageDownload.client.vue | 8 +- components/LandingPageGetInvolved.vue | 51 +- components/LandingPageMore.vue | 2 +- components/ModalDialog.vue | 2 +- components/NavBar.vue | 72 +-- components/PasswordInput.vue | 2 +- components/SideBar.vue | 10 +- components/UButton.stories.vue | 22 + components/n-button.stories.vue | 28 - layouts/content.vue | 15 +- nuxt.config.ts | 18 +- package.json | 11 +- pages/_storybook/external-iframe.vue | 4 +- pages/change-password/[token].vue | 4 +- pages/index.vue | 23 +- pages/user/forgot-password.vue | 4 +- pages/user/login.vue | 6 +- pages/user/register.vue | 4 +- pnpm-lock.yaml | 624 +++++++++++++++++++++- tailwind.config.ts | 59 +- 26 files changed, 810 insertions(+), 236 deletions(-) delete mode 100644 app.vue create mode 100644 components/UButton.stories.vue delete mode 100644 components/n-button.stories.vue diff --git a/.vscode/settings.json b/.vscode/settings.json index 19977e72c..c383950da 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -63,5 +63,11 @@ "https://json.schemastore.org/github-workflow.json": "/.github/workflows/*.yml" }, "testing.automaticallyOpenPeekView": "never", - "tailwindCSS.experimental.configFile": ".nuxt/tailwind.config.cjs" + "files.associations": { + "*.css": "tailwindcss" + }, + "editor.quickSuggestions": { + "strings": true + }, + "tailwindCSS.experimental.configFile": "tailwind.config.ts" } diff --git a/app.config.ts b/app.config.ts index 90e50c1c2..a7034266f 100644 --- a/app.config.ts +++ b/app.config.ts @@ -1,29 +1,6 @@ -import theme from '#tailwind-config/theme.mjs' - export default defineAppConfig({ - naiveui: { - themeConfig: { - shared: { - common: { - fontFamily: theme.fontFamily.sans.join(', '), - lineHeight: theme.lineHeight.normal, - }, - }, - light: { - common: { - primaryColor: theme.colors.primary[500], - primaryColorHover: theme.colors.primary[600], - primaryColorPressed: theme.colors.primary[700], - primaryColorSuppl: theme.colors.primary[600], - }, - }, - dark: { - common: { - primaryColor: theme.colors.primary[500], - primaryColorHover: theme.colors.primary[400], - primaryColorPressed: theme.colors.primary[600], - }, - }, - }, + ui: { + primary: 'primary', + gray: 'gray', }, }) diff --git a/app.vue b/app.vue deleted file mode 100644 index 71ddeae25..000000000 --- a/app.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/components/DetailPane.vue b/components/DetailPane.vue index 1ce20a6f5..c0cec6d09 100644 --- a/components/DetailPane.vue +++ b/components/DetailPane.vue @@ -16,13 +16,13 @@
- - - + +
diff --git a/components/LandingPageDownload.client.vue b/components/LandingPageDownload.client.vue index 6482c898d..60088699f 100644 --- a/components/LandingPageDownload.client.vue +++ b/components/LandingPageDownload.client.vue @@ -10,17 +10,13 @@ JabRef is free and works across all your devices.
- + Download JabRef - +
diff --git a/components/LandingPageGetInvolved.vue b/components/LandingPageGetInvolved.vue index b459a7aab..807a93a07 100644 --- a/components/LandingPageGetInvolved.vue +++ b/components/LandingPageGetInvolved.vue @@ -32,22 +32,25 @@

JabRef is developed and maintained by a multidisciplinary - - + diff --git a/components/n-button.stories.vue b/components/n-button.stories.vue deleted file mode 100644 index c90b7e7f2..000000000 --- a/components/n-button.stories.vue +++ /dev/null @@ -1,28 +0,0 @@ - - diff --git a/layouts/content.vue b/layouts/content.vue index 01634e552..33f544c4a 100644 --- a/layouts/content.vue +++ b/layouts/content.vue @@ -30,21 +30,14 @@ screenshot="https://www.jabref.org/assets/jabref-mainscreen.png" :offers="{ price: '0', priceCurrency: 'EUR' }" /> - -

- - - - - +
+
+
- +