Skip to content

Commit 5d783d0

Browse files
authored
Merge pull request #14 from oslabs-beta/dev
Merging into master
2 parents 2e7b33a + 40001bb commit 5d783d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+743
-267
lines changed

.DS_Store

-8 KB
Binary file not shown.

.env.example

Lines changed: 0 additions & 6 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
DS_Store
1+
.DS_Store
2+
build/
23
dist/
34
node_modules/
45
security/
@@ -13,4 +14,3 @@ src/components/display/.StoppedContainers.js.icloud
1314
src/database/docketeerdb
1415
.env
1516
yarn.lock
16-
/security

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ npm install
5757
>
5858
> ...
5959
60-
4. In the .env file, configure the following environment variables for Twilio API. Refer to Twilio Setup section below.
60+
4. In the .env file, configure the following environment variables for Twilio API, Slack API, and Postgres URI. Refer to Twilio Setup section below.
6161

6262
```
6363
// .env
@@ -66,6 +66,8 @@ TWILIO_ACCOUNT_SID=''
6666
TWILIO_AUTH_TOKEN=''
6767
SERVICE_SID=''
6868
VERIFICATION_SERVICE_SID=''
69+
SLACK_API=''
70+
POSTGRES_URI=''
6971
```
7072

7173
5. Create a folder called `security` in the project's top-level directory.
@@ -223,6 +225,11 @@ npm run test
223225
- Ricardo Cortez [@Github](https://github.com/rcortez88) [@LinkedIn](https://www.linkedin.com/in/rcortez88/)
224226
- Emma Czech [@Github](https://github.com/emczech) [@LinkedIn](https://https://www.linkedin.com/in/emczech/)
225227
- Brent Speight [@Github](https://github.com/brentspeight) [@LinkedIn](https://www.linkedin.com/in/brent-speight/)
228+
- Eric Lee [@Github](https://github.com/errc-lee)
229+
- Kristine Aguda [@Github](https://github.com/kaguda)
230+
- Dylan Feldman [@Github](https://github.com/dfeldman24)
231+
- Tre Hultzen [@Github](https://github.com/THultz)
232+
- Kenneth Hui [@Github](https://github.com/kennethhui121)
226233

227234
## ⭐ Show your support
228235

assets/githublogo.png

4.2 KB
Loading

assets/settings.svg

Lines changed: 4 additions & 1 deletion
Loading

assets/users.svg

Lines changed: 3 additions & 0 deletions
Loading

assets/volumehistory.svg

Lines changed: 3 additions & 0 deletions
Loading

build/background.png

-18.8 KB
Binary file not shown.

build/icon.png

-64.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)