Skip to content

Create speaker page add all fields #53

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

Open
wants to merge 81 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
a28bd1a
Created SignUp page
grqce Oct 20, 2024
bffa945
signup page + app changes for signup page, git fixes
happyjoytotheworld Oct 27, 2024
b25395d
Merge pull request #38 from hack4impact-upenn/signup
happyjoytotheworld Oct 27, 2024
b9f2551
Revert "Reverting accidental pushes from git"
happyjoytotheworld Oct 27, 2024
9ba1267
new branch init
2024eli Jan 26, 2025
0333c44
Create speaker cards
joshchen984 Jan 26, 2025
815a426
nav bar meowwww
2024eli Jan 26, 2025
0f85eaa
side bar
Jan 26, 2025
c215aed
willard notif yay
2024eli Jan 26, 2025
adf06e5
logo
Jan 26, 2025
94343e0
ding dong
2024eli Jan 26, 2025
6b818ba
searchbar and app integrate
happyjoytotheworld Jan 26, 2025
3ad9af6
Merge pull request #2 from hack4impact-upenn/searchbar
happyjoytotheworld Feb 12, 2025
4478238
Merge branch 'main' into cards
happyjoytotheworld Feb 12, 2025
0af59e6
Merge pull request #1 from hack4impact-upenn/cards
happyjoytotheworld Feb 12, 2025
f47114e
Merge branch 'main' into topbar
2024eli Feb 12, 2025
b958167
Merge pull request #3 from hack4impact-upenn/topbar
2024eli Feb 12, 2025
009b9d6
can you work
2024eli Feb 12, 2025
0bf2d07
Merge pull request #4 from hack4impact-upenn/sidebar
happyjoytotheworld Feb 12, 2025
7d4d7af
added the rest of the models service controller
2024eli Feb 12, 2025
9dab6fe
request page
Feb 12, 2025
62a18ff
schema checma chedmca shecma
2024eli Feb 12, 2025
5d8e046
added login select page
WillardSun Feb 12, 2025
ae33402
HOLD BC DELETING REPO
happyjoytotheworld Feb 12, 2025
637752a
yarn.lock
khoiddinh Feb 15, 2025
b5c32fd
Merge pull request #5 from hack4impact-upenn/requestpageyeon
khoiddinh Feb 19, 2025
a7c271f
added home route
khoiddinh Feb 19, 2025
96ed215
search speakers page
happyjoytotheworld Feb 19, 2025
d8001fb
Merge branch 'main' into search_page
khoiddinh Feb 19, 2025
fd41227
Merge pull request #6 from hack4impact-upenn/search_page
khoiddinh Feb 19, 2025
25bf562
create user routes
joshchen984 Feb 19, 2025
b09d7bc
improved styling and added redirects from login page
WillardSun Feb 19, 2025
ca2a6d9
fixed major frontend bugs, login bug, and topbar only for authenticae…
2024eli Feb 25, 2025
070a07e
Merge pull request #7 from hack4impact-upenn/fix/frontendbackend
khoiddinh Feb 25, 2025
9b5d66f
commenetd out one line LOL
2024eli Feb 25, 2025
e8c44e7
Merge pull request #8 from hack4impact-upenn/fix/oopsiehomepage
khoiddinh Feb 25, 2025
354edda
fix
Feb 26, 2025
aa0689d
Delete yarn.lock
WillardSun Feb 26, 2025
f9c11a8
Merge branch 'hack4impact-upenn:main' into main
edwardzhang2 Feb 26, 2025
dcfb8e9
JOSH AND I DID IT: filter
2024eli Mar 5, 2025
4a918d4
Merge pull request #10 from hack4impact-upenn/added-schemas
khoiddinh Mar 5, 2025
8e19f2f
added specific register pages
WillardSun Mar 5, 2025
a93e5ab
fixed landing pagee
khoiddinh Mar 14, 2025
9929d55
made buttons functional and fixed css
khoiddinh Mar 20, 2025
5e05e68
made buttons functional and fixed css
khoiddinh Mar 20, 2025
f501410
requests page made
2024eli Mar 20, 2025
d1220db
meow
2024eli Mar 20, 2025
0bb70f3
frontend stuff for request page should be good
2024eli Mar 20, 2025
0806593
backend integerated mvp
2024eli Mar 20, 2025
19f5dc4
Merge pull request #11 from hack4impact-upenn/speaker-request
2024eli Mar 20, 2025
4fb64bc
meow
2024eli Mar 23, 2025
f6fb137
new admin page
2024eli Mar 23, 2025
292ee0e
for josh
2024eli Mar 23, 2025
226399c
added admin speaker visualization and speaker add form
khoiddinh Mar 24, 2025
27ec142
added admin speaker visualization and speaker add form
khoiddinh Mar 24, 2025
e684248
Merge pull request #12 from hack4impact-upenn/admindash
khoiddinh Mar 24, 2025
bdf8cc4
added yarn.lock
khoiddinh Mar 27, 2025
f99cee9
Merge branch 'main' into login-page
khoiddinh Mar 27, 2025
79bf28e
Merge pull request #14 from hack4impact-upenn/login-page
khoiddinh Mar 27, 2025
d17b530
added requests page and profile editing on admin side
zhange2 Mar 27, 2025
22b530b
Update package.json
khoiddinh Mar 27, 2025
ccc2947
Update .gitignore
khoiddinh Mar 27, 2025
5973f63
Merge pull request #15 from hack4impact-upenn/feat/admin-speaker-pages
khoiddinh Mar 27, 2025
29159d0
eslint + error fix
khoiddinh Mar 27, 2025
62c292e
fixed test data to match speaker card
zhange2 Mar 27, 2025
9780de9
random fixes
zhange2 Mar 27, 2025
4112f2a
fixed admin dash label
khoiddinh Mar 27, 2025
e496a14
Merge pull request #16 from hack4impact-upenn/fix_formatting
khoiddinh Mar 27, 2025
272598f
changed boilerplate welcome message
khoiddinh Mar 28, 2025
80450ab
Merge pull request #17 from hack4impact-upenn/label_update
khoiddinh Mar 28, 2025
b63e014
added request form
khoiddinh Apr 6, 2025
1db8a01
Merge pull request #18 from hack4impact-upenn/request_speaker_form
khoiddinh Apr 6, 2025
6b9dbae
updated speaker model
WillardSun Apr 6, 2025
accbe8d
Merge branch 'addSpeakerUpdate' of https://github.com/hack4impact-upe…
WillardSun Apr 6, 2025
043ddfe
add all fields to speaker page
joshchen984 Apr 6, 2025
5558437
Merge remote-tracking branch 'origin/create-speaker-page' into addSpe…
WillardSun Apr 6, 2025
ee96d5a
Delete package-lock.json
khoiddinh Apr 6, 2025
6fc5a1e
Delete yarn.lock
khoiddinh Apr 6, 2025
0d39439
adding speaker to mongodb works
WillardSun Apr 6, 2025
968d220
Merge pull request #21 from hack4impact-upenn/addSpeakerUpdate
khoiddinh Apr 6, 2025
f7bea87
Merge branch 'main' into create-speaker-page
khoiddinh Apr 8, 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
10 changes: 0 additions & 10 deletions .eslintrc.js

This file was deleted.

82 changes: 41 additions & 41 deletions .github/workflows/dockerBuildAndDeploy.yaml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
name: Create and publish the Docker image
on:
push:
branches: ['main']
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Log in to the Container registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build and push client Docker image
uses: docker/build-push-action@v5
with:
context: ./client
push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:client
labels: ${{ steps.meta.outputs.labels }}
- name: Build and push server Docker image
uses: docker/build-push-action@v5
with:
context: ./server
push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:server
labels: ${{ steps.meta.outputs.labels }}
name: Create and publish the Docker image
on:
push:
branches: ["main"]
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Log in to the Container registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build and push client Docker image
uses: docker/build-push-action@v5
with:
context: ./client
push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:client
labels: ${{ steps.meta.outputs.labels }}
- name: Build and push server Docker image
uses: docker/build-push-action@v5
with:
context: ./server
push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:server
labels: ${{ steps.meta.outputs.labels }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ yarn-error.log
.env.test.local
.env.production.local
.terraform.env
.lock
5 changes: 0 additions & 5 deletions .prettierrc.js

This file was deleted.

20 changes: 13 additions & 7 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@reduxjs/toolkit": "^1.8.1",
"axios": "^1.1.2",
"cross-env": "^7.0.3",
"globals": "^16.0.0",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -62,15 +63,20 @@
"@types/react-dom": "^18.0.6",
"@types/react-redux": "^7.1.24",
"@types/styled-components": "^5.1.23",
"eslint": "^8.8.0",
"@typescript-eslint/eslint-plugin": "^8.28.0",
"@typescript-eslint/parser": "^8.28.0",
"eslint": "8.46.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-airbnb-typescript-prettier": "^5.0.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"prettier": "^2.5.1",
"typescript": "^4.4.2"
"eslint-config-prettier": "^10.1.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-prettier": "^5.2.5",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^5.2.0",
"prettier": "2",
"typescript": "^5.8.2"
},
"resolutions": {
"styled-components": "^5",
Expand Down
Binary file added client/public/defaultprofile.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/images/speaker-stock.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/images/teacher-stock.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading