Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

C17 Whales - Eggplant Parmesan Sandwiches (Alexa Coffman, Joan Kovacs, Kelly Kang, Kiana Shui) #17

Open
wants to merge 69 commits into
base: main
Choose a base branch
from
Open

C17 Whales - Eggplant Parmesan Sandwiches (Alexa Coffman, Joan Kovacs, Kelly Kang, Kiana Shui) #17

wants to merge 69 commits into from

Conversation

shkx281
Copy link

@shkx281 shkx281 commented Jul 20, 2022

I hope you like our eggplant parmigiana color palette!

shkx281 and others added 30 commits June 27, 2022 15:25
@shkx281
kk: add .env and setup react app
8fdd0de
@kianashui
added board, card, boardform, and cardform components and their scaff…
02e5846 
…olding
@kianashui
saved board component
37b0113
@AlexaCoffman
added css files and imported to components
487d4a4
@AlexaCoffman
added css files and imported to components
b331169
@shkx281
Added container components
66a8c3d
@shkx281
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
42a19f2 
…on-board
@AlexaCoffman
deleted unnecessary import
e41d3fb
@joankovacs
removed redundant line
8906687
@joankovacs
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
fd0ec64 
…on-board
@kianashui
update scaffolding
2281b31
@joankovacs
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
0a6d805 
…on-board
@kianashui
updated outline and scaffolding
7d629b7
@joankovacs
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
a1e22b4 
…on-board
@shkx281
Created UseEffect and get request for boards.
5d12495
@AlexaCoffman
added more css files, created boardlist component
ff00a2b
@joankovacs
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
1fe545f 
…on-board
@shkx281
Resolved merge conflict
52ecf84
@shkx281
Fixing merge conflicts
2c353b8
@joankovacs
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
2434e45 
…on-board
@kianashui
added boardform functionality
9bf2cff
@kianashui
added boardform functionality
d37378f
@joankovacs
literally nothing
be26fa6
@joankovacs
test
68568cf
@kianashui
added selectBoard functionality with Kelly
ed38c55
@AlexaCoffman
updated CardForm, began adding supporting code to App, added proptype…
af4c2b0 
…s to BoardForm
@AlexaCoffman
Merge branch 'main' of github.com:shkx281/front-end-inspiration-board
450a22e
@AlexaCoffman
added addCard and getCards to app
510f061
@AlexaCoffman
fixed App and CardForm so that new cards are added to database:
3e910dc 
git push
@shkx281
Added cardlist and card functionalities, working on repopulating cards
71b9743
AlexaCoffman and others added 30 commits July 1, 2022 11:53
@AlexaCoffman
Changed like to +1
0a91b5e
@AlexaCoffman
adds css for buttons
3da3dcd
@shkx281
Created the basic grid layout for webpage. Started working on CSS.
35c2c7b
@shkx281
Solved merge conflicts
37c3249
@shkx281
Added PlaceHolders for Forms. Tested that the form does not submit wi…
978d962 
…th placeholders. With Alexa and Kiana.
@joankovacs
small changes
43ced8e
@kianashui
changed cursor upon button hover and changed style of disabled button
82a8e8f
@kianashui
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
9edddc5 
…on-board
@shkx281
Fixed cards so the cards appear in two rows
09175cf
@shkx281
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
fdabf0e 
…on-board
@kianashui
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
bbdcc04 
…on-board
@shkx281
set width to a set amount of px
a882746
@kianashui
disabled add card button when no board is selected with Alexa and Kelly
9bb1a0c
@kianashui
added functionality to sort cards with Alexa and Kelly
2bdf2fb
@shkx281
Added styling for board list
2fb8f33
@shkx281
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
e43b670 
…on-board
@kianashui
hide card list section when no board is selected and change card list…
50c597c 
… section title based on board name with Kelly and Alexa
@kianashui
hide card form when no board is selected
9b820b1
@kianashui
hide card list and form when board is deleted with Alexa and Kelly
c4634a3
@kianashui
clear board and card form fields upon submitting
2f7a087
@shkx281
added box shadows to cards
adde94d
@AlexaCoffman
small style updates for selected board, board list, h1
316be0f
@AlexaCoffman
style changes to cards, selected boards
042e919
@shkx281
working on CSS
c9e099c
@shkx281
Merge branch 'main' of https://github.com/shkx281/front-end-inspirati…
6be7f11 
…on-board
@AlexaCoffman
removed unnecessary getcards call
32ce980
@AlexaCoffman
Merge branch 'main' of github.com:shkx281/front-end-inspiration-board
1504e3f
@AlexaCoffman
adds border to card delete buttons
9f3f887
@shkx281
moved the buttons to the right for boards.
a45ef93
@shkx281
fixed button issure
db159b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@shkx281 @kianashui @AlexaCoffman @joankovacs