Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
b7b3a69
First frank commit
Frank-cntrl Jul 11, 2025
1e01aab
Franks first commit
Frank-cntrl Jul 11, 2025
9edeae2
initial commit
baryaakov555 Jul 11, 2025
499c5ab
Initial commit
AlexNurci Jul 11, 2025
3094294
Made profile/me view
Frank-cntrl Jul 14, 2025
a56cbc4
Added friends page with placeholder photos and css
AlexNurci Jul 14, 2025
d0f19b3
Merge pull request #3 from TabulaRasae/frank
AlexNurci Jul 14, 2025
1ff1273
Merge branch 'main' into alex
AlexNurci Jul 14, 2025
fd94651
Merge pull request #4 from TabulaRasae/alex
Frank-cntrl Jul 14, 2025
2431ada
Solved URL error
AlexNurci Jul 14, 2025
715f518
Merge pull request #5 from TabulaRasae/alex2
Frank-cntrl Jul 14, 2025
f27d16d
Added Poll list and New Poll components, waiting for backend to test …
AlexNurci Jul 14, 2025
df664a4
Merge pull request #6 from TabulaRasae/alex
Frank-cntrl Jul 14, 2025
2124f83
profile/me page calls for data from back end
Frank-cntrl Jul 15, 2025
a021ea5
Made frontend work with backend
AlexNurci Jul 15, 2025
1e4c696
Merge pull request #9 from TabulaRasae/alex
Frank-cntrl Jul 15, 2025
f94d3fd
Merge branch 'main' into frank
Frank-cntrl Jul 15, 2025
190f0ce
Merge pull request #10 from TabulaRasae/frank
AlexNurci Jul 15, 2025
ddb8cce
Connected Poll Creation with Poll List, not fully connected with back…
AlexNurci Jul 15, 2025
d1fe3b1
test
baryaakov555 Jul 15, 2025
07948ae
All polls and poll card
Frank-cntrl Jul 15, 2025
ad0bea6
added an all users page
baryaakov555 Jul 15, 2025
28460cd
added a way to go to a specific user's page when clicking the user ca…
baryaakov555 Jul 15, 2025
4c52371
added the user card component
baryaakov555 Jul 15, 2025
238ec7b
Merge pull request #15 from TabulaRasae/frank
baryaakov555 Jul 15, 2025
c21a112
Merge branch 'main' into bar
baryaakov555 Jul 15, 2025
fe4d826
Merge pull request #17 from TabulaRasae/bar
TabulaRasae Jul 15, 2025
90e6e80
resolved conflict
baryaakov555 Jul 15, 2025
0ae440b
Added Dropdown Menu to the Navbar and added CSS to it
AlexNurci Jul 15, 2025
e82ef6b
Merge branch 'main' into alex
TabulaRasae Jul 15, 2025
8ff8c10
Merge pull request #18 from TabulaRasae/alex
TabulaRasae Jul 15, 2025
5f439f4
Franks work 07/15
Frank-cntrl Jul 15, 2025
debe439
Connected Poll Creation with Poll List, not fully connected with back…
AlexNurci Jul 15, 2025
ec57723
Added Dropdown Menu to the Navbar and added CSS to it
AlexNurci Jul 15, 2025
d5d49bd
test
baryaakov555 Jul 15, 2025
d159812
added a way to go to a specific user's page when clicking the user ca…
baryaakov555 Jul 15, 2025
5c52043
added the user card component
baryaakov555 Jul 15, 2025
8169ab8
New poll form, and poll list, and poll cards
Frank-cntrl Jul 15, 2025
5fd1b8a
Added space
Frank-cntrl Jul 15, 2025
723a061
Merge branch 'main' into frank
Frank-cntrl Jul 15, 2025
e530b8f
Merge pull request #20 from TabulaRasae/frank
TabulaRasae Jul 15, 2025
6a441d1
Minor bug fix
Frank-cntrl Jul 15, 2025
54aee49
Single poll view
Frank-cntrl Jul 16, 2025
1bb6fb8
Merge branch 'main' into frank
Frank-cntrl Jul 16, 2025
53e01dc
Merge pull request #25 from TabulaRasae/frank
Frank-cntrl Jul 16, 2025
07483b6
DO NOT MERGE, added search options to users and friends page, also ad…
baryaakov555 Jul 16, 2025
5ed66b4
pulled from main
baryaakov555 Jul 16, 2025
4daed26
added polls created by the user to the user card
baryaakov555 Jul 16, 2025
227fc68
Merge pull request #27 from TabulaRasae/bar
Frank-cntrl Jul 16, 2025
315e223
Frank
Frank-cntrl Jul 16, 2025
390e5ba
Merge pull request #28 from TabulaRasae/frank
Frank-cntrl Jul 16, 2025
3fcacc3
Minor bug fixes
Frank-cntrl Jul 17, 2025
a5213f9
Created voting form
Frank-cntrl Jul 17, 2025
32eb449
Merge pull request #29 from TabulaRasae/frank
TabulaRasae Jul 17, 2025
5facbd0
Published Polls have a chart with current results
TabulaRasae Jul 18, 2025
c40be6e
Styled the current winner component
TabulaRasae Jul 18, 2025
f920465
Merge pull request #30 from TabulaRasae/IRVResults
Frank-cntrl Jul 18, 2025
1bb088f
Draft poll progress
AlexNurci Jul 18, 2025
35012d5
Fixed refresh issue
Frank-cntrl Jul 18, 2025
f6ee911
Merge pull request #32 from TabulaRasae/frank
baryaakov555 Jul 18, 2025
703ea44
Added anonymous voting option functionality
Frank-cntrl Jul 18, 2025
0f61868
Merge pull request #33 from TabulaRasae/frank
Frank-cntrl Jul 18, 2025
b5e63b5
Logged out users have a poll list butotn on their nav bar
Frank-cntrl Jul 18, 2025
9239603
Merge pull request #34 from TabulaRasae/frank
Frank-cntrl Jul 18, 2025
adf486e
Draft Poll
AlexNurci Jul 21, 2025
94179aa
Added Draft Poll and Duplicate Poll
AlexNurci Jul 21, 2025
b081653
Merge branch 'main' into alex
Frank-cntrl Jul 21, 2025
c2e337b
Merge pull request #35 from TabulaRasae/alex
Frank-cntrl Jul 21, 2025
11f15b4
.
baryaakov555 Jul 21, 2025
3b31d9e
Merge branch 'main' into bar
Frank-cntrl Jul 21, 2025
e7ba326
Merge pull request #36 from TabulaRasae/bar
Frank-cntrl Jul 21, 2025
4eb7908
.
Frank-cntrl Jul 21, 2025
916e85a
Latest changes added, everything is working
AlexNurci Jul 21, 2025
cac5c2e
Merge pull request #37 from TabulaRasae/alex
Frank-cntrl Jul 21, 2025
016ebdd
.
baryaakov555 Jul 21, 2025
20e221f
.
baryaakov555 Jul 21, 2025
f764c64
Only admins are able to get the list of all users
TabulaRasae Jul 21, 2025
3f7859c
All Users link in the navbar is hidden from the regular users
TabulaRasae Jul 21, 2025
4cc32be
Added home and landing pages
baryaakov555 Jul 21, 2025
6d79400
Added home and landing pages
baryaakov555 Jul 21, 2025
3d7f9c8
Admin related additions
TabulaRasae Jul 22, 2025
960b510
fixed the api route
TabulaRasae Jul 22, 2025
bf751cf
.
baryaakov555 Jul 21, 2025
84d5ae7
Edit profile and copy to clipboard
Frank-cntrl Jul 22, 2025
8afd70e
Merge branch 'main' into frank
Frank-cntrl Jul 22, 2025
cff1e20
.
baryaakov555 Jul 21, 2025
f6e0555
minor fix
Frank-cntrl Jul 21, 2025
e7784a1
Merge pull request #38 from TabulaRasae/frank
Frank-cntrl Jul 22, 2025
4115291
Added small changes to draftpoll and polllist
AlexNurci Jul 22, 2025
e16629e
Merge branch 'main' into alex
Frank-cntrl Jul 22, 2025
b69b8a6
Merge pull request #39 from TabulaRasae/alex
Frank-cntrl Jul 22, 2025
a707b44
Resolved small errors regarding validation
AlexNurci Jul 22, 2025
4fedaa3
Merge pull request #40 from TabulaRasae/alex
Frank-cntrl Jul 22, 2025
684fb21
Merge branch 'main' into adminView
TabulaRasae Jul 22, 2025
8ca48bd
merged
TabulaRasae Jul 22, 2025
bef6df3
Merge pull request #41 from TabulaRasae/AdminView
AlexNurci Jul 22, 2025
a695686
hotfix resolving the name of the file
TabulaRasae Jul 22, 2025
286e10e
empty commit
TabulaRasae Jul 22, 2025
b416d55
Delete src/components/css directory
TabulaRasae Jul 22, 2025
0e2698f
Merge pull request #42 from TabulaRasae/AdminView
Frank-cntrl Jul 22, 2025
ea3428c
Merge pull request #43 from TabulaRasae/TabulaRasae-patch-1
Frank-cntrl Jul 22, 2025
a803f1c
path of the file resolved
TabulaRasae Jul 22, 2025
2c976c4
Merge pull request #44 from TabulaRasae/vercelhotfix
Frank-cntrl Jul 22, 2025
90e6688
Friends
Frank-cntrl Jul 22, 2025
a99baf2
Update FriendsPage.jsx
Frank-cntrl Jul 22, 2025
48c1ab7
Merge pull request #45 from TabulaRasae/Frank-cntrl-patch-1
Frank-cntrl Jul 22, 2025
ce482af
Only admins are able to get the list of all users
TabulaRasae Jul 21, 2025
f4b7102
All Users link in the navbar is hidden from the regular users
TabulaRasae Jul 21, 2025
d1d5cb6
Admin related additions
TabulaRasae Jul 22, 2025
c5bafc7
fixed the api route
TabulaRasae Jul 22, 2025
ee0024c
merged
TabulaRasae Jul 22, 2025
333127c
hotfix resolving the name of the file
TabulaRasae Jul 22, 2025
d1ea5d8
empty commit
TabulaRasae Jul 22, 2025
4eac13e
Delete src/components/css directory
TabulaRasae Jul 22, 2025
53d4e29
path of the file resolved
TabulaRasae Jul 22, 2025
476819c
Update FriendsPage.jsx
Frank-cntrl Jul 22, 2025
0c6a71c
Only admins are able to get the list of all users
TabulaRasae Jul 21, 2025
306236a
Admin related additions
TabulaRasae Jul 22, 2025
20e45a6
merged
TabulaRasae Jul 22, 2025
dbb5436
Admin related additions
TabulaRasae Jul 22, 2025
97c40b1
merged
TabulaRasae Jul 22, 2025
8916d61
Rename ProfileStyles.CSS to ProfileStyles.css
TabulaRasae Jul 22, 2025
d023f92
Works
Frank-cntrl Jul 22, 2025
a72c204
Merge pull request #46 from TabulaRasae/TabulaRasae-patch-2
TabulaRasae Jul 22, 2025
680a851
Admin related additions
TabulaRasae Jul 22, 2025
cbebf45
merged
TabulaRasae Jul 22, 2025
0512e49
Rename ProfileStyles.CSS to ProfileStyles.css
TabulaRasae Jul 22, 2025
4a5befb
Merge branch 'main' into frank
Frank-cntrl Jul 22, 2025
42ca12c
Merge pull request #47 from TabulaRasae/frank
Frank-cntrl Jul 22, 2025
c64507d
minor fix
Frank-cntrl Jul 22, 2025
c5c3de6
Merge pull request #48 from TabulaRasae/frank
Frank-cntrl Jul 22, 2025
1dc845c
Fixed css
Frank-cntrl Jul 22, 2025
11dde32
Merge pull request #49 from TabulaRasae/frank
Frank-cntrl Jul 22, 2025
1fb3b36
Added search bar to poll list
AlexNurci Jul 23, 2025
0518510
Admin can disable user accounts from the front-end
TabulaRasae Jul 23, 2025
9fca503
Merge pull request #51 from TabulaRasae/AdminView
Frank-cntrl Jul 23, 2025
270137a
removed the duplicated component that was populated twice during merging
TabulaRasae Jul 23, 2025
9a8cd71
Merge pull request #52 from TabulaRasae/AdminView
TabulaRasae Jul 23, 2025
5970aad
Restricted viewers
Frank-cntrl Jul 23, 2025
cf2eb23
Restriction for poll viewing and voting
Frank-cntrl Jul 23, 2025
d870e22
Merge branch 'main' into frank
Frank-cntrl Jul 23, 2025
2209117
Merge pull request #53 from TabulaRasae/frank
Frank-cntrl Jul 23, 2025
48b5bf8
Started transition to bootstrap
AlexNurci Jul 24, 2025
b734f53
Merged alex with main
AlexNurci Jul 24, 2025
1916380
Merge pull request #50 from TabulaRasae/bar2
Frank-cntrl Jul 24, 2025
316f2fc
Merge branch 'main' into alex
AlexNurci Jul 24, 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
1 change: 1 addition & 0 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" href="favicon.ico" />
<base href="/" />
<title>Capstone 1</title>
<script defer src="main.js"></script>
</head>
Expand Down
Loading