mayura-andrew · mayura-andrew · May 9, 2024 · May 12, 2024 · May 19, 2024 · May 21, 2024
diff --git a/. dockerignore b/. dockerignore
@@ -0,0 +1,7 @@
+node_modules
+npm-debug.log
+dist
+.git
+*.md
+.gitignore
+.env
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -7,7 +7,8 @@
     "standard-with-typescript",
     "plugin:react/recommended",
     "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended"
+    "plugin:prettier/recommended",
+    "plugin:react/jsx-runtime"
   ],
   "plugins": ["@typescript-eslint", "prettier", "react"],
   "parserOptions": {
@@ -17,7 +18,11 @@
   },
   "rules": {
     "@typescript-eslint/explicit-function-return-type": 0,
-    "@typescript-eslint/no-misused-promises": 0
+    "@typescript-eslint/no-misused-promises": 0,
+    "@typescript-eslint/strict-boolean-expressions": 0,
+    "@typescript-eslint/no-unused-expressions": 0,
+    "@typescript-eslint/no-empty-function": 0,
+    "@typescript-eslint/consistent-type-imports": 0
   },
   "settings": {
     "react": {

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -1,4 +1,4 @@
-name: CI
+name: CI/CD
 
 on:
   push:
@@ -7,10 +7,10 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -20,13 +20,41 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
 
       - name: Install dependencies
-        run: npm install
+        run: npm ci
+
+      - name: Unit tests
+        run: npm run test
 
       - name: ESLint check
         run: npm run lint
 
       - name: Build
         run: npm run build
+
+  deploy:
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - name: Deploy to server
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          password: ${{ secrets.SERVER_PASSWORD }}
+          port: ${{ secrets.SERVER_PORT }}
+          script: |
+            export NVM_DIR=~/.nvm
+            source ~/.nvm/nvm.sh
+            npm --help
+            cd scholarx-frontend
+            git pull
+            npm install
+            npm run build
+            echo "build successful"
+            sudo cp -r dist/* /var/www/scholarx/
+            sudo systemctl restart nginx
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 18
     - name: Install dependencies
       run: npm ci
     - name: Install Playwright Browsers

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,24 @@
+# Fetching the latest node image on apline linux
+FROM node:alpine AS builder
+
+# Setting up the work directory
+WORKDIR /app
+
+# Installing dependencies
+COPY ./package.json ./
+RUN npm install
+
+# Copying all the files in our project
+COPY . .
+
+# Building our application
+RUN npm run build
+
+# Fetching the latest nginx image
+FROM nginx
+
+# Copying built assets from builder
+COPY --from=builder /app/dist /usr/share/nginx/html
+
+# Copying our nginx.conf
+COPY nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/example.env b/example.env
@@ -1 +1,3 @@
 VITE_API_URL=http://localhost:3000/api
+VITE_EMAILAPI_URL=https://64.227.135.79/
+VITE_SENDER_EMAIL=
diff --git a/index.html b/index.html
@@ -1,11 +1,39 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
+    <!-- Google tag (gtag.js) -->
+    <script
+      async
+      src="https://www.googletagmanager.com/gtag/js?id=UA-167873271-3"
+    ></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+      gtag('js', new Date());
+
+      gtag('config', 'UA-167873271-3');
+    </script>
+    <!-- Hotjar Tracking Code for ScholarX V2 -->
+    <script>
+        (function(h,o,t,j,a,r){
+            h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+            h._hjSettings={hjid:5160281,hjsv:6};
+            a=o.getElementsByTagName('head')[0];
+            r=o.createElement('script');r.async=1;
+            r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+            a.appendChild(r);
+        })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+    </script>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="shortcut icon" href="/favicon.png">
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <link rel="shortcut icon" href="/favicon.png" />
     <title>ScholarX | Sustainable Education Foundation</title>
-</head>
+  </head>
   <body>
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>

diff --git a/nginx.conf b/nginx.conf
@@ -0,0 +1,9 @@
+server {
+ listen 80;
+
+ location / {
+   root /usr/share/nginx/html/;
+   include /etc/nginx/mime.types;
+   try_files $uri $uri/ /index.html;
+ }
+}