Skip to content
This repository has been archived by the owner on Dec 11, 2023. It is now read-only.

Commit

Permalink
Merge pull request #30 from COS301-SE-2023/dev
Browse files Browse the repository at this point in the history
Release v0.1.0
  • Loading branch information
JacoMalan1 authored May 22, 2023
2 parents d155f28 + 0655e30 commit 1ce2082
Show file tree
Hide file tree
Showing 93 changed files with 8,741 additions and 1,643 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/app-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: APP Unit tests
on:
push:
pull_request:
branches:
- main
- dev

jobs:
test:
name: Run Unit Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "18"
- name: Install Dependencies
working-directory: ./app/WhereIsThePower
run: npm install --frozen-lock
- name: Update env
uses: cschleiden/[email protected]
with:
tokenPrefix: '{'
tokenSuffix: '}'
files: ./app/WhereIsThePower/src/environments/environment.ts
env:
GOOGLE_MAPS_API_KEY: ${{ secrets.TEST_SECRET }}

- name: Run Tests
working-directory: ./app/WhereIsThePower
run: npm run test
2 changes: 2 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Setup Testing keys
run: cp api/test_pk.pem api/publicKey.pem && cp api/test_sk.pem api/privateKey.pem
- name: Build
run: cd api && cargo build --verbose
- name: Run tests
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
api/target/
api/www

# Specifies intentionally untracked files to ignore when using Git
# http://git-scm.com/docs/gitignore
Expand Down Expand Up @@ -68,3 +69,4 @@ testem.log
# System files
.DS_Store
Thumbs.db
app/WhereIsThePower/src/environments/environment.ts
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ Where is the power is a web app accessible on mobile and desktop that gives
the user a map overlay of areas where loadshedding is currently happening,
to help assist users navigate their routes through these dark times.

# Demos
- ## Demo 1
- [BytemyCode Demo 1 Video]()
- [System Requirements Specifications](https://github.com/COS301-SE-2023/Where-is-the-power/wiki/Software-Requirements-Specification-(SRS))


# About the repo ℹ️
## 🏛️ Basic Structure 🏛️
<a href="https://angular.io/">
Expand Down
1 change: 1 addition & 0 deletions api/.env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DATABASE_URI=mongodb://<username>:<password>@<host>:<port>/?authSource=admin
5 changes: 5 additions & 0 deletions api/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.pem
!test_pk.pem
!test_sk.pem
.env
macros/target
Loading

0 comments on commit 1ce2082

Please sign in to comment.