Merge branch 'saigonbitmaster:master' into testnet

jackchuong · Oct 6, 2023 · 04c3843 · 04c3843
2 parents e7629b1 + 66f45e0
commit 04c3843
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/cms/src/i18n/en.ts b/cms/src/i18n/en.ts
@@ -23,6 +23,7 @@ const customEnglishMessages: TranslationMessages = {
       pending_orders: "Pending Orders",
       allPostedJobs: "See all Jobs",
       allPlutusTxs: "See all plutus TXs",
+      postedJob: "Posted jobs",
       order: {
         items:
           "by %{customer_name}, one item |||| by %{customer_name}, %{nb_items} items",
@@ -56,7 +57,7 @@ const customEnglishMessages: TranslationMessages = {
       import: "Import excels",
     },
     jobtasks: {
-      name: "Job task |||| Job tasks",
+      name: "Task management|||| Task management",
 
       filters: {
         last_visited: "Last visited",
@@ -151,7 +152,7 @@ const customEnglishMessages: TranslationMessages = {
       },
     },
     postJobs: {
-      name: "Post Job |||| Post jobs",
+      name: "Posted Job |||| Posted jobs",
       fields: {
         commands: "Orders",
       },
@@ -169,7 +170,7 @@ const customEnglishMessages: TranslationMessages = {
       },
     },
     jobBids: {
-      name: "Job bid |||| Job bids",
+      name: "Job application |||| Job applications",
       fields: {
         commands: "Orders",
       },

diff --git a/cms/src/jobbids/list.tsx b/cms/src/jobbids/list.tsx
@@ -20,7 +20,7 @@ const ListScreen = () => {
   return (
     <List
       perPage={25}
-      sort={{ field: "date", order: "desc" }}
+      sort={{ field: "createdAt", order: "desc" }}
       hasCreate={false}
       resource="jobbids"
       filters={filters}

diff --git a/cms/src/layout/Menu.tsx b/cms/src/layout/Menu.tsx
@@ -46,7 +46,7 @@ const Menu = ({ dense = false }: MenuProps) => {
   return (
     <Box
       sx={{
-        width: open ? 200 : 50,
+        width: open ? 220 : 50,
         marginTop: 1,
         marginBottom: 1,
         transition: (theme) =>

diff --git a/cms/src/layout/themes.ts b/cms/src/layout/themes.ts
@@ -11,7 +11,7 @@ export const darkTheme = {
         mode: 'dark' as 'dark', // Switching the dark mode on is a single property value change.
     },
     sidebar: {
-        width: 200,
+        width: 220,
     },
     components: {
         ...defaultTheme.components,
@@ -56,7 +56,7 @@ export const lightTheme = {
         borderRadius: 10,
     },
     sidebar: {
-        width: 200,
+        width: 220,
     },
     components: {
         ...defaultTheme.components,

diff --git a/cms/src/plutustx/list.tsx b/cms/src/plutustx/list.tsx
@@ -53,7 +53,7 @@ const ListScreen = () => {
   return (
     <List
       perPage={25}
-      sort={{ field: "date", order: "desc" }}
+      sort={{ field: "createdAt", order: "desc" }}
       hasCreate
       resource="plutustxs"
     >
@@ -66,6 +66,9 @@ const ListScreen = () => {
           <TextField source="name" />
         </ReferenceField>
         <TextField source="lockedTxHash" />
+        <ReferenceField source="unlockUserId" reference="users">
+          <TextField source="username" />
+        </ReferenceField>
         <DateField source="lockDate" showTime />
         <TextField source="lockMessage" />
         <TextField source="unlockedTxHash" />

diff --git a/cms/src/postjobs/list.tsx b/cms/src/postjobs/list.tsx
@@ -47,7 +47,7 @@ const ListScreen = () => {
     );
   };
   return (
-    <List perPage={25} sort={{ field: "date", order: "desc" }} filters={filters}>
+    <List perPage={25}  sort={{ field: "createdAt", order: "desc" }} filters={filters}>
       <Datagrid bulkActionButtons={false}>
         <TextField source="name" />
         <ReferenceField reference="users" source="employerId">

diff --git a/emp/src/jobbids/list.tsx b/emp/src/jobbids/list.tsx
@@ -155,6 +155,7 @@ const ListScreen = () => {
           )}
         />
         <CompletedButton />
+        <BooleanField source="isPaid" />
       </Datagrid>
     </List>
   );

diff --git a/jsk/src/jobbids/list.tsx b/jsk/src/jobbids/list.tsx
@@ -54,6 +54,7 @@ const ListScreen = () => {
 
         <DateField source="completeDate" showTime label="Your deadline" />
         <BooleanField source="isSelected" label="Selected" />
+        <BooleanField source="isPaid" />
         <ReferenceField
           reference="postJobs"
           source="jobId"
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,6 +155,7 @@ const ListScreen = () => { @@
               )}
             />
             <CompletedButton />
+            <BooleanField source="isPaid" />
           </Datagrid>
         </List>
       );
@@ Expand Down @@