This repository was archived by the owner on Mar 12, 2023. It is now read-only.

Feedback - #1

Open

github-classroom[bot] wants to merge 277 commits into

This pull request is big! We're only showing the most recent 250 commits

Commits on Feb 2, 2021

friends dropdown and my cards dropdown
tfalba
committed
ca4bdcd
Merge pull request #8 from momentum-projects/mock-cardlist-component
tfalba
authored
b82a6ac
added token auth
loganrobinson315
committed
7bd47fd
Merge pull request #9 from momentum-projects/token-auth
loganrobinson315
authored
9f09a6d
added CORS
loganrobinson315
committed
93f2e99
Merge pull request #10 from momentum-projects/cors
loganrobinson315
authored
82a1cb7
initial heroku
loganrobinson315
committed
67ed3f6
working token authorization for existing user and using login from api
tfalba
committed
90c7ea1
Merge pull request #11 from momentum-projects/testing-api-connect
tfalba
authored
d323b23
final heroku deployment
loganrobinson315
committed
3b05fb6
Merge branch 'main' into heroku-deploy
loganrobinson315
authored
5310be1
Merge pull request #12 from momentum-projects/heroku-deploy
loganrobinson315
authored
3a5d3c2
handling eslintcache
tfalba
committed
403909a
merging origin with pull
tfalba
committed
7bed676
Merge pull request #13 from momentum-projects/add-react-router
tfalba
authored
c914ef1
testing change in app.css
tfalba
committed
f69f684
Merge pull request #14 from momentum-projects/add-react-router
tfalba
authored
ea15741

Commits on Feb 3, 2021

Moved Procfile to correct location
loganrobinson315
committed
b098209
got routing and switches working for login register and home
tfalba
committed
5b151b5
registration link working
tfalba
committed
de1071c
removed eslintcache
tfalba
committed
c6311a0
merge conflict
tfalba
committed
8458cee
Merge pull request #15 from momentum-projects/add-react-router
tfalba
authored
f8c35d2
removed .eslintcache
matthewbenton224
committed
7483dfc
Merge branch 'main' of https://github.com/momentum-projects/group-social-ecards-tracy-logan-matt into main
matthewbenton224
committed
95a57f8
models made with card API endpoint
loganrobinson315
committed
b8b7bff
Merge pull request #16 from momentum-projects/models
loganrobinson315
authored
d13fd00
added null to user field
loganrobinson315
committed
4746a81
working request to heroku api
tfalba
committed
3e90f2c
Merge pull request #17 from momentum-projects/login-heroku
tfalba
authored
7ea5886
reading card list from heroku api
tfalba
committed
de72c06
Merge pull request #18 from momentum-projects/read-cards
tfalba
authored
f9fdd46
added user-card endpoint
loganrobinson315
committed
f2fcd55
Merge pull request #19 from momentum-projects/detialAPI
loganrobinson315
authored
6b240fb
start of card detail page
tfalba
committed
dc2bed2
merging branch with main
tfalba
committed
bb4d8d5
recognizes path but reading card as empty
tfalba
committed
3b2bbac
added single card api detail for user
loganrobinson315
committed
dcca679
Merge pull request #20 from momentum-projects/detail-card-api
loganrobinson315
authored
283c182
pause before pulling in from main
tfalba
committed
372e9ee
working Nav.Link's
matthewbenton224
committed
4e2ae40
Merge branch 'main' into linkdetail
matthewbenton224
committed
bee9d48
Merge pull request #21 from momentum-projects/linkdetail
loganrobinson315
authored
58fbfa5
merging with main
tfalba
committed
fe8785b
added loose auth
loganrobinson315
committed
e2adbf1
working view of card detail
tfalba
committed
49b20a4
fixed pk dependency on card detail
tfalba
committed
5b7e739
merging with main
tfalba
committed
2ed75d9
Merge pull request #22 from momentum-projects/card-detail-sketch
tfalba
authored
ada69fb
changed auth on deatil back
loganrobinson315
committed
8da2929
added slash on url
loganrobinson315
committed
57acf78
some early formatting for card view
tfalba
committed
870cf65

Commits on Feb 4, 2021

Merge pull request #23 from momentum-projects/card-detail-skeleton
matthewbenton224
authored
e184287
testing out accordian and carousel components for card detail view
tfalba
committed
913b417
carousel and pushed some changes to database to use background color and images
tfalba
committed
362bfca
Merge pull request #24 from momentum-projects/accordian-component
tfalba
authored
cd72bc5
redid the front splash page
tfalba
committed
b4d1770
added thumbnail of image in list view
tfalba
committed
52faa04
split view of list and detail
tfalba
committed
630155a
changed back to accordian and modified list view
tfalba
committed
c4301e6
Merge pull request #25 from momentum-projects/card-detail-view-separate
tfalba
authored
b2a30c7
updates to dynamic styling on detail page
tfalba
committed
fee09cf
css styling changes to navbar - need to fix card detail navbar
matthewbenton224
committed
9a69efe
Merge pull request #26 from momentum-projects/styling2
matthewbenton224
authored
3d0a46d
storing changes before merge
tfalba
committed
3dc716b
merging branches
tfalba
committed
88442be
Merge pull request #27 from momentum-projects/next-previous-fix
tfalba
authored
045dd36
fixed POST request and added Auth for edit
loganrobinson315
committed
47a564e
Merge branch 'main' into views-update
loganrobinson315
committed
614af47
Merge pull request #28 from momentum-projects/views-update
loganrobinson315
authored
db2fde3
lots of changes-fonts, styling, etc etc etc
matthewbenton224
committed
08aec1c
Merge pull request #29 from momentum-projects/fontstyling
matthewbenton224
authored
c86099d
reformatted sizing and links on list and detail views
tfalba
committed
450703d

Commits on Feb 5, 2021

styling changes on detail page
matthewbenton224
committed
d7650c8
Merge pull request #30 from momentum-projects/stylingpartdeux
matthewbenton224
authored
c34cb3b
solved paths and updated with persist state and params
tfalba
committed
6eab95b
merging
tfalba
committed
d48981a
Merge pull request #31 from momentum-projects/paths-and-links
tfalba
authored
31f43e8
created page for card creation with all placeholders
tfalba
committed
517ae6e
Merge pull request #32 from momentum-projects/create-card
tfalba
authored
02f09f8
reading from font and background color and setup for separatly managing photo search
tfalba
committed
ce077f0
set up basic structure for search photo api
tfalba
committed
bcda9ca
working creating of a card without title and message and generic photo input
tfalba
committed
7ff054c
Merge pull request #33 from momentum-projects/populate-create-card
tfalba
authored
5bcffdd
changed margin to go to edge
tfalba
committed
e5e26fd
Merge pull request #34 from momentum-projects/switch-border-margin
tfalba
authored
071dc47

Commits on Feb 6, 2021

working adding photos on create card and input and message
tfalba
committed
a4aeac8
Merge pull request #35 from momentum-projects/testing-order
tfalba
authored
79e9972
rewrote create-card into components
tfalba
committed
71de14b
Merge pull request #36 from momentum-projects/exploring-unsplash
tfalba
authored
7165bee
added new fields and started followers endpoint
loganrobinson315
committed
96e0fe5
update card working -- delete works but redirect fails
tfalba
committed
9a7f860
Merge pull request #37 from momentum-projects/delete-and-edit
tfalba
authored
2702124
put conditions on edit delete and like follow
tfalba
committed
021598d
handles routing and iscreating
tfalba
committed
30d195b
Merge pull request #38 from momentum-projects/more-unsplash
tfalba
authored
21e802f
made input forms in view with preview
tfalba
committed
b5a33ab
Merge pull request #39 from momentum-projects/pagination
tfalba
authored
504c845

Commits on Feb 7, 2021

delete working but need to make update similar with link
tfalba
committed
7ef72b8
made card detail view smaller started setup for different card paths
tfalba
committed
5aa8b01
Merge pull request #40 from momentum-projects/solving-delete
tfalba
authored
f462b4a
set up basic paths and started populating user components
tfalba
committed
62990f3
pre-populated fields for setting border style, justification, and font color // also created folder hierarchy
tfalba
committed
9127812
Merge pull request #41 from momentum-projects/path-construction
tfalba
authored
12249b7
added views
loganrobinson315
committed
6fd4d48
Merge branch 'main' into friends
loganrobinson315
committed
0a327de
Merge pull request #42 from momentum-projects/friends
loganrobinson315
authored
2f85d01
font styling on create card page
matthewbenton224
committed
c08eb0f
working on pagination for photos
tfalba
committed
88a5ca4
merging branches
tfalba
committed
02bb154
merging branches
matthewbenton224
committed
999db64
Merge pull request #43 from momentum-projects/dropdownstyling
matthewbenton224
authored
8ea3553
merging branches
tfalba
committed
e463972
updated border-type and font-color with the new backend fields
tfalba
committed
df652b8
Merge pull request #44 from momentum-projects/avatar-api
tfalba
authored
8c3555f

Commits on Feb 8, 2021

created skeleton of user list and profile page
tfalba
committed
e83d218
temp fix on the rerouting based on setCardFilter and more sketch of user pages
tfalba
committed
799cedf
Merge pull request #45 from momentum-projects/user-page
tfalba
authored
5d9a1a6
adapted update profile to match view of profile itself
tfalba
committed
e8c1987
can update user- lookup by username
loganrobinson315
committed
9f37d14
Merge branch 'main' into friends-cards
loganrobinson315
committed
1f4c486
Merge pull request #46 from momentum-projects/friends-cards
loganrobinson315
authored
baafb5f
merging branches
tfalba
committed
20bc039
added user card view
loganrobinson315
committed
0bf552b
added user card view
loganrobinson315
committed
8d4b590
Merge pull request #47 from momentum-projects/cards-for-users
loganrobinson315
authored
5d2245c
font and border changes
matthewbenton224
committed
8de7584
merging branches
matthewbenton224
committed
b3f3ad6
more font and border changes
matthewbenton224
committed
d5f8add
Merge branch 'main' of https://github.com/momentum-projects/group-social-ecards-tracy-logan-matt into main
loganrobinson315
committed
3b37405
Merge pull request #48 from momentum-projects/cardformdropdowns
matthewbenton224
authored
6c18ef8
linking with username
tfalba
committed
0e8d428
merging branches
tfalba
committed
efbb9ab
creepster font working
matthewbenton224
committed
f6e3bf2
Merge pull request #49 from momentum-projects/creepster
matthewbenton224
authored
e6fcb1a
general link font caveat
matthewbenton224
committed
ae36caf
Merge pull request #50 from momentum-projects/styles
matthewbenton224
authored
0b7a482
added font styling and font color
matthewbenton224
committed
8f138bb
Merge pull request #51 from momentum-projects/morefonts
matthewbenton224
authored
68d9e95
sedgwick ave font
matthewbenton224
committed
43a24a2
Merge pull request #52 from momentum-projects/onemorefont
matthewbenton224
authored
391295e
Merge branch 'main' of https://github.com/momentum-projects/group-social-ecards-tracy-logan-matt into main
loganrobinson315
committed
79b4b54
added friend cards view
loganrobinson315
committed
57cac5d
Merge pull request #53 from momentum-projects/friends-cards-view
loganrobinson315
authored
7bb9f22
user profiles can be edited
tfalba
committed
4e88374
merging branches
tfalba
committed
ab4ba91
Merge pull request #54 from momentum-projects/user-profiles
tfalba
authored
1c523fa
card views by self, all, and friends - styling fixes on card view and edit - font change on choosing styles
tfalba
committed
8ff0141
Merge pull request #55 from momentum-projects/card-list-views
tfalba
authored
4cc7589

Commits on Feb 9, 2021

working link to show-user-cards
tfalba
committed
67bf046
Merge pull request #56 from momentum-projects/show-user-cards
tfalba
authored
3223df7
updated display of user friends and links to show user cards and friend profiles
tfalba
committed
e6e7635
follower option not avail for logged in user for own profile
tfalba
committed
87c91eb
got rid of all set filters and handle filters
tfalba
committed
923d9d2
border color changes
matthewbenton224
committed
a9061de
Merge pull request #57 from momentum-projects/colors
matthewbenton224
authored
432ce46
got avatars showing on friend list on user page
tfalba
committed
19e14a3
merging branches
tfalba
committed
805eef5
Merge pull request #58 from momentum-projects/user-views
tfalba
authored
4ff8d7d
follow and following adjusted by friend status
tfalba
committed
03b5ea7
merging branches
tfalba
committed
26766bf
Merge pull request #59 from momentum-projects/user-views-update
tfalba
authored
4900586
created myprofile view from menu with awkward workaround
tfalba
committed
0a4de6e
changes before redoing following button
tfalba
committed
7aa9008
added font colors
matthewbenton224
committed
7a9fcaa
Merge pull request #60 from momentum-projects/fontcolors
matthewbenton224
authored
40aa826
updated links for following to separate from user link
tfalba
committed
b7843c6
merging branches
tfalba
committed
99597f1
added border colors
matthewbenton224
committed
30b9bdd
Merge pull request #61 from momentum-projects/bordercolors
matthewbenton224
authored
c835bbd
merging branches
tfalba
committed
5e5d3d0
Merge pull request #62 from momentum-projects/myprofile-view
tfalba
authored
8912787
added add a friend
loganrobinson315
committed
c10a2cd
Merge pull request #63 from momentum-projects/relationships
loganrobinson315
authored
d6dc7e5
fixed most warnings on myprofile condition and handled justification
tfalba
committed
8c567fa
merging branches
tfalba
committed
0081d21
Merge pull request #64 from momentum-projects/check-key-warnings
tfalba
authored
5c2b48b
added delete a friend
loganrobinson315
committed
0234cc2
Merge pull request #65 from momentum-projects/delete-friend
loganrobinson315
authored
571d441
working mark as friends
tfalba
committed
338ef18
merging branches
tfalba
committed
0f013e8
Merge pull request #66 from momentum-projects/posting-friends
tfalba
authored
8735744

Commits on Feb 10, 2021

delete following working
tfalba
committed
86c9e27
Merge pull request #67 from momentum-projects/delete-following
tfalba
authored
2f448ba
formatted cards and friends to two columns on user profile view
tfalba
committed
5f5a513
added labels to input fields on profile edit
tfalba
committed
b3e3080
Merge pull request #68 from momentum-projects/format-user-profiles
tfalba
authored
2f7708b
fixed header on user page for all
tfalba
committed
14944f3
added carousel to splash page
tfalba
committed
3da8533
updating front page
tfalba
committed
30b7394
Merge pull request #69 from momentum-projects/updated-pagination
tfalba
authored
36f1c22
added friends page
loganrobinson315
committed
7b96f0a
Merge pull request #70 from momentum-projects/friends-page
loganrobinson315
authored
84f5f78
added odering of cards
loganrobinson315
committed
4a0dcdb
Merge pull request #71 from momentum-projects/ordering
loganrobinson315
authored
dcd468e
user-friends profile view working
tfalba
committed
ef495a9
Merge pull request #72 from momentum-projects/handle-friends-view
tfalba
authored
eae6ba5
flipped order
loganrobinson315
committed
2c3920b
Merge pull request #73 from momentum-projects/correct-order
loganrobinson315
authored
6251d28
reveresed ordering AGAIN
loganrobinson315
committed
0dc9007
Merge pull request #74 from momentum-projects/ordering-again
loganrobinson315
authored
5cf17a6
corrected order for user
loganrobinson315
committed
fb523fd
Merge pull request #75 from momentum-projects/user-order
loganrobinson315
authored
a189339
added pagination
loganrobinson315
committed
cde4d1c
Merge pull request #76 from momentum-projects/pagination
loganrobinson315
authored
d8c5633
added ,
loganrobinson315
committed
e79a8e5
removed [
loganrobinson315
committed
8c669af
custom APIView pagination
loganrobinson315
committed
15f544a
Merge pull request #77 from momentum-projects/fix-pagination
loganrobinson315
authored
d3068b0
start of pagination
tfalba
committed
c0d26a4
merging branches
tfalba
committed
bc3d034
changed pagination to 10
loganrobinson315
committed
b9792de
almost good with apis
tfalba
committed
1b5b865
merging branches
tfalba
committed
4356b7e
Merge pull request #78 from momentum-projects/solving-pagination
tfalba
authored
f0fe47f
apis working
tfalba
committed
0c0fd83
Merge pull request #79 from momentum-projects/fixing-apis
tfalba
authored
a5bbc0f
mobile styling
matthewbenton224
committed
aa13ed8
mobile formatting
matthewbenton224
committed
cf59df3

Commits on Feb 11, 2021

Merge pull request #80 from momentum-projects/mobile
matthewbenton224
authored
a42e12f
fixed justification error
tfalba
committed
21b1c70
added favorites api
loganrobinson315
committed
7d4812e
Merge pull request #81 from momentum-projects/favorites
loganrobinson315
authored
4a118b7
working version of favoriting
tfalba
committed
0e3fcb9
merging
tfalba
committed
15d78ca
Merge pull request #82 from momentum-projects/favorites-frontend
tfalba
authored
073d3a9
favorites working all places and in menu bar
tfalba
committed
a712a24
Merge pull request #83 from momentum-projects/favorite-menu-view
tfalba
authored
1ffe850
cleaned up code and handlers and left some comments in backend models
tfalba
committed
3197846
Merge pull request #84 from momentum-projects/cleanup-code
tfalba
authored
ffc072e
added a few comments in models
tfalba
committed
af2faf6
clean-up git
tfalba
committed
5303000
git cleanup of json
tfalba
committed
2396ac5
added ordering to favorites
loganrobinson315
committed
626b320
Merge pull request #85 from momentum-projects/cleanups
loganrobinson315
authored
3b8a48d
added pagination back
loganrobinson315
committed
8a1a658
fixed friends cards pagination
loganrobinson315
committed
2dc1e80
added followers view
loganrobinson315
committed
328c180
Merge pull request #86 from momentum-projects/followers
loganrobinson315
authored
288ab06
staging for followers on profile page
tfalba
committed
dc6fae6
merging branch
tfalba
committed
db47a8f
added followers to seriallizer
loganrobinson315
committed
a653a2c
added followers
loganrobinson315
committed
ab86e60
Merge pull request #87 from momentum-projects/followers-update
loganrobinson315
authored
82c7189
sorted favs
loganrobinson315
committed
0ff42f7
updated set of users and have follower view on menu and profile
tfalba
committed
9301d4b
merging
tfalba
committed
71c0558
Merge pull request #88 from momentum-projects/adding-followers
tfalba
authored
ce4f6cc

Commits on Feb 12, 2021

minor style change
tfalba
committed
24bb220

Commits on Feb 13, 2021

trying hastag router to handle refresh on netlify
tfalba
committed
e4d9e9f