Add revamp user and login page

backend/enmedd/server/manage/users.py

@@ -122,6 +122,12 @@ def list_all_users(
                     status=UserStatus.LIVE
                     if user.is_active
                     else UserStatus.DEACTIVATED,
+                    full_name=user.full_name,
+                    billing_email_address=user.billing_email_address,
+                    company_billing=user.company_billing,
+                    company_email=user.company_email,
+                    company_name=user.company_name,
+                    vat=user.vat,
                 )
                 for user in users
             ],
@@ -138,6 +144,12 @@ def list_all_users(
                 email=user.email,
                 role=user.role,
                 status=UserStatus.LIVE if user.is_active else UserStatus.DEACTIVATED,
+                full_name=user.full_name,
+                billing_email_address=user.billing_email_address,
+                company_billing=user.company_billing,
+                company_email=user.company_email,
+                company_name=user.company_name,
+                vat=user.vat,
             )
             for user in users
         ][accepted_page * USERS_PAGE_SIZE : (accepted_page + 1) * USERS_PAGE_SIZE],

backend/enmedd/server/models.py

@@ -4,6 +4,7 @@
 from uuid import UUID
 
 from pydantic import BaseModel
+from pydantic import EmailStr
 from pydantic.generics import GenericModel
 
 from enmedd.auth.schemas import UserRole
@@ -34,6 +35,12 @@ class MinimalUserSnapshot(BaseModel):
 
 class FullUserSnapshot(BaseModel):
     id: UUID
+    full_name: str
+    company_name: Optional[str]
+    company_email: Optional[EmailStr]
+    company_billing: Optional[str]
+    billing_email_address: Optional[EmailStr]
+    vat: Optional[str]
     email: str
     role: UserRole
     status: UserStatus

web/package.json

@@ -19,6 +19,7 @@
     "@radix-ui/react-dropdown-menu": "^2.1.1",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.1",
+    "@radix-ui/react-progress": "^1.1.0",
     "@radix-ui/react-radio-group": "^1.2.0",
     "@radix-ui/react-select": "^2.1.1",
     "@radix-ui/react-separator": "^1.1.0",
@@ -42,6 +43,7 @@
     "date-fns": "^3.6.0",
     "formik": "^2.2.9",
     "framer-motion": "^11.3.24",
+    "input-otp": "^1.2.4",
     "js-cookie": "^3.0.5",
     "lenis": "^1.0.45",
     "lodash": "^4.17.21",

web/src/app/admin/users/AddUserButton.tsx

@@ -0,0 +1,51 @@
+"use client";
+
+import BulkAdd from "@/components/admin/users/BulkAdd";
+import { CustomModal } from "@/components/CustomModal";
+import { Button } from "@/components/ui/button";
+import { Label } from "@/components/ui/label";
+import { useToast } from "@/hooks/use-toast";
+import { useState } from "react";
+import { mutate } from "swr";
+
+export const AddUserButton = () => {
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const { toast } = useToast();
+  const onSuccess = () => {
+    mutate(
+      (key) => typeof key === "string" && key.startsWith("/api/manage/users")
+    );
+    setIsModalOpen(false);
+    toast({
+      title: "Success",
+      description: "Users invited!",
+      variant: "success",
+    });
+  };
+  const onFailure = async (res: Response) => {
+    const error = (await res.json()).detail;
+    toast({
+      title: "Error",
+      description: `Failed to invite users - ${error}`,
+      variant: "destructive",
+    });
+  };
+
+  return (
+    <CustomModal
+      title="Bulk Add Users"
+      onClose={() => setIsModalOpen(false)}
+      open={isModalOpen}
+      trigger={
+        <Button onClick={() => setIsModalOpen(true)}>Invite People</Button>
+      }
+    >
+      <div className="flex flex-col gap-y-3 pt-4">
+        <Label>
+          Add the email addresses to import, separated by whitespaces.
+        </Label>
+        <BulkAdd onSuccess={onSuccess} onFailure={onFailure} />
+      </div>
+    </CustomModal>
+  );
+};