From c8af14baab146fe3113ac752f72aa6b0000a084f Mon Sep 17 00:00:00 2001
From: Bruce Berrios <58147810+Bruception@users.noreply.github.com>
Date: Tue, 8 Feb 2022 16:17:26 -0500
Subject: [PATCH] Fix PR check action (#2447)

* fix

* Install all dependencies

* Fix PR check action

* Fix lint

* Update install.sh and remove pretty check
---
 .github/pr-check.yml           | 20 --------------------
 .github/workflows/pr-check.yml |  1 -
 backend/server.js              |  1 +
 backend/worker.js              |  1 +
 bin/install.sh                 |  2 ++
 package.json                   |  2 +-
 6 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 .github/pr-check.yml
 create mode 100755 bin/install.sh

diff --git a/.github/pr-check.yml b/.github/pr-check.yml
deleted file mode 100644
index fcc3d5844..000000000
--- a/.github/pr-check.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: PR Check
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: "16.13.2"
-      - run: npm ci
-      - run: npm run pretty
-      - run: npm run lint
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index e852e8175..3f066b071 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -17,4 +17,3 @@ jobs:
           node-version: "16.13.2"
       - run: npm run install:all
       - run: npm run lint
-      - run: npm run pretty
diff --git a/backend/server.js b/backend/server.js
index 129c9d871..1f301c388 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -6,6 +6,7 @@ config({ path: path.join(__dirname, ".env") });
 const cors = require("cors");
 const admin = require("firebase-admin");
 const Logger = require("./handlers/logger.js");
+// eslint-disable-next-line
 const serviceAccount = require("./credentials/serviceAccountKey.json");
 const db = require("./init/db");
 const jobs = require("./jobs");
diff --git a/backend/worker.js b/backend/worker.js
index daa21995b..02c47c8c0 100644
--- a/backend/worker.js
+++ b/backend/worker.js
@@ -4,6 +4,7 @@ config({ path: path.join(__dirname, ".env") });
 
 const db = require("./init/db");
 const admin = require("firebase-admin");
+// eslint-disable-next-line
 const serviceAccount = require("./credentials/serviceAccountKey.json");
 
 async function main() {
diff --git a/bin/install.sh b/bin/install.sh
new file mode 100755
index 000000000..b5ba2396a
--- /dev/null
+++ b/bin/install.sh
@@ -0,0 +1,2 @@
+npm install & (cd ./frontend && npm install) & (cd ./backend && npm install)
+wait
\ No newline at end of file
diff --git a/package.json b/package.json
index c4a1275a6..53e9a42ca 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "start:dev:be": "cd backend && npm run start:dev",
     "start:dev:fe": "cd frontend && npm run start:dev",
     "deploy:live": "cd frontend && npm run deploy:live",
-    "install:all": "npm install && `cd ./frontend && npm install` && `cd ./backend && npm install`",
+    "install:all": "sh ./bin/install.sh",
     "lint": "./node_modules/.bin/eslint './backend/**/*.js' './frontend/src/js/**/*.js'",
     "pretty": "prettier --check './backend/**/*.js' './frontend/src/**/*.{js,scss}' './frontend/static/**/*.{json,html}'"
   },