Merge pull request #51 from Niklex21/dev

Fixing critical bugs & adding new tags

Author: Niklex21

.env.template

@@ -1,3 +1,3 @@
-AIRTABLE_API_KEY=
+AIRTABLE_API_TOKEN=
 AIRTABLE_BASE_ID=
 NEXT_PUBLIC_MAPBOX_ACCESS_TOKEN=

api/_airtable.ts

@@ -5,7 +5,7 @@ import { log } from 'next-axiom'
 // Airtable database REST API set-up
 
 Airtable.configure({
-    apiKey: process.env.AIRTABLE_API_KEY,
+    apiKey: process.env.AIRTABLE_API_TOKEN,
     requestTimeout: defaults.airtableRequestTimeout
 })
 

api/business/model.ts

@@ -42,7 +42,8 @@ function tagsConverter(values: Array<string>) : Array<Tag> {
         'Online': Tag.Online,
         'On Request': Tag.OnRequest,
         'Ukrainian Product': Tag.SellUkrainianProducts,
-        'Lead Supporter': Tag.LeadSupporter
+        'Lead Supporter': Tag.LeadSupporter,
+        'Hires Ukrainians': Tag.HiresUkrainians,
     }
 
     let tags : Array<Tag> = [];

api/business/types.ts

@@ -24,7 +24,8 @@ export enum Tag {
     Online,
     OnRequest,
     SellUkrainianProducts,
-    LeadSupporter
+    LeadSupporter,
+    HiresUkrainians
 }
 
 /**

package-lock.json

@@ -15,7 +15,7 @@
     "@headlessui/react": "^1.6.6",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "@next/font": "^13.1.6",
+    "@next/font": "13.1.6",
     "@tailwindcss/line-clamp": "^0.4.2",
     "@tailwindcss/typography": "^0.5.7",
     "@types/geojson": "^7946.0.10",

package.json

@@ -40,6 +40,10 @@ export function BadgesRow(tags: Array<Tag>) {
             color: "bg-pink-100",
             emoji: "🛒"
         },
+        [Tag.HiresUkrainians]: {
+            color: "bg-purple-100",
+            emoji: "💼"
+        }
     }
 
     let badges : Array<Badge> = tags.map(t => {

src/components/business/BadgesRow.tsx

@@ -10,12 +10,12 @@ import { Analytics } from '@vercel/analytics/react';
 import {ErrorBoundary} from 'react-error-boundary'
 import { processError } from '@api/_error'
 import ErrorFallback from '@components/common/ErrorFallback'
-import localFont from '@next/font/local'
 import strings from '@utils/strings'
 import Head from 'next/head'
 import { DarkModeOptions } from '@appTypes/common'
 import { useAtom } from 'jotai'
 import { atomDarkMode } from 'src/atoms/global'
+import localFont from '@next/font/local'
 
 export type NextPageWithLayout<P = {}, IP = P> = NextPage<P, IP> & {
   getLayout?: (page: ReactElement) => ReactNode,

src/pages/_app.tsx

@@ -24,7 +24,7 @@ async function handler(req: AxiomAPIRequest, res: NextApiResponse) {
         options["filterByFormula"] = formula
 
         Airtable.configure({
-            apiKey: process.env.AIRTABLE_API_KEY
+            apiKey: process.env.AIRTABLE_API_TOKEN
         })
 
         const base : Airtable.Base = Airtable.base(process.env.AIRTABLE_BASE_ID || "appo268wXvedC1FSM")

src/pages/api/businesses/get.ts

@@ -146,7 +146,8 @@ const BUSINESS_TAGS: Array<Tag> = [
     Tag.OnRequest,
     Tag.Online,
     Tag.SellUkrainianProducts,
-    Tag.UkrainianOwned
+    Tag.UkrainianOwned,
+    Tag.HiresUkrainians
 ];
 
 // stores the corresponding local storage keys so that they are configurable in one place

src/utils/config.ts

@@ -387,21 +387,24 @@ const strings_en = {
             [Tag.OnRequest]: 'On request',
             [Tag.Online]: 'Online-only',
             [Tag.SellUkrainianProducts]: 'Sell Ukrainian products',
-            [Tag.UkrainianOwned]: 'Ukrainian-owned'
+            [Tag.UkrainianOwned]: 'Ukrainian-owned',
+            [Tag.HiresUkrainians]: 'Hires Ukrainians'
         },
         tagExtended: {
             [Tag.LeadSupporter]: 'Businesses that made significant contributions to the Ukrainian community: fundraising, event support, donation, and in other ways.',
             [Tag.OnRequest]: 'All services and products are offered in person but not through a physical location.',
             [Tag.Online]: 'All services and products are offered online only and with deliveries if applicable.',
             [Tag.SellUkrainianProducts]: 'Offers Ukrainian services and products made by Ukrainians or imported from Ukraine.',
-            [Tag.UkrainianOwned]: 'Ukrainian-owned: Ukrainian immigrants, Ukrainian family, Ukrainian Americans with strong Ukrainian ties.'
+            [Tag.UkrainianOwned]: 'Ukrainian-owned: Ukrainian immigrants, Ukrainian family, Ukrainian Americans with strong Ukrainian ties.',
+            [Tag.HiresUkrainians]: 'Hires Ukrainians: actively hires Ukrainians or has a significant number of Ukrainian employees.'
         },
         tagShort: {
             [Tag.LeadSupporter]: 'supporter',
             [Tag.OnRequest]: 'on request',
             [Tag.Online]: 'online',
             [Tag.SellUkrainianProducts]: 'Ukrainian product',
-            [Tag.UkrainianOwned]: 'owned'
+            [Tag.UkrainianOwned]: 'owned',
+            [Tag.HiresUkrainians]: 'hires Ukrainians'
         }
     },
     countries: {