Skip to content

Commit 88946ed

Browse files
ddbrucelramos15CKegel
authored
Adds dispatch feature (#69)
* Master -> dev (#44) Co-authored-by: Logan Ramos <lramos15@gmail.com> * Add CAD Display from Herald (#65) * Restructured Index.html and added endpoint for herald to push dispatch info to * Styled Dispatch alerts, set dispatch alert duration to three minutes, and fixed odds and ends * add dev env * add dev workflow * match database fields * add css file to index.html * this is what happens when you copy and paste a line * eslint * work on dispatch styling * more styling * add dispatch time * fix dispatch time text * Style Changes for Headsup Dispatch (#66) * Changed Styling to capitalize dispatch info by request of RPIA dev-team coordinator * Capitalize the start of words and Uppercase the determinant in Dispatch Alerts * Moved Dispatch style to style-dispatch.scss * BugFix: Fix issues with dispatches that occur within 3 minutes of each other (#68) * Changed Styling to capitalize dispatch info by request of RPIA dev-team coordinator * Capitalize the start of words and Uppercase the determinant in Dispatch Alerts * Moved Dispatch style to style-dispatch.scss * Fixed issues with dispatches that occur within 3 minutes of each other * Correct Logic Errors in ClearDispatch Timeout * Added authentication token for herald dispatch * 1.5.0 * Clean Code and Add Admin Authentication (#70) * Spell checking and code adjustments * Added token authentication to admin POST endpoints * restructure admin authentication * fix double-dispatch clearing time issue * update build status badge --------- Co-authored-by: Logan Ramos <lramos15@gmail.com> Co-authored-by: Christian <57967583+CKegel@users.noreply.github.com>
1 parent b0aac26 commit 88946ed

17 files changed

Lines changed: 443 additions & 164 deletions

‎.env.example‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ DB_HOST=dbhosthere
44
DB_USER=dbuserhere
55
DB_PASSWORD=dbpasshere
66
WEBSITE_ACCESS_TOKEN=access restriction token
7+
HERALD_TOKEN=randomstringhere
78
PORT=8080
89
TZ=America/New_York
910
CHOREBOT_VERIFICATION_TOKEN=chorebot token here
11+
ENV=dev

‎.github/workflows/dev.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: deploy headsup dev
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
jobs:
8+
build:
9+
name: Build
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: executing remote ssh commands using password
13+
uses: appleboy/ssh-action@master
14+
with:
15+
host: ${{ secrets.TIEMS_DEV1_URL }}
16+
username: ${{ secrets.TIEMS_DEV1_SSH_USERNAME }}
17+
password: ${{ secrets.TIEMS_DEV1_SSH_PASSWORD }}
18+
script: ${{ secrets.TIEMS_DEV1_SSH_SCRIPT }} headsup

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://cloud.drone.io/api/badges/rpiambulance/headsup/status.svg)](https://cloud.drone.io/rpiambulance/headsup)
1+
[![deploy headsup](https://github.com/techinems/headsup/actions/workflows/main.yml/badge.svg)](https://github.com/techinems/headsup/actions/workflows/main.yml)
22

33
[![forthebadge](https://forthebadge.com/images/badges/built-with-love.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/made-with-javascript.svg)](https://forthebadge.com)
44

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "headsup",
3-
"version": "1.4.3",
3+
"version": "1.5.0",
44
"description": "RPIA's digital whiteboard system",
55
"main": "server.js",
66
"scripts": {

‎public/css/style-dark.min.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/style-dark.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,4 @@ hr {
126126
margin-bottom: 0;
127127
padding-bottom: 0;
128128
}
129-
}
129+
}

‎public/css/style-dispatch.min.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/style-dispatch.min.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/style-dispatch.scss‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
@keyframes dispatchBackground {
2+
from{
3+
background-color: #4a0000;
4+
}
5+
to{
6+
background-color: #5a0000;
7+
}
8+
}
9+
10+
body {
11+
height: 100vh;
12+
// background-color: #952525;
13+
animation: dispatchBackground .5s infinite cubic-bezier(0, 1, 1, 1) alternate;
14+
color: white;
15+
font-weight: 700;
16+
}
17+
18+
#dispatch{
19+
font-size: 100px;
20+
text-transform: capitalize;
21+
}
22+
23+
#dispatch-filler {
24+
height: 200px;
25+
font-size: 60px;
26+
color: #e5e5e5;
27+
}
28+
29+
#determinant {
30+
border-radius: 100px;
31+
text-transform: uppercase;
32+
}
33+
34+
.alpha {
35+
background: #9bda9b;
36+
color: black;
37+
}
38+
39+
.bravo {
40+
background: #ece68d;
41+
color: black;
42+
}
43+
44+
.charlie {
45+
background: #f09442;
46+
color: #020004;
47+
}
48+
49+
.delta {
50+
background: #b10000;
51+
color: #fff;
52+
}
53+
54+
.echo {
55+
background: #000;
56+
color: #ff1f1f;
57+
}
58+

0 commit comments

Comments
 (0)