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.

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

Pull to own branch #1

Merged
merged 28 commits into from
Nov 12, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
8d7c44f
Refactor project structure and add Ant Design
TULENp Nov 8, 2022
a345ec1
Change structure a bit
TULENp Nov 8, 2022
395ae37
Refactor structure. final version
TULENp Nov 8, 2022
8bf7c40
Add filter. Import ant design styles to main.tsx
TULENp Nov 9, 2022
8393c63
Add Eslint Typescript
kildanL Nov 9, 2022
61181bd
Merge remote-tracking branch 'origin/Eugene's' into Rasim's
kildanL Nov 9, 2022
afd26fc
Add cart page and element
TULENp Nov 9, 2022
2a75ac0
Add data.ts. Add props to ProductCard_mini.tsx
TULENp Nov 9, 2022
c63922d
Move type and cardList to their own files.
TULENp Nov 9, 2022
2c405e4
Pass props to cards and get them. Add icons.
TULENp Nov 9, 2022
a223741
Add order page
TULENp Nov 9, 2022
5985a9a
Fix ts(7031) error
TULENp Nov 9, 2022
0084d1b
Add settings, orders list and favorites pages
TULENp Nov 10, 2022
82830b3
Fill favoritesPage with products.
TULENp Nov 10, 2022
8f1c00b
Add header
kildanL Nov 10, 2022
1dc3df5
Add orders pages and components
TULENp Nov 10, 2022
bb1347c
Fixed sort in Filter.tsx
TULENp Nov 10, 2022
862121a
Change Header
kildanL Nov 11, 2022
4d2042c
Merge remote-tracking branch 'origin/Dev' into Rasim's
kildanL Nov 11, 2022
7c0871f
Now PlantPage open selected plant (dirty hack)
TULENp Nov 11, 2022
c069e9e
Add Frontend and BackEnd folders. Move files.
TULENp Nov 11, 2022
b69cca4
Add base layout
kildanL Nov 11, 2022
f422b2d
Add plant pics. Styled ProductCard_mini
TULENp Nov 11, 2022
858dea8
Add folder FrontEnd
kildanL Nov 11, 2022
268f75a
Add folder FrontEnd
kildanL Nov 11, 2022
669ed6c
Merge remote-tracking branch 'origin/Rasim's' into Dev
TULENp Nov 11, 2022
7639947
remove src copy
TULENp Nov 11, 2022
6fbaa41
Change styles. Change Header
TULENp Nov 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add folder FrontEnd
  • Loading branch information
kildanL committed Nov 11, 2022
commit 268f75a2687216ac4502ba59c57c393acce77b63
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
19 changes: 0 additions & 19 deletions src/pages/MainPage/MainPage.tsx

This file was deleted.