Fix/issue 33 login form (#36)

* add error type from Feathers

* Update LoginForm.tsx

* add error from API in LoginModal

* Update entities.mdx

* improve secondary button style

* fix image layout in markdown

* fixupdatenotebooks to update only notebooks without the SHA or with a different SHA

---------

Co-authored-by: Daniele Guido <[email protected]>

package.json

@@ -22,6 +22,7 @@
     "@codemirror/lang-python": "^6.1.6",
     "@custom-react-hooks/use-on-screen": "^1.5.1",
     "@feathersjs/authentication-client": "^5.0.30",
+    "@feathersjs/errors": "^5.0.30",
     "@feathersjs/feathers": "^5.0.30",
     "@feathersjs/socketio-client": "^5.0.30",
     "@react-spring/web": "^9.7.4",

src/components/LoginForm.tsx

@@ -1,5 +1,12 @@
+import {
+  BadRequest,
+  NotAuthenticated,
+  type FeathersError,
+} from "@feathersjs/errors"
 import React, { useRef } from "react"
 import { Form } from "react-bootstrap"
+import { useBrowserStore } from "../store"
+import { BrowserViewRegister } from "../constants"
 
 export interface LoginFormPayload {
   email: string
@@ -9,37 +16,96 @@ export interface LoginFormPayload {
 export interface LoginFormProps {
   className?: string
   onSubmit: (payload: LoginFormPayload) => void
+  error?: FeathersError | null
 }
 
-const LoginForm: React.FC<LoginFormProps> = ({ className, onSubmit }) => {
+const LoginForm: React.FC<LoginFormProps> = ({
+  className,
+  onSubmit,
+  error,
+}) => {
+  const setView = useBrowserStore((state) => state.setView)
   const formPayload = useRef({ email: "", password: "" })
   const handleOnSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault()
     console.info("[LoginForm] @handleOnSubmit")
     onSubmit(formPayload.current)
   }
 
+  console.info("[LoginForm] @render", { error })
+  let errorMessages: { key: string; message: string }[] = []
+
+  if (error instanceof BadRequest && error.data) {
+    errorMessages = Object.keys(error.data).map((key) => {
+      return { key, message: error.data[key].message }
+    })
+  } else if (error instanceof NotAuthenticated) {
+    errorMessages = [{ key: "Error", message: error.message }]
+  } else if (error) {
+    errorMessages = [{ key: "Error", message: error.message }]
+  }
   return (
-    <Form onSubmit={handleOnSubmit} className={`LoginForm ${className}`}>
-      <Form.Group className="mb-3" controlId="ModalLoginForm.email">
-        <Form.Label className="font-weight-bold">Email address</Form.Label>
-        <Form.Control
-          onChange={(e) => (formPayload.current.email = e.target.value)}
-          type="email"
-          placeholder="[email protected]"
-        />
-      </Form.Group>
-      <Form.Group className="mb-3" controlId="ModalLoginForm.password">
-        <Form.Label className="font-weight-bold">Password</Form.Label>
-        <Form.Control
-          onChange={(e) => (formPayload.current.password = e.target.value)}
-          type="password"
-        />
-      </Form.Group>
-      <button type="submit" className="btn btn-primary">
-        Log in
-      </button>
-    </Form>
+    <>
+      <Form onSubmit={handleOnSubmit} className={`LoginForm ${className}`}>
+        {errorMessages.length > 0 ? (
+          <div className="alert alert-danger" role="alert">
+            <ul className="list-unstyled m-0">
+              {errorMessages.map((d, _i) => (
+                <li key={_i}>
+                  <b>{d.key}</b>:&nbsp;
+                  {d.message}
+                </li>
+              ))}
+            </ul>
+          </div>
+        ) : null}
+        <Form.Group className="mb-3" controlId="ModalLoginForm.email">
+          <Form.Label className="font-weight-bold">Email address</Form.Label>
+          <Form.Control
+            onChange={(e) => (formPayload.current.email = e.target.value)}
+            type="email"
+            placeholder="[email protected]"
+          />
+        </Form.Group>
+        <Form.Group className="mb-3" controlId="ModalLoginForm.password">
+          <Form.Label className="font-weight-bold">Password</Form.Label>
+          <Form.Control
+            onChange={(e) => (formPayload.current.password = e.target.value)}
+            type="password"
+          />
+        </Form.Group>
+        <div className="">
+          <button
+            type="submit"
+            className="btn btn-primary w-100 d-flex justify-content-center px-5"
+          >
+            Log in
+          </button>
+        </div>
+      </Form>
+      {/* Did you forget your password?  */}
+      <p className="mt-3">
+        Did you forget your password?{" "}
+        <a href="https://impresso-project.ch/app/password-reset">
+          Reset your password
+        </a>
+      </p>
+      <p className="my-3 py-3 gap-3 border-top border-bottom d-flex align-items-center">
+        Don't have an account?
+        <button
+          onClick={() => setView(BrowserViewRegister)}
+          className="btn btn-secondary px-5"
+        >
+          Register
+        </button>
+      </p>
+
+      <p className="mt-2">
+        Any Questions? <br />
+        Contact us at{" "}
+        <a href="mailto:[email protected]">[email protected]</a>
+      </p>
+    </>
   )
 }
 

src/components/LoginModal.tsx

@@ -1,15 +1,18 @@
 import { Modal } from "react-bootstrap"
+import { FeathersError } from "@feathersjs/errors"
 import { useBrowserStore, usePersistentStore } from "../store"
 import { BrowserViewLogin } from "../constants"
 import LoginForm, { type LoginFormPayload } from "./LoginForm"
 import { loginService } from "../services"
+import { useEffect, useState } from "react"
 
 const LoginModal = () => {
   const view = useBrowserStore((state) => state.view)
   const setView = useBrowserStore((state) => state.setView)
   const setAuthenticatedUser = usePersistentStore(
-    (state) => state.setAuthenticatedUser
+    (state) => state.setAuthenticatedUser,
   )
+  const [error, setError] = useState<FeathersError | null>(null)
 
   const checkCredentials = (credentials: LoginFormPayload) => {
     loginService
@@ -22,11 +25,15 @@ const LoginModal = () => {
         setAuthenticatedUser(data.user, data.accessToken)
         setView(null)
       })
-      .catch((err) => {
+      .catch((err: FeathersError) => {
+        setError(err)
         console.error("loginService.create", err)
       })
   }
 
+  useEffect(() => {
+    setError(null)
+  }, [view])
   return (
     <Modal
       centered
@@ -38,7 +45,7 @@ const LoginModal = () => {
       </Modal.Header>
       <Modal.Body className="p-3">
         <p>Log in to your account</p>
-        <LoginForm onSubmit={checkCredentials} />
+        <LoginForm onSubmit={checkCredentials} error={error} />
       </Modal.Body>
     </Modal>
   )

src/components/MarkdownSnippet.css

@@ -0,0 +1,6 @@
+.MarkdownSnippet img {
+  max-width: 100%;
+  height: auto;
+  display: block;
+  margin: 0 auto;
+}

src/components/MarkdownSnippet.tsx

@@ -1,4 +1,5 @@
 import { marked } from "marked"
+import "./MarkdownSnippet.css"
 
 export interface MarkdownSnippetProps {
   value?: string
@@ -12,7 +13,7 @@ const MarkdownSnippet: React.FC<MarkdownSnippetProps> = ({
   const content = marked.parse(value)
   return (
     <div
-      className={`MarkdownSnipped ${className}`}
+      className={`MarkdownSnippet ${className}`}
       dangerouslySetInnerHTML={{ __html: content }}
     />
   )

src/content/series/entities.mdx

@@ -1,10 +1,12 @@
 ---
 title: Explore and Visualise your Impresso Data
-excerpt: "Notebook templates offer complementary views on your Impresso personal collections and external datasets beyond the capabilities of the Impresso Web App."
+excerpt: ""
 notebooks:
   - impresso-py-maps
   - impresso-py-network
 category:
   - explorations
 position: central-column
 ---
+
+Notebook templates offer complementary views on your Impresso personal collections and external datasets beyond the capabilities of the Impresso Web App.