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.

Sign up for GitHub

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

Jump to bottom

Deploy prod: merge dev into main #62

Merged
merged 267 commits into from
Dec 16, 2024
Merged

Deploy prod: merge dev into main #62

merged 267 commits into from
Dec 16, 2024

Conversation

voctory
Copy link
Member

@voctory voctory commented Dec 16, 2024

Notes

This deploys bt-web-v2 on v2.ubcbiztech.com in preparation for BluePrint 2025.

  • Non-companion routes are gated off with middleware

BluePrint 2025 prod dummy event has been setup to test out Companion functionality on prod

voctory and others added 30 commits July 1, 2024 23:12
@voctory
Move <Navbar> rendering in front of <main> for mobile view, give Navb…
7f6911e 
…ar fixed positioning on desktop
@isa-leroux448
add stats table component
84d73c4
@isa-leroux448
add title and data props to stats table
8de449c
@AllanT102
removed piechart import from index
87ba060
@AllanT102
removed dummy data
188f7ae
@AllanT102
Merge pull request #13 from ubc-biztech/registration-table
b7a1ef1 
Add Registrations Table to /admin/event/[eventID]/[year] route
@AllanT102
base page completed
bbcb15f
@m20arcusk
used mock data to pass in as the events and are rendered using the ma…
1cdbb10 
…p function. next will work on mobile display
@m20arcusk
updated mobile view for admin events, some minor issues with the navb…
2fc46be 
…ar and mobile device recognition, but styling is fine
@bennypc
Login UI
1ad93f5
@AllanT102
put helper in utils
2f55c9e
@AllanT102
added poppin font
9a80a96
@AllanT102
removed render from main
3d659b6
@kevinxiao27
Merge branch 'pie-chart' into bar-chart
7139e10
@bennypc
amplify gen 2 cognito implementation
c4eb353
@kevinxiao27
Feat: barchart draft (horizontal gridlines dont show since data is no…
11179c4 
…n continuous)
@bennypc
build error
f4a8f06
@isa-leroux448
add nested object compatibility
2a2a3c2
@isa-leroux448
Merge branch 'dev' of https://github.com/ubc-biztech/bt-web-v2 into s…
6bac037 
…tats-table
@m20arcusk
Merge remote-tracking branch 'origin/dev' into admin-events
bb8ecd9 
 especially if it merges an updated upstream into a topic branch.
Pulling the Navbar fixes Victor made into my branch.
@kevinxiao27
Style: Barchart axis colours
30f39f2
@kevinxiao27
Merge branch 'dev' into bar-chart
f6c4f94
@AllanT102
merge conflicts
1abae41
@AllanT102
Merge pull request #15 from ubc-biztech/pie-chart
5b8e67e 
Pie chart
@AllanT102
Merge branch 'dev' of https://github.com/ubc-biztech/bt-web-v2 into s…
de63b5f 
…tats-base-page
@AllanT102
Merge pull request #17 from ubc-biztech/stats-base-page
748a5d3 
base page completed
@kevinxiao27
Merge branch 'dev' into bar-chart
2882f88
@kevinxiao27
Merge pull request #19 from ubc-biztech/bar-chart
e1d2fa0 
Bar Chart
@kevinxiao27
Fix: test on supported versions of node for next.js in github ci
d1c3a1a
@kevinxiao27
Fix: test on supported versions of node for next.js in github ci
f8ecadd
isa-leroux448 and others added 27 commits October 30, 2024 19:17
@isa-leroux448
add document name
81ba2b7
@isa-leroux448
refactor formatting function
6494b1a
@voctory
Fix refresh table on admin registrations table
d412b15
@voctory
Add rendering for custom questions on admin registration table
fdcfe0e
@voctory
Fix styling of 'Edit event' button in the admin registrations table
eed2ed1
@voctory
Fix TypeScript compile errors on admin registration page
af37226
@isa-leroux448
disable export button for empty table
9c20486
@isa-leroux448
Merge pull request #55 from ubc-biztech/export-table
884d708 
Export table as PDF or CSV
@liuisaac
Added and integrated SortableHeader component
9fe018d
@liuisaac
added extra hover effects to make feature obvious
3ae999d
@liuisaac
Merge pull request #57 from ubc-biztech/sort-reg-tables
6754852
@isa-leroux448
Merge branch 'dev' of https://github.com/ubc-biztech/bt-web-v2 into e…
6fa8ff3 
…vent-stats
@voctory
Merge pull request #36 from ubc-biztech/event-stats
3eab1f8 
Event stats
@voctory
Force update dev branch
4426be8 
For refreshing Vercel deploy
@voctory
Fix stats component imports and pricing null-checks
e12788a
@voctory
Fix stats component rename
9e3b87d 
IDE mishap
@voctory
Merge pull request #58 from ubc-biztech/fix-dev-deploy
db35942 
Add optional-chaining operator to prices
@voctory
Sync package-lock.json
1f0efc6
@voctory
Rebase admin registration table backend onto dev; add stats navigation
06727a2
@voctory
Fix overuse of Fetch calls on admin events API
af8a1d9
@voctory
Merge pull request #59 from ubc-biztech/reg-table-backend
2fd280e 
Connect Admin Registrations Table to the backend
@voctory
Change .env flag for prod and change to v2 url
6cec4ee
@voctory
Merge pull request #60 from ubc-biztech/setup-db-prod
4ca0811 
Change .env flag for prod and change to V2 URL
@voctory
Middleware gate bt-web-v2 to /companion unless you're an admin
8d6bd9e
@voctory
Initialize BluePrint 2025 companion
b58ed40
@voctory
Add sharp package for image optimization
6c7fabb
@voctory
Merge pull request #61 from ubc-biztech/init-companion
8ae610b 
Initialize Companion for bt-web-v2
@voctory voctory requested a review from AllanT102 December 16, 2024 07:49
@vercel Vercel
Copy link

vercel bot commented Dec 16, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
biztech-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 16, 2024 7:49am

@voctory voctory merged commit 7be6b7f into main Dec 16, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AllanT102 AllanT102 Awaiting requested review from AllanT102

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@voctory @isa-leroux448 @AllanT102 @m20arcusk @bennypc @kevinxiao27 @liuisaac