diff --git a/vip-web-backend/pom.xml b/vip-web-backend/pom.xml index 445547b4..ce37437a 100644 --- a/vip-web-backend/pom.xml +++ b/vip-web-backend/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.3 + 3.2.4 org.molgenis diff --git a/vip-web-frontend/.gitattributes b/vip-web-frontend/.gitattributes index a52bd184..ea8a4108 100644 --- a/vip-web-frontend/.gitattributes +++ b/vip-web-frontend/.gitattributes @@ -1 +1,2 @@ -*.* text eol=lf \ No newline at end of file +*.* text eol=lf +*.png -text \ No newline at end of file diff --git a/vip-web-frontend/package.json b/vip-web-frontend/package.json index 3ea9abb3..dec689d0 100644 --- a/vip-web-frontend/package.json +++ b/vip-web-frontend/package.json @@ -49,7 +49,7 @@ "@creativebulma/bulma-tagsinput": "^1.0.3", "@fortawesome/fontawesome-svg-core": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", - "@solidjs/router": "^0.9.1", + "@solidjs/router": "^0.13.1", "axios": "^1.6.8", "bulma": "^0.9.4", "solid-js": "^1.8.15" diff --git a/vip-web-frontend/pnpm-lock.yaml b/vip-web-frontend/pnpm-lock.yaml index 9cb84af5..bdf1617f 100644 --- a/vip-web-frontend/pnpm-lock.yaml +++ b/vip-web-frontend/pnpm-lock.yaml @@ -15,8 +15,8 @@ dependencies: specifier: ^6.5.1 version: 6.5.1 '@solidjs/router': - specifier: ^0.9.1 - version: 0.9.1(solid-js@1.8.15) + specifier: ^0.13.1 + version: 0.13.1(solid-js@1.8.15) axios: specifier: ^1.6.8 version: 1.6.8 @@ -780,10 +780,10 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@solidjs/router@0.9.1(solid-js@1.8.15): - resolution: {integrity: sha512-kRY75piOQsyoH75E/RP6lr7uVGFCjeeCCCJx7Z2D1Vc6+I1yFQjLCvE+6agXGwqDoWi6vbETP1g7gmp/L1mNLg==} + /@solidjs/router@0.13.1(solid-js@1.8.15): + resolution: {integrity: sha512-Rz5Lf0ssWMuN+Wm2GFO0vwZoO/KSwYFSuCUzWrRAvje5M0ZYZrMk5FZxuzdJT+zg8KuqWJQlRALks5E0r+FjAA==} peerDependencies: - solid-js: ^1.8.4 + solid-js: ^1.8.6 dependencies: solid-js: 1.8.15 dev: false diff --git a/vip-web-frontend/src/App.tsx b/vip-web-frontend/src/App.tsx index 2d536108..b33abfcf 100644 --- a/vip-web-frontend/src/App.tsx +++ b/vip-web-frontend/src/App.tsx @@ -1,20 +1,17 @@ -import { Component, createSignal, onMount, Show } from "solid-js"; -import { Route, Routes, useNavigate } from "@solidjs/router"; -import { Home } from "./views/Home"; -import { Jobs } from "./views/Jobs.tsx"; -import { JobCreateForm } from "./views/JobCreateForm.tsx"; -import VcfData from "./views/data/VcfData.tsx"; -import JobData from "./views/data/JobData.tsx"; -import { JobCloneForm } from "./views/JobCloneForm.tsx"; -import { LoginModal } from "./components/LoginModal.tsx"; +import { createSignal, onMount, ParentComponent, Show } from "solid-js"; +import { useNavigate } from "@solidjs/router"; import { useStore } from "./store/store.tsx"; import { User } from "./api/Api.ts"; -import { VcfCreate } from "./views/VcfCreate.tsx"; import { Navbar } from "./components/Navbar.tsx"; -import { Error, ErrorNotification } from "./components/ErrorNotification.tsx"; +import Notification from "./components/bulma/notification.tsx"; import api from "./api/ApiClient.ts"; +import LoginModal from "./components/LoginModal.tsx"; -const App: Component = () => { +export type Error = { + message: string; +}; + +export const App: ParentComponent = (props) => { const navigate = useNavigate(); const [, actions] = useStore(); const [isModalOpen, setIsModalOpen] = createSignal(false); @@ -54,28 +51,16 @@ const App: Component = () => { <> setIsModalOpen(true)} onLogout={() => void handleLogout()} /> - {(error) => setError()} />} + {(error) => ( + setError()}> + {error.message} + + )} + +
{props.children}
+ + setIsModalOpen(false)} onLogIn={(user: User) => handleLogin(user)} /> -
- - } /> - - } /> - - - } /> - } /> - } /> - - -
- setIsModalOpen(false)} - onLogIn={(user: User) => handleLogin(user)} - /> ); }; - -export default App; diff --git a/vip-web-frontend/src/assets/img/logo.png b/vip-web-frontend/src/assets/img/logo.png new file mode 100644 index 00000000..0af0554d Binary files /dev/null and b/vip-web-frontend/src/assets/img/logo.png differ diff --git a/vip-web-frontend/src/assets/img/molgenis_logo_white.png b/vip-web-frontend/src/assets/img/molgenis_logo_white.png deleted file mode 100644 index d4665fc1..00000000 Binary files a/vip-web-frontend/src/assets/img/molgenis_logo_white.png and /dev/null differ diff --git a/vip-web-frontend/src/components/ErrorNotification.tsx b/vip-web-frontend/src/components/ErrorNotification.tsx deleted file mode 100644 index 1536ae5c..00000000 --- a/vip-web-frontend/src/components/ErrorNotification.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { Component } from "solid-js"; - -export type Error = { - message: string; -}; -export const ErrorNotification: Component<{ - error: Error; - onClose: () => void; -}> = (props) => { - return ( -
-
- ); -}; diff --git a/vip-web-frontend/src/components/LoginModal.tsx b/vip-web-frontend/src/components/LoginModal.tsx index 749ac904..d650ee72 100644 --- a/vip-web-frontend/src/components/LoginModal.tsx +++ b/vip-web-frontend/src/components/LoginModal.tsx @@ -2,9 +2,9 @@ import { Component, createSignal, Show } from "solid-js"; import { Login, User } from "../api/Api.ts"; import api from "../api/ApiClient.ts"; import { createStore } from "solid-js/store"; +import Modal from "./bulma/modal.tsx"; -export const LoginModal: Component<{ - active: boolean; +const LoginModal: Component<{ onClose: () => void; onLogIn: (user: User) => void; }> = (props) => { @@ -30,73 +30,72 @@ export const LoginModal: Component<{ }; return ( -
-
-
-
- {/* username */} -
-
- -
-
-
-
- { - setFields("username", e.target.value); - }} - /> -
+ handleCancel()}> +
+ {/* username */} +
+
+ +
+
+
+
+ { + setFields("username", e.target.value); + }} + />
- {/* password */} -
-
- -
-
-
-
- { - setFields("password", e.target.value); - }} - /> -
- - {(help) =>

{help}

} - +
+ {/* password */} +
+
+ +
+
+
+
+ { + setFields("password", e.target.value); + }} + />
+ + {(help) =>

{help}

} +
- {/* buttons */} -
-
-
-
-
- -
-
- -
+
+ {/* buttons */} +
+
+
+
+
+ +
+
+
-
+ ); }; + +export default LoginModal; diff --git a/vip-web-frontend/src/components/Navbar.tsx b/vip-web-frontend/src/components/Navbar.tsx index 1e5a7c86..50e1a9c1 100644 --- a/vip-web-frontend/src/components/Navbar.tsx +++ b/vip-web-frontend/src/components/Navbar.tsx @@ -1,6 +1,5 @@ import { Component, Show } from "solid-js"; -import { Link } from "@solidjs/router"; -import logoImgUrl from "../assets/img/molgenis_logo_white.png"; +import logoImgUrl from "../assets/img/logo.png"; import { useStore } from "../store/store.tsx"; export const Navbar: Component<{ @@ -12,9 +11,9 @@ export const Navbar: Component<{ return (