Tom shlom - #3

Open

OhamjDung wants to merge 184 commits into

mainfrom

Commits on Feb 11, 2026

Update README.md
enayas
authored
227773a
Update weekly breakdown in README.md
enayas
authored
935ef8a
Add learning resources to README.md
enayas
authored
8dcaec1

Commits on Mar 1, 2026

Initial Frontend
SiriKishoreDola
committed
7e0a4f5

Commits on Mar 3, 2026

added backend folder
OhamjDung
committed
77c87d4
Merge pull request #1 from acm-projects/tom-shlom
OhamjDung
authored
783f438
Initialize Next
SiriKishoreDola
committed
b653407
Merge branch 'Siri'
SiriKishoreDola
committed
401baff
Deleting Frontend
PranayChintakunta
committed
a0010c8
Creating frontend
PranayChintakunta
committed
6b529ae

Commits on Mar 5, 2026

Initialized routing and map page
SiriKishoreDola
committed
a44c7c4
Landing page
PranayChintakunta
committed
85ca7b7
Merge branch 'main' of https://github.com/acm-projects/Rolemap
PranayChintakunta
committed
8afeed8

Commits on Mar 6, 2026

Landing page with Tailwind CSS and Sign Up/Login Buttons
PranayChintakunta
committed
0a5df80

Commits on Mar 7, 2026

Changes for adding auth
jonm02
committed
3c31066
Final check for auth changes
jonm02
committed
f91aaa3

Commits on Mar 9, 2026

Updated color scheme and added profile icon
SiriKishoreDola
committed
12b548c
Merge branch 'main' of https://github.com/acm-projects/Rolemap
SiriKishoreDola
committed
426b51d
Merge
SiriKishoreDola
committed
4c1c626

Commits on Mar 10, 2026

Navigation Bar Completed
PranayChintakunta
committed
294fabf
Drop down avatar menu
jonm02
committed
2368c21

Commits on Mar 11, 2026

Merge main into jon-montague: integrate color scheme updates and new pages
jonm02
committed
5caca63
Update page.tsx
jonm02
committed
55ea014
Updated UI and Dashboard
SiriKishoreDola
committed
00e6fe2

Commits on Mar 12, 2026

Updated text styling
SiriKishoreDola
committed
fa2d46a
Fixed issues
jonm02
committed
fce9839

Commits on Mar 19, 2026

Deleting Social Page
PranayChintakunta
committed
c377682

Commits on Mar 23, 2026

Everything
OhamjDung
committed
b3488e7
Everything
OhamjDung
committed
97f95ce
Github, Graph, Resume, 3 API Endpoints
OhamjDung
committed
3827e35
Github, Graph, Resume, 3 API Endpoints
OhamjDung
committed
c231cae

Commits on Mar 25, 2026

Onboarding pages/auth for google and github
jonm02
committed
a5fce6e
Updated map and dashboard page
SiriKishoreDola
committed
0574df5
Completed Landing Page and Daily Tasks Page
PranayChintakunta
committed
a7e05c7
navbar
SiriKishoreDola
committed
2e03e98
Revert "navbar"
SiriKishoreDola
committed
4ad5e83
navbar
SiriKishoreDola
committed
ed79664
remove navbar
SiriKishoreDola
committed
bfc266a
added navbar
SiriKishoreDola
committed
ea591f5
Merge remote-tracking branch 'origin/jon-montague' into pranay
PranayChintakunta
committed
72d671d
Task generation
OhamjDung
committed
1530031
Task generation
OhamjDung
committed
7fc1f43

Commits on Mar 26, 2026

Adding social page
PranayChintakunta
committed
5ec9cf8
quiz gen
OhamjDung
committed
c4c82ef
quiz gen
OhamjDung
committed
f1856f0
Merge remote-tracking branch 'origin/Siri2' into pranay
PranayChintakunta
committed
f0584ac

Commits on Mar 28, 2026

Merged Frontend
PranayChintakunta
committed
91ef494
quiz page added
SiriKishoreDola
committed
99b44c4
Added in SM-2(skill decay)
jonm02
committed
00e8ccf
Added in SM-2(skill decay)
jonm02
committed
66cac65
Merge branch 'pranay' of https://github.com/acm-projects/Rolemap into jon-montague
jonm02
committed
e6558d7
Merge branch 'pranay' of https://github.com/acm-projects/Rolemap into jon-montague
jonm02
committed
e377e9c

Commits on Mar 30, 2026

Updated map node borders
SiriKishoreDola
committed
4eafafb
Updated daily tasks page and icons added
PranayChintakunta
committed
d38ced3
Merge branch 'pranay' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
34fcb43

Commits on Mar 31, 2026

Commits on Apr 1, 2026

Pixelated Onboarding/Company page with reuseable components
PranayChintakunta
committed
7d59d74
Onboarding Integration and Map integration
OhamjDung
committed
0b3ae3f
Onboarding Integration and Map integration
OhamjDung
committed
fdef3f9
Mock data
OhamjDung
committed
de73d49
Mock data
OhamjDung
committed
4d1abca
type
OhamjDung
committed
8ef0718
type
OhamjDung
committed
b1bd41d
nav bar fixed and testing decay
jonm02
committed
b7a5411
nav bar fixed and testing decay
jonm02
committed
0746220

Commits on Apr 4, 2026

stuff
OhamjDung
committed
f317438
stuff
OhamjDung
committed
1e8aef3
Pixelated Onboarding Pages
PranayChintakunta
committed
9511110
Merge branch 'pranay' into jon-montague
jonm02
committed
9d373a0
Merge branch 'pranay' into jon-montague
jonm02
committed
2f445f9
Merge pranay branch
jonm02
committed
d4098ba
Merge pranay branch
jonm02
committed
403795d
map generation and ordering
OhamjDung
committed
843f10a
map generation and ordering
OhamjDung
committed
cec28c4

Commits on Apr 5, 2026

Commits on Apr 6, 2026

integration
OhamjDung
committed
8aba968
integration
OhamjDung
committed
92e6553
Remove .claude from tracking and add to .gitignore

OhamjDung
and
claude
committed
d35bc71
Remove .claude from tracking and add to .gitignore

OhamjDung
and
claude
committed
4971b42
removed stuff
OhamjDung
committed
a4d1795
removed stuff
OhamjDung
committed
1c436c1
copilot fixes
OhamjDung
committed
aa6b0d4
copilot fixes
OhamjDung
committed
4e041e3
Updated Dashboard Page
PranayChintakunta
committed
01c02f5
Updated Dashboard Page
PranayChintakunta
committed
c391f38
Misisng stuff
OhamjDung
committed
ad23d4a
Misisng stuff
OhamjDung
committed
1062e65

Commits on Apr 7, 2026

Shop added
jonm02
committed
0b95c8d
Shop added
jonm02
committed
73c3e87
Remove non-frontend files
OhamjDung
committed
3c3e995
Remove non-frontend files
OhamjDung
committed
5742818
Merge remote-tracking branch 'origin/tom-front' into jon-montague

Copilot
and
OhamjDung
authored
3693915
Merge remote-tracking branch 'origin/tom-front' into jon-montague

Copilot
and
OhamjDung
authored
2d66e67
Merge pull request #4 from acm-projects/jon-montague
OhamjDung
authored
a1e0221
Merge pull request #4 from acm-projects/jon-montague
OhamjDung
authored
b67d34b
Resolve merge conflicts: merge tom-front into pranay

Copilot
and
OhamjDung
authored
c878b70
Resolve merge conflicts: merge tom-front into pranay

Copilot
and
OhamjDung
authored
1128a29
add in shop
Jon Montague
committed
50311e9
add in shop
Jon Montague
committed
1a49f62
Unused / Fixed Roadmap gen
OhamjDung
committed
749abec
gitignore
OhamjDung
committed
5f0799f

Commits on Apr 8, 2026

Shop done
jonm02
committed
64b86c3
Shop done
jonm02
committed
83bb1ff
Merge tom-shlom: take backend + his frontend, keep our shop
jonm02
committed
92cbdbc
Merge tom-shlom: take backend + his frontend, keep our shop
jonm02
committed
5ed5bd3
Current 8 April Changes
SiriKishoreDola
committed
04e139b
Merge branch 'tom-shlom' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
ab9edc9
Merge branch 'pranay' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
fbe2b90
Merge branch 'jon-montague' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
67ce2bb
navbar
SiriKishoreDola
committed
892ef38
Chagesns
SiriKishoreDola
committed
bc3b01b
Final Dashboard page
PranayChintakunta
committed
d0cbfb4

Commits on Apr 12, 2026

Merge branch 'pranay' of https://github.com/acm-projects/Rolemap into pranay
PranayChintakunta
committed
6ad1366

Commits on Apr 14, 2026

merge progress frontend and backend
SiriKishoreDola
committed
1c51156
fixed app flow
SiriKishoreDola
committed
11b9a40
Current change
Pham
committed
185deee
test
Pham
committed
2404b8d

Commits on Apr 15, 2026

backend apis
jonm02
committed
d50cd0e

Commits on Apr 20, 2026

Merge origin/pranay into tom-shlom

OhamjDung
and
claude
committed
3826256
Merge origin/Siri2 into tom-shlom

OhamjDung
and
claude
committed
35f488d
Merge origin/jon-montague into tom-shlom

OhamjDung
and
claude
committed
8661ee3

Commits on Apr 21, 2026

updated map ui
SiriKishoreDola
committed
41ada8a
Jump and confetti added when node completed
jonm02
committed
0e5b568
Merged and accepted all incoming changes
PranayChintakunta
committed
029b958

Commits on Apr 22, 2026

Commits on Apr 23, 2026

Testin
OhamjDung
committed
ee00970
Added lil jump animation when you press on a node
OhamjDung
committed
038bd2c

Commits on Apr 24, 2026

assets + animations jumping from tab to tab
OhamjDung
committed
daac3a4
animation on task page for sprite
OhamjDung
committed
d7d368e
shop character animation
OhamjDung
committed
7c1563c

Commits on Apr 25, 2026

changed map background
SiriKishoreDola
committed
2903976
Merge branch 'main' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
0f62b32
animations for task and dashboard
OhamjDung
committed
18c678a
task auto scroll up to show the non completed task
OhamjDung
committed
771bfd6
character goes behind menu when scrolling in task
OhamjDung
committed
0db38da
resized char in dashboard
OhamjDung
committed
850ff61
Merge branch 'Siri2' of https://github.com/acm-projects/Rolemap into tom-shlom
OhamjDung
committed
5a8bcca
reverted
OhamjDung
committed
deb3c15
changed sky name
OhamjDung
committed
310eeb5
updated map, tasks, and shop page
SiriKishoreDola
committed
04e8ebe
Completed Profile Page
PranayChintakunta
committed
b630681

Commits on Apr 26, 2026

Merge branch 'pranay' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
2778e72
Changes after merging with Pranay
SiriKishoreDola
committed
0d9f35c
Merge branch 'pranay' into jon-montague
jonm02
committed
7073bbb
New colors to dashboard + copied Siri's background
jonm02
committed
9cddc18
Merge branch 'tom-shlom' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
2741b21
merge
SiriKishoreDola
committed
b0839a2
Added jon changes to frontend
OhamjDung
committed
43139a2

Commits on Apr 27, 2026

onboarding stylings
OhamjDung
committed
be4a126
updated map and tasks page
SiriKishoreDola
committed
6dd7011
Merge branch 'tom-shlom' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
9906e8e
Completed Landing Page
PranayChintakunta
committed
10f0632
merging
SiriKishoreDola
committed
c3e8c36
color changes - front end
jonm02
committed
aa3bc2b

Commits on Apr 28, 2026

Fixed Landing Page sizing and branch lines in hero section
PranayChintakunta
committed
1cbd356
Merge remote-tracking branch 'origin/Siri2' into jon-montague
jonm02
committed
79c0bd8
Updated xp constant, profile sprite same as all sprite, centered the sprite
jonm02
committed
b1a6b7f
4/28 merge
SiriKishoreDola
committed
ce3c939
merge
SiriKishoreDola
committed
872f969
Merge branch 'jon-montague' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
9b5181e
Merge branch 'pranay' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
4081083
onboarding changes
OhamjDung
committed
ea5c16b
Fixed Sky background
PranayChintakunta
committed
7f6d6a7
Merge branch 'pranay' of https://github.com/acm-projects/Rolemap into Siri2
SiriKishoreDola
committed
0168118
merge
SiriKishoreDola
committed
5ddcba1
onboarding changes teal to dark navy
OhamjDung
committed
bb96b59
Merge branch 'Siri2' of https://github.com/acm-projects/Rolemap into tom-shlom
OhamjDung
committed
e8abf76

Commits on Apr 29, 2026

;lkjs
OhamjDung
committed
2f6ad63
oh hel na
OhamjDung
committed
75a47fb
bruh
OhamjDung
committed
d46cbd7
new
SiriKishoreDola
committed
a8c21fd
Merge branch 'Siri2' of https://github.com/acm-projects/Rolemap into tom-shlom
OhamjDung
committed
526e434
WORKING DEMO V1?
OhamjDung
committed
8cd00e3
WORKING DEMO V2???
OhamjDung
committed
71060b4
Refresh mock onboarding data and task descriptions
OhamjDung
committed
e38ad36

Commits on Apr 30, 2026

WORKING DEMO DO NOT CHANGE

OhamjDung
and
Copilot
committed
39b744b