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

Pull to own branch #1

Merged
merged 28 commits into from
Nov 12, 2022
Merged

Pull to own branch #1

merged 28 commits into from
Nov 12, 2022

Commits on Nov 8, 2022

  1. Refactor project structure and add Ant Design

    @TULENp
    TULENp committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    8d7c44f View commit details
    Browse the repository at this point in the history

  2. Change structure a bit

    @TULENp
    TULENp committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    a345ec1 View commit details
    Browse the repository at this point in the history

  3. Refactor structure. final version

    @TULENp
    TULENp committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    395ae37 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. Add filter. Import ant design styles to main.tsx 

    import styles
    @TULENp
    TULENp committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    8bf7c40 View commit details
    Browse the repository at this point in the history

  2. Add Eslint Typescript

    @kildanL
    kildanL committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    8393c63 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/Eugene's' into Rasim's

    @kildanL
    kildanL committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    61181bd View commit details
    Browse the repository at this point in the history

  4. Add cart page and element

    @TULENp
    TULENp committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    afd26fc View commit details
    Browse the repository at this point in the history

  5. Add data.ts. Add props to ProductCard_mini.tsx 

    Data.ts added for backend simulating. Add placeholder images.
    @TULENp
    TULENp committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    2a75ac0 View commit details
    Browse the repository at this point in the history

  6. Move type and cardList to their own files.

    @TULENp
    TULENp committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    c63922d View commit details
    Browse the repository at this point in the history

  7. Pass props to cards and get them. Add icons.

    @TULENp
    TULENp committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    2c405e4 View commit details
    Browse the repository at this point in the history

  8. Add order page

    @TULENp
    TULENp committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    a223741 View commit details
    Browse the repository at this point in the history

  9. Fix ts(7031) error

    @TULENp
    TULENp committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    5985a9a View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. Add settings, orders list and favorites pages

    @TULENp
    TULENp committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    0084d1b View commit details
    Browse the repository at this point in the history

  2. Fill favoritesPage with products.

    @TULENp
    TULENp committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    82830b3 View commit details
    Browse the repository at this point in the history

  3. Add header

    @kildanL
    kildanL committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    8f1c00b View commit details
    Browse the repository at this point in the history

  4. Add orders pages and components 

    Add OrderList, OrderListPage, CompletedOrderPage.
    @TULENp
    TULENp committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    1dc3df5 View commit details
    Browse the repository at this point in the history

  5. Fixed sort in Filter.tsx

    @TULENp
    TULENp committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    bb1347c View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. Change Header

    @kildanL
    kildanL committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    862121a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/Dev' into Rasim's

    @kildanL
    kildanL committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    4d2042c View commit details
    Browse the repository at this point in the history

  3. Now PlantPage open selected plant (dirty hack) 

    And add some code comments
    @TULENp
    TULENp committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    7c0871f View commit details
    Browse the repository at this point in the history

  4. Add Frontend and BackEnd folders. Move files. 

    Move files to FrontEnd folder
    @TULENp
    TULENp committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    c069e9e View commit details
    Browse the repository at this point in the history

  5. Add base layout

    @kildanL
    kildanL committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    b69cca4 View commit details
    Browse the repository at this point in the history

  6. Add plant pics. Styled ProductCard_mini

    @TULENp
    TULENp committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    f422b2d View commit details
    Browse the repository at this point in the history

  7. Add folder FrontEnd

    @kildanL
    kildanL committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    858dea8 View commit details
    Browse the repository at this point in the history

  8. Add folder FrontEnd

    @kildanL
    kildanL committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    268f75a View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/Rasim's' into Dev

    @TULENp
    TULENp committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    669ed6c View commit details
    Browse the repository at this point in the history

  10. remove src copy

    @TULENp
    TULENp committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    7639947 View commit details
    Browse the repository at this point in the history

  11. Change styles. Change Header

    @TULENp
    TULENp committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    6fbaa41 View commit details
    Browse the repository at this point in the history