From 54068771b8c6f70b83b541faec7002e13f1cb326 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Tue, 8 Oct 2024 11:08:58 +0000 Subject: [PATCH] Upgrade remix-themes --- app/auth.server.ts | 2 -- app/routes/profile.tsx | 9 --------- app/scenarios/MacroMoleculeSubForm.client.tsx | 6 +++++- package-lock.json | 17 +++++++++-------- package.json | 2 +- 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/app/auth.server.ts b/app/auth.server.ts index 11088c8c..983984cf 100644 --- a/app/auth.server.ts +++ b/app/auth.server.ts @@ -97,7 +97,6 @@ if ( userAgent: "Haddock3WebApp", }, async ({ profile }) => { - // TODO store users display name in database for more personal greeting const primaryEmail = profile.emails[0].value; const photo = profile.photos[0].value ?? undefined; const userId = await oauthregister(primaryEmail, photo); @@ -181,7 +180,6 @@ if ( }); const profile = await profileResponse.json(); const emails = await this.userEmails(profile.sub); - // TODO store Orcid id into database return { ...profile, emails, diff --git a/app/routes/profile.tsx b/app/routes/profile.tsx index 26ec82da..20dae2fb 100644 --- a/app/routes/profile.tsx +++ b/app/routes/profile.tsx @@ -90,15 +90,6 @@ export default function Page() { setTheme(t === "" ? null : (t as Theme)); }} > - {/* - TODO system is not yet supported by remix-themes, - but issue by author was created on 2 feb 2024. - -
- - -
- */}
diff --git a/app/scenarios/MacroMoleculeSubForm.client.tsx b/app/scenarios/MacroMoleculeSubForm.client.tsx index 7ab9d012..df7c1bb3 100644 --- a/app/scenarios/MacroMoleculeSubForm.client.tsx +++ b/app/scenarios/MacroMoleculeSubForm.client.tsx @@ -28,7 +28,11 @@ import { computeNeighbours, useNeighbourRadius } from "./useNeighbourRadius"; import { useSafeFile } from "./useSafeFile"; import { useTheme } from "remix-themes"; import { Viewer } from "@i-vresse/haddock3-ui"; -import { ActPass, ResidueSelection, toggleResidue } from "@i-vresse/haddock3-ui/toggles"; +import { + ActPass, + ResidueSelection, + toggleResidue, +} from "@i-vresse/haddock3-ui/toggles"; export function ResiduesSubForm({ molecule, diff --git a/package-lock.json b/package-lock.json index afbb93e2..4f7e1662 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "haddock3-webapp", "version": "0.3.8", "dependencies": { - "@i-vresse/haddock3-ui": "^0.2.2", + "@i-vresse/haddock3-ui": "^0.3.1", "@i-vresse/wb-core": "^3.2.1", "@i-vresse/wb-form": "^2.0.1", "@radix-ui/react-checkbox": "^1.0.4", @@ -51,7 +51,7 @@ "remix-auth-form": "^1.3.0", "remix-auth-github": "^1.7.0", "remix-auth-oauth2": "^1.8.0", - "remix-themes": "^1.3.1", + "remix-themes": "^1.5.1", "tailwind-merge": "^2.2.1", "tailwindcss-animate": "^1.0.7", "tiny-invariant": "^1.3.1", @@ -3292,9 +3292,9 @@ "dev": true }, "node_modules/@i-vresse/haddock3-ui": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@i-vresse/haddock3-ui/-/haddock3-ui-0.2.2.tgz", - "integrity": "sha512-EQE8DDR8K/p7yOUBo16QJoW4W8jnE/lTeo7u/Wr4fkZGsw7V9ZFrvotfGtSi+ZZe9Lck+iiC11MpKSfiUleN8g==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@i-vresse/haddock3-ui/-/haddock3-ui-0.3.1.tgz", + "integrity": "sha512-Fl6e9FJEqjIHWt1HDKuVIZ0Gl0FfZpORenDxglyz7zg6o+0jdL1mgfcfG63LilENNlPCnz4BhTrcLoSA3A//8g==", "license": "Apache-2.0", "dependencies": { "clsx": "^2.1.1", @@ -21873,9 +21873,10 @@ } }, "node_modules/remix-themes": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/remix-themes/-/remix-themes-1.3.1.tgz", - "integrity": "sha512-RNw2nMG7c8Ei6KLjr5dUwy++4ga3KFSmedzqPk+de+f3JZhPbfH+HaEWSu2nPpuIMBlNldrUoCt4GN7rC5u5uw==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/remix-themes/-/remix-themes-1.5.1.tgz", + "integrity": "sha512-3/qo8pLjWdL5c6QORCzRp2KwT9izg294wCjL9grNPGhOaO/tkAkzf36imV7nkIhUc8U+7QGffiRl+Zg0prGfgA==", + "license": "MIT", "peerDependencies": { "@remix-run/react": ">= 1", "@remix-run/server-runtime": ">= 1" diff --git a/package.json b/package.json index 05f6dc78..c8ce0cbf 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "remix-auth-form": "^1.3.0", "remix-auth-github": "^1.7.0", "remix-auth-oauth2": "^1.8.0", - "remix-themes": "^1.3.1", + "remix-themes": "^1.5.1", "tailwind-merge": "^2.2.1", "tailwindcss-animate": "^1.0.7", "tiny-invariant": "^1.3.1",