Skip to content

Commit

Permalink
Merge pull request #19 from sjohn198/Develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
cmaloney111 authored Jun 3, 2024
2 parents 8d84971 + 9db86a6 commit 7ecf9c0
Show file tree
Hide file tree
Showing 82 changed files with 14,758 additions and 4,725 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: CI
on:
push:
branches: ["Develop"]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
name: 🏗️ Build
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: ⬇️ Checkout repo
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: ⎔ Setup Node
uses: actions/setup-node@v3
with:
cache: "npm"

- name: 👷‍♂️ Install dependencies
run: npm ci

- name: 📦 Build app
run: npm run build

#- name: 📏 Check for code style compliance
# run: npm run eslint

- name: 🧪 Run tests
run: npm run test

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
node_modules
.env
.DS_Store
/uploads
/uploads
/coverage
8 changes: 4 additions & 4 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"trailingComma": "none",
"semi": true,
"singleQuote": false,
"printWidth": 100
"trailingComma": "none",
"semi": true,
"singleQuote": false,
"printWidth": 100
}
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
Note for grader: Sequence Diagrams are the two '.png' files in the root of the repo

To run from the repository's root folder, install concurrently with:

```
npm install concurrently
```

Then simply run with:

```
npm start
```

or run the development mode with

```
npm run dev
```

Also, make sure to create a .env file in express-backend and add
```MONGODB_URI = "your_connection_string"```
Also, make sure to create a .env file in express-backend and add
`MONGODB_URI = "your_connection_string"`
and
`TOKEN_SECRET = 1234`
6 changes: 6 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
presets: [
["@babel/preset-env", { targets: { node: "current" } }],
["@babel/preset-react", { runtime: "automatic" }],
],
};
61 changes: 61 additions & 0 deletions coverage/clover.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<coverage generated="1717014855010" clover="3.2.0">
<project timestamp="1717014855010" name="All files">
<metrics statements="52" coveredstatements="52" conditionals="6" coveredconditionals="6" methods="3" coveredmethods="3" elements="61" coveredelements="61" complexity="0" loc="52" ncloc="52" packages="1" files="1" classes="1"/>
<file name="Form.jsx" path="/Users/jagan-kalsi/Desktop/csc/csc307/SafeHaven/packages/react-frontend/src/Components/Form.jsx">
<metrics statements="52" coveredstatements="52" conditionals="6" coveredconditionals="6" methods="3" coveredmethods="3"/>
<line num="1" count="1" type="stmt"/>
<line num="2" count="1" type="stmt"/>
<line num="3" count="15" type="cond" truecount="1" falsecount="0"/>
<line num="4" count="15" type="stmt"/>
<line num="5" count="15" type="stmt"/>
<line num="6" count="15" type="stmt"/>
<line num="7" count="15" type="stmt"/>
<line num="8" count="15" type="stmt"/>
<line num="9" count="15" type="cond" truecount="1" falsecount="0"/>
<line num="10" count="11" type="stmt"/>
<line num="11" count="11" type="cond" truecount="1" falsecount="0"/>
<line num="12" count="1" type="stmt"/>
<line num="13" count="1" type="stmt"/>
<line num="14" count="11" type="cond" truecount="1" falsecount="0"/>
<line num="15" count="8" type="stmt"/>
<line num="16" count="8" type="stmt"/>
<line num="17" count="11" type="cond" truecount="1" falsecount="0"/>
<line num="18" count="2" type="stmt"/>
<line num="19" count="2" type="stmt"/>
<line num="20" count="11" type="stmt"/>
<line num="21" count="15" type="stmt"/>
<line num="22" count="15" type="cond" truecount="1" falsecount="0"/>
<line num="23" count="1" type="stmt"/>
<line num="24" count="1" type="stmt"/>
<line num="25" count="1" type="stmt"/>
<line num="26" count="15" type="stmt"/>
<line num="27" count="15" type="stmt"/>
<line num="28" count="15" type="stmt"/>
<line num="29" count="15" type="stmt"/>
<line num="30" count="15" type="stmt"/>
<line num="31" count="15" type="stmt"/>
<line num="32" count="15" type="stmt"/>
<line num="33" count="15" type="stmt"/>
<line num="34" count="15" type="stmt"/>
<line num="35" count="15" type="stmt"/>
<line num="36" count="15" type="stmt"/>
<line num="37" count="15" type="stmt"/>
<line num="38" count="15" type="stmt"/>
<line num="39" count="15" type="stmt"/>
<line num="40" count="15" type="stmt"/>
<line num="41" count="15" type="stmt"/>
<line num="42" count="15" type="stmt"/>
<line num="43" count="15" type="stmt"/>
<line num="44" count="15" type="stmt"/>
<line num="45" count="15" type="stmt"/>
<line num="46" count="15" type="stmt"/>
<line num="47" count="15" type="stmt"/>
<line num="48" count="15" type="stmt"/>
<line num="49" count="15" type="stmt"/>
<line num="50" count="15" type="stmt"/>
<line num="51" count="1" type="stmt"/>
<line num="52" count="1" type="stmt"/>
</file>
</project>
</coverage>
2 changes: 2 additions & 0 deletions coverage/coverage-final.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{"/Users/jagan-kalsi/Desktop/csc/csc307/SafeHaven/packages/react-frontend/src/Components/Form.jsx": {"path":"/Users/jagan-kalsi/Desktop/csc/csc307/SafeHaven/packages/react-frontend/src/Components/Form.jsx","all":false,"statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":1,"column":40}},"1":{"start":{"line":2,"column":0},"end":{"line":2,"column":0}},"2":{"start":{"line":3,"column":0},"end":{"line":3,"column":22}},"3":{"start":{"line":4,"column":0},"end":{"line":4,"column":38}},"4":{"start":{"line":5,"column":0},"end":{"line":5,"column":16}},"5":{"start":{"line":6,"column":0},"end":{"line":6,"column":16}},"6":{"start":{"line":7,"column":0},"end":{"line":7,"column":5}},"7":{"start":{"line":8,"column":0},"end":{"line":8,"column":0}},"8":{"start":{"line":9,"column":0},"end":{"line":9,"column":32}},"9":{"start":{"line":10,"column":0},"end":{"line":10,"column":41}},"10":{"start":{"line":11,"column":0},"end":{"line":11,"column":30}},"11":{"start":{"line":12,"column":0},"end":{"line":12,"column":63}},"12":{"start":{"line":13,"column":0},"end":{"line":13,"column":5}},"13":{"start":{"line":14,"column":0},"end":{"line":14,"column":29}},"14":{"start":{"line":15,"column":0},"end":{"line":15,"column":87}},"15":{"start":{"line":16,"column":0},"end":{"line":16,"column":5}},"16":{"start":{"line":17,"column":0},"end":{"line":17,"column":27}},"17":{"start":{"line":18,"column":0},"end":{"line":18,"column":89}},"18":{"start":{"line":19,"column":0},"end":{"line":19,"column":5}},"19":{"start":{"line":20,"column":0},"end":{"line":20,"column":3}},"20":{"start":{"line":21,"column":0},"end":{"line":21,"column":0}},"21":{"start":{"line":22,"column":0},"end":{"line":22,"column":25}},"22":{"start":{"line":23,"column":0},"end":{"line":23,"column":30}},"23":{"start":{"line":24,"column":0},"end":{"line":24,"column":55}},"24":{"start":{"line":25,"column":0},"end":{"line":25,"column":3}},"25":{"start":{"line":26,"column":0},"end":{"line":26,"column":0}},"26":{"start":{"line":27,"column":0},"end":{"line":27,"column":10}},"27":{"start":{"line":28,"column":0},"end":{"line":28,"column":10}},"28":{"start":{"line":29,"column":0},"end":{"line":29,"column":46}},"29":{"start":{"line":30,"column":0},"end":{"line":30,"column":12}},"30":{"start":{"line":31,"column":0},"end":{"line":31,"column":19}},"31":{"start":{"line":32,"column":0},"end":{"line":32,"column":22}},"32":{"start":{"line":33,"column":0},"end":{"line":33,"column":20}},"33":{"start":{"line":34,"column":0},"end":{"line":34,"column":29}},"34":{"start":{"line":35,"column":0},"end":{"line":35,"column":31}},"35":{"start":{"line":36,"column":0},"end":{"line":36,"column":8}},"36":{"start":{"line":37,"column":0},"end":{"line":37,"column":48}},"37":{"start":{"line":38,"column":0},"end":{"line":38,"column":12}},"38":{"start":{"line":39,"column":0},"end":{"line":39,"column":19}},"39":{"start":{"line":40,"column":0},"end":{"line":40,"column":23}},"40":{"start":{"line":41,"column":0},"end":{"line":41,"column":21}},"41":{"start":{"line":42,"column":0},"end":{"line":42,"column":30}},"42":{"start":{"line":43,"column":0},"end":{"line":43,"column":31}},"43":{"start":{"line":44,"column":0},"end":{"line":44,"column":8}},"44":{"start":{"line":45,"column":0},"end":{"line":45,"column":42}},"45":{"start":{"line":46,"column":0},"end":{"line":46,"column":95}},"46":{"start":{"line":47,"column":0},"end":{"line":47,"column":69}},"47":{"start":{"line":48,"column":0},"end":{"line":48,"column":11}},"48":{"start":{"line":49,"column":0},"end":{"line":49,"column":4}},"49":{"start":{"line":50,"column":0},"end":{"line":50,"column":1}},"50":{"start":{"line":51,"column":0},"end":{"line":51,"column":0}},"51":{"start":{"line":52,"column":0},"end":{"line":52,"column":20}}},"s":{"0":1,"1":1,"2":15,"3":15,"4":15,"5":15,"6":15,"7":15,"8":15,"9":11,"10":11,"11":1,"12":1,"13":11,"14":8,"15":8,"16":11,"17":2,"18":2,"19":11,"20":15,"21":15,"22":1,"23":1,"24":1,"25":15,"26":15,"27":15,"28":15,"29":15,"30":15,"31":15,"32":15,"33":15,"34":15,"35":15,"36":15,"37":15,"38":15,"39":15,"40":15,"41":15,"42":15,"43":15,"44":15,"45":15,"46":15,"47":15,"48":15,"49":15,"50":1,"51":1},"branchMap":{"0":{"type":"branch","line":3,"loc":{"start":{"line":3,"column":0},"end":{"line":50,"column":1}},"locations":[{"start":{"line":3,"column":0},"end":{"line":50,"column":1}}]},"1":{"type":"branch","line":9,"loc":{"start":{"line":9,"column":2},"end":{"line":20,"column":3}},"locations":[{"start":{"line":9,"column":2},"end":{"line":20,"column":3}}]},"2":{"type":"branch","line":11,"loc":{"start":{"line":11,"column":29},"end":{"line":13,"column":5}},"locations":[{"start":{"line":11,"column":29},"end":{"line":13,"column":5}}]},"3":{"type":"branch","line":14,"loc":{"start":{"line":14,"column":28},"end":{"line":16,"column":5}},"locations":[{"start":{"line":14,"column":28},"end":{"line":16,"column":5}}]},"4":{"type":"branch","line":17,"loc":{"start":{"line":17,"column":26},"end":{"line":19,"column":5}},"locations":[{"start":{"line":17,"column":26},"end":{"line":19,"column":5}}]},"5":{"type":"branch","line":22,"loc":{"start":{"line":22,"column":2},"end":{"line":25,"column":3}},"locations":[{"start":{"line":22,"column":2},"end":{"line":25,"column":3}}]}},"b":{"0":[15],"1":[11],"2":[1],"3":[8],"4":[2],"5":[1]},"fnMap":{"0":{"name":"Form","decl":{"start":{"line":3,"column":0},"end":{"line":50,"column":1}},"loc":{"start":{"line":3,"column":0},"end":{"line":50,"column":1}},"line":3},"1":{"name":"handleChange","decl":{"start":{"line":9,"column":2},"end":{"line":20,"column":3}},"loc":{"start":{"line":9,"column":2},"end":{"line":20,"column":3}},"line":9},"2":{"name":"submitForm","decl":{"start":{"line":22,"column":2},"end":{"line":25,"column":3}},"loc":{"start":{"line":22,"column":2},"end":{"line":25,"column":3}},"line":22}},"f":{"0":15,"1":11,"2":1}}
}
Loading

0 comments on commit 7ecf9c0

Please sign in to comment.