.github/workflows/test_and_deploy.yml

@@ -3,7 +3,7 @@ name: Test and Deploy the Application
 on: [push]
 
 env:
-  terraform_version: 0.13.0
+  terraform_version: 0.14.3
   TF_WORKSPACE: production
   TF_VAR_do_token: ${{ secrets.DO_ACCESS_TOKEN }}
   TF_VAR_spaces_access_id: ${{ secrets.DO_SPACES_ACCESS_ID }}
@@ -183,7 +183,7 @@ jobs:
       run: poetry install
       working-directory: ${{ env.working_directory }}
 
-    - uses: hashicorp/setup-terraform@v1.1.0
+    - uses: hashicorp/setup-terraform@v1.3.2
       with:
         terraform_version: ${{ env.terraform_version }}
         cli_config_credentials_token: ${{ secrets.TF_CLOUD_TOKEN }}
@@ -193,7 +193,7 @@ jobs:
       working-directory: ${{ env.working_directory }}
 
     - name: Setup deployment SSH key
-      uses: webfactory/ssh-agent@v0.2.0
+      uses: webfactory/ssh-agent@v0.4.1
       with:
         ssh-private-key: ${{ secrets.DEPLOY_SSH_PRIV_KEY }}
 

CONTRIBUTING.md

@@ -0,0 +1,79 @@
+## Contributing
+
+Contributions are what make the open source community such an amazing place to
+be learn, inspire, and create. Any contributions you make are **greatly
+appreciated**.
+
+We use a pattern known as [Github Flow](https://guides.github.com/introduction/flow/). Click that link to learn more.
+
+### ACM Web Members
+**One-time set up:**
+1. Ask the Chair of ACM Web to add you to the [sigdotcom
+   organization][sigdotcom-organization]
+2. Clone the mstacm.org repository
+    ```bash
+    git clone https://github.com/sigdotcom/mstacm.org.git
+    ```
+**Every feature:**
+1. Update your local master branch 
+    ```bash
+    git switch master # "git checkout master" if git < 2.23
+    git pull master
+    ```
+2. Create your branch
+    ```bash
+    git switch -c feature/<feature-name>
+    ```
+    > where `<feature-name>` is replaced with a short description of
+    your feature (ex. `admin-permission-tool` for a feature adding a new tool to admin-web)
+
+    Name your commits with `feature/` or `hotfix/` at the beginning depending on the content of the branch. (ex. `feature/new-icons`, `hotfix/icon-render-glitch`)
+
+3. Add and commit your Changes 
+    ```bash
+    git add file1 file2 ... # only add relevant files
+    git commit -m 'Add some great specific and well described features' # After the "-m" goes the commit message
+    ```
+    > Read [this article about good commit messages](https://chris.beams.io/posts/git-commit/) to maintain good quality commits
+4. Push to the remote branch
+    ```bash
+    git push origin feature/<feature-name>
+    ```
+5. [Open a Pull Request on Github](https://github.com/sigdotcom/mstacm.org/compare)
+6. Grab a new issue to work on and start from the top!
+
+### Outside Contributors
+1. Fork the mstacm.org repository
+2. Create your branch
+    ```bash
+    git switch -c feature/<feature-name>
+    ```
+    > where <feature-name> is replaced with a short description of
+    your feature (ex. admin-permission-tool for a feature adding a new tool to admin-web)
+
+    Name your commits with `feature/` or `hotfix/` at the beginning depending on the content of the branch. (ex. `feature/new-icons`, `hotfix/icon-render-glitch`)
+
+3. Add and commit your Changes 
+    ```bash
+    git add file1 file2 ... # only add relevant files
+    git commit -m 'Add some great specific and well described features' # After the "-m" goes the commit message
+    ```
+    > Read [this article about good commit messages](https://chris.beams.io/posts/git-commit/) to maintain good quality commits
+4. Push to the remote branch
+    ```bash
+    git push origin feature/<feature-name>
+    ```
+5. [Open a Pull Request on Github](https://github.com/sigdotcom/mstacm.org/compare)
+6. Grab a new issue to work on and start from the top!
+
+## Coding Conventions
+We use [ESLint](https://eslint.org/) and [Prettier](https://prettier.io/) to format and style all of our code, please get those installed and configured in your preffered editor while working on code!
+
+## Keeping up with the main branch
+Before you merge your changes, and also after big changes go into the main branch, you will want to get up to date with main. To do this, we use a technique called rebasing. This is better explained [here](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) so please read up.
+
+When you want to get up to date, commit all of your changes, then use this command:
+```
+git pull --rebase origin master
+```
+which will pull any changes from the origin, and then rebase your changes on top of master. This starts a rebase, so complete the rebase by using the knowledge gained from the link above.

apps/admin-web/package.json

@@ -9,15 +9,12 @@
     "export-to-csv": "^0.2.1",
     "graphql": "^14",
     "graphql-tag": "^2.10.1",
-    "handlebars": "^4.7.2",
     "qrcode.react": "^1.0.0",
     "react": "^16.7.0",
-    "react-apollo": "^3.1.3",
     "react-dom": "^16.7.0",
     "react-highlight-words": "^0.16.0",
     "react-router-dom": "^5.1.2",
     "react-scripts": "^3.4.1",
-    "serialize-javascript": "^2.1.2",
     "styled-components": "^4.1.3"
   },
   "scripts": {
@@ -61,4 +58,4 @@
     "not ie <= 11",
     "not op_mini all"
   ]
-}
+}

apps/admin-web/src/generated/graphql.tsx

@@ -2,7 +2,7 @@ import gql from 'graphql-tag';
 import * as ApolloReactCommon from '@apollo/react-common';
 import * as ApolloReactHooks from '@apollo/react-hooks';
 export type Maybe<T> = T | null;
-export type Exact<T extends { [key: string]: any }> = { [K in keyof T]: T[K] };
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
   ID: string;

apps/api/package.json

@@ -18,7 +18,6 @@
     "file-type": "^12.0.1",
     "graphql": "^14.5.8",
     "graphql-upload": "^8.1.0",
-    "handlebars": "^4.7.2",
     "jsonwebtoken": "^8.5.1",
     "jwks-rsa": "^1.6.0",
     "koa": "^2.10.0",