Merge pull request #47 from Code-Hammers/dev

Merge Dev to Main

.github/workflows/build-tests.yml

@@ -1,8 +1,6 @@
 name: build-tests
 on:
   pull_request:
-    branches:
-      - dev
 jobs:
   unit-testing:
     runs-on: ubuntu-latest

.gitignore

@@ -2,4 +2,5 @@ node_modules
 .env
 dist/
 coverage/
-/client/build/
+/client/build/
+/server/config/serviceKey.json

client/tailwind.config.js

@@ -11,6 +11,11 @@ module.exports = {
         turquoise: "#A3E1CC",
         greenish: "#D4EBAE",
         lightblue: "#B6D7FB",
+        primary: "#4682B4",
+        secondary: "#5F9EA0",
+        background: "#36454F",
+        text: "#F8F8FF",
+        cta: "#CD7F32",
       },
     },
   },

client/webpack.config.js

@@ -3,6 +3,9 @@ const HtmlWebPackPlugin = require("html-webpack-plugin");
 require("dotenv").config();
 
 module.exports = {
+  watchOptions: {
+    poll: 1000,
+  },
   entry: "./src/index.tsx",
   output: {
     path: path.resolve(__dirname, "build"),