Resizing the image and the highlighter#45

Open

FMcapper wants to merge 68 commits intoProjects-CS15:devfrom heat-chicken:kidpix

+10,117-4,755

Commits on Jul 25, 2024

Added jest-mock to dependencies. Renamed test files to 'test' instead of 'Test'. Server tests in progress.
MZiegler96
committed
changed 'import's to 'require's. Added mockSupabaseClient.
MZiegler96
committed
deleted useless files

Yiqun Zheng
authored and
Yiqun Zheng
committed
get user details from Oauth login
ryangilbert
committed
Merge pull request #2 from heat-chicken/yiqun
yiqunzheng
authored
Add .DS_Store to .gitignore

Yiqun Zheng
authored and
Yiqun Zheng
committed
Merge branch 'dev' into yiqun

Yiqun Zheng
authored and
Yiqun Zheng
committed

Commits on Jul 26, 2024

barebones upload functionality
FMcapper
committed
deprecating export button
FMcapper
committed
ignoring ds store
FMcapper
committed
Merge branch 'dev' of https://github.com/heat-chicken/fashion-selector-2.0 into kidpix
FMcapper
committed
added signup function to signup component

Yiqun Zheng
authored and
Yiqun Zheng
committed
Merge pull request #4 from heat-chicken/yiqun
yiqunzheng
authored
added user controller to handle sign up

Yiqun Zheng
authored and
Yiqun Zheng
committed
Oauth on login and signup & get user details
ryangilbert
committed
Merge pull request #5 from heat-chicken/yiqun
yiqunzheng
authored
resolve merge conflicts
ryangilbert
committed

Commits on Jul 27, 2024

implemented login flow

Yiqun Zheng
authored and
Yiqun Zheng
committed
Merge pull request #3 from heat-chicken/ryan/supabase-auth-start
ryangilbert
authored
resolve merge conflict of login component

Yiqun Zheng
authored and
Yiqun Zheng
committed
Merge pull request #6 from heat-chicken/yiqun
yiqunzheng
authored
ttrying out cors stuff
FMcapper
committed
Add redux toolkit
ryangilbert
committed
Merge pull request #7 from heat-chicken/redux
ryangilbert
authored
deleted separate test files. Set up playwright for E2E tests.
MZiegler96
committed
Merge branch 'dev' of https://github.com/heat-chicken/fashion-selector-2.0 into kidpix
FMcapper
committed
Set up playwright to run app on webserver for tests.
MZiegler96
committed
first complete draft of upload flow
FMcapper
committed

Commits on Jul 28, 2024

save email to db

Yiqun Zheng
authored and
Yiqun Zheng
committed

Commits on Jul 29, 2024

display a message to user to ask them to login when they try to save an image

Yiqun Zheng
authored and
Yiqun Zheng
committed

Commits on Jul 30, 2024

updating file transfer
FMcapper
committed
Merge pull request #8 from heat-chicken/kidpix
FMcapper
authored
playwright PR
MZiegler96
committed
adding ImageForm
FMcapper
committed
resolve merge conflict

Yiqun Zheng
authored and
Yiqun Zheng
committed
resolved merge conflicts
MZiegler96
committed
Merge pull request #9 from heat-chicken/yiqun-redux
yiqunzheng
authored
Merge branch 'dev' of https://github.com/heat-chicken/fashion-selector-2.0 into kidpix
FMcapper
committed
added closet to nav bar

Yiqun Zheng
authored and
Yiqun Zheng
committed
added some comments to login and signup

Yiqun Zheng
authored and
Yiqun Zheng
committed

Commits on Jul 31, 2024

Commits on Aug 1, 2024

make closet persistent by cookies

Yiqun Zheng
authored and
Yiqun Zheng
committed
Merge pull request #15 from heat-chicken/yiqun/user-persist
yiqunzheng
authored
checking in on the merge
FMcapper
committed
fixing typo
FMcapper
committed
Merge pull request #16 from heat-chicken/kidpix
FMcapper
authored
search page user persist using cookie

Yiqun Zheng
authored and
Yiqun Zheng
committed

Commits on Aug 2, 2024

Merge pull request #17 from heat-chicken/yiqun/user-persist
yiqunzheng
authored

Commits on Aug 3, 2024