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

Final Project || Museek || Alma & Etna #51

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

Final Project || Museek || Alma & Etna #51

wants to merge 188 commits into from

Commits on May 28, 2024

  1. Added json and created some folders

    @almaherris
    almaherris committed May 28, 2024
    Configuration menu
    Copy the full SHA
    87d1105 View commit details
    Browse the repository at this point in the history

  2. Created detailspage and components related to it

    @almaherris
    almaherris committed May 28, 2024
    Configuration menu
    Copy the full SHA
    be14180 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. setting up the components

    @Caracal23
    Caracal23 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    37d7938 View commit details
    Browse the repository at this point in the history

  2. working the searchbar

    @Caracal23
    Caracal23 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    8917c92 View commit details
    Browse the repository at this point in the history

  3. adding components on the landing page

    @Caracal23
    Caracal23 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    efa670a View commit details
    Browse the repository at this point in the history

  4. some work on notfound

    @almaherris
    almaherris committed May 29, 2024
    Configuration menu
    Copy the full SHA
    c2a3762 View commit details
    Browse the repository at this point in the history

  5. creating carousel

    @Caracal23
    Caracal23 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    a1e12ff View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge pull request #1 from Caracal23/detail-page 

    Detail page merge
    @almaherris
    almaherris authored May 30, 2024
    Configuration menu
    Copy the full SHA
    77d7e54 View commit details
    Browse the repository at this point in the history

  2. set up routes and added more items to json

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    3ba6ae2 View commit details
    Browse the repository at this point in the history

  3. descriptions for all museums

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    24ce241 View commit details
    Browse the repository at this point in the history

  4. removed duplicates from museum list

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    8a182e5 View commit details
    Browse the repository at this point in the history

  5. setting up route with useParams

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    35f4149 View commit details
    Browse the repository at this point in the history

  6. commit

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    c2f09a0 View commit details
    Browse the repository at this point in the history

  7. "added id in json and updated userpage"

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ff97796 View commit details
    Browse the repository at this point in the history

  8. solved issue in useParams and details page

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    17b4f3f View commit details
    Browse the repository at this point in the history

  9. updated details in json

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    929b1dd View commit details
    Browse the repository at this point in the history

  10. added dummy text to pages

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    7959dbe View commit details
    Browse the repository at this point in the history

  11. added conditional rendering of restaurant icon

    @almaherris
    almaherris committed May 30, 2024
    Configuration menu
    Copy the full SHA
    8e3910f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. added link to museumcard

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    d503cba View commit details
    Browse the repository at this point in the history

  2. added icons for userpage on navbar

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    0bab588 View commit details
    Browse the repository at this point in the history

  3. extended search result to location and theme

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    d5d0bc9 View commit details
    Browse the repository at this point in the history

  4. added linking to detail page from search results

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    fea6f49 View commit details
    Browse the repository at this point in the history

  5. backend copied from last week and adjusted for this project

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    d82dea9 View commit details
    Browse the repository at this point in the history

  6. Copied and set up login and register from auth project

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    8c6c01e View commit details
    Browse the repository at this point in the history

  7. Copy and set up userpage

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    631072d View commit details
    Browse the repository at this point in the history

  8. text and comments on userpage and login page

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    eaed909 View commit details
    Browse the repository at this point in the history

  9. started setting up review function

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    31ae380 View commit details
    Browse the repository at this point in the history

  10. added comment about delete method

    @almaherris
    almaherris committed May 31, 2024
    Configuration menu
    Copy the full SHA
    12755d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Installed styled components and start working on styling landing page… 

    … components
    @Caracal23
    Caracal23 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    5010798 View commit details
    Browse the repository at this point in the history

  2. hero and nav bar styled from mobil view

    @Caracal23
    Caracal23 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    b210dba View commit details
    Browse the repository at this point in the history

  3. backend - comment section

    @almaherris
    almaherris committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    28caee0 View commit details
    Browse the repository at this point in the history

  4. tried making musuemId in comments work

    @almaherris
    almaherris committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    941c6de View commit details
    Browse the repository at this point in the history

  5. created getcomment component

    @almaherris
    almaherris committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    9b61ad8 View commit details
    Browse the repository at this point in the history

  6. family font added, keep on styling

    @Caracal23
    Caracal23 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    5657f84 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. placing correct searchbar component

    @Caracal23
    Caracal23 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    81689e8 View commit details
    Browse the repository at this point in the history

  2. keep on styling work

    @Caracal23
    Caracal23 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    485533c View commit details
    Browse the repository at this point in the history

  3. search bar error message and result presentation

    @Caracal23
    Caracal23 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    95c8f3a View commit details
    Browse the repository at this point in the history

  4. icon button to scroll smoothly up

    @Caracal23
    Caracal23 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    d36c17c View commit details
    Browse the repository at this point in the history

  5. added get comment component

    @almaherris
    almaherris committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    7485bbd View commit details
    Browse the repository at this point in the history

  6. backend - made sure museumId is a number

    @almaherris
    almaherris committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    9287fbb View commit details
    Browse the repository at this point in the history

  7. made sure museumId is a number

    @almaherris
    almaherris committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    0e82640 View commit details
    Browse the repository at this point in the history

  8. re-arranging components; working on grid style

    @Caracal23
    Caracal23 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    9b4624e View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. css work continues; liked button added

    @Caracal23
    Caracal23 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3a6efce View commit details
    Browse the repository at this point in the history

  2. museum comments appearing on the correct page

    @almaherris
    almaherris committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    e380e29 View commit details
    Browse the repository at this point in the history

  3. added comment in getcomments

    @almaherris
    almaherris committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    495e2c7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feature/comment

    @almaherris
    almaherris authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    73fd2f5 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2 from Caracal23/feature/comment 

    Feature/comment
    @almaherris
    almaherris authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    1c9514a View commit details
    Browse the repository at this point in the history

  6. newsletter added

    @Caracal23
    Caracal23 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    89cc7b4 View commit details
    Browse the repository at this point in the history

  7. working on fav button

    @Caracal23
    Caracal23 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    54c24ca View commit details
    Browse the repository at this point in the history

  8. Favorite endpoint created and button works

    @Caracal23
    Caracal23 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    1e285f4 View commit details
    Browse the repository at this point in the history

  9. newsletter submit button

    @Caracal23
    Caracal23 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    d2c5a69 View commit details
    Browse the repository at this point in the history

  10. Newsletter success message

    @Caracal23
    Caracal23 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    cd4e571 View commit details
    Browse the repository at this point in the history

  11. updated json

    @almaherris
    almaherris committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2c73cb3 View commit details
    Browse the repository at this point in the history

  12. updated msueum json

    @almaherris
    almaherris committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    d272b2c View commit details
    Browse the repository at this point in the history

  13. update json

    @almaherris
    almaherris committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2fb4c41 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. json update

    @almaherris
    almaherris committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    659d492 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from Caracal23/feature/images 

    Feature/images
    @almaherris
    almaherris authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    f1e041f View commit details
    Browse the repository at this point in the history

  3. Update Footer.styled.jsx

    @Caracal23
    Caracal23 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    e555efc View commit details
    Browse the repository at this point in the history

  4. image addition

    @Caracal23
    Caracal23 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    de4d42b View commit details
    Browse the repository at this point in the history

  5. styled components in detailpage and json update

    @almaherris
    almaherris committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    fda2e4f View commit details
    Browse the repository at this point in the history

  6. added authentication to comment section

    @almaherris
    almaherris committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1b2cd56 View commit details
    Browse the repository at this point in the history

  7. some styling in detailpage

    @almaherris
    almaherris committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    bfb898f View commit details
    Browse the repository at this point in the history

  8. Styling in progress

    @Caracal23
    Caracal23 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    fa7d250 View commit details
    Browse the repository at this point in the history

  9. styling detailpage

    @almaherris
    almaherris committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    dc5f640 View commit details
    Browse the repository at this point in the history

  10. starting responsiveness

    @Caracal23
    Caracal23 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    bc7242c View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge branch 'main' into detail-page

    @almaherris
    almaherris authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    03c3efd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from Caracal23/detail-page 

    Detail page work
    @almaherris
    almaherris authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e3e6b53 View commit details
    Browse the repository at this point in the history

  3. detailpage - created parent component for comments, enabling instant … 

    …fetch of posted comment
    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    7fbdb41 View commit details
    Browse the repository at this point in the history

  4. tried adding user to comments but not working yet...!

    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    dfdc3ab View commit details
    Browse the repository at this point in the history

  5. working on style

    @Caracal23
    Caracal23 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e7ec2e4 View commit details
    Browse the repository at this point in the history

  6. backend - added delete method to reviews

    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    5281ca0 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5 from Caracal23/detail-page 

    Detail page
    @almaherris
    almaherris authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    f783700 View commit details
    Browse the repository at this point in the history

  8. delete method for reviews working

    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    681f4c0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #6 from Caracal23/detail-page 

    delete method for reviews working
    @almaherris
    almaherris authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    29888f6 View commit details
    Browse the repository at this point in the history

  10. styling detailpage

    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    b5588a5 View commit details
    Browse the repository at this point in the history

  11. css and one item to the json file

    @Caracal23
    Caracal23 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    ec455e8 View commit details
    Browse the repository at this point in the history

  12. working on css register and login pages

    @Caracal23
    Caracal23 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    bdabdad View commit details
    Browse the repository at this point in the history

  13. Merge pull request #7 from Caracal23/detail-page 

    styling detailpage
    @almaherris
    almaherris authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    22d1702 View commit details
    Browse the repository at this point in the history

  14. styling detailpage

    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    bb1a2e3 View commit details
    Browse the repository at this point in the history

  15. more styling detailpage

    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    0b0e970 View commit details
    Browse the repository at this point in the history

  16. updated location in json

    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    755c2c9 View commit details
    Browse the repository at this point in the history

  17. updated backarrow

    @almaherris
    almaherris committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    d61b691 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #8 from Caracal23/detail-page 

    updated backarrow
    @almaherris
    almaherris authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    a606894 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. updated review.js

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    630ddf3 View commit details
    Browse the repository at this point in the history

  2. split up the backend

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    f5d304f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9 from Caracal23/backend/structure 

    split up the backend
    @almaherris
    almaherris authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    9903377 View commit details
    Browse the repository at this point in the history

  4. create mongoose model for Museum

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    465b70e View commit details
    Browse the repository at this point in the history

  5. fixed size problem in carousel

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    0345f42 View commit details
    Browse the repository at this point in the history

  6. responsiveness searchbar

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    373384a View commit details
    Browse the repository at this point in the history

  7. added gradient black at hero bottom

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    5ec76d1 View commit details
    Browse the repository at this point in the history

  8. update detailpage

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    14b4212 View commit details
    Browse the repository at this point in the history

  9. updated ref about and cotact pages

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    4ffe279 View commit details
    Browse the repository at this point in the history

  10. typo contactpage

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    cca36da View commit details
    Browse the repository at this point in the history

  11. added wordwrap breakword to comment section

    @almaherris
    almaherris committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    715ffd8 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. css work detail page

    @Caracal23
    Caracal23 committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    fbae7da View commit details
    Browse the repository at this point in the history

  2. todo list and add shoppage

    @almaherris
    almaherris committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    8e00144 View commit details
    Browse the repository at this point in the history

  3. removed museumdate ffrom insertmany

    @almaherris
    almaherris committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    66bd86d View commit details
    Browse the repository at this point in the history

  4. imported museumdata correctly

    @almaherris
    almaherris committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    fc1ad1f View commit details
    Browse the repository at this point in the history

  5. working with the favorite button per user id

    @Caracal23
    Caracal23 committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    9c5f01b View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. endpoint for museums set up

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    ea22565 View commit details
    Browse the repository at this point in the history

  2. temporary update shopPage

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    985af94 View commit details
    Browse the repository at this point in the history

  3. more update to shopPage

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    e216ada View commit details
    Browse the repository at this point in the history

  4. updated amount to show in grid

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    cb12d3f View commit details
    Browse the repository at this point in the history

  5. added some logos

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    9a11164 View commit details
    Browse the repository at this point in the history

  6. set up React leaflet map for grid

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    02b033b View commit details
    Browse the repository at this point in the history

  7. favorited museums per user

    @Caracal23
    Caracal23 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    2beb6fa View commit details
    Browse the repository at this point in the history

  8. Update toDo

    @Caracal23
    Caracal23 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    88922e2 View commit details
    Browse the repository at this point in the history

  9. updated detail page image positioning for phone/tablet

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    7dc76ac View commit details
    Browse the repository at this point in the history

  10. removed borders

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    2b82dc4 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into frontend/general

    @almaherris
    almaherris authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    79d5a22 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #10 from Caracal23/frontend/general 

    Frontend/general
    @almaherris
    almaherris authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    65433a4 View commit details
    Browse the repository at this point in the history

  13. update z-index for navbar to be on top of map

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    39d2666 View commit details
    Browse the repository at this point in the history

  14. solved conflict in detailpage

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    b844afa View commit details
    Browse the repository at this point in the history

  15. more updated image detailpage

    @almaherris
    almaherris committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    45140d1 View commit details
    Browse the repository at this point in the history

  16. Update package.json

    @Caracal23
    Caracal23 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    6bfe61c View commit details
    Browse the repository at this point in the history

  17. user name added to the museum comments

    @Caracal23
    Caracal23 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    954a8bf View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. testing new images for carousel

    @Caracal23
    Caracal23 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    c641f04 View commit details
    Browse the repository at this point in the history

  2. starting to work on comments per user in Userpage

    @Caracal23
    Caracal23 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    38bf7ed View commit details
    Browse the repository at this point in the history

  3. changed place of the heart in detailpage and aligned comment sections

    @almaherris
    almaherris committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    e50d2f9 View commit details
    Browse the repository at this point in the history

  4. added heart function to grid page

    @almaherris
    almaherris committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    b745e07 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11 from Caracal23/detail-page 

    Detail page
    @almaherris
    almaherris authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    82efa19 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. new font, updated links in navbar

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    3ad8b05 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12 from Caracal23/frontend/design 

    new font, updated links in navbar
    @almaherris
    almaherris authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    f739eff View commit details
    Browse the repository at this point in the history

  3. todo list update

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    75c2213 View commit details
    Browse the repository at this point in the history

  4. added point to todolist

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    8ab0a05 View commit details
    Browse the repository at this point in the history

  5. fetch from deployed API in landingpage

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    564f7cc View commit details
    Browse the repository at this point in the history

  6. endpoint for musuem id created

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    68fd82b View commit details
    Browse the repository at this point in the history

  7. Merge pull request #13 from Caracal23/backend/connect 

    Backend/connect
    @almaherris
    almaherris authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    33280d8 View commit details
    Browse the repository at this point in the history

  8. console logs to debug deployed version

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    4920171 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #14 from Caracal23/backend/connect 

    console logs to debug deployed version
    @almaherris
    almaherris authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    ca6c157 View commit details
    Browse the repository at this point in the history

  10. fetching from real api set up

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9ce551b View commit details
    Browse the repository at this point in the history

  11. starting to work on the review backend

    @Caracal23
    Caracal23 committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    0d07749 View commit details
    Browse the repository at this point in the history

  12. navbar hamburger menu

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    062d2ba View commit details
    Browse the repository at this point in the history

  13. small design updates

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    83701a4 View commit details
    Browse the repository at this point in the history

  14. add the user name to userpage header

    @Caracal23
    Caracal23 committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    42fc4e7 View commit details
    Browse the repository at this point in the history

  15. go back buttons and navbar

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    612c5bb View commit details
    Browse the repository at this point in the history

  16. break out map component

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    2da5662 View commit details
    Browse the repository at this point in the history

  17. reinstalled dependencies

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    6adb28c View commit details
    Browse the repository at this point in the history

  18. rename backbutton

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    a008d0a View commit details
    Browse the repository at this point in the history

  19. fixed map lat long prop passing

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    8bc029d View commit details
    Browse the repository at this point in the history

  20. Merge branch 'main' into backend/connect

    @almaherris
    almaherris authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    a3d34a0 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #15 from Caracal23/backend/connect 

    Backend/connect
    @almaherris
    almaherris authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    88e1adf View commit details
    Browse the repository at this point in the history

  22. solved double icons in navbar for mobile

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    a48f616 View commit details
    Browse the repository at this point in the history

  23. update todo

    @almaherris
    almaherris committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    cbf4c8e View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. ToDo list points

    @Caracal23
    Caracal23 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    1741a80 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/Caracal23/project-final

    @Caracal23
    Caracal23 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    8ccb7a3 View commit details
    Browse the repository at this point in the history

  3. ToDo list updated

    @Caracal23
    Caracal23 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    c8947de View commit details
    Browse the repository at this point in the history

  4. json update and filter bar started

    @almaherris
    almaherris committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    161ecc4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into museumpage

    @almaherris
    almaherris authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    8cd46d5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #16 from Caracal23/museumpage 

    json update and filter bar started
    @almaherris
    almaherris authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    9c40cbf View commit details
    Browse the repository at this point in the history

  7. styled museumpage and filterbar

    @almaherris
    almaherris committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    259dddb View commit details
    Browse the repository at this point in the history

  8. added button to clear filters

    @almaherris
    almaherris committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    9273d69 View commit details
    Browse the repository at this point in the history

  9. added active state to navbar links

    @almaherris
    almaherris committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    7f3b1ea View commit details
    Browse the repository at this point in the history

  10. Updated ToDo list completed

    @Caracal23
    Caracal23 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    6e9f353 View commit details
    Browse the repository at this point in the history

  11. Rating stars for comments

    @Caracal23
    Caracal23 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    77bc947 View commit details
    Browse the repository at this point in the history

  12. error messages for comments and for rating stars

    @Caracal23
    Caracal23 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    a1e5272 View commit details
    Browse the repository at this point in the history

  13. toDo updated

    @Caracal23
    Caracal23 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    c785e32 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. clear rating after submit

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    cd8c9cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into museumpage

    @almaherris
    almaherris authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4ff5611 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #17 from Caracal23/museumpage 

    Museumpage
    @almaherris
    almaherris authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    32eabb1 View commit details
    Browse the repository at this point in the history

  4. added link to usercomments

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    80a0018 View commit details
    Browse the repository at this point in the history

  5. updated shop button

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    f4b7afd View commit details
    Browse the repository at this point in the history

  6. deleted filed not needed

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    054d17f View commit details
    Browse the repository at this point in the history

  7. update image

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    26d6467 View commit details
    Browse the repository at this point in the history

  8. added logic to disable login when already logged in

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7d414cf View commit details
    Browse the repository at this point in the history

  9. style unauth user page

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    a778dd2 View commit details
    Browse the repository at this point in the history

  10. update loading state landingpage

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    44f5b37 View commit details
    Browse the repository at this point in the history

  11. set up modale login from detailpage

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7c38f41 View commit details
    Browse the repository at this point in the history

  12. styling in modale

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    08ce051 View commit details
    Browse the repository at this point in the history

  13. more styling modal

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    c0d6eaa View commit details
    Browse the repository at this point in the history

  14. random styling and fixes

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    8205ac6 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #18 from Caracal23/feature/modale 

    Feature/modale
    @almaherris
    almaherris authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    1b87786 View commit details
    Browse the repository at this point in the history

  16. update todo

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7f7216a View commit details
    Browse the repository at this point in the history

  17. styling updates everywhere

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    3fe7476 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #19 from Caracal23/feature/modale 

    Feature/modale
    @almaherris
    almaherris authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    8a76435 View commit details
    Browse the repository at this point in the history

  19. filterbar and museumpage

    @almaherris
    almaherris committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4151199 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. window scroll up update

    @almaherris
    almaherris committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    88f7074 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #20 from Caracal23/feature/modale 

    Feature/modale
    @almaherris
    almaherris authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    6ae19d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. clean up styled components, single use in same component, multiple us… 

    …e in own component
    @almaherris
    almaherris committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    5bcc1ba View commit details
    Browse the repository at this point in the history

  2. ordered lists alfabetically

    @almaherris
    almaherris committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    ed52017 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #21 from Caracal23/frontend/design 

    Frontend/design
    @almaherris
    almaherris authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    c701959 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Complete ReadMe

    @Caracal23
    Caracal23 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    194b51e View commit details
    Browse the repository at this point in the history

  2. Remove our ToDo List

    @Caracal23
    Caracal23 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    00c951e View commit details
    Browse the repository at this point in the history

  3. added more padding to title in detailpage

    @almaherris
    almaherris committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    82990fc View commit details
    Browse the repository at this point in the history

  4. accessibility improvements

    @almaherris
    almaherris committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    8c1a309 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. changed name of utils file and removed width rule in userpage as sugg… 

    …ested in review
    @almaherris
    almaherris committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    f4a97fe View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. added loading state to museumpage

    @almaherris
    almaherris committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    1dda8cd View commit details
    Browse the repository at this point in the history

  2. added loading state to landing page

    @almaherris
    almaherris committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    a9c338e View commit details
    Browse the repository at this point in the history