umwd-components 0.1.665 → 0.1.666

package/dist/types/types/e-commerce/enduser/types.d.ts

@@ -8,7 +8,6 @@ export interface EnduserProfileProps {
     last_name: string;
     email: string;
     phone: string;
-    private_address: AddressProps;
     company_address: AddressProps;
     business_credentials: BusinessCredentialsWithJSONProps;
 }

package/dist/types/types/logistics/dispatcher/types.d.ts

@@ -4,6 +4,10 @@ export interface DispatcherProfileProps {
     id: string;
     uuid: string;
     dispatcher_number: string;
-    address: AddressProps;
+    first_name: string;
+    last_name: string;
+    email: string;
+    phone: string;
+    company_address: AddressProps;
     business_credentials: BusinessCredentialsWithJSONProps;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umwd-components",
-  "version": "0.1.665",
+  "version": "0.1.666",
   "description": "UMWD Component library",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",

package/src/components/e-commerce/enduser/EnduserProfileDisplay.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import React from "react";
+
 import Paper from "@mui/material/Paper";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
@@ -10,6 +11,9 @@ import Grid from "@mui/material/Grid";
 import Alert from "@mui/material/Alert";
 
 import { SxProps, Theme } from "@mui/material/styles";
+import PersonIcon from "@mui/icons-material/Person";
+import EmailIcon from "@mui/icons-material/Email";
+import PhoneIcon from "@mui/icons-material/Phone";
 import Address from "../../common/Address";
 import BusinessCredentials from "../../e-commerce/customer/BusinessCredentials";
 import { StyledLink } from "../../StyledLink";
@@ -30,7 +34,10 @@ export default function EnduserProfileDisplay({
   readonly data: EnduserProfileDisplayProps;
 }) {
   const {
-    private_address,
+    first_name,
+    last_name,
+    email,
+    phone,
     company_address,
     business_credentials,
     editProfileUrl = "/dashboard/enduser/user/profile/edit",
@@ -38,7 +45,8 @@ export default function EnduserProfileDisplay({
   } = data;
 
   const pathname = usePathname();
-  const isEnduser = pathname.includes("/user/");
+  // Check if the current path is for an enduser profile
+  const isEnduser = pathname.includes("enduser/user/");
 
   return (
     <Paper sx={{ p: 2 }}>
@@ -66,31 +74,47 @@ export default function EnduserProfileDisplay({
             )}
           </>
         )}
+
         {business_credentials ? (
           <BusinessCredentials data={business_credentials} />
         ) : (
           <Typography>Business credentials not available</Typography>
         )}
-        <Divider />{" "}
+
+        <Divider />
+
         <Grid container spacing={2} sx={{ width: "100%" }}>
-          <Grid item xs={12} md={6}>
-            <Typography variant="h6" gutterBottom>
-              Company Address
-            </Typography>
-            {company_address ? (
-              <Address data={company_address} />
+          <Grid item xs={12} md={4}>
+            <Typography variant="h6">Personal Information</Typography>
+            <Stack spacing={1} sx={{ mt: 2 }}>
+              <Stack direction="row" alignItems="center">
+                <PersonIcon />
+                <Typography>{`${first_name} ${last_name}`}</Typography>
+              </Stack>
+              <Stack direction="row" alignItems="center">
+                <EmailIcon />
+                <Typography>{email}</Typography>
+              </Stack>
+              <Stack direction="row" alignItems="center">
+                <PhoneIcon />
+                <Typography>{phone}</Typography>
+              </Stack>
+            </Stack>
+          </Grid>
+          <Grid item xs={12} md={4}>
+            <Typography variant="h6">Business Credentials</Typography>
+            {business_credentials ? (
+              <BusinessCredentials data={business_credentials} />
             ) : (
-              <Typography>Company address not available</Typography>
+              <Typography>Business credentials not available</Typography>
             )}
           </Grid>
-          <Grid item xs={12} md={6}>
-            <Typography variant="h6" gutterBottom>
-              Private Address
-            </Typography>
-            {private_address ? (
-              <Address data={private_address} />
+          <Grid item xs={12} md={4}>
+            <Typography variant="h6">Company Address</Typography>
+            {company_address ? (
+              <Address data={{ ...company_address }} />
             ) : (
-              <Typography>Private address not available</Typography>
+              <Typography>Company address not available</Typography>
             )}
           </Grid>
         </Grid>

package/src/components/e-commerce/enduser/EnduserProfileEditForm.tsx

@@ -5,14 +5,15 @@ import Paper from "@mui/material/Paper";
 import Box from "@mui/material/Box";
 import Stack from "@mui/material/Stack";
 import Grid from "@mui/material/Grid";
-import Button from "@mui/material/Button";
+import TextField from "@mui/material/TextField";
 import Typography from "@mui/material/Typography";
+import Button from "@mui/material/Button";
 
 import { AddressFields } from "../../common/Address";
-import { BusinessCredentialsFields } from "../customer/BusinessCredentials";
 import { SubmitButton } from "../../SubmitButton";
 import { useFormState } from "react-dom";
 import { updateEnduserProfileAction } from "../../../data/actions/e-commerce/enduser/profile-actions";
+import { BusinessCredentialsFields } from "../../e-commerce/customer/BusinessCredentials";
 import { useSession } from "../../../context/auth/SessionContext";
 import { useSnackbar } from "../../../context/common/SnackbarContext";
 import React, { useEffect } from "react";
@@ -38,7 +39,15 @@ export default function EnduserProfileEditForm({
   revalidateCallback?: () => void;
   handleClose?: () => void;
 }) {
-  const { id, private_address, company_address, business_credentials } = data;
+  const {
+    id,
+    first_name,
+    last_name,
+    email,
+    phone,
+    company_address,
+    business_credentials,
+  } = data;
   const boundAction = updateEnduserProfileAction.bind(null, parseInt(id));
   const [formState, formAction] = useFormState(boundAction, INITIAL_STATE);
   const { handleAddMessage } = useSnackbar();
@@ -74,24 +83,32 @@ export default function EnduserProfileEditForm({
         <Grid container spacing={2}>
           <Grid item xs={12}>
             <Stack spacing={2}>
-              <Typography variant="h3" component="h1" gutterBottom>
+              <Typography variant="h3" component="h1">
                 Edit Profile
               </Typography>
+              <Typography variant="body1">
+                Update your profile information
+              </Typography>
             </Stack>
           </Grid>
+
           <Grid item xs={12}>
-            <Paper sx={{ p: 2 }}>
-              <Typography variant="h6" gutterBottom>
-                Business Credentials
-              </Typography>
-              <Divider sx={{ mb: 2 }} />
-              <BusinessCredentialsFields
-                componentName="business_credentials"
-                componentReference="business.credentials"
-                data={business_credentials}
-              />
-            </Paper>
-          </Grid>{" "}
+            <TextField
+              id="email"
+              name="email"
+              label="Email"
+              type="email"
+              defaultValue={email}
+            />
+            <TextField
+              id="phone"
+              name="phone"
+              label="Phone"
+              type="tel"
+              defaultValue={phone}
+            />
+          </Grid>
+
           <Grid item xs={12}>
             <Paper sx={{ p: 2 }}>
               <Typography variant="h6" gutterBottom>
@@ -105,19 +122,21 @@ export default function EnduserProfileEditForm({
               />
             </Paper>
           </Grid>
+
           <Grid item xs={12}>
             <Paper sx={{ p: 2 }}>
               <Typography variant="h6" gutterBottom>
-                Private Address
+                Business Credentials
               </Typography>
               <Divider sx={{ mb: 2 }} />
-              <AddressFields
-                componentName="private_address"
-                componentReference="common.address"
-                data={private_address}
+              <BusinessCredentialsFields
+                componentName="business_credentials"
+                componentReference="business.credentials"
+                data={business_credentials}
               />
             </Paper>
           </Grid>
+
           <Grid item xs={12}>
             <Stack
               direction="row"

package/src/components/logistics/dispatcher/DispatcherProfileDisplay.tsx

@@ -4,11 +4,11 @@ import React from "react";
 
 import Paper from "@mui/material/Paper";
 import Stack from "@mui/material/Stack";
-import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import Divider from "@mui/material/Divider";
 import Grid from "@mui/material/Grid";
+import Alert from "@mui/material/Alert";
 
 import { SxProps, Theme } from "@mui/material/styles";
 import PersonIcon from "@mui/icons-material/Person";
@@ -18,7 +18,6 @@ import Address from "../../common/Address";
 import BusinessCredentials from "../../../components/e-commerce/customer/BusinessCredentials";
 import { StyledLink } from "../../../components/StyledLink";
 import { DispatcherProfileProps } from "../../../types/logistics/dispatcher/types";
-import { Alert } from "@mui/material";
 
 import { usePathname } from "next/navigation";
 
@@ -35,14 +34,19 @@ export default function DispatcherProfileDisplay({
   readonly data: DispatcherProfileDisplayProps;
 }) {
   const {
-    address,
+    first_name,
+    last_name,
+    email,
+    phone,
+    company_address,
     business_credentials,
     editProfileUrl = "/dashboard/dispatcher/user/profile/edit",
     completeEnough = false,
   } = data;
 
   const pathname = usePathname();
-  const isDispatcher = pathname.includes("/user/");
+  // Check if the current path is for a dispatcher profile
+  const isDispatcher = pathname.includes("dispatcher/user/");
 
   return (
     <Paper sx={{ p: 2 }}>
@@ -76,19 +80,43 @@ export default function DispatcherProfileDisplay({
         ) : (
           <Typography>Business credentials not available</Typography>
         )}
+
         <Divider />
 
-        <Grid container sx={{ width: "100%" }}>
-          {address ? (
-            <Grid item xs={12} md={4}>
-              <Typography variant="h6">Address</Typography>
-              <Address data={{ ...address }} />
-            </Grid>
-          ) : (
-            <Grid item xs={12} md={4}>
-              <Typography>Address not available</Typography>
-            </Grid>
-          )}
+        <Grid container spacing={2} sx={{ width: "100%" }}>
+          <Grid item xs={12} md={4}>
+            <Typography variant="h6">Personal Information</Typography>
+            <Stack spacing={1} sx={{ mt: 2 }}>
+              <Stack direction="row" alignItems="center">
+                <PersonIcon />
+                <Typography>{`${first_name} ${last_name}`}</Typography>
+              </Stack>
+              <Stack direction="row" alignItems="center">
+                <EmailIcon />
+                <Typography>{email}</Typography>
+              </Stack>
+              <Stack direction="row" alignItems="center">
+                <PhoneIcon />
+                <Typography>{phone}</Typography>
+              </Stack>
+            </Stack>
+          </Grid>
+          <Grid item xs={12} md={4}>
+            <Typography variant="h6">Business Credentials</Typography>
+            {business_credentials ? (
+              <BusinessCredentials data={business_credentials} />
+            ) : (
+              <Typography>Business credentials not available</Typography>
+            )}
+          </Grid>
+          <Grid item xs={12} md={4}>
+            <Typography variant="h6">Company Address</Typography>
+            {company_address ? (
+              <Address data={{ ...company_address }} />
+            ) : (
+              <Typography>Company address not available</Typography>
+            )}
+          </Grid>
         </Grid>
       </Stack>
     </Paper>

package/src/components/logistics/dispatcher/DispatcherProfileEditForm.tsx

@@ -5,22 +5,18 @@ import Paper from "@mui/material/Paper";
 import Box from "@mui/material/Box";
 import Stack from "@mui/material/Stack";
 import Grid from "@mui/material/Grid";
-import Alert from "@mui/material/Alert";
 import TextField from "@mui/material/TextField";
 import Typography from "@mui/material/Typography";
-import Checkbox from "@mui/material/Checkbox";
 import Button from "@mui/material/Button";
 
 import { AddressFields } from "../../common/Address";
-import { AddressProps } from "@/types/AddressProps";
-import { BusinessCredentialsProps } from "@/types/e-commerce/BusinessCredentialsProps";
 import { SubmitButton } from "../../SubmitButton";
 import { useFormState } from "react-dom";
 import { updateDispatcherProfileAction } from "../../../data/actions/logistics/dispatcher/profile-actions"; //"@/data/actions/profile-actions";
 import { BusinessCredentialsFields } from "../../e-commerce/customer/BusinessCredentials";
 import { useSession } from "../../../context/auth/SessionContext";
 import { useSnackbar } from "../../../context/common/SnackbarContext";
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
 import { DispatcherProfileProps } from "../../../types/logistics/dispatcher/types";
 import { SxProps } from "@mui/material";
 
@@ -43,7 +39,15 @@ export default function DispatcherProfileEditForm({
   revalidateCallback?: () => void;
   handleClose?: () => void;
 }) {
-  const { id, uuid, dispatcher_number, address, business_credentials } = data;
+  const {
+    id,
+    first_name,
+    last_name,
+    email,
+    phone,
+    company_address,
+    business_credentials,
+  } = data;
   const boundAction = updateDispatcherProfileAction.bind(null, parseInt(id));
   const [formState, formAction] = useFormState(boundAction, INITIAL_STATE);
   const { handleAddMessage } = useSnackbar();
@@ -79,22 +83,42 @@ export default function DispatcherProfileEditForm({
         <Grid container spacing={2}>
           <Grid item xs={12}>
             <Stack spacing={2}>
-              <Typography variant="h3" component="h1" gutterBottom>
+              <Typography variant="h3" component="h1">
                 Edit Profile
               </Typography>
+              <Typography variant="body1">
+                Update your profile information
+              </Typography>
             </Stack>
           </Grid>
 
+          <Grid item xs={12}>
+            <TextField
+              id="email"
+              name="email"
+              label="Email"
+              type="email"
+              defaultValue={email}
+            />
+            <TextField
+              id="phone"
+              name="phone"
+              label="Phone"
+              type="tel"
+              defaultValue={phone}
+            />
+          </Grid>
+
           <Grid item xs={12}>
             <Paper sx={{ p: 2 }}>
               <Typography variant="h6" gutterBottom>
-                Business Credentials
+                Company Address
               </Typography>
               <Divider sx={{ mb: 2 }} />
-              <BusinessCredentialsFields
-                componentName="business_credentials"
-                componentReference="business.credentials"
-                data={business_credentials}
+              <AddressFields
+                componentName="company_address"
+                componentReference="common.address"
+                data={company_address}
               />
             </Paper>
           </Grid>
@@ -102,13 +126,13 @@ export default function DispatcherProfileEditForm({
           <Grid item xs={12}>
             <Paper sx={{ p: 2 }}>
               <Typography variant="h6" gutterBottom>
-                Company Address
+                Business Credentials
               </Typography>
               <Divider sx={{ mb: 2 }} />
-              <AddressFields
-                componentName="address"
-                componentReference="common.address"
-                data={address}
+              <BusinessCredentialsFields
+                componentName="business_credentials"
+                componentReference="business.credentials"
+                data={business_credentials}
               />
             </Paper>
           </Grid>

package/src/types/e-commerce/enduser/types.ts

@@ -9,7 +9,6 @@ export interface EnduserProfileProps {
   last_name: string;
   email: string;
   phone: string;
-  private_address: AddressProps;
   company_address: AddressProps;
   business_credentials: BusinessCredentialsWithJSONProps;
 }

package/src/types/logistics/dispatcher/types.ts

@@ -1,26 +1,14 @@
-import {
-  BusinessCredentialsProps,
-  BusinessCredentialsWithJSONProps,
-} from "../../e-commerce/BusinessCredentialsProps";
+import { BusinessCredentialsWithJSONProps } from "../../e-commerce/BusinessCredentialsProps";
 import { AddressProps } from "../../AddressProps";
 
-// export type DispatcherLabel = {
-//   id: number;
-//   title: string;
-//   slug?: string;
-// };
-
-// export interface DispatcherSelectorProps {
-//   dispatcherLabels: DispatcherLabel[];
-//   currentValue?: number[];
-//   multiple?: boolean;
-//   onChangeCallback?: (value: number[]) => void;
-// }
-
 export interface DispatcherProfileProps {
   id: string;
   uuid: string;
   dispatcher_number: string;
-  address: AddressProps;
+  first_name: string;
+  last_name: string;
+  email: string;
+  phone: string;
+  company_address: AddressProps;
   business_credentials: BusinessCredentialsWithJSONProps;
 }