-
- Downloads
Merge branch 'master' into 'media'
# Conflicts: # frontend/src/Components/ArtPage.tsx
No related branches found
No related tags found
Showing
- frontend/src/Components/ArtPage.tsx 73 additions, 24 deletionsfrontend/src/Components/ArtPage.tsx
- frontend/src/Components/DropDown.tsx 36 additions, 50 deletionsfrontend/src/Components/DropDown.tsx
- frontend/src/Components/DropDownSelect.tsx 37 additions, 0 deletionsfrontend/src/Components/DropDownSelect.tsx
- frontend/src/Components/DropDownToggle.tsx 0 additions, 39 deletionsfrontend/src/Components/DropDownToggle.tsx
- frontend/src/Components/ExhibitionPiece.tsx 6 additions, 6 deletionsfrontend/src/Components/ExhibitionPiece.tsx
- frontend/src/Components/FavoriteButton.tsx 33 additions, 3 deletionsfrontend/src/Components/FavoriteButton.tsx
- frontend/src/Components/FavoriteLink.tsx 15 additions, 0 deletionsfrontend/src/Components/FavoriteLink.tsx
- frontend/src/Components/LandingPage.tsx 45 additions, 33 deletionsfrontend/src/Components/LandingPage.tsx
- frontend/src/Components/LandingpageSVG.tsx 36 additions, 0 deletionsfrontend/src/Components/LandingpageSVG.tsx
- frontend/src/Components/MainPage.tsx 43 additions, 31 deletionsfrontend/src/Components/MainPage.tsx
- frontend/src/Components/NavButton.tsx 16 additions, 7 deletionsfrontend/src/Components/NavButton.tsx
- frontend/src/Components/usePoetry.tsx 6 additions, 3 deletionsfrontend/src/Components/usePoetry.tsx
- frontend/src/Media/cross-icon.png 0 additions, 0 deletionsfrontend/src/Media/cross-icon.png
- frontend/src/Media/favorite-active.png 0 additions, 0 deletionsfrontend/src/Media/favorite-active.png
- frontend/src/Media/favorite.png 0 additions, 0 deletionsfrontend/src/Media/favorite.png
- frontend/src/Media/left-arrow.png 0 additions, 0 deletionsfrontend/src/Media/left-arrow.png
- frontend/src/Media/right-arrow.png 0 additions, 0 deletionsfrontend/src/Media/right-arrow.png
- frontend/src/Style/ArtPage.css 58 additions, 8 deletionsfrontend/src/Style/ArtPage.css
- frontend/src/Style/DropDown.css 38 additions, 0 deletionsfrontend/src/Style/DropDown.css
- frontend/src/Style/FavoriteLink.css 0 additions, 0 deletionsfrontend/src/Style/FavoriteLink.css
Loading
Please register or sign in to comment