Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
d5a576b
Auth-o branch
RamsesCode Jul 30, 2025
64058a8
log in button and autho implemented but some errors on AuthO's side
RamsesCode Jul 30, 2025
bb8d4c1
Auth-o finished and fully working
RamsesCode Jul 31, 2025
3b78764
random push to fix merge
RamsesCode Jul 31, 2025
65a6a60
added webpack rule for images
Rend1027 Aug 1, 2025
46a99d9
added content to the landing page
Rend1027 Aug 1, 2025
a4226c4
Merge pull request #18 from Local-Beats/flo
Rend1027 Aug 1, 2025
69a10d7
changes but still not working for the momenent only error is browser …
RamsesCode Aug 1, 2025
f430123
Merge branch 'currently-playing' of github.com:Local-Beats/LocalBeats…
Rend1027 Aug 1, 2025
a3dc80f
created axios instance
Rend1027 Aug 1, 2025
bb29c7b
updated useEffect hook
Rend1027 Aug 1, 2025
ae34aef
updated app.jsx no longer need callback
Rend1027 Aug 1, 2025
107c968
fixed- can now recieve custom claim
Rend1027 Aug 2, 2025
733480e
feat- created Dashboard startin point
Rend1027 Aug 2, 2025
d49b626
Merge pull request #19 from Local-Beats/flo
Rend1027 Aug 3, 2025
a872c38
refactored- removed SI from source code
Rend1027 Aug 3, 2025
50940c8
refactored- send id token to backend
Rend1027 Aug 3, 2025
6cb9155
fixed- extract claim
Rend1027 Aug 3, 2025
7e9678a
fixed- Authorixation header
Rend1027 Aug 3, 2025
810bb3b
refactored- updated http request to fetch data from DB
Rend1027 Aug 4, 2025
018fbea
Merge pull request #20 from Local-Beats/flo
Rend1027 Aug 4, 2025
33decaa
resized logo
Rend1027 Aug 4, 2025
955674c
Merge pull request #21 from Local-Beats/flo
Rend1027 Aug 4, 2025
fead913
Updated package-lock.json file
MrRobot458 Aug 4, 2025
5d71a33
Merge branch 'main' of https://github.com/Local-Beats/LocalBeats-Fron…
MrRobot458 Aug 4, 2025
d8edf85
feat-Created listener Card
Rend1027 Aug 5, 2025
4f73aa9
feat-Created Active Listener component
Rend1027 Aug 5, 2025
ad74461
feat-created dummy content for listener card
Rend1027 Aug 5, 2025
3aa95c5
added some css to card
Rend1027 Aug 5, 2025
967044e
getting the track is not fully working and ready to be merged
RamsesCode Aug 5, 2025
f040592
commenting out line 26 which shows errors because its unused
RamsesCode Aug 5, 2025
9c601a6
commented console logs
Rend1027 Aug 5, 2025
2bb4709
Merge pull request #23 from Local-Beats/listener_card
Rend1027 Aug 5, 2025
4937d74
Merge branch 'track' of github.com:Local-Beats/LocalBeats-Frontend in…
Rend1027 Aug 5, 2025
3b8c8a9
Merge pull request #25 from Local-Beats/listener_card
Rend1027 Aug 5, 2025
769da9d
refactored- reconfigured our front-end so it only uses one axios inst…
Rend1027 Aug 5, 2025
1bcb3ed
fixed- diplay name
Rend1027 Aug 5, 2025
e6737e2
Merge pull request #26 from Local-Beats/flo
Rend1027 Aug 5, 2025
94219a5
location working must bring decoder to give us addresses
RamsesCode Aug 5, 2025
2622994
feat- added logic to add song to Song medel
Rend1027 Aug 6, 2025
59af33d
feat- created http request for session
Rend1027 Aug 6, 2025
9fe3c22
Maps moved to dashboard
RamsesCode Aug 6, 2025
6616463
refactored now playing
Rend1027 Aug 6, 2025
b45852a
refactored- finished refactoring front-end
Rend1027 Aug 6, 2025
a692ab9
feat- able to render one active listener
Rend1027 Aug 6, 2025
1e13793
fixing location issues
RamsesCode Aug 7, 2025
96aa9ab
feat- created request to close listening session
Rend1027 Aug 7, 2025
fcf2b2c
location as localbeat logo, and we should be able to see others locat…
RamsesCode Aug 7, 2025
6238b8b
able to update listening session
Rend1027 Aug 8, 2025
66bbf5c
not my changes but vs code says there changes left to commit
RamsesCode Aug 8, 2025
7736cc6
background proposal
RamsesCode Aug 8, 2025
4badbb1
making the web app responsive to its design by making sure one view i…
RamsesCode Aug 8, 2025
b9300de
css changes to landing page to make it more mobile friendly
RamsesCode Aug 8, 2025
3461aa3
removing the navbar buttons
RamsesCode Aug 8, 2025
13b5a23
logo placement
RamsesCode Aug 8, 2025
15a21fb
spotify logo as the button
RamsesCode Aug 8, 2025
fdd047e
landing page submitting for review
RamsesCode Aug 8, 2025
32e1e31
refactored-ActiveListener.jsx for optimization
Rend1027 Aug 8, 2025
9208665
fixed- changed const to let
Rend1027 Aug 9, 2025
dbee1bf
Merge branch 'main' into flo
Rend1027 Aug 9, 2025
a03dab5
Merge pull request #28 from Local-Beats/location
Rend1027 Aug 9, 2025
a35dacc
Resolve merge: keep ActiveListener.jsx, confirm NowPlaying.jsx removal
Rend1027 Aug 9, 2025
06f4250
merged google map
Rend1027 Aug 9, 2025
398891a
Merge pull request #29 from Local-Beats/flo
Rend1027 Aug 9, 2025
3dfca2e
final landing page
RamsesCode Aug 11, 2025
3ba01fb
Merge branch 'main' of https://github.com/Local-Beats/LocalBeats-Fron…
RamsesCode Aug 11, 2025
a0fc6dd
final landing page merged with main
RamsesCode Aug 11, 2025
2a91d69
Revert "final landing page merged with main"
RamsesCode Aug 12, 2025
eb8c05e
Revert "Merge branch 'main' of https://github.com/Local-Beats/LocalBe…
RamsesCode Aug 12, 2025
bb6320d
reverting changes to help return to a working state
RamsesCode Aug 12, 2025
afc5103
Revert "final landing page"
RamsesCode Aug 12, 2025
7b06227
setting up production
Rend1027 Aug 12, 2025
d5bc88c
migrated the landing page files to the proper channel and removed it …
RamsesCode Aug 12, 2025
54092e1
must merge with main to bring full functionality to the branch
RamsesCode Aug 12, 2025
ef17efb
change before merge
RamsesCode Aug 12, 2025
393a9ab
setting up production
Rend1027 Aug 12, 2025
67dd471
setting up production
Rend1027 Aug 12, 2025
4545ead
setting up production
Rend1027 Aug 12, 2025
f3f3d9c
setting up production
Rend1027 Aug 12, 2025
038ab3c
setting up production
Rend1027 Aug 12, 2025
1562097
setting up production
Rend1027 Aug 12, 2025
46563c1
setting up production
Rend1027 Aug 12, 2025
fe3b0d2
setting up production
Rend1027 Aug 12, 2025
fd58f74
merging with main
RamsesCode Aug 12, 2025
c3606de
not my changes but vs code says there changes left to commit
RamsesCode Aug 8, 2025
bfffd7a
final landing page
RamsesCode Aug 11, 2025
c0f83c7
Revert "Merge branch 'main' of https://github.com/Local-Beats/LocalBe…
RamsesCode Aug 12, 2025
528a338
Revert "final landing page"
RamsesCode Aug 12, 2025
c28dd19
migrated the landing page files to the proper channel and removed it …
RamsesCode Aug 12, 2025
4f800d9
final landing page
RamsesCode Aug 12, 2025
62b0b41
trying to fix the landing page and the dashboard
RamsesCode Aug 12, 2025
5fdf8a4
final landing page ready for pull request
RamsesCode Aug 12, 2025
db51919
Merge pull request #30 from Local-Beats/css-ramses
Rend1027 Aug 12, 2025
3e654bb
fixed import typo
Rend1027 Aug 12, 2025
50bf769
Merge pull request #31 from Local-Beats/flo
Rend1027 Aug 12, 2025
d2c77e6
map now shows well on phone
RamsesCode Aug 12, 2025
2164090
navbar fully functional but not ready for merge to main
RamsesCode Aug 13, 2025
b35ef20
map has been made mobile friendly and does not collide with the navba…
RamsesCode Aug 13, 2025
586de31
this is a checkpoint incase i mess up from this point on, at this poi…
RamsesCode Aug 13, 2025
8275f50
the pop out for the hamburger nav bar is popping out correctly now, n…
RamsesCode Aug 13, 2025
984f19c
navbar and map fully working, checkpoint for working on the view once…
RamsesCode Aug 13, 2025
8421220
navbar position fixed along with username
RamsesCode Aug 13, 2025
6f43698
Back to Map button refreshing the page as intended
RamsesCode Aug 13, 2025
e6a57fb
refresh of the map using setMapKey for a better user experience, its …
RamsesCode Aug 13, 2025
fb9b24e
back to map centered and display fixed
RamsesCode Aug 13, 2025
4c69b98
fixed- lister card is dynamic now
Rend1027 Aug 13, 2025
ebb09fb
making sure components do not hover over navbar as the user scrolls down
RamsesCode Aug 13, 2025
bb3a715
Merge pull request #32 from Local-Beats/ramses-dashboard
Rend1027 Aug 13, 2025
06c015a
Merge branch 'main' into flo
Rend1027 Aug 13, 2025
9aad295
log out button fixed and redirected to the landing page for a better …
RamsesCode Aug 13, 2025
2669c83
Merge pull request #33 from Local-Beats/flo
Rend1027 Aug 13, 2025
b57fd7b
removed now playing
Rend1027 Aug 13, 2025
2c8cb66
Merge pull request #35 from Local-Beats/flo
Rend1027 Aug 13, 2025
688793d
Merge pull request #34 from Local-Beats/ramses-dashboard
Rend1027 Aug 13, 2025
351e775
fixed- added props to ActiveListener
Rend1027 Aug 13, 2025
da9e76a
Merge pull request #36 from Local-Beats/flo
Rend1027 Aug 13, 2025
a5d5664
updated the button to List for the Dashboard map page
AmyLuSunshine Aug 13, 2025
2870969
Merge branch 'main' into dashboard-new
AmyLuSunshine Aug 13, 2025
2344e8e
refactor: update Dashboard and ListenerCard styles and structure for …
AmyLuSunshine Aug 13, 2025
8ebadd1
fix: remove unnecessary Icon component from Dashboard button
AmyLuSunshine Aug 13, 2025
d50f981
feat: add Material-UI and Emotion for styling; enhance Dashboard and …
AmyLuSunshine Aug 13, 2025
68de7f6
map test 1
RamsesCode Aug 13, 2025
3281285
Merge pull request #37 from Local-Beats/ramses-map
Rend1027 Aug 13, 2025
9be98b1
Merge branch 'main' into dashboard-new
Rend1027 Aug 13, 2025
e26a2b9
map test 2
RamsesCode Aug 13, 2025
b2ea117
fixed bug on sessions
Rend1027 Aug 13, 2025
8cc8daf
Merge branch 'main' into flo
Rend1027 Aug 13, 2025
6f2cd5e
Merge pull request #39 from Local-Beats/flo
Rend1027 Aug 13, 2025
8a3465c
map test 3
RamsesCode Aug 13, 2025
ac27be6
Merge branch 'main' of https://github.com/Local-Beats/LocalBeats-Fron…
RamsesCode Aug 13, 2025
31584d3
Merge pull request #40 from Local-Beats/ramses-quick
RamsesCode Aug 13, 2025
c796f80
minor map reload fix
RamsesCode Aug 13, 2025
25139b8
Merge pull request #41 from Local-Beats/mapreload
RamsesCode Aug 13, 2025
4e11f2c
Merge branch 'dashboard-new' of https://github.com/Local-Beats/LocalB…
Rend1027 Aug 13, 2025
a1e1d08
Merge branch 'main' into flo
Rend1027 Aug 13, 2025
eba3c46
Merge pull request #42 from Local-Beats/flo
Rend1027 Aug 13, 2025
9bed0b0
map reload hopefully it works now
RamsesCode Aug 13, 2025
bae4b77
merge to main ready
RamsesCode Aug 13, 2025
4a05225
Merge pull request #43 from Local-Beats/mapreload
RamsesCode Aug 13, 2025
b04a4f8
working icon before pull from main
AmyLuSunshine Aug 13, 2025
f95e4ed
updated the spotify link
AmyLuSunshine Aug 13, 2025
fec9fbb
testing out the container gap for acrive listener page
AmyLuSunshine Aug 13, 2025
21edfa1
localbeats.png
AmyLuSunshine Aug 18, 2025
375a1b7
Add files via upload
AmyLuSunshine Aug 19, 2025
40a306a
Add files via upload
AmyLuSunshine Aug 19, 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
Binary file added .DS_Store
Binary file not shown.
4 changes: 0 additions & 4 deletions .env.example

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules
.env
dist/main.*
dist/main.*

.DS_Store
Binary file added LocalBeats.png
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 dist/images/3a426ca7e83eb4d81d6e.png
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 dist/images/ef3dfda9668f59f80dbd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 17 additions & 11 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" href="favicon.ico" />
<title>Capstone 1</title>
<script defer src="main.js"></script>
</head>
<body>
<div id="root"></div>
</body>
</html>

<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- ⚠️ Only for development -->
<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline' 'unsafe-eval' data: blob:;">

<link rel="icon" href="favicon.ico" />
<title>Capstone 1</title>
<script defer src="main.js"></script>
</head>

<body>
<div id="root"></div>
</body>

</html>
Loading