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

Merge changes from dev into master #30

Merged
merged 25 commits into from
Mar 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bf2a4f1
remove api folder, cleanup code
Firebird1029 Mar 24, 2024
bf6e41e
Merge pull request #27 from Firebird1029/delete-api-folder
davidcrair Mar 29, 2024
9ae50d4
Round genres shared percentage
davidcrair Mar 29, 2024
a55ef98
Update user data and unify page
davidcrair Mar 29, 2024
798c544
Bug fix: Add rounding matching artists
davidcrair Mar 29, 2024
affc6bb
Update UnifyContent.jsx
davidcrair Mar 29, 2024
dbf4742
Update enter code button to log out
davidcrair Mar 29, 2024
c426458
Update redirect in unify when not logged in
davidcrair Mar 29, 2024
f6c52a3
Update Pie Charts
hoixw Mar 29, 2024
7059c3e
Update error messages
davidcrair Mar 30, 2024
a81484c
Add errors to user page and unify page
davidcrair Mar 30, 2024
492dd67
Redirect /user/ to user page
davidcrair Mar 30, 2024
057e07b
Update page.jsx
davidcrair Mar 30, 2024
458c213
Update page.jsx
davidcrair Mar 30, 2024
e9949ab
Update frontend.t.js.snap
davidcrair Mar 30, 2024
f73be06
Merge pull request #28 from Firebird1029/deployment_fixes
hoixw Mar 30, 2024
910c941
Update README.md
davidcrair Mar 30, 2024
74a63e3
Merge pull request #29 from Firebird1029/update_readme
hoixw Mar 30, 2024
70bf057
Merge pull request #31 from Firebird1029/master
davidcrair Mar 30, 2024
7973b48
Update index_content.jsx
davidcrair Mar 30, 2024
e598f6b
Merge branch 'dev' of https://github.com/Firebird1029/unify-cs439 int…
davidcrair Mar 30, 2024
5df4345
Update index_content.jsx
davidcrair Mar 30, 2024
fc29ff2
Update README.md
davidcrair Mar 30, 2024
a354a02
Update README.md
davidcrair Mar 30, 2024
75d0c86
Merge pull request #32 from Firebird1029/fix_lint
hoixw Mar 30, 2024
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: 5 additions & 5 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
NEXT_PUBLIC_CLIENT_ID="319f3f19b0794ac28b1df51ca946609c"
# NEXT_PUBLIC_CLIENT_ID="319f3f19b0794ac28b1df51ca946609c"
# NEXT_PUBLIC_AUTH_ENDPOINT="https://accounts.spotify.com/authorize"
# NEXT_PUBLIC_RESPONSE_TYPE="token"
# NEXT_PUBLIC_BACKEND_URL="http://localhost:3001"
NEXT_PUBLIC_REDIRECT_URI="http://localhost:3000/auth/callback"
NEXT_PUBLIC_AUTH_ENDPOINT="https://accounts.spotify.com/authorize"
NEXT_PUBLIC_RESPONSE_TYPE="token"
NEXT_PUBLIC_BACKEND_URL="http://localhost:3001"
NEXT_PUBLIC_FRONTENT_URL="localhost:3000"
NEXT_PUBLIC_FRONTEND_URL="localhost:3000"
NEXT_PUBLIC_SUPABASE_URL=https://dkuewaaupmoqazilskoo.supabase.co
NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImRrdWV3YWF1cG1vcWF6aWxza29vIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MTA4MTc1MjIsImV4cCI6MjAyNjM5MzUyMn0.KgPgXhCY0jZxmUh9lOAYNcVBQFBU3vuSnl3Yfid_U6g
29 changes: 6 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,11 @@

```bash
npm install
touch api/.env
```

## Development

To start the frontend and backend locally together, simply run `npm run dev`. Ctrl+C will kill both processes.

### Frontend

To run the frontend application in development:

```bash
npm run next-dev
```

Access it from `localhost:3000`.

### Backend

To run the backend server in development:

```bash
npm run server-dev
```

Access it from `localhost:3001`.
To start the application, simply run `npm run dev`. You can access it from `localhost:3000`.

## Testing

Expand All @@ -49,4 +28,8 @@ npm run lint

## Production & Deployment

Coming soon!
The application is deployed at [http://unify-cs439.vercel.app](http://unify-cs439.vercel.app).\
You can view an example of a user data page at [http://unify-cs439.vercel.app/user/testuser](http://unify-cs439.vercel.app/user/testuser)\
You can view an example of a unify data page at [http://unify-cs439.vercel.app/unify/testuser&byee1029](http://unify-cs439.vercel.app/unify/testuser&byee1029)\
To log in with Spotify, you must be a registered user, as the app is in development (on Spotify's end).\
Contact <david.crair@yale.edu> to be added as a user.
2 changes: 1 addition & 1 deletion __tests__/__snapshots__/frontend.t.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ exports[`Index Component matches the snapshot 1`] = `
style="cursor: pointer;"
/>
<path
d="M1029.28 392H1019.58C1019.5 392 1019.47 391.951 1019.47 391.854L1019.5 371.243C1019.5 371.165 1019.53 371.126 1019.61 371.126H1029.25C1029.33 371.126 1029.37 371.175 1029.37 371.272V374.627C1029.37 374.705 1029.33 374.744 1029.25 374.744H1023.1V379.432H1029.25C1029.33 379.432 1029.37 379.471 1029.37 379.549L1029.4 382.947C1029.4 383.025 1029.36 383.064 1029.28 383.064H1023.1V388.309H1029.28C1029.36 388.309 1029.4 388.357 1029.4 388.455V391.883C1029.4 391.961 1029.36 392 1029.28 392ZM1035.33 392H1032.33C1032.17 392 1032.09 391.932 1032.09 391.795L1032.06 371.36C1032.06 371.204 1032.14 371.126 1032.3 371.126H1035.01L1040.08 382.947L1039.93 371.36C1039.93 371.204 1040.02 371.126 1040.19 371.126H1043.17C1043.28 371.126 1043.34 371.204 1043.34 371.36L1043.37 391.824C1043.37 391.941 1043.32 392 1043.23 392H1040.59L1035.39 380.955L1035.61 391.766C1035.61 391.922 1035.52 392 1035.33 392ZM1052.38 392H1049C1048.91 392 1048.87 391.951 1048.87 391.854V374.744H1044.97C1044.87 374.744 1044.82 374.695 1044.82 374.598L1044.85 371.243C1044.85 371.165 1044.89 371.126 1044.97 371.126H1056.37C1056.47 371.126 1056.53 371.165 1056.53 371.243V374.598C1056.53 374.695 1056.49 374.744 1056.41 374.744H1052.47L1052.5 391.854C1052.5 391.951 1052.46 392 1052.38 392ZM1067.81 392H1058.11C1058.03 392 1057.99 391.951 1057.99 391.854L1058.02 371.243C1058.02 371.165 1058.06 371.126 1058.14 371.126H1067.78C1067.85 371.126 1067.89 371.175 1067.89 371.272V374.627C1067.89 374.705 1067.85 374.744 1067.78 374.744H1061.62V379.432H1067.78C1067.85 379.432 1067.89 379.471 1067.89 379.549L1067.92 382.947C1067.92 383.025 1067.88 383.064 1067.81 383.064H1061.62V388.309H1067.81C1067.88 388.309 1067.92 388.357 1067.92 388.455V391.883C1067.92 391.961 1067.88 392 1067.81 392ZM1074.1 392H1070.71C1070.63 392 1070.59 391.951 1070.59 391.854L1070.65 371.243C1070.65 371.165 1070.69 371.126 1070.76 371.126H1076.83C1077.91 371.126 1078.91 371.39 1079.82 371.917C1080.73 372.444 1081.45 373.152 1081.99 374.041C1082.53 374.93 1082.81 375.936 1082.81 377.059C1082.81 377.791 1082.69 378.455 1082.47 379.051C1082.24 379.646 1081.98 380.149 1081.68 380.56C1081.38 380.97 1081.12 381.272 1080.87 381.468C1081.96 382.669 1082.5 384.08 1082.5 385.701L1082.53 391.854C1082.53 391.951 1082.48 392 1082.38 392H1078.98C1078.9 392 1078.87 391.971 1078.87 391.912V385.701C1078.87 384.979 1078.61 384.354 1078.1 383.826C1077.6 383.299 1076.97 383.035 1076.23 383.035H1074.25L1074.22 391.854C1074.22 391.951 1074.18 392 1074.1 392ZM1076.83 374.715H1074.25V379.432H1076.83C1077.44 379.432 1077.99 379.202 1078.47 378.743C1078.96 378.284 1079.2 377.723 1079.2 377.059C1079.2 376.424 1078.97 375.877 1078.5 375.418C1078.03 374.949 1077.47 374.715 1076.83 374.715ZM1098.38 392.293C1097.29 392.293 1096.3 392.02 1095.4 391.473C1094.51 390.926 1093.81 390.193 1093.28 389.275C1092.76 388.348 1092.5 387.317 1092.5 386.185L1092.53 376.824C1092.53 375.711 1092.79 374.705 1093.29 373.807C1093.8 372.898 1094.5 372.171 1095.39 371.624C1096.29 371.067 1097.28 370.789 1098.38 370.789C1099.49 370.789 1100.48 371.058 1101.35 371.595C1102.23 372.132 1102.93 372.859 1103.45 373.777C1103.97 374.686 1104.24 375.701 1104.24 376.824V378.201C1104.24 378.279 1104.2 378.318 1104.12 378.318H1100.75C1100.67 378.318 1100.63 378.279 1100.63 378.201V376.824C1100.63 376.16 1100.42 375.589 1099.99 375.11C1099.56 374.632 1099.02 374.393 1098.38 374.393C1097.66 374.393 1097.12 374.637 1096.74 375.125C1096.36 375.613 1096.17 376.18 1096.17 376.824V386.185C1096.17 386.917 1096.38 387.518 1096.81 387.986C1097.24 388.445 1097.76 388.675 1098.38 388.675C1099.02 388.675 1099.56 388.421 1099.99 387.913C1100.42 387.396 1100.63 386.819 1100.63 386.185V384.793C1100.63 384.715 1100.67 384.676 1100.75 384.676H1104.15C1104.23 384.676 1104.27 384.715 1104.27 384.793V386.185C1104.27 387.308 1104 388.333 1103.47 389.261C1102.94 390.179 1102.23 390.916 1101.35 391.473C1100.47 392.02 1099.48 392.293 1098.38 392.293ZM1112 392.293C1110.94 392.293 1109.95 392.02 1109.06 391.473C1108.17 390.926 1107.45 390.198 1106.9 389.29C1106.37 388.372 1106.1 387.366 1106.1 386.272L1106.13 376.766C1106.13 375.652 1106.39 374.651 1106.93 373.763C1107.46 372.864 1108.17 372.146 1109.07 371.609C1109.97 371.062 1110.95 370.789 1112 370.789C1113.09 370.789 1114.08 371.058 1114.94 371.595C1115.82 372.132 1116.53 372.854 1117.05 373.763C1117.59 374.661 1117.86 375.662 1117.86 376.766L1117.89 386.272C1117.89 387.366 1117.62 388.367 1117.1 389.275C1116.56 390.193 1115.85 390.926 1114.96 391.473C1114.07 392.02 1113.08 392.293 1112 392.293ZM1112 388.675C1112.61 388.675 1113.13 388.431 1113.58 387.942C1114.03 387.444 1114.26 386.888 1114.26 386.272L1114.23 376.766C1114.23 376.102 1114.02 375.54 1113.6 375.081C1113.18 374.622 1112.64 374.393 1112 374.393C1111.38 374.393 1110.86 374.617 1110.42 375.066C1109.98 375.516 1109.76 376.082 1109.76 376.766V386.272C1109.76 386.927 1109.98 387.493 1110.42 387.972C1110.86 388.44 1111.38 388.675 1112 388.675ZM1125.68 391.971L1120.31 392C1120.21 392 1120.16 391.951 1120.16 391.854L1120.22 371.243C1120.22 371.165 1120.26 371.126 1120.33 371.126L1125.95 371.097C1127.06 371.067 1128.06 371.321 1128.96 371.858C1129.87 372.396 1130.59 373.123 1131.13 374.041C1131.68 374.949 1131.95 375.955 1131.95 377.059V385.672C1131.95 386.824 1131.67 387.879 1131.12 388.836C1130.55 389.783 1129.8 390.54 1128.86 391.106C1127.92 391.663 1126.86 391.951 1125.68 391.971ZM1125.95 374.686L1123.85 374.715L1123.82 388.309H1125.68C1126.42 388.309 1127.05 388.05 1127.56 387.532C1128.06 387.015 1128.32 386.395 1128.32 385.672V377.029C1128.32 376.395 1128.08 375.843 1127.62 375.374C1127.15 374.896 1126.59 374.666 1125.95 374.686ZM1144.12 392H1134.43C1134.35 392 1134.31 391.951 1134.31 391.854L1134.34 371.243C1134.34 371.165 1134.38 371.126 1134.46 371.126H1144.09C1144.17 371.126 1144.21 371.175 1144.21 371.272V374.627C1144.21 374.705 1144.17 374.744 1144.09 374.744H1137.94V379.432H1144.09C1144.17 379.432 1144.21 379.471 1144.21 379.549L1144.24 382.947C1144.24 383.025 1144.2 383.064 1144.12 383.064H1137.94V388.309H1144.12C1144.2 388.309 1144.24 388.357 1144.24 388.455V391.883C1144.24 391.961 1144.2 392 1144.12 392Z"
d="M1050.27 392H1040.58C1040.5 392 1040.46 391.951 1040.46 391.854L1040.49 371.272C1040.49 371.175 1040.54 371.126 1040.63 371.126H1043.97C1044.07 371.126 1044.12 371.175 1044.12 371.272L1044.09 388.309H1050.27C1050.37 388.309 1050.42 388.357 1050.42 388.455V391.854C1050.42 391.951 1050.37 392 1050.27 392ZM1057.93 392.293C1056.87 392.293 1055.89 392.02 1054.99 391.473C1054.1 390.926 1053.38 390.198 1052.84 389.29C1052.3 388.372 1052.03 387.366 1052.03 386.272L1052.06 376.766C1052.06 375.652 1052.33 374.651 1052.87 373.763C1053.39 372.864 1054.11 372.146 1055 371.609C1055.9 371.062 1056.88 370.789 1057.93 370.789C1059.03 370.789 1060.01 371.058 1060.88 371.595C1061.76 372.132 1062.46 372.854 1062.99 373.763C1063.53 374.661 1063.79 375.662 1063.79 376.766L1063.82 386.272C1063.82 387.366 1063.56 388.367 1063.03 389.275C1062.5 390.193 1061.78 390.926 1060.89 391.473C1060 392.02 1059.02 392.293 1057.93 392.293ZM1057.93 388.675C1058.54 388.675 1059.07 388.431 1059.52 387.942C1059.97 387.444 1060.19 386.888 1060.19 386.272L1060.16 376.766C1060.16 376.102 1059.95 375.54 1059.53 375.081C1059.11 374.622 1058.58 374.393 1057.93 374.393C1057.32 374.393 1056.79 374.617 1056.35 375.066C1055.91 375.516 1055.69 376.082 1055.69 376.766V386.272C1055.69 386.927 1055.91 387.493 1056.35 387.972C1056.79 388.44 1057.32 388.675 1057.93 388.675ZM1071.59 392.293C1070.5 392.293 1069.53 392.024 1068.66 391.487C1067.78 390.95 1067.07 390.228 1066.53 389.319C1066.01 388.411 1065.74 387.396 1065.74 386.272V376.766C1065.74 375.672 1066.01 374.676 1066.55 373.777C1067.08 372.869 1067.78 372.146 1068.67 371.609C1069.56 371.062 1070.53 370.789 1071.59 370.789C1072.69 370.789 1073.69 371.053 1074.58 371.58C1075.46 372.117 1076.17 372.835 1076.68 373.733C1077.21 374.632 1077.48 375.643 1077.48 376.766V378.143C1077.48 378.221 1077.43 378.26 1077.33 378.26H1073.96C1073.88 378.26 1073.84 378.221 1073.84 378.143V377C1073.84 376.238 1073.63 375.608 1073.2 375.11C1072.77 374.612 1072.23 374.363 1071.59 374.363C1071.01 374.363 1070.5 374.603 1070.05 375.081C1069.6 375.56 1069.38 376.121 1069.38 376.766V386.272C1069.38 386.927 1069.59 387.493 1070.03 387.972C1070.47 388.44 1070.99 388.675 1071.59 388.675C1072.23 388.675 1072.77 388.445 1073.2 387.986C1073.63 387.518 1073.84 386.946 1073.84 386.272V384.793H1071.75C1071.64 384.793 1071.59 384.744 1071.59 384.646V381.292C1071.59 381.194 1071.64 381.146 1071.75 381.146H1077.36C1077.44 381.146 1077.48 381.194 1077.48 381.292V386.272C1077.48 387.396 1077.21 388.411 1076.68 389.319C1076.15 390.228 1075.44 390.95 1074.56 391.487C1073.68 392.024 1072.69 392.293 1071.59 392.293ZM1092.94 392.293C1091.88 392.293 1090.9 392.02 1090 391.473C1089.11 390.926 1088.39 390.198 1087.85 389.29C1087.31 388.372 1087.04 387.366 1087.04 386.272L1087.07 376.766C1087.07 375.652 1087.34 374.651 1087.88 373.763C1088.4 372.864 1089.12 372.146 1090.01 371.609C1090.91 371.062 1091.89 370.789 1092.94 370.789C1094.04 370.789 1095.02 371.058 1095.89 371.595C1096.77 372.132 1097.47 372.854 1098 373.763C1098.54 374.661 1098.8 375.662 1098.8 376.766L1098.83 386.272C1098.83 387.366 1098.57 388.367 1098.04 389.275C1097.5 390.193 1096.79 390.926 1095.9 391.473C1095.01 392.02 1094.03 392.293 1092.94 392.293ZM1092.94 388.675C1093.55 388.675 1094.08 388.431 1094.53 387.942C1094.98 387.444 1095.2 386.888 1095.2 386.272L1095.17 376.766C1095.17 376.102 1094.96 375.54 1094.54 375.081C1094.12 374.622 1093.59 374.393 1092.94 374.393C1092.33 374.393 1091.8 374.617 1091.36 375.066C1090.92 375.516 1090.7 376.082 1090.7 376.766V386.272C1090.7 386.927 1090.92 387.493 1091.36 387.972C1091.8 388.44 1092.33 388.675 1092.94 388.675ZM1106.63 392.293C1105.57 392.293 1104.59 392.02 1103.7 391.473C1102.8 390.926 1102.08 390.193 1101.54 389.275C1101.02 388.348 1100.75 387.337 1100.75 386.243L1100.81 371.243C1100.81 371.165 1100.85 371.126 1100.93 371.126H1104.3C1104.38 371.126 1104.41 371.165 1104.41 371.243V386.243C1104.41 386.917 1104.63 387.493 1105.06 387.972C1105.49 388.44 1106.01 388.675 1106.63 388.675C1107.27 388.675 1107.81 388.44 1108.24 387.972C1108.67 387.493 1108.88 386.917 1108.88 386.243V371.243C1108.88 371.165 1108.92 371.126 1109 371.126H1112.37C1112.45 371.126 1112.49 371.165 1112.49 371.243L1112.54 386.243C1112.54 387.347 1112.28 388.362 1111.75 389.29C1111.22 390.208 1110.5 390.94 1109.61 391.487C1108.73 392.024 1107.73 392.293 1106.63 392.293ZM1121.3 392H1117.92C1117.83 392 1117.79 391.951 1117.79 391.854V374.744H1113.89C1113.79 374.744 1113.75 374.695 1113.75 374.598L1113.77 371.243C1113.77 371.165 1113.81 371.126 1113.89 371.126H1125.29C1125.4 371.126 1125.45 371.165 1125.45 371.243V374.598C1125.45 374.695 1125.41 374.744 1125.33 374.744H1121.39L1121.42 391.854C1121.42 391.951 1121.38 392 1121.3 392Z"
fill="black"
style="cursor: pointer;"
/>
Expand Down
77 changes: 0 additions & 77 deletions __tests__/backend.t.js

This file was deleted.

1 change: 0 additions & 1 deletion api/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions api/index.js

This file was deleted.

Loading