CadmiumRed40 / FindAFlick

Group Movie App
4 stars 3 forks source link

Add search #24

Closed pan-alex closed 2 years ago

pan-alex commented 2 years ago

Description of the PR:

Changes in this PR include:

image

Co-authored by @edward2550

pan-alex commented 2 years ago

This is to address issue #11

floorrinse commented 2 years ago

I noticed some changes you made that would overwrite what's currently in the main branch. Github also is letting you know you'll have to resolve those conflicts before you merge this pr (fyi i pushed up a profile nav menu change that would be overwritten)

pan-alex commented 2 years ago

From what I can tell this is just the style.css? I know that several branches have made changes to the CSS; I purposely only added 3 declarations so it should be simple to resolve (by accepting both changes) at merge.

floorrinse commented 2 years ago

From what I can tell this is just the style.css? I know that several branches have made changes to the CSS; I purposely only added 3 declarations so it should be simple to resolve (by accepting both changes) at merge.

There's also the views/ejs.file where I added in the menu component if you check out the main branch code: https://github.com/CadmiumRed40/FindAFlick/blob/main/views/flix.ejs#L11

I can add it back in later though after this is merged

pan-alex commented 2 years ago

Merging PR.