Append mailto to job contactInfo if email, order jobs and listings by…

… id in reverse (#258) * Append mailto: if contactInfo is an email * Order jobs and listings by id in reverse * Removed log
Official-MoonDao · Nov 25, 2024 · 71efaad · 71efaad
1 parent 329bd6a
commit 71efaad
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/ui/components/subscription/LatestJobs.tsx b/ui/components/subscription/LatestJobs.tsx
@@ -22,7 +22,7 @@ export default function LatestJobs({
     async function getLatestJobs() {
       const now = Math.floor(Date.now() / 1000)
       const tableName = await jobTableContract.call('getTableName')
-      const statement = `SELECT * FROM ${tableName} WHERE (endTime = 0 OR endTime >= ${now}) ORDER BY timestamp ASC LIMIT 25`
+      const statement = `SELECT * FROM ${tableName} WHERE (endTime = 0 OR endTime >= ${now}) ORDER BY id DESC LIMIT 25`
       const latestJobsRes = await fetch(
         `${TABLELAND_ENDPOINT}?statement=${statement}`
       )
@@ -33,7 +33,7 @@ export default function LatestJobs({
         ])
         return teamExpiration.toNumber() > now
       })
-      setLatestJobs(validJobs.reverse())
+      setLatestJobs(validJobs)
     }
     if (teamContract && jobTableContract) {
       getLatestJobs()

diff --git a/ui/components/subscription/NewMarketplaceListings.tsx b/ui/components/subscription/NewMarketplaceListings.tsx
@@ -24,7 +24,7 @@ export default function NewMarketplaceListings({
     async function getNewMarketplaceListings() {
       const now = Math.floor(Date.now() / 1000)
       const tableName = await marketplaceTableContract.call('getTableName')
-      const statement = `SELECT * FROM ${tableName} WHERE (startTime = 0 OR startTime <= ${now}) AND (endTime = 0 OR endTime >= ${now}) ORDER BY timestamp ASC LIMIT 25`
+      const statement = `SELECT * FROM ${tableName} WHERE (startTime = 0 OR startTime <= ${now}) AND (endTime = 0 OR endTime >= ${now}) ORDER BY id DESC LIMIT 25`
       const allListingsRes = await fetch(
         `${TABLELAND_ENDPOINT}?statement=${statement}`
       )
@@ -37,7 +37,7 @@ export default function NewMarketplaceListings({
           return teamExpiration.toNumber() > now
         }
       )
-      setNewListings(validListings.reverse())
+      setNewListings(validListings)
     }
     if (teamContract && marketplaceTableContract) {
       getNewMarketplaceListings()

diff --git a/ui/components/subscription/TeamJobModal.tsx b/ui/components/subscription/TeamJobModal.tsx
@@ -95,6 +95,17 @@ export default function TeamJobModal({
 
           const cleanedData = cleanData(jobData)
 
+          //Check if the contact info is an email and append mailto: if needed
+          let formattedContactInfo
+          if (
+            cleanedData.contactInfo.includes('@') &&
+            !cleanedData.contactInfo.startsWith('mailto:')
+          ) {
+            formattedContactInfo = `mailto:${cleanedData.contactInfo}`
+          } else {
+            formattedContactInfo = cleanedData.contactInfo
+          }
+
           try {
             if (edit) {
               await jobTableContract.call('updateTable', [
@@ -106,7 +117,7 @@ export default function TeamJobModal({
                 '',
                 endTime,
                 currTime,
-                cleanedData.contactInfo,
+                formattedContactInfo,
               ])
             } else {
               await jobTableContract?.call('insertIntoTable', [
@@ -117,7 +128,7 @@ export default function TeamJobModal({
                 '',
                 endTime,
                 currTime,
-                cleanedData.contactInfo,
+                formattedContactInfo,
               ])
             }
 

diff --git a/ui/pages/jobs.tsx b/ui/pages/jobs.tsx
@@ -125,7 +125,7 @@ export async function getStaticProps() {
 
   const jobBoardTableName = await jobTableContract.call('getTableName')
 
-  const statement = `SELECT * FROM ${jobBoardTableName} WHERE (endTime = 0 OR endTime >= ${now})`
+  const statement = `SELECT * FROM ${jobBoardTableName} WHERE (endTime = 0 OR endTime >= ${now}) ORDER BY id DESC`
 
   const allJobsRes = await fetch(`${TABLELAND_ENDPOINT}?statement=${statement}`)
   const allJobs = await allJobsRes.json()

diff --git a/ui/pages/marketplace/index.tsx b/ui/pages/marketplace/index.tsx
@@ -119,7 +119,7 @@ export async function getStaticProps() {
     'getTableName'
   )
 
-  const statement = `SELECT * FROM ${marketplaceTableName} WHERE (startTime = 0 OR startTime <= ${now}) AND (endTime = 0 OR endTime >= ${now})`
+  const statement = `SELECT * FROM ${marketplaceTableName} WHERE (startTime = 0 OR startTime <= ${now}) AND (endTime = 0 OR endTime >= ${now}) ORDER BY id DESC`
 
   const allListingsRes = await fetch(
     `${TABLELAND_ENDPOINT}?statement=${statement}`