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

intial template to begin #2

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

intial template to begin #2

wants to merge 104 commits into from

Commits on Oct 17, 2024

  1. Merge pull request #3 from OmarSanad3/header 

    Header
    @ossaammaaa
    ossaammaaa authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    b8a2a16 View commit details
    Browse the repository at this point in the history

  2. add footer

    @ossaammaaa
    ossaammaaa committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    cb04a8f View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. footer finsihed

    @ossaammaaa
    ossaammaaa committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    49a075b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from OmarSanad3/footer 

    Footer
    @ossaammaaa
    ossaammaaa authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    7f41d03 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'front' into header

    @ZyadElnaghy
    ZyadElnaghy authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    9607537 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6 from OmarSanad3/header 

    5od ya omsama
    @ZyadElnaghy
    ZyadElnaghy authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    9bb587c View commit details
    Browse the repository at this point in the history

  5. update

    @ossaammaaa
    ossaammaaa committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    fbf1bfa View commit details
    Browse the repository at this point in the history

  6. update side bar

    @ossaammaaa
    ossaammaaa committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    49d2aaa View commit details
    Browse the repository at this point in the history

  7. Merge pull request #7 from OmarSanad3/Osama 

    update side bar
    @ossaammaaa
    ossaammaaa authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    27efef3 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. fix nav rendering

    Zayd Elnaghy committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    14bff7d View commit details
    Browse the repository at this point in the history

  2. some refactors

    Zayd Elnaghy committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    7a3fef7 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Merge pull request #8 from OmarSanad3/naghy 

    some refactors
    @ZyadElnaghy
    ZyadElnaghy authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    51323ae View commit details
    Browse the repository at this point in the history

  2. login/register

    @ossaammaaa
    ossaammaaa committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    8cce831 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'front' into Osama

    @ZyadElnaghy
    ZyadElnaghy authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    15a95d0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #9 from OmarSanad3/Osama 

    login/register
    @ZyadElnaghy
    ZyadElnaghy authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    5a60204 View commit details
    Browse the repository at this point in the history

  5. fix navbar reg

    Zayd Elnaghy committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    ad9eb03 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #10 from OmarSanad3/naghy 

    fix navbar reg
    @ZyadElnaghy
    ZyadElnaghy authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    c52836c View commit details
    Browse the repository at this point in the history

  7. edits

    @ossaammaaa
    ossaammaaa committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    a24508d View commit details
    Browse the repository at this point in the history

  8. update

    @ossaammaaa
    ossaammaaa committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    25dc8d5 View commit details
    Browse the repository at this point in the history

  9. add intial menu

    Zayd Elnaghy committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    052c625 View commit details
    Browse the repository at this point in the history

  10. menu

    @ossaammaaa
    ossaammaaa committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    bb18990 View commit details
    Browse the repository at this point in the history

  11. fix

    Zayd Elnaghy committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    95c397f View commit details
    Browse the repository at this point in the history

  12. fix to solve

    Zayd Elnaghy committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    e645c69 View commit details
    Browse the repository at this point in the history

  13. update

    @ossaammaaa
    ossaammaaa committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    6513c31 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. filter and some navigation on menu

    Zayd Elnaghy committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    864b2fb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from OmarSanad3/naghy 

    Naghy
    @ZyadElnaghy
    ZyadElnaghy authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    ece4302 View commit details
    Browse the repository at this point in the history

  3. a

    @ossaammaaa
    ossaammaaa committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    2604d7e View commit details
    Browse the repository at this point in the history

  4. merging

    @ossaammaaa
    ossaammaaa committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    4f02bc5 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Created the models

    @OmarSanad3
    OmarSanad3 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    4a4a4ec View commit details
    Browse the repository at this point in the history

  2. basic setup and installed important packages

    @OmarSanad3
    OmarSanad3 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    aa93f19 View commit details
    Browse the repository at this point in the history

  3. handle refresh

    @ossaammaaa
    ossaammaaa committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    98a0ede View commit details
    Browse the repository at this point in the history

  4. fix

    Zayd Elnaghy committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    5b4c782 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #18 from OmarSanad3/naghy 

    fix
    @ZyadElnaghy
    ZyadElnaghy authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    3282d48 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'front' into osama

    @ossaammaaa
    ossaammaaa authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    ec4e1ea View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19 from OmarSanad3/osama 

    osama
    @ossaammaaa
    ossaammaaa authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    fcc01dc View commit details
    Browse the repository at this point in the history

  8. Some config

    @OmarSanad3
    OmarSanad3 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    fddc5a1 View commit details
    Browse the repository at this point in the history

  9. get ready with fetch

    Zayd Elnaghy committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    974e451 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #20 from OmarSanad3/naghy 

    get ready with fetch
    @ZyadElnaghy
    ZyadElnaghy authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    93e5b91 View commit details
    Browse the repository at this point in the history

  11. restaurants logic done

    @OmarSanad3
    OmarSanad3 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    e84dbcc View commit details
    Browse the repository at this point in the history

  12. added authentication

    Abdelsalam Ebrahim committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    8f003ee View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Merged successfully

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    b411470 View commit details
    Browse the repository at this point in the history

  2. Edited user model

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    3ac84c1 View commit details
    Browse the repository at this point in the history

  3. Edited app.js

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    eae6eb5 View commit details
    Browse the repository at this point in the history

  4. Small Changes

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    9649fef View commit details
    Browse the repository at this point in the history

  5. fixing bug in sidebar

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    3877efb View commit details
    Browse the repository at this point in the history

  6. Merge pull request #21 from OmarSanad3/naghy 

    fixing bug in sidebar
    @ZyadElnaghy
    ZyadElnaghy authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    7131a62 View commit details
    Browse the repository at this point in the history

  7. add StarRating component

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    9e63bda View commit details
    Browse the repository at this point in the history

  8. Merge pull request #22 from OmarSanad3/naghy 

    add StarRating component
    @ZyadElnaghy
    ZyadElnaghy authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    f6ab7e6 View commit details
    Browse the repository at this point in the history

  9. add callbacks

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    fc25946 View commit details
    Browse the repository at this point in the history

  10. link menu

    @ossaammaaa
    ossaammaaa committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    c4e616f View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' of https://github.com/OmarSanad3/food-ordering-app … 

    …into front
    @ossaammaaa
    ossaammaaa committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    8db99b6 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #23 from OmarSanad3/naghy 

    add callbacks
    @ZyadElnaghy
    ZyadElnaghy authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    3e303a7 View commit details
    Browse the repository at this point in the history

  13. handling resturant id

    @ossaammaaa
    ossaammaaa committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    a7965be View commit details
    Browse the repository at this point in the history

  14. handling resturant id

    @ossaammaaa
    ossaammaaa committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    c3952e3 View commit details
    Browse the repository at this point in the history

  15. get ready to get backend

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    df38e13 View commit details
    Browse the repository at this point in the history

  16. Small edits

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    943ade6 View commit details
    Browse the repository at this point in the history

  17. get ready to get backend

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    a2c38ab View commit details
    Browse the repository at this point in the history

  18. Merge branch 'sanad' into naghy

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    5bf6347 View commit details
    Browse the repository at this point in the history

  19. Added end point for updating (editing) restaurant

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    b300d4f View commit details
    Browse the repository at this point in the history

  20. add

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    66d4483 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #24 from OmarSanad3/naghy 

    Naghy
    @ZyadElnaghy
    ZyadElnaghy authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    42843ef View commit details
    Browse the repository at this point in the history

  22. add to cart

    @ossaammaaa
    ossaammaaa committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d34c1f8 View commit details
    Browse the repository at this point in the history

  23. user cart done

    Abdelsalam Ebrahim committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    2b9145b View commit details
    Browse the repository at this point in the history

  24. .

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    48d94bc View commit details
    Browse the repository at this point in the history

  25. .

    Abdelsalam Ebrahim committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    1b9c9b8 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'front' into osama

    @ZyadElnaghy
    ZyadElnaghy authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    826abbe View commit details
    Browse the repository at this point in the history

  27. Merge pull request #25 from OmarSanad3/osama 

    osama
    @ZyadElnaghy
    ZyadElnaghy authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    55191b6 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'abdelsalam' into sanad

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    b70a024 View commit details
    Browse the repository at this point in the history

  29. update

    @ossaammaaa
    ossaammaaa committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    0187b18 View commit details
    Browse the repository at this point in the history

  30. .

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    b00eb90 View commit details
    Browse the repository at this point in the history

  31. git router

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    7ca73b4 View commit details
    Browse the repository at this point in the history

  32. Added add-review logic

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    bcc417c View commit details
    Browse the repository at this point in the history

  33. updated signup

    Abdelsalam Ebrahim committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    ebc23eb View commit details
    Browse the repository at this point in the history

  34. updated register

    Abdelsalam Ebrahim committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    2b1ab4a View commit details
    Browse the repository at this point in the history

  35. handle routes

    Zayd Elnaghy committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    9e2dd53 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #26 from OmarSanad3/naghy 

    Naghy
    @ZyadElnaghy
    ZyadElnaghy authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    95f3267 View commit details
    Browse the repository at this point in the history

  37. Added the review functionalities

    @OmarSanad3
    OmarSanad3 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    4da103b View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Edited get Restaurants In Location

    @OmarSanad3
    OmarSanad3 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    59e6c96 View commit details
    Browse the repository at this point in the history

  2. handle routes

    Zayd Elnaghy committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    0b1d933 View commit details
    Browse the repository at this point in the history

  3. edit get restaurant method

    @OmarSanad3
    OmarSanad3 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    278129f View commit details
    Browse the repository at this point in the history

  4. cart

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    449f845 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'sanad' into osama

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d246792 View commit details
    Browse the repository at this point in the history

  6. handle routes

    Zayd Elnaghy committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    6c2567c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #27 from OmarSanad3/naghy 

    Naghy
    @ZyadElnaghy
    ZyadElnaghy authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    af948db View commit details
    Browse the repository at this point in the history

  8. handling some errors

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    7bc18e7 View commit details
    Browse the repository at this point in the history

  9. update

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    7b86e18 View commit details
    Browse the repository at this point in the history

  10. handle routes

    Zayd Elnaghy committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    5273176 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #28 from OmarSanad3/naghy 

    handle routes
    @ZyadElnaghy
    ZyadElnaghy authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    a275a89 View commit details
    Browse the repository at this point in the history

  12. update

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    ad3e909 View commit details
    Browse the repository at this point in the history

  13. last change

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    98e3389 View commit details
    Browse the repository at this point in the history

  14. update

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    428fa3e View commit details
    Browse the repository at this point in the history

  15. fix bug img

    Zayd Elnaghy committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    69816b5 View commit details
    Browse the repository at this point in the history

  16. fix

    Zayd Elnaghy committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d5da5d4 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'front' into osama

    @ZyadElnaghy
    ZyadElnaghy authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    e731ebe View commit details
    Browse the repository at this point in the history

  18. Merge pull request #29 from OmarSanad3/osama 

    Osama
    @ZyadElnaghy
    ZyadElnaghy authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    9e66aea View commit details
    Browse the repository at this point in the history

  19. Edited the reviews returned by the restaurant data

    @OmarSanad3
    OmarSanad3 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    a3183c1 View commit details
    Browse the repository at this point in the history

  20. update

    Zayd Elnaghy committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    96f1342 View commit details
    Browse the repository at this point in the history

  21. fix bugs in review

    Zayd Elnaghy committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    42d94ce View commit details
    Browse the repository at this point in the history

  22. updating

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d0996b2 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'front' into osama

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    06e555a View commit details
    Browse the repository at this point in the history

  24. update cart

    @ossaammaaa
    ossaammaaa committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    195afa5 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #30 from OmarSanad3/osama 

    Osama
    @ZyadElnaghy
    ZyadElnaghy authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    aabdc07 View commit details
    Browse the repository at this point in the history

  26. wrong

    Zayd Elnaghy committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    51af776 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #31 from OmarSanad3/osama 

    wrong
    @ZyadElnaghy
    ZyadElnaghy authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    9746934 View commit details
    Browse the repository at this point in the history