merge with main - #6

Draft

Timur-Sul wants to merge 67 commits into

Commits on Apr 21, 2024

Start React
Insatsu
committed
71e0458

Commits on Apr 23, 2024

Update README.md
awderi
authored
d205343

Commits on Apr 24, 2024

Showing HomePage on React
Insatsu
committed
343bf15
Update README.md
awderi
authored
2488a53
the first version of the authorization system has been added
JoskiyChel
committed
4e017a0
Extra test pages have been removed
JoskiyChel
committed
6926bf5
Merge remote-tracking branch 'origin/pythonApi'
JoskiyChel
committed
e4462c7
Removed test styles
JoskiyChel
committed
215aa07
-Added a section for choosing flowers for sale
WhitePencil1
committed
7bda673
Merge branch 'front'
WhitePencil1
committed
c6cf09c
-Fixed the merge...
WhitePencil1
committed
fd35097

Commits on Apr 26, 2024

Take new front
Insatsu
committed
3beabb5
Try to solve "can't resolve" problem
Insatsu
committed
a237e82
Make switch(of course it is test) between pages & add some TODO.
Insatsu
committed
192a7df
test
Insatsu
committed
deca290
Merge branch 'Insatsu'. It works(at least on my PC)
Insatsu
committed
8e59c17
solve some problem
Insatsu
committed
1f85791

Commits on Apr 27, 2024

Added the multer middleware and uploaded a few images
Maxim
committed
d3743e6
fixed a little mistake
Maxim
committed
ba4068e
multer realisation has been removed
Maxim
committed
e8ee4cf
Footer added
WhitePencil1
committed
78a8c4f
Merge branch 'main' of https://github.com/algorithm-ssau/Lycoris_
Maxim
committed
3cd1887

Commits on Apr 28, 2024

take
Insatsu
committed
91b253e
take
Insatsu
committed
941c382

Commits on Apr 29, 2024

Added Purchase Page and some example images
WhitePencil1
committed
73d597f
- Completed purchase page;
WhitePencil1
committed
71273af
add footer to ShopItemsPage
Insatsu
committed
bb98aa2
temp merge
Insatsu
committed
6d0d4bc
add purchase
Insatsu
committed
1b63e79

Commits on May 6, 2024

make docker for front & back but still not python. make connection with mongodb. there is a little problem with style on purchase_page
Insatsu
committed
17e93b2

Commits on May 9, 2024

Commits on May 11, 2024

- Added cart page;
WhitePencil1
committed
f3b215d

Commits on May 12, 2024

temp_2
Insatsu
committed
1dc9409
add cart_page ; change pyApi
Insatsu
committed
c989e3c
Merged with Insatsu
Insatsu
committed
0027132
Update README.md
Insatsu
authored
c35801e

Commits on May 20, 2024

Add shoppingCarts
Timur-Sul
committed
935f9e6
fix
Timur-Sul
committed
6909c60
docker works again; some update
Insatsu
committed
a739c83
Replenishment of the database
Timur-Sul
committed
ab1e859
api update
JoskiyChel
committed
1ca3aca
requirements update
JoskiyChel
committed
2ecaeee
deleted test flask pages
JoskiyChel
committed
62729bb

Commits on May 21, 2024

start make user&cart actions
Insatsu
committed
dc66246
Add a shopping cart request by user
Timur-Sul
committed
d871e4b
Merge branch 'main' of https://github.com/algorithm-ssau/Lycoris_ into main
Timur-Sul
committed
42c7a59
Add a request to add flowers to the cart
Timur-Sul
committed
a776f05
Homepage translated
Maxim
committed
3de1a87
Footer translated
Maxim
committed
deb8b2f
CartContent & FlowerItem translated
Maxim
committed
179f79c
Merge pull request #7 from algorithm-ssau/Rimiol
awderi
authored
9398cfa

Commits on May 22, 2024

Merge branch 'main' into Insatsu
Insatsu
committed
81fb966

Commits on May 23, 2024

- Added user registration (login) page;
WhitePencil1
committed
c9b6aa9

Commits on May 24, 2024

- Added a page for user registration;
WhitePencil1
committed
20f0fd5
make cart
Insatsu
committed
44208a8
remove cache
Insatsu
committed
3ef97bd
make order add to db
Insatsu
committed
3bb3fae

Commits on May 25, 2024

make profile
Insatsu
committed
4be7c68
start make login/reg
Insatsu
committed
614521c
- Added scaling of profile pictures;
WhitePencil1
committed
361f154
readme update (опять)
JoskiyChel
committed
3dad8d7

Commits on May 26, 2024

96% made. I'll leave the rest to you
Insatsu
committed
aae424f
Merge branch 'Insatsu'
Insatsu
committed
7d4f59f

Commits on Jun 3, 2024

Fixed some bugs
WhitePencil1
committed
0019653
readme, again
JoskiyChel
committed
0802317
- Fixed some more bugs;
WhitePencil1
committed
9395e47