diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml index 4fcc7e9..065d463 100644 --- a/.github/workflows/build-tests.yml +++ b/.github/workflows/build-tests.yml @@ -1,8 +1,6 @@ name: build-tests on: pull_request: - branches: - - dev jobs: unit-testing: runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index 5329222..d8950cf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ node_modules .env dist/ coverage/ -/client/build/ \ No newline at end of file +/client/build/ +/server/config/serviceKey.json \ No newline at end of file diff --git a/client/tailwind.config.js b/client/tailwind.config.js index 0c5bb83..367f921 100644 --- a/client/tailwind.config.js +++ b/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", }, }, }, diff --git a/client/webpack.config.js b/client/webpack.config.js index 4f8a159..e45bb19 100644 --- a/client/webpack.config.js +++ b/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"),