feat: update styles and my orders route

regen-network · Oct 11, 2024 · 7ee4600 · 7ee4600
1 parent f94c5ab
commit 7ee4600
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/web-marketplace/src/clients/regen/Regen.Routes.tsx b/web-marketplace/src/clients/regen/Regen.Routes.tsx
@@ -338,7 +338,7 @@ export const getRegenRoutes = ({
  path="settings"
  element={<AuthRoute component={ProfileEditSettings} />}
  />
- <Route path="orders" element={<AuthRoute component={Orders} />} />
+ <Route path="my-orders" element={<AuthRoute component={Orders} />} />
  </Route>
  </Route>
  <Route path="connect-wallet" element={<ConnectWalletPage />} />

diff --git a/web-marketplace/src/components/organisms/AdminNavigation/AdminNavigation.constants.tsx b/web-marketplace/src/components/organisms/AdminNavigation/AdminNavigation.constants.tsx
@@ -15,9 +15,9 @@ export const adminNavigationSections: AdminNavigationSection[] = [
  heading: i18n._(msg`Orders`),
  items: [
  {
- name: i18n._(msg`My Orders`),
+ name: i18n._(msg`My orders`),
  icon: <ShoppingBagIcon linearGradient />,
- path: 'orders',
+ path: 'my-orders',
  },
  {
  name: i18n._(msg`My prefinance projects`),
@@ -35,7 +35,7 @@ export const adminNavigationSections: AdminNavigationSection[] = [
  heading: i18n._(msg`Profile`),
  items: [
  {
- name: i18n._(msg`Edit Profile`),
+ name: i18n._(msg`Edit profile`),
  icon: <UserMenuIcon linearGradient />,
  path: 'profile',
  },

diff --git a/web-marketplace/src/components/organisms/EditProfileForm/EditProfileForm.tsx b/web-marketplace/src/components/organisms/EditProfileForm/EditProfileForm.tsx
@@ -130,6 +130,7 @@ const EditProfileForm: React.FC<React.PropsWithChildren<EditProfileFormProps>> =
 
  return (
  <Form
+ className="p-40"
  form={form}
  onSubmit={async data => {
  const hasError = validateEditProfileForm({

diff --git a/web-marketplace/src/pages/Dashboard/Dashboard.constants.tsx b/web-marketplace/src/pages/Dashboard/Dashboard.constants.tsx
@@ -84,8 +84,8 @@ export const HEADING_PROFILE = {
 };
 
 export const MY_ORDERS = {
- label: msg`My Orders`,
- href: '/profile/edit/orders',
+ label: msg`My orders`,
+ href: '/profile/edit/my-orders',
  icon: <ShoppingBagIcon linearGradient />,
  labelClassName,
  className,

diff --git a/web-marketplace/src/pages/ProfileEdit/ProfileEdit.Settings.tsx b/web-marketplace/src/pages/ProfileEdit/ProfileEdit.Settings.tsx
@@ -52,10 +52,10 @@ export const ProfileEditSettings = () => {
  });
 
  return (
- <>
- {error && (
+ <div className="p-40">
+ {(error as string) && (
  <ErrorBanner
- text={error.toString()}
+ text={(error as string).toString()}
  onClose={() => setError(undefined)}
  />
  )}
@@ -88,6 +88,6 @@ export const ProfileEditSettings = () => {
  setError={setError}
  onConnectModalClose={onModalClose}
  />
- </>
+ </div>
  );
 };
diff --git a/web-marketplace/src/pages/ProfileEdit/ProfileEdit.tsx b/web-marketplace/src/pages/ProfileEdit/ProfileEdit.tsx
@@ -63,7 +63,7 @@ export const ProfileEdit = () => {
  }, [isDirtyRef, setIsProfileEditDirtyref]);
 
  return (
- <>
+ <div className="bg-grey-100">
  <div className="flex flex-col justify-start items-center lg:items-start lg:flex-row lg:justify-evenly max-w-[1150px] mx-auto p-10 lg:py-50 lg:px-15 min-h-screen">
  <AdminNavigation
  className="hidden lg:block min-w-[235px]"
@@ -84,7 +84,7 @@ export const ProfileEdit = () => {
  section ? 'flex' : 'hidden',
  )}
  >
- <Flex justifyContent="space-between" className="mb-25 w-full">
+ <Flex justifyContent="space-between" className="mb-25 w-full h-50">
  <Title variant="h3">{startCase(section)}</Title>
  {section === 'profile' && (
  <ViewProfileButton
@@ -112,6 +112,6 @@ export const ProfileEdit = () => {
  setIsWarningModalOpen(undefined);
  }}
  />
- </>
+ </div>
  );
 };