Merge branch 'favorite-button' into 'master' (ca72237c) · Commits · Anne Mosvold Ørke / Prosjekt 2 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Prosjekt 2
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

ca72237c

Commit ca72237c authored 4 years ago by Thor-Herman Van Eggelen

Downloads
- Plain Diff

Merge branch 'favorite-button' into 'master'

Add Favorite button and favorites to landing page #2 #8

See merge request it2810-h20/team-75/prosjekt-2!10

parents db6b93b5 1e3963f6

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

frontend/src/Components/ArtPage.tsx 1 addition, 1 deletion

frontend/src/Components/ArtPage.tsx
frontend/src/Components/FavoriteButton.tsx 33 additions, 3 deletions

frontend/src/Components/FavoriteButton.tsx
frontend/src/Components/FavoriteLink.tsx 15 additions, 0 deletions

frontend/src/Components/FavoriteLink.tsx
frontend/src/Components/LandingPage.tsx 49 additions, 32 deletions

frontend/src/Components/LandingPage.tsx
frontend/src/Components/MainPage.tsx 13 additions, 3 deletions

frontend/src/Components/MainPage.tsx
frontend/src/Components/NavButton.tsx 3 additions, 2 deletions

frontend/src/Components/NavButton.tsx
frontend/src/Media/favorite-active.png 0 additions, 0 deletions

frontend/src/Media/favorite-active.png
frontend/src/Media/favorite.png 0 additions, 0 deletions

frontend/src/Media/favorite.png
frontend/src/Style/FavoriteLink.css 0 additions, 0 deletions

frontend/src/Style/FavoriteLink.css
frontend/src/Style/LandingPage.css 6 additions, 0 deletions

frontend/src/Style/LandingPage.css

with 120 additions and 41 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment