Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
294 commits
Select commit Hold shift + click to select a range
ba46a1c
Merge branch 'main' into NeeravTopNav
neerav27 Apr 13, 2022
ab0d968
login/register
bmwise Apr 13, 2022
fe927c8
fix conflicts
bmwise Apr 13, 2022
22b70eb
nothing
anchao0207 Apr 13, 2022
fa252bc
added data
anchao0207 Apr 13, 2022
63fa7ed
nothing
anchao0207 Apr 13, 2022
c12feb7
yes
bmwise Apr 13, 2022
ef7ee66
Merge branch 'main' of https://github.com/CS322-spring22/ANBM into main
bmwise Apr 13, 2022
71eae24
save icon
bmwise Apr 13, 2022
dcbf7f1
like
anchao0207 Apr 13, 2022
da9afb1
Merge branch 'An' into main
anchao0207 Apr 13, 2022
421d8b9
Made profile page
neerav27 Apr 13, 2022
5066d2b
Adjusted sidebar colums
neerav27 Apr 13, 2022
bed4a4c
Merge branch 'NeeravTopNav'
neerav27 Apr 13, 2022
ead0f9c
removed duplicate home from app
neerav27 Apr 13, 2022
9459f7a
Changed the profile info
neerav27 Apr 14, 2022
641ae61
neerav27 Apr 14, 2022
a277b9c
Changed right side bar and the logo colors
neerav27 Apr 14, 2022
a6a3d58
changed app.js
neerav27 Apr 15, 2022
2214244
changed app.js
neerav27 Apr 18, 2022
d7736d5
Added login and register buttons
neerav27 Apr 18, 2022
e2d4699
changes
bmwise Apr 18, 2022
f97199e
changes
bmwise Apr 18, 2022
5f2b6ea
test
bmwise Apr 18, 2022
398dae7
test
bmwise Apr 18, 2022
faf7e98
added Links
anchao0207 Apr 18, 2022
2a3bf2e
new buttons
bmwise Apr 18, 2022
61807e7
fixes
bmwise Apr 18, 2022
390e664
test
bmwise Apr 18, 2022
00726ef
fixed profile
anchao0207 Apr 18, 2022
3a872cf
fix
bmwise Apr 18, 2022
00078de
Merge branch 'main' of https://github.com/CS322-spring22/ANBM into main
bmwise Apr 18, 2022
157ba78
fixed
anchao0207 Apr 18, 2022
c0c99f8
test
bmwise Apr 18, 2022
981faea
Merge branch 'main' of https://github.com/CS322-spring22/ANBM into main
bmwise Apr 18, 2022
50e2541
finished setting up for backend
anchao0207 Apr 19, 2022
97e06c8
api
bmwise Apr 19, 2022
b7e0ee4
Merge branch 'main' into leftsidebar
bmwise Apr 20, 2022
302563a
added 2 lines to users.js
neerav27 Apr 20, 2022
ace4ddf
auth
bmwise Apr 20, 2022
98aea60
yes
bmwise Apr 20, 2022
20bcbbd
added password to users.js
neerav27 Apr 20, 2022
5b4b8e2
auth
bmwise Apr 20, 2022
49827de
added postmodel, post function, like/dislike with database mongoDB
anchao0207 Apr 21, 2022
f4d94c7
Merge branch 'main' into An
anchao0207 Apr 21, 2022
8fc5f3d
changes
bmwise Apr 21, 2022
33c949e
fix
bmwise Apr 21, 2022
bc6eabe
user
bmwise Apr 21, 2022
00cbecf
fix
bmwise Apr 21, 2022
ff4bfaa
fix
bmwise Apr 21, 2022
2b8d68c
fix
bmwise Apr 21, 2022
6b536eb
fix
bmwise Apr 21, 2022
db65701
fix
bmwise Apr 21, 2022
1909266
s
bmwise Apr 21, 2022
4ceec09
2
bmwise Apr 21, 2022
4994439
3
bmwise Apr 21, 2022
d858a61
e
bmwise Apr 21, 2022
ae42ca8
f
bmwise Apr 21, 2022
ddc33b2
s
bmwise Apr 21, 2022
cf83cba
e
bmwise Apr 21, 2022
e0d134e
e
bmwise Apr 21, 2022
e19fa6d
e
bmwise Apr 21, 2022
0bc1e75
d
bmwise Apr 21, 2022
257bfc4
d
bmwise Apr 21, 2022
51f002d
3
bmwise Apr 22, 2022
42f8ced
Merge branch 'main' into leftsidebar
bmwise Apr 22, 2022
8391458
Merge branch 'main' into NeeravTopNav
neerav27 Apr 22, 2022
81336ae
w
bmwise Apr 24, 2022
8f8c8ef
e
bmwise Apr 24, 2022
0873a89
d
bmwise Apr 24, 2022
d7861b3
3
bmwise Apr 24, 2022
7424524
e
bmwise Apr 24, 2022
1a08a1b
s
bmwise Apr 24, 2022
aa3170d
s
bmwise Apr 24, 2022
5ac5e38
e
bmwise Apr 24, 2022
5bc0cca
started file uploading
neerav27 Apr 25, 2022
194df90
copied images
neerav27 Apr 25, 2022
bbc9ba5
finished fetching data for anbm
anchao0207 Apr 25, 2022
b8c06b9
changes to share
neerav27 Apr 25, 2022
2e1f2dd
a
bmwise Apr 25, 2022
1dfc55c
Merge branch 'main' into leftsidebar
bmwise Apr 26, 2022
829b9c7
da
bmwise Apr 26, 2022
ba77216
w
bmwise Apr 26, 2022
92af23e
test
bmwise Apr 27, 2022
81c6d3b
fix
bmwise Apr 27, 2022
93c88c5
fix in app.js, adding a misisng line of code and change redirect into…
anchao0207 Apr 27, 2022
9f49944
Navigate replace
anchao0207 Apr 27, 2022
4470686
fixed login and register bug
anchao0207 Apr 27, 2022
b12d6d3
added upload feature
neerav27 Apr 27, 2022
073bc71
Merge branch 'main' into NeeravTopNav
neerav27 Apr 27, 2022
ebbba17
Finished up posts
neerav27 Apr 27, 2022
a6f5bb5
Merge branch 'leftsidebar' of https://github.com/CS322-spring22/ANBM …
bmwise Apr 27, 2022
8dcdd6b
test
bmwise Apr 27, 2022
37bee30
jdf
neerav27 Apr 27, 2022
ed9d6d5
fixed
neerav27 Apr 27, 2022
6285260
fixing
neerav27 Apr 27, 2022
22dc697
fixed profile part
bmwise Apr 27, 2022
e82ea16
Finished video
neerav27 Apr 27, 2022
c976c21
reverting to 4470686de0
anchao0207 Apr 27, 2022
c75e955
fixed userid
neerav27 Apr 27, 2022
0652d7e
reverting to 4470686de0
anchao0207 Apr 27, 2022
79d5c10
added like and dislike function
anchao0207 Apr 29, 2022
973335e
resolve conflict
anchao0207 Apr 29, 2022
98f8973
fixed a bug from dislike
anchao0207 Apr 29, 2022
fa03661
Merge branch 'main' into leftsidebar
bmwise Apr 29, 2022
a7bed25
fix
bmwise Apr 29, 2022
4afe6b5
Installed
neerav27 Apr 29, 2022
ee5adfb
profile picture
anchao0207 Apr 29, 2022
4dcf08c
fixed warning
anchao0207 May 2, 2022
9a75fce
fix warning
anchao0207 May 2, 2022
725af75
change
bmwise May 2, 2022
4b3381c
Trying to fix
neerav27 May 2, 2022
d5c5869
axios {}
neerav27 May 2, 2022
bd82f61
change
bmwise May 2, 2022
9e9b46a
Merge branch 'main' into leftsidebar
bmwise May 2, 2022
cfd45cb
fix navbar profile pic
anchao0207 May 2, 2022
51c413b
Merge branch 'main' of https://github.com/CS322-spring22/ANBM into main
bmwise May 2, 2022
de6cd80
fix profile link bug from post
anchao0207 May 2, 2022
b786290
deploy bug
anchao0207 May 4, 2022
9f500b7
addedtimeago
anchao0207 May 4, 2022
9740475
fixed build in package.json
anchao0207 May 4, 2022
40f1ba0
fix localhost in index.html
anchao0207 May 4, 2022
c18e248
band app
anchao0207 May 6, 2022
d053774
add favicon
anchao0207 May 6, 2022
3452087
fix heroki postbuild in packagejson
anchao0207 May 6, 2022
c1c74df
change root directoru
anchao0207 May 6, 2022
3f18dbf
change base URL in config.js
anchao0207 May 6, 2022
126b5de
added log in auth
anchao0207 May 6, 2022
9522767
change https to http
anchao0207 May 6, 2022
27a2022
api is AMBM
neerav27 May 6, 2022
16a9dcf
api is ANBM
neerav27 May 6, 2022
58fccd4
change back to https
anchao0207 May 6, 2022
2465ee9
merge
bmwise May 6, 2022
1249a1b
changes
bmwise May 6, 2022
82b3827
merge
bmwise May 6, 2022
a7bc175
Merge branch 'main' into leftsidebar
bmwise May 6, 2022
abeebf5
fix
bmwise May 6, 2022
dd63c0b
fix
bmwise May 6, 2022
57fd54f
Merge branch 'NeeravTopNav' into leftsidebar
bmwise May 6, 2022
b2e0dbd
Merge branch 'leftsidebar' into main
bmwise May 6, 2022
1d26871
Merge branch 'main' into NeeravTopNav
neerav27 May 8, 2022
ced7180
Merge branch 'main' of https://github.com/CS322-spring22/ANBM
neerav27 May 8, 2022
5380512
fix heroku try
anchao0207 May 8, 2022
52a68ac
Merge branch 'main' of https://github.com/CS322-spring22/ANBM into main
bmwise May 11, 2022
a99efba
FIXED followings
neerav27 May 11, 2022
1007935
revert back to the meeting
bmwise May 11, 2022
8c3910f
get rid of extra folder
bmwise May 11, 2022
f2f9b7d
testing change
anchao0207 May 11, 2022
9827052
adjusted cors
neerav27 May 11, 2022
60fbaf0
added core
anchao0207 May 11, 2022
4610527
Merge branch 'main' into NeeravTopNav
neerav27 May 11, 2022
22497d5
Merge branch 'main' into An
anchao0207 May 11, 2022
df22d83
removed axios and cors
neerav27 May 11, 2022
6146f09
rsb
neerav27 May 11, 2022
fd23747
feed
neerav27 May 11, 2022
2ca00b2
rsb
neerav27 May 11, 2022
7c0e71f
assets
neerav27 May 11, 2022
dcec4df
added env file of local and heroku
anchao0207 May 11, 2022
02daf9f
added DM
neerav27 May 11, 2022
96e70ab
before changing list
neerav27 May 12, 2022
560cb70
dark mode and left side bar
neerav27 May 12, 2022
b05e9c3
leftbar
neerav27 May 12, 2022
36920e3
rightbar flex
neerav27 May 12, 2022
f153255
fixing
neerav27 May 12, 2022
f6b3674
changes
neerav27 May 12, 2022
f177f88
adjust
neerav27 May 12, 2022
a9a470d
NavBar
neerav27 May 13, 2022
21fb626
env
neerav27 May 13, 2022
6304800
Merge branch 'main' into NeeravTopNav
neerav27 May 13, 2022
96c14fb
got back to brendan orginal working branch
bmwise May 13, 2022
c928c0f
Merge branch 'main' into leftsidebar3
bmwise May 13, 2022
55298fa
added logout button
anchao0207 May 16, 2022
079671b
Merge branch 'An' into main
anchao0207 May 16, 2022
5cc2272
push to heroku
anchao0207 May 16, 2022
daf1263
made upload button
neerav27 May 16, 2022
ddb9ba8
reado the express installation for heroku
anchao0207 May 17, 2022
0aa11cf
change to heroku baseURL
anchao0207 May 17, 2022
6d8f0fc
post method now work
anchao0207 May 17, 2022
0ec5e45
working popup button
neerav27 May 17, 2022
7726aef
changed colors
neerav27 May 17, 2022
08a5ee5
fixing upload
neerav27 May 18, 2022
b0bdae7
changed config
neerav27 May 18, 2022
d100c2a
Merge branch 'main' into NeeravTopNav
neerav27 May 18, 2022
4462404
fixed nav merge
neerav27 May 18, 2022
07e5c4c
reinstall packagejson.lock in frontend
anchao0207 May 17, 2022
6d2c891
top nav bar dark mode
neerav27 May 18, 2022
38ab241
Merge branch 'main' of https://github.com/CS322-spring22/ANBM
neerav27 May 18, 2022
9e999c3
power button
neerav27 May 18, 2022
fbdbf68
no more like handler in power button
neerav27 May 18, 2022
aeae7ce
he
bmwise May 18, 2022
dd17e06
button fix
bmwise May 18, 2022
f4d6251
fixed flex
bmwise May 18, 2022
c7e7bc4
fixed upload
neerav27 May 18, 2022
7c6ae6b
search bar no change
neerav27 May 23, 2022
831e8ef
youtube video embed
anchao0207 May 23, 2022
8f1b328
upload post with links and fixed following
anchao0207 May 23, 2022
9dc4e19
delete upload file
anchao0207 May 23, 2022
3b3b491
now can search for ID
anchao0207 May 25, 2022
535b215
deploying to heroku
anchao0207 May 28, 2022
88f54a8
fixing youtube embedded
anchao0207 May 28, 2022
6d436e2
fixing youtube video
anchao0207 May 28, 2022
73d8cce
trying to fix
anchao0207 May 28, 2022
c247714
Merge branch 'main' of https://git.heroku.com/band-cs322 into main
anchao0207 May 28, 2022
c6bd890
testing heroku
anchao0207 May 28, 2022
6776c5d
heroku
anchao0207 May 28, 2022
9c768e9
trying again
anchao0207 May 28, 2022
95cfe7e
trying
anchao0207 May 28, 2022
bc52e94
youtube video
anchao0207 May 28, 2022
2a75b85
trya again
anchao0207 May 28, 2022
b00d109
youtube
anchao0207 May 28, 2022
60eba9d
return
anchao0207 May 28, 2022
ffc2f1f
heroku
anchao0207 May 28, 2022
be795db
heroku
anchao0207 May 28, 2022
11c9678
return
anchao0207 May 28, 2022
faa8640
heroku
anchao0207 May 28, 2022
504d191
fail
anchao0207 May 28, 2022
5c3cfba
youtube vid heroku
anchao0207 May 28, 2022
6089ace
change heroku
anchao0207 May 28, 2022
86c40f7
add csp json file
anchao0207 May 28, 2022
8a0f1d5
fix cso json
anchao0207 May 28, 2022
4c57acf
update package json
anchao0207 May 28, 2022
dd19efc
fix csp.json
anchao0207 May 28, 2022
ee9b282
fix csp json
anchao0207 May 28, 2022
1f6b420
update csp json
anchao0207 May 28, 2022
3282746
update csp json
anchao0207 May 28, 2022
605bd5f
update csp json
anchao0207 May 28, 2022
cf51913
update csp json
anchao0207 May 28, 2022
bd2b56e
add static json file
anchao0207 May 28, 2022
3550bfb
change static json directory
anchao0207 May 28, 2022
46ba449
update static json
anchao0207 May 28, 2022
ed21207
update static json
anchao0207 May 28, 2022
eebfb83
update csp files
anchao0207 May 28, 2022
2831476
update static json
anchao0207 May 28, 2022
0597839
update static and package json
anchao0207 May 28, 2022
6947fd9
update package json
anchao0207 May 28, 2022
29f179d
brendans changes
neerav27 May 29, 2022
d056cea
Merge branch 'main' of https://github.com/CS322-spring22/ANBM
neerav27 May 29, 2022
fa12514
Cleanup
neerav27 May 29, 2022
66ce7bc
frontend done
neerav27 May 29, 2022
99c759f
changes
neerav27 May 29, 2022
32ca6fa
netlify
anchao0207 May 29, 2022
2d4f199
frontend
neerav27 May 29, 2022
c0bc9b9
cover pic change
neerav27 May 29, 2022
94ffb68
background and home
neerav27 May 29, 2022
c64e095
nav
neerav27 May 29, 2022
7b68482
Merge branch 'main' of https://github.com/CS322-spring22/ANBM
neerav27 May 29, 2022
f1a9aec
final frontend
neerav27 May 29, 2022
3fd34d5
fixed the search method with login problem
anchao0207 May 30, 2022
8892bad
FIXED SEARCH BAR radius
neerav27 May 30, 2022
c4dbb63
Merge branch 'main' of https://github.com/CS322-spring22/ANBM
neerav27 May 30, 2022
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 .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MONGO_URL = mongodb+srv://atrieu:Copycopy27@band.mrp7y.mongodb.net/social?retryWrites=true&w=majority
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
node_modules
build/
# Local Netlify folder
.netlify
3 changes: 2 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

readmeeeeeeeeeeeee
testing new lap
3 changes: 3 additions & 0 deletions anbm/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
REACT_APP_PUBLIC_FOLDER = /assets/
REACT_APP_BASE_URL_LOCAL = "http://localhost:8800/api"
REACT_APP_BASE_URL_HEROKU = "https://band-cs322.herokuapp.com/api"
23 changes: 0 additions & 23 deletions anbm/.gitignore

This file was deleted.

3 changes: 3 additions & 0 deletions anbm/.netlify/state.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"siteId": "4412257f-2d4a-471d-b02b-27e3582ac51a"
}
70 changes: 0 additions & 70 deletions anbm/README.md

This file was deleted.

13 changes: 13 additions & 0 deletions anbm/build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"files": {
"main.css": "/static/css/main.614e2203.css",
"main.js": "/static/js/main.29260e38.js",
"index.html": "/index.html",
"main.614e2203.css.map": "/static/css/main.614e2203.css.map",
"main.29260e38.js.map": "/static/js/main.29260e38.js.map"
},
"entrypoints": [
"static/css/main.614e2203.css",
"static/js/main.29260e38.js"
]
}
Binary file added anbm/build/assets/dislike.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 anbm/build/assets/like.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 anbm/build/assets/post/post1.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 anbm/build/assets/post/post2.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 anbm/build/assets/post/post3.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 anbm/build/assets/profile/noAvatar.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 anbm/build/assets/profile/noCover.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 anbm/build/assets/profile/photo1.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 anbm/build/assets/profile/photo2.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 anbm/build/assets/profile/photo3.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 anbm/build/assets/profile/template_3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions anbm/build/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!doctype html><html lang="en"><head><meta http-equiv="Content-Security-Policy" content="default-src *; script-src-elem * https://www.youtube.com/iframe_api; script-src * 'unsafe-inline'; font-src 'self' *; style-src * 'unsafe-inline'; connect-src 'self' *; img-src 'self' *; child-src *; "><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="Web site created using create-react-app"><link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&amp;display=swap" rel="stylesheet"><link rel="stylesheet" href="/assets/style.css"><title>Social App</title><script defer="defer" src="/static/js/main.29260e38.js"></script><link href="/static/css/main.614e2203.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
Binary file added anbm/build/logo192.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 anbm/build/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions anbm/csp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"prod": {
"default-src": ["*"],
"script-src-elem": ["*", "https://www.youtube.com/iframe_api"],
"script-src": ["*", "'unsafe-inline'"],
"font-src": ["'self'", "*"],
"style-src": ["*", "'unsafe-inline'"],
"connect-src": ["'self'", "*"],
"img-src": ["'self'", "*"],
"child-src": ["*"]
}
}
Loading