Merge pull request #568 from nkowaokwu/io/fix-website-pages

Fix Website Pages
nkowaokwu · Feb 17, 2023 · cfd99bb · cfd99bb
2 parents 7e6541c + 7f69c64
commit cfd99bb
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 65 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -19,15 +19,18 @@
     "cypress"
   ],
   "rules": {
+    "function-call-argument-newline": ["off"],
     "function-paren-newline": ["off"],
     "import/prefer-default-export": ["off"],
     "max-len": ["error", { "code": 120 }],
     "newline-per-chained-call": ["off"],
     "no-console": ["off"],
     "no-nested-ternary": ["off"],
+    "no-promise-executor-return": ["off"],
     "no-underscore-dangle": ["off"],
     "semi": ["error", "always"],
     "react/jsx-filename-extension": ["off"],
+    "react/function-component-definition": ["off"],
     "react/jsx-props-no-spreading": ["off"],
     "react/no-danger": ["off"],
     "@next/next/no-html-link-for-pages": ["off"],

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -12,7 +12,7 @@ jobs:
   test:
     name: Build and Test
     runs-on: ubuntu-latest
-    timeout-minutes: 7
+    timeout-minutes: 10
 
     strategy:
       matrix:
@@ -40,5 +40,5 @@ jobs:
       run: yarn test:build
     - name: Test API
       run: yarn jest
-    # - name: Test API Homepage
-    #   run: yarn cypress:ci
+    - name: Test API Homepage
+      run: yarn cypress:ci
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,5 @@ jobs:
       - name: Install Node.js dependencies
         run: yarn install
 
-      - name: Run linters
-        uses: wearerequired/lint-action@v1
-        with:
-          eslint: true
+      - name: Run ESLint
+        run: yarn run eslint ./src --ext .js,.jsx,.ts,.tsx -c ./.eslintrc.json
diff --git a/__tests__/cypress/integration/client.test.js b/__tests__/cypress/integration/client.test.js
@@ -21,6 +21,16 @@ describe('Igbo API Homepage', () => {
       cy.contains('Email:');
     });
 
+    it('render the Privacy page', () => {
+      cy.findByText('Privacy').click();
+      cy.findByText('Privacy Policy').should('exist');
+    });
+
+    it('render the Terms or Service page', () => {
+      cy.findByText('Terms of Service').click();
+      cy.findByText('Terms and Conditions').should('exist');
+    });
+
     describe('Try it Out', () => {
       it('enter a word and select flag', () => {
         cy.visit('/');

diff --git a/jest.config.js b/jest.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   displayName: 'igbo-api-admin',
   testMatch: ['**/__tests__/*.js'],
-  testTimeout: 15000,
+  testTimeout: 20000,
   testEnvironment: 'node',
   moduleFileExtensions: ['ts', 'js', 'json'],
   globalSetup: './testSetup.js',

diff --git a/package.json b/package.json
@@ -145,14 +145,14 @@
     "babel-loader": "^8.1.0",
     "cross-env": "^7.0.2",
     "cypress": "^6.0.0",
-    "eslint": "^7.10.0",
-    "eslint-config-airbnb": "^18.2.0",
-    "eslint-config-next": "^12.0.7",
-    "eslint-config-prettier": "^6.12.0",
-    "eslint-plugin-cypress": "^2.11.2",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.3.1",
-    "eslint-plugin-react": "^7.21.3",
+    "eslint": "8.34.0",
+    "eslint-config-airbnb": "19.0.4",
+    "eslint-config-next": "13.1.6",
+    "eslint-config-prettier": "8.6.0",
+    "eslint-plugin-cypress": "2.12.1",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-jsx-a11y": "6.7.1",
+    "eslint-plugin-react": "7.32.2",
     "husky": "^4.3.0",
     "jest": "^29.2.2",
     "lint-staged": "^10.4.0",
@@ -167,6 +167,9 @@
       "tag": true
     }
   },
+  "resolutions": {
+    "esquery": "1.4.0"
+  },
   "nodemonConfig": {
     "delay": "1500ms"
   }

diff --git a/src/pages/_app.js b/src/pages/_app.js
@@ -7,6 +7,7 @@ import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import { appWithTranslation } from 'next-i18next';
 import Head from 'next/head';
+import ChakraTheme from '../shared/constants/ChakraTheme';
 import en from '../public/locales/en';
 import ig from '../public/locales/ig';
 import * as gtag from '../lib/gtag';
@@ -49,7 +50,7 @@ const MainApp = ({ Component, pageProps, ...rest }) => {
         <title>Igbo API - The First African Language API</title>
       </Head>
       <>
-        <ChakraProvider>
+        <ChakraProvider theme={ChakraTheme}>
           <Component {...pageProps} {...rest} />
         </ChakraProvider>
         {/* Global Site Tag (gtag.js) - Google Analytics */}

diff --git a/src/pages/about.js b/src/pages/about.js
@@ -41,7 +41,7 @@ const About = () => {
               <a className="link" href={DICTIONARY_APP_URL}>
                 Nkọwa okwu
               </a>
-              {' , our official online Igbo-English dictionary app.'}
+              , our official online Igbo-English dictionary app.
             </p>
           ) : (
             <p dangerouslySetInnerHTML={{

diff --git a/src/pages/components/Footer/Footer.js b/src/pages/components/Footer/Footer.js
@@ -74,7 +74,7 @@ const Footer = () => {
                   </li>
                   <li>
                     <a href="/terms" className="font-normal border-b border-b-gray-500">
-                      Terms of service
+                      Terms of Service
                     </a>
                   </li>
                   <li>