Update lint.yml (#83)

* Update lint.yml * moved eslint dir * caching * Update lint.yml * installed typescript ? * Update lint.yml * Update lint.yml
1tracy · Aug 14, 2021 · 768557f · 768557f
1 parent 8ef6aff
commit 768557f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -29,10 +29,10 @@ jobs:
           SSH_IP: ${{ secrets.SSH_IP }}
 
       - name: Deploy site
-        run: ssh my-vm 'cd ${{ secrets.PROJECT_DIR }} && git fetch && git reset --hard origin/master && docker-compose down && docker-compose up -d --build'
+        run: ssh my-vm 'cd ${{ secrets.PROJECT_DIR }} && git fetch && git reset --hard origin/main && docker-compose down && docker-compose up -d --build'
 
       - name: Check deploy status
         run: ssh my-vm 'cd ${{ secrets.PROJECT_DIR }} && docker-compose ps'
 
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -31,10 +31,11 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 12
+          cache: "npm"
+          cache-dependency-path: frontend/package-lock.json
 
       - name: Install dependencies
-        run: npm ci
-        eslint_dir: /frontend/src/
+        run: npm install && npm i eslint && npm i typescript
 
       - name: Run linters
         uses: wearerequired/[email protected]
@@ -43,6 +44,7 @@ jobs:
           flake8: true
           black_dir: backend/app/
           flake8_args: "backend/app/ --max-line-length=100"
+          eslint_dir: frontend/src/
           eslint: true
           prettier: true
           stylelint: true
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -13,6 +13,7 @@
     "react-dom": "^17.0.2",
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.1",
+    "typescript": "^4.3.5",
     "watchpack": "^2.2.0",
     "web-vitals": "^0.2.4"
   },

diff --git a/frontend/src/components/Home.js b/frontend/src/components/Home.js
@@ -374,11 +374,7 @@ function Home() {
                                 <header>
                                     <h3>Tracy Dong</h3>
                                 </header>
-                                <p>Tracy developed the front and back end for this project. 
-                                    She is majoring in computer science at the University of Waterloo. 
-                                    She was inspired to create this project due to the rising focus on mental health 
-                                    and loneliness during the pandemic, and wanted to motivate people to put their best foot forwards 
-                                    and accomplish all of their goals.</p>
+                                <p>She tied frontend and backend stuff together!</p>
                             </section>
                         </div>
                         <div class="col-4 col-6-medium col-12-small">
@@ -388,10 +384,7 @@ function Home() {
                                 <header>
                                     <h3>Vi Pham</h3>
                                 </header>
-                                <p>Vi originally inspired this project and worked on the backend.
-                                She is a computer science major at the University of Richmond. 
-                                She came up with this project in hope of providing a platform where 
-                                users can take a moment to express and process their thoughts daily. She believes reflections play an important role in improving one's mental state and should be done more often.</p>
+                                <p>She originally inspired this project and did the backend stuff!</p>
                             </section>
 
                         </div>