Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #453

Open
wants to merge 643 commits into
base: oauth-login
Choose a base branch
from
Open

Dev #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
643 commits
Select commit Hold shift + click to select a range
6933554
Merge pull request #525 from ubc-biztech/blueprint-companion-styling
ddennis924 Jan 24, 2024
245709d
render pronouns if present
AllanT102 Jan 25, 2024
b9f7d87
updated attendee showcase
lhurepo Jan 25, 2024
a129d0a
reduced point values
Jan 25, 2024
93a1ab1
Merge pull request #527 from ubc-biztech/update-attendee-showcase
ddennis924 Jan 25, 2024
8b3b171
moved space
Jan 25, 2024
4ba9b34
changed syntax
Jan 25, 2024
2f99d96
Merge pull request #526 from ubc-biztech/render-pronouns
ddennis924 Jan 25, 2024
069f666
Merge pull request #528 from ubc-biztech/dev
ddennis924 Jan 25, 2024
9e56a29
made event stats table show reg stats dependent on whether attendee o…
Jan 26, 2024
e80b652
Merge pull request #529 from ubc-biztech/attendee-partner-specific-ev…
ddennis924 Jan 26, 2024
4e44099
Merge pull request #530 from ubc-biztech/dev
ddennis924 Jan 26, 2024
05c41d9
card fi
AllanT102 Jan 27, 2024
0811262
render link if linkedin not null
AllanT102 Jan 27, 2024
745eae2
linted
AllanT102 Jan 27, 2024
9aeeb0e
Merge pull request #531 from ubc-biztech/mentorcard-fix
ddennis924 Jan 27, 2024
98351f3
added attendees and try catch to websocket
Jan 27, 2024
2b6c4da
Merge pull request #532 from ubc-biztech/last-minute-attendees
ddennis924 Jan 27, 2024
d175980
Merge pull request #533 from ubc-biztech/dev
ddennis924 Jan 27, 2024
48d3519
added descriptivve text
Jan 27, 2024
10b33ba
clarification
Jan 27, 2024
0bb517f
Merge pull request #534 from ubc-biztech/dev
ddennis924 Jan 27, 2024
e2b2435
hotfix for bp
Jan 27, 2024
494eca7
Merge pull request #535 from ubc-biztech/dev
ddennis924 Jan 27, 2024
fc33e18
linting
Jan 27, 2024
3d195a6
cap emails
Jan 27, 2024
ea11d58
Merge pull request #536 from ubc-biztech/dev
ddennis924 Jan 27, 2024
1c790b4
replace vote showcase
Jan 27, 2024
22580c9
Merge pull request #537 from ubc-biztech/replace-vote-showcase
jerryxu99 Jan 27, 2024
2986311
added more emails
Jan 27, 2024
a558980
Merge pull request #539 from ubc-biztech/dev
ddennis924 Jan 27, 2024
de60910
moved to prod
Jan 27, 2024
15d3b4c
UNDID
Jan 27, 2024
7737a5b
Merge pull request #540 from ubc-biztech/dev
ddennis924 Jan 27, 2024
cf5398d
removed dhruv
Jan 27, 2024
05ddb4b
Merge pull request #541 from ubc-biztech/dev
ddennis924 Jan 27, 2024
8190d79
changed workshops
Jan 27, 2024
7249941
Merge pull request #542 from ubc-biztech/workshop-svg
jerryxu99 Jan 27, 2024
ba11e61
removed reels
Jan 27, 2024
2adaefb
Merge pull request #543 from ubc-biztech/reels
ddennis924 Jan 27, 2024
9eb4528
Merge pull request #544 from ubc-biztech/dev
ddennis924 Jan 27, 2024
406b715
modal pops up w/ textbox for emails as CSV
stevenh17 Feb 11, 2024
5dc1512
update but doesn't display properly
stevenh17 Feb 20, 2024
66f6d60
init
isa-leroux448 Feb 20, 2024
9ee53af
restyle Showcase card
isa-leroux448 Feb 20, 2024
63f722d
add voting link
isa-leroux448 Feb 20, 2024
2bc751c
fixes and touch ups
isa-leroux448 Feb 23, 2024
110b84c
remove carousel from techstyle
isa-leroux448 Feb 28, 2024
9173fb1
update point tiers and prizes
isa-leroux448 Feb 28, 2024
8c7ce18
update points and lint fixes
isa-leroux448 Feb 29, 2024
8c7e1ef
fixed timeout and points
Mar 1, 2024
59eb396
added new points
Mar 1, 2024
e292fad
Merge pull request #546 from ubc-biztech/techstyle-companion
ddennis924 Mar 1, 2024
5204261
updated emails for lowercasing login
Mar 1, 2024
bc201ff
Merge pull request #547 from ubc-biztech/dev
ddennis924 Mar 1, 2024
1edac48
update schedule with new icebreaker
isa-leroux448 Mar 1, 2024
cee1fc9
copy pasted the email logic over from companion/index.js
Mar 1, 2024
8ea252c
Merge pull request #548 from ubc-biztech/techstyle-companion
ddennis924 Mar 1, 2024
f92b854
updated prompt user payment on app-based
lhurepo Mar 2, 2024
d0e5a54
Merge pull request #551 from ubc-biztech/dev
ddennis924 Mar 3, 2024
80608c1
Merge pull request #549 from ubc-biztech/fix-emails-for-redemption-page
ddennis924 Mar 3, 2024
2e02b96
Merge pull request #552 from ubc-biztech/dev
ddennis924 Mar 3, 2024
3774928
added context
Mar 3, 2024
a86953a
added more context
Mar 3, 2024
37b2c86
added more donatino
Mar 3, 2024
9c46e49
increased points
Mar 3, 2024
6be0b85
Merge pull request #553 from ubc-biztech/dev
ddennis924 Mar 3, 2024
bba70cc
lowered point thresholds
Mar 3, 2024
6855adc
Merge pull request #554 from ubc-biztech/dev
ddennis924 Mar 3, 2024
fbdca78
buggy version half working
stevenh17 Mar 4, 2024
4cd664f
fixed emails fr
Mar 5, 2024
bbe5ae8
sorting fix
AllanT102 Mar 5, 2024
3922c85
linted
Mar 5, 2024
7e47b38
Merge pull request #555 from ubc-biztech/fixed-emails-fr
ddennis924 Mar 5, 2024
9e1755b
it works now πŸ₯Ή
stevenh17 Mar 5, 2024
b2981bc
modal pops up w/ textbox for emails as CSV
stevenh17 Feb 11, 2024
f1235fd
update but doesn't display properly
stevenh17 Feb 20, 2024
69dfc01
buggy version half working
stevenh17 Mar 4, 2024
1789082
it works now πŸ₯Ή
stevenh17 Mar 5, 2024
c20ae3c
added app status
Mar 5, 2024
7c56138
Merge branch 'dev' of https://github.com/ubc-biztech/bt-web into app-…
lhurepo Mar 6, 2024
0d4fae4
run lint
lhurepo Mar 6, 2024
6985366
added all states
Mar 6, 2024
e9d3d51
Merge pull request #550 from ubc-biztech/app-based-payment-after
ddennis924 Mar 6, 2024
3d70ce0
Merge pull request #556 from ubc-biztech/stats-filter
ddennis924 Mar 6, 2024
a24b8f1
reduced techstyle active time
Mar 6, 2024
a39d12f
updated success message to reflect accordingly
Mar 6, 2024
2be1aff
Merge remote-tracking branch 'origin/dev' into massUpdateStatus
stevenh17 Mar 6, 2024
edb336f
removed commented out and console logs
stevenh17 Mar 6, 2024
8430019
Merge branch 'massUpdateStatus' of https://github.com/ubc-biztech/bt-…
stevenh17 Mar 6, 2024
4b0ea40
removed console log / commented out code
stevenh17 Mar 6, 2024
3e1e16c
Merge pull request #559 from ubc-biztech/success-message
ddennis924 Mar 6, 2024
2c29bb4
added logout button
Mar 6, 2024
f2b296f
made table actually work
Mar 6, 2024
fb0e4cd
removed the confirmation modal + styling
Mar 6, 2024
015ffd7
Merge pull request #561 from ubc-biztech/companion-logout
ddennis924 Mar 6, 2024
3a5e3b1
Merge pull request #560 from ubc-biztech/fix-table
ddennis924 Mar 6, 2024
8af7a31
added withdrawn
Mar 6, 2024
62dc1d9
new fname
stevenh17 Mar 7, 2024
ca00c11
Merge pull request #558 from ubc-biztech/produhacks-companion
ddennis924 Mar 7, 2024
b2517cd
fixed package lock?
Mar 7, 2024
bfdb7c3
fixed package lock
Mar 7, 2024
34791c7
Merge branch 'master' into dev
jerryxu99 Mar 7, 2024
62b560c
Merge pull request #562 from ubc-biztech/dev
ddennis924 Mar 7, 2024
72a1acb
fixed incomplete event page
Mar 8, 2024
43d149e
create new stripe checkout on complete payment
AllanT102 Mar 8, 2024
bd40314
added stripe checkout stuff to companion
AllanT102 Mar 8, 2024
0b4f724
Merge pull request #563 from ubc-biztech/fix-incomplete-event-page
ddennis924 Mar 8, 2024
cf6c9b3
Merge branch 'dev' into massUpdateStatus
Mar 11, 2024
f31fac4
added package lock
Mar 11, 2024
182e4bd
Merge pull request #557 from ubc-biztech/massUpdateStatus
ddennis924 Mar 11, 2024
a48dcb2
Merge pull request #565 from ubc-biztech/dev
ddennis924 Mar 11, 2024
f299d2d
merge conflicts
Mar 15, 2024
18a8e24
styling
Mar 15, 2024
218a999
Merge pull request #564 from ubc-biztech/stripe-checkout-sesh
ddennis924 Mar 15, 2024
649002f
added imports
Mar 17, 2024
647c4fd
Merge pull request #567 from ubc-biztech/export-hotfix
ddennis924 Mar 17, 2024
2f32b6c
Merge pull request #568 from ubc-biztech/dev
ddennis924 Mar 17, 2024
eab4d6f
enabled checkout link when link doesn't exist yet
Mar 19, 2024
4a052d6
Merge pull request #569 from ubc-biztech/showCheckoutLink
ddennis924 Mar 19, 2024
7ca58d7
Merge pull request #570 from ubc-biztech/dev
ddennis924 Mar 19, 2024
a4e25a1
hotfix
Mar 22, 2024
f99602b
Merge pull request #571 from ubc-biztech/dev
ddennis924 Mar 22, 2024
57f92f3
changed form descriptions to 2025
AllanT102 Sep 1, 2024
552b0a1
removed logs
AllanT102 Sep 1, 2024
37d2e13
Merge pull request #573 from ubc-biztech/2025
AllanT102 Sep 1, 2024
9b751b8
Merge pull request #574 from ubc-biztech/dev
AllanT102 Sep 1, 2024
620efc7
Fix unnecessary email lowercase
voctory Sep 4, 2024
7e15ea2
Merge pull request #575 from ubc-biztech/membership-email-fix
voctory Sep 6, 2024
5a0061a
added a new event for hello-hacks;2024 - still uses data and beyond l…
m20arcusk Sep 18, 2024
d284728
implemented hot fix by removing login button and using Hello Hacks 20…
m20arcusk Sep 18, 2024
7cdc2ad
commented out unused imports and vars
m20arcusk Sep 18, 2024
f3822c2
Merge pull request #576 from ubc-biztech/companion-quick-fix
AllanT102 Sep 18, 2024
781941a
Merge pull request #577 from ubc-biztech/dev
AllanT102 Sep 18, 2024
8276a9d
companion update for hello hacks
AllanT102 Sep 19, 2024
e949e66
lint
AllanT102 Sep 19, 2024
21f73c3
lint
AllanT102 Sep 19, 2024
8493302
Merge pull request #578 from ubc-biztech/dev
AllanT102 Sep 19, 2024
1dd10d1
updated event date to be active until oct 8 2024
m20arcusk Sep 25, 2024
278290b
Merge pull request #579 from ubc-biztech/companion-app-date-fix
AllanT102 Sep 26, 2024
72c7fe6
Merge pull request #580 from ubc-biztech/dev
AllanT102 Sep 26, 2024
3b3162e
UXOpen2024 first draft -- need to do payment
jaypark25 Oct 15, 2024
d75c165
fixes
AllanT102 Oct 16, 2024
e60f3cd
Merge pull request #581 from ubc-biztech/uxopen
AllanT102 Oct 16, 2024
b5c4613
Merge pull request #582 from ubc-biztech/dev
AllanT102 Oct 16, 2024
7deb29f
stupid ah bug
AllanT102 Oct 16, 2024
4a9f632
Merge pull request #583 from ubc-biztech/master
AllanT102 Oct 16, 2024
705c111
added email validation
Oct 16, 2024
fc4d522
fixed email validation for workshop
Oct 16, 2024
3455e5a
refactored email validation
Oct 16, 2024
3196695
add createdAt column in registration table
isa-leroux448 Nov 5, 2024
d625d16
change order of createdAt and updatedAt
isa-leroux448 Nov 5, 2024
c6b1ef7
skeleton dataverse component created
mchlcui Nov 13, 2024
ad25283
added quiz skeleton and access key input
mchlcui Nov 14, 2024
720f2c2
connected user to their team and points and added placeholder quiz
mchlcui Nov 14, 2024
2ec29c5
Changed landing page for dataverse
liuisaac Nov 15, 2024
cc4f30f
Merge branch 'dataverse-mchl' of https://github.com/ubc-biztech/bt-we…
liuisaac Nov 15, 2024
c028803
Restructured and aesthetically rehauled Quiz comp
liuisaac Nov 15, 2024
452a64f
Merge pull request #585 from ubc-biztech/registration-created-at
isa-leroux448 Nov 15, 2024
e69d3d0
Merge pull request #586 from ubc-biztech/dataverse-isaac
mchlcui Nov 15, 2024
37606a0
Merge pull request #587 from ubc-biztech/dev
AllanT102 Nov 16, 2024
2cd1a9e
point system implemented
mchlcui Nov 18, 2024
5e56f8e
initial commit
mchlcui Nov 18, 2024
f1e1816
fixed naming errors
mchlcui Nov 19, 2024
d6e7f40
added leaderboard poc and fixed withdrawl button
liuisaac Nov 20, 2024
f51b724
implemented new ui and quiz1 problems
liuisaac Nov 24, 2024
22ee053
adjusted dataverse leaderboard theming and ui
liuisaac Nov 24, 2024
6747cfc
Merge branch 'dataverse-isaac' of https://github.com/ubc-biztech/bt-w…
mchlcui Nov 24, 2024
754d54b
conflict resolving
mchlcui Nov 24, 2024
3e85359
Merge pull request #588 from ubc-biztech/dataverse-isaac
mchlcui Nov 24, 2024
02f7d11
added polling for points display in dashboard
mchlcui Nov 24, 2024
c6fedf3
Merge pull request #589 from ubc-biztech/dataverse-mchl
mchlcui Nov 24, 2024
322f06a
Merge branch 'dataverse' of https://github.com/ubc-biztech/bt-web int…
liuisaac Nov 24, 2024
a973f3c
Merge pull request #590 from ubc-biztech/dataverse-isaac
mchlcui Nov 24, 2024
3d0b5c6
added polling and dynamically display teams in leaderboard
mchlcui Nov 25, 2024
498e27c
Added dataverse logo to Leaderboard and removed b
liuisaac Nov 25, 2024
96050ad
Merge pull request #591 from ubc-biztech/dataverse-isaac
liuisaac Nov 25, 2024
77f1ae4
Minor UI Updates to background and white dividers
liuisaac Nov 25, 2024
06ca38f
Update Progress.js to not use - names
liuisaac Nov 25, 2024
68be5bb
Merge pull request #592 from ubc-biztech/dataverse-isaac
liuisaac Nov 25, 2024
bc7d9b7
hopefully fixed background for stars
liuisaac Nov 25, 2024
3451035
fixed linting issues
mchlcui Nov 25, 2024
24e8c7e
Merge pull request #593 from ubc-biztech/dataverse-isaac
mchlcui Nov 25, 2024
7c2c092
Added congrats page and autograder to final q.
liuisaac Nov 25, 2024
2eeddd9
Merge pull request #594 from ubc-biztech/dataverse-isaac
liuisaac Nov 25, 2024
3feb77f
added answer persistence and disabled re-answering correct questions
mchlcui Nov 25, 2024
a68b66c
Merge pull request #595 from ubc-biztech/dataverse-mchl
mchlcui Nov 25, 2024
5976198
liuisaac Nov 25, 2024
85662df
added scrambled letters for cards and questions
liuisaac Nov 25, 2024
71c1ea3
fixed linting issues
mchlcui Nov 25, 2024
55bef96
Merge pull request #596 from ubc-biztech/dataverse-isaac
mchlcui Nov 25, 2024
18ce3da
Added clue words given at the completion of each quiz
mchlcui Nov 25, 2024
1c69dc9
Merge pull request #597 from ubc-biztech/dataverse-mchl
mchlcui Nov 25, 2024
33116de
Merge pull request #598 from ubc-biztech/dataverse
mchlcui Nov 25, 2024
a986136
Added question revisions
liuisaac Nov 26, 2024
94bf3d2
Added downloads to dataset to each quiz room
liuisaac Nov 26, 2024
fb9dd52
fixing linting issues
mchlcui Nov 26, 2024
d666eea
Merge pull request #599 from ubc-biztech/dataverse-isaac
mchlcui Nov 26, 2024
6888a6d
Fixed Quiz 3 true/false having no correct answer
liuisaac Nov 26, 2024
aedc941
Merge branch 'dataverse-isaac' of https://github.com/ubc-biztech/bt-w…
liuisaac Nov 26, 2024
33562b1
Merge pull request #600 from ubc-biztech/dataverse-isaac
AllanT102 Nov 26, 2024
bb15e73
Merge pull request #584 from ubc-biztech/emailfixed
voctory Nov 28, 2024
a50665a
updated and refactored quiz room ui
liuisaac Nov 28, 2024
2fc52ae
wordle-like highlighting, disabled case sens
liuisaac Nov 28, 2024
3ef0a01
Fixed submission related issues & locked FQ
liuisaac Nov 28, 2024
86f8092
fixed display of double counting points
mchlcui Nov 28, 2024
53a4db3
Merge pull request #603 from ubc-biztech/dataverse-mchl
mchlcui Nov 28, 2024
5bc042d
Tighten up the QuizRoom component width max 1500px
liuisaac Nov 28, 2024
e12129c
Merge pull request #602 from ubc-biztech/dataverse-isaac
mchlcui Nov 28, 2024
72a3fc0
Tighten up the QuizRoom component width max 1500px
liuisaac Nov 28, 2024
af9ccb8
fixed linting issues
mchlcui Nov 28, 2024
6b9a2e4
Merge pull request #606 from ubc-biztech/dataverse
mchlcui Nov 28, 2024
2eafa05
Merge branch 'dataverse-isaac' of https://github.com/ubc-biztech/bt-w…
liuisaac Nov 28, 2024
a48fe22
fixed hardcoded values due to questions chage
mchlcui Nov 29, 2024
a4c93f0
Merge pull request #607 from ubc-biztech/dataverse-mchl
liuisaac Nov 29, 2024
a9a21d6
fixed refresh and rerendering after quiz sub
liuisaac Nov 29, 2024
49d47e0
Merge branch 'dev' of https://github.com/ubc-biztech/bt-web into data…
liuisaac Nov 29, 2024
df5dbf3
fixed linting :(
liuisaac Nov 29, 2024
ad3104a
Merge pull request #608 from ubc-biztech/dataverse-isaac
mchlcui Nov 29, 2024
4b63d82
added crash course and new datasets
liuisaac Nov 29, 2024
9be2e0b
Merge pull request #609 from ubc-biztech/dataverse-isaac
mchlcui Nov 29, 2024
cdd6eb7
sorting leaderboard by completion time
mchlcui Nov 29, 2024
b6a967d
modified final answer
liuisaac Nov 29, 2024
7abcb75
Merge branch 'dev' of https://github.com/ubc-biztech/bt-web into data…
liuisaac Nov 29, 2024
2bed1dc
Merge pull request #611 from ubc-biztech/dataverse-isaac
mchlcui Nov 29, 2024
15c3387
fixed final question
liuisaac Nov 29, 2024
d01fce0
Merge pull request #610 from ubc-biztech/dataverse-mchl
mchlcui Nov 29, 2024
402f285
i dont understand it now
liuisaac Nov 29, 2024
d19f03a
Merge branch 'dev' into dataverse-isaac
liuisaac Nov 29, 2024
b9e0093
Merge pull request #612 from ubc-biztech/dataverse-isaac
liuisaac Nov 29, 2024
d99a002
Added back hard deadline set to 3:10pm
liuisaac Nov 29, 2024
caf8b32
Merge branch 'dataverse-isaac' of https://github.com/ubc-biztech/bt-w…
liuisaac Nov 29, 2024
00a39b0
updated final question and timer timeout limit
liuisaac Nov 29, 2024
0cde136
updated room questions and point totals
liuisaac Nov 29, 2024
48bc250
Implemented obfuscation through base64 encoding
liuisaac Nov 29, 2024
87862c3
Merge pull request #613 from ubc-biztech/dataverse-isaac
mchlcui Nov 29, 2024
dfdd8cc
Merge pull request #614 from ubc-biztech/dev
mchlcui Nov 30, 2024
a044270
set end hard deadline to 3:15
liuisaac Nov 30, 2024
814d52c
Merge pull request #615 from ubc-biztech/dataverse-isaac
mchlcui Nov 30, 2024
c4338b8
updated tiem to 3:#5
liuisaac Nov 30, 2024
5ffbede
Merge pull request #616 from ubc-biztech/dataverse-isaac
mchlcui Nov 30, 2024
0addc03
changed time to 3:40
liuisaac Nov 30, 2024
8218e0f
Merge pull request #617 from ubc-biztech/dataverse-isaac
mchlcui Nov 30, 2024
b40d5b8
bruh i changed time to 3:45
liuisaac Nov 30, 2024
6ea1866
Merge pull request #618 from ubc-biztech/dataverse-isaac
AllanT102 Nov 30, 2024
8f96eb8
Add email bypasses
voctory Jan 18, 2025
9794d05
Merge pull request #619 from ubc-biztech/email-bypass
voctory Jan 18, 2025
2d19613
Add more bypasses; do direct user check to avoid pre-fill bug
voctory Jan 18, 2025
a925f06
Merge pull request #620 from ubc-biztech/email-bypass
voctory Jan 18, 2025
5fa3e6a
No-op commit
voctory Jan 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,41 @@ module.exports = {
ecmaFeatures: {
jsx: true
},
ecmaVersion: 2018,
ecmaVersion: 2020,
sourceType: "module"
},
plugins: ["react", "react-hooks", "prettier"],
rules: {
"react/prop-types": 0,
"react/no-unescaped-entities": 0,
"camelcase": 0,
"no-var": 2,
"array-bracket-spacing": ["warn", "never"],
"array-bracket-newline": ["warn", "consistent"],
"eol-last": ["warn", "always"],
"indent": ["warn", 2],
"no-prototype-builtins": "off",
"no-trailing-spaces": ["warn", {
"ignoreComments": true
}],
"no-unused-vars": "warn",
"object-curly-spacing": ["warn", "always"],
"padded-blocks": ["warn", "never"],
"quotes": ["warn", "double"],
"semi": ["warn", "always"],
"space-in-parens": ["warn", "never"],
"object-property-newline": ["warn", {
}],
"object-curly-newline": ["warn", "always"]
},
settings: {
"import/resolver": {
node: {
moduleDirectory: ["node_modules", "src/"]
}
},
"react": {
"version": "detect"
}
}
};
6 changes: 3 additions & 3 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"projects": {
"default": "bt-web-staging",
"staging": "bt-web-staging",
"production": "bt-web-19a7b"
"default": "bt-web-dev-ebf17",
"production": "bt-web-19a7b",
"development": "bt-web-dev-ebf17"
}
}
86 changes: 86 additions & 0 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
'on':
push:
branches: [ dev, master ]
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: '16.13.2'

- name: Dev Firebase Build
if: github.ref == 'refs/heads/dev'
run: npm ci && npm run build
env:
SASS_PATH: './node_modules'
REACT_APP_DEV_API: '${{ secrets.REACT_APP_DEV_API }}'
REACT_APP_STAGING_API: '${{ secrets.REACT_APP_STAGING_API }}'
REACT_APP_WEBSOCKET_API: '${{ secrets.REACT_APP_WEBSOCKET_API }}'
REACT_APP_SHOW_MAXVP: true
REACT_APP_STAGE: 'development'
REACT_APP_SPREADSHEET_ID: '${{ secrets.REACT_APP_SPREADSHEET_ID }}'
REACT_APP_SHEET_ID: ${{ secrets.REACT_APP_SHEET_ID }}
REACT_APP_CLIENT_EMAIL: '${{ secrets.REACT_APP_CLIENT_EMAIL }}'
REACT_APP_PRIVATE_KEY: '${{ secrets.REACT_APP_PRIVATE_KEY }}'
REACT_APP_BYPASS_EMAIL_1: '${{ secrets.REACT_APP_BYPASS_EMAIL_1 }}'
REACT_APP_BYPASS_EMAIL_2: '${{ secrets.REACT_APP_BYPASS_EMAIL_2 }}'
REACT_APP_BYPASS_EMAIL_3: '${{ secrets.REACT_APP_BYPASS_EMAIL_3 }}'
REACT_APP_BYPASS_EMAIL_4: '${{ secrets.REACT_APP_BYPASS_EMAIL_4 }}'
REACT_APP_BYPASS_EMAIL_5: '${{ secrets.REACT_APP_BYPASS_EMAIL_5 }}'
REACT_APP_BYPASS_EMAIL_6: '${{ secrets.REACT_APP_BYPASS_EMAIL_6 }}'
REACT_APP_BYPASS_EMAIL_7: '${{ secrets.REACT_APP_BYPASS_EMAIL_7 }}'
REACT_APP_BYPASS_EMAIL_8: '${{ secrets.REACT_APP_BYPASS_EMAIL_8 }}'
REACT_APP_BYPASS_EMAIL_9: '${{ secrets.REACT_APP_BYPASS_EMAIL_9 }}'
REACT_APP_BYPASS_EMAIL_10: '${{ secrets.REACT_APP_BYPASS_EMAIL_10 }}'

- name: Dev Firebase Deploy
if: github.ref == 'refs/heads/dev'
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BT_WEB_DEV_EBF17 }}'
channelId: live
projectId: bt-web-dev-ebf17
firebaseToolsVersion: '12.9.1'

- name: Prod Firebase Build
if: github.ref == 'refs/heads/master'
run: npm ci && npm run build
env:
SASS_PATH: './node_modules'
REACT_APP_DEV_API: '${{ secrets.REACT_APP_DEV_API }}'
REACT_APP_STAGING_API: '${{ secrets.REACT_APP_STAGING_API }}'
REACT_APP_WEBSOCKET_API: '${{ secrets.REACT_APP_WEBSOCKET_API }}'
REACT_APP_SHOW_MAXVP: true
REACT_APP_STAGE: 'production'
REACT_APP_SPREADSHEET_ID: '${{ secrets.REACT_APP_SPREADSHEET_ID }}'
REACT_APP_SHEET_ID: ${{ secrets.REACT_APP_SHEET_ID }}
REACT_APP_CLIENT_EMAIL: '${{ secrets.REACT_APP_CLIENT_EMAIL }}'
REACT_APP_PRIVATE_KEY: '${{ secrets.REACT_APP_PRIVATE_KEY }}'
REACT_APP_BYPASS_EMAIL_1: '${{ secrets.REACT_APP_BYPASS_EMAIL_1 }}'
REACT_APP_BYPASS_EMAIL_2: '${{ secrets.REACT_APP_BYPASS_EMAIL_2 }}'
REACT_APP_BYPASS_EMAIL_3: '${{ secrets.REACT_APP_BYPASS_EMAIL_3 }}'
REACT_APP_BYPASS_EMAIL_4: '${{ secrets.REACT_APP_BYPASS_EMAIL_4 }}'
REACT_APP_BYPASS_EMAIL_5: '${{ secrets.REACT_APP_BYPASS_EMAIL_5 }}'
REACT_APP_BYPASS_EMAIL_6: '${{ secrets.REACT_APP_BYPASS_EMAIL_6 }}'
REACT_APP_BYPASS_EMAIL_7: '${{ secrets.REACT_APP_BYPASS_EMAIL_7 }}'
REACT_APP_BYPASS_EMAIL_8: '${{ secrets.REACT_APP_BYPASS_EMAIL_8 }}'
REACT_APP_BYPASS_EMAIL_9: '${{ secrets.REACT_APP_BYPASS_EMAIL_9 }}'
REACT_APP_BYPASS_EMAIL_10: '${{ secrets.REACT_APP_BYPASS_EMAIL_10 }}'

- name: Prod Firebase Deploy
if: github.ref == 'refs/heads/master'
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BT_WEB_19A7B }}'
channelId: live
projectId: bt-web-19a7b
firebaseToolsVersion: '12.9.1'
83 changes: 83 additions & 0 deletions .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
'on': pull_request
jobs:
build_and_preview:
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: '16.13.2'

- name: Dev Firebase Build
if: github.event.pull_request.base.ref == 'dev'
run: npm ci && npm run build
env:
SASS_PATH: './node_modules'
REACT_APP_DEV_API: '${{ secrets.REACT_APP_DEV_API }}'
REACT_APP_STAGING_API: '${{ secrets.REACT_APP_STAGING_API }}'
REACT_APP_WEBSOCKET_API: '${{ secrets.REACT_APP_WEBSOCKET_API }}'
REACT_APP_SHOW_MAXVP: true
REACT_APP_STAGE: 'development'
REACT_APP_SPREADSHEET_ID: '${{ secrets.REACT_APP_SPREADSHEET_ID }}'
REACT_APP_SHEET_ID: ${{ secrets.REACT_APP_SHEET_ID }}
REACT_APP_CLIENT_EMAIL: '${{ secrets.REACT_APP_CLIENT_EMAIL }}'
REACT_APP_PRIVATE_KEY: '${{ secrets.REACT_APP_PRIVATE_KEY }}'
REACT_APP_BYPASS_EMAIL_1: '${{ secrets.REACT_APP_BYPASS_EMAIL_1 }}'
REACT_APP_BYPASS_EMAIL_2: '${{ secrets.REACT_APP_BYPASS_EMAIL_2 }}'
REACT_APP_BYPASS_EMAIL_3: '${{ secrets.REACT_APP_BYPASS_EMAIL_3 }}'
REACT_APP_BYPASS_EMAIL_4: '${{ secrets.REACT_APP_BYPASS_EMAIL_4 }}'
REACT_APP_BYPASS_EMAIL_5: '${{ secrets.REACT_APP_BYPASS_EMAIL_5 }}'
REACT_APP_BYPASS_EMAIL_6: '${{ secrets.REACT_APP_BYPASS_EMAIL_6 }}'
REACT_APP_BYPASS_EMAIL_7: '${{ secrets.REACT_APP_BYPASS_EMAIL_7 }}'
REACT_APP_BYPASS_EMAIL_8: '${{ secrets.REACT_APP_BYPASS_EMAIL_8 }}'
REACT_APP_BYPASS_EMAIL_9: '${{ secrets.REACT_APP_BYPASS_EMAIL_9 }}'
REACT_APP_BYPASS_EMAIL_10: '${{ secrets.REACT_APP_BYPASS_EMAIL_10 }}'

- name: Dev Firebase Preview
if: github.event.pull_request.base.ref == 'dev'
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BT_WEB_DEV_EBF17 }}'
projectId: bt-web-dev-ebf17
firebaseToolsVersion: '12.9.1'

- name: Prod Firebase Build
if: github.event.pull_request.base.ref == 'master'
run: npm ci && npm run build
env:
SASS_PATH: './node_modules'
REACT_APP_DEV_API: '${{ secrets.REACT_APP_DEV_API }}'
REACT_APP_STAGING_API: '${{ secrets.REACT_APP_STAGING_API }}'
REACT_APP_WEBSOCKET_API: '${{ secrets.REACT_APP_WEBSOCKET_API }}'
REACT_APP_SHOW_MAXVP: true
REACT_APP_STAGE: 'production'
REACT_APP_SPREADSHEET_ID: '${{ secrets.REACT_APP_SPREADSHEET_ID }}'
REACT_APP_SHEET_ID: ${{ secrets.REACT_APP_SHEET_ID }}
REACT_APP_CLIENT_EMAIL: '${{ secrets.REACT_APP_CLIENT_EMAIL }}'
REACT_APP_PRIVATE_KEY: '${{ secrets.REACT_APP_PRIVATE_KEY }}'
REACT_APP_BYPASS_EMAIL_1: '${{ secrets.REACT_APP_BYPASS_EMAIL_1 }}'
REACT_APP_BYPASS_EMAIL_2: '${{ secrets.REACT_APP_BYPASS_EMAIL_2 }}'
REACT_APP_BYPASS_EMAIL_3: '${{ secrets.REACT_APP_BYPASS_EMAIL_3 }}'
REACT_APP_BYPASS_EMAIL_4: '${{ secrets.REACT_APP_BYPASS_EMAIL_4 }}'
REACT_APP_BYPASS_EMAIL_5: '${{ secrets.REACT_APP_BYPASS_EMAIL_5 }}'
REACT_APP_BYPASS_EMAIL_6: '${{ secrets.REACT_APP_BYPASS_EMAIL_6 }}'
REACT_APP_BYPASS_EMAIL_7: '${{ secrets.REACT_APP_BYPASS_EMAIL_7 }}'
REACT_APP_BYPASS_EMAIL_8: '${{ secrets.REACT_APP_BYPASS_EMAIL_8 }}'
REACT_APP_BYPASS_EMAIL_9: '${{ secrets.REACT_APP_BYPASS_EMAIL_9 }}'
REACT_APP_BYPASS_EMAIL_10: '${{ secrets.REACT_APP_BYPASS_EMAIL_10 }}'

- name: Prod Firebase Preview
if: github.event.pull_request.base.ref == 'master'
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BT_WEB_19A7B }}'
projectId: bt-web-19a7b
firebaseToolsVersion: '12.9.1'
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.fixAll.eslint": "explicit",
"editor.tabSize": 2
}
},
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# bt-web

Biztech's web application.
Biztech's web application.

## Getting Started

Expand Down
6 changes: 5 additions & 1 deletion firebase.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"hosting": {
"public": "build",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
Expand Down
Loading
Loading