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

Resizing the image and the highlighter #45

Open
wants to merge 68 commits into
base: dev
Choose a base branch
from
Open

Resizing the image and the highlighter #45

wants to merge 68 commits into from

Conversation

FMcapper
Copy link

@FMcapper FMcapper commented Aug 3, 2024

still some bugginess in the overall flow if user doesn't follow specific flow of:

  1. upload image
  2. drag and resize image
  3. draw on image, resizing eraser as they see fit
  4. describing item of clothing
  5. Generating
  6. Landing on a preferred item after yes or no.

But if they do follow this flow it works great!

MZiegler96 and others added 30 commits July 23, 2024 21:07
@MZiegler96
Added test files w/ imports for each functional component and added j…
8f3f398 
…est to package-json.
@MZiegler96
Added server side test files w/ imports. Finalized package json confi…
f8c75cb 
…g for tests.
@FMcapper
getting started with Konva react library
5cd5d29
created a new db
4c1e3af
@yiqunzheng
Merge pull request #1 from heat-chicken/yiqun
b3b796b 
created a new db
@FMcapper
Merge branch 'dev' of https://github.com/heat-chicken/fashion-selecto…
23c583a 
…r-2.0 into kidpix
@MZiegler96
Added jest-mock to dependencies. Renamed test files to 'test' instead…
6c9e012 
… of 'Test'. Server tests in progress.
@MZiegler96
changed 'import's to 'require's. Added mockSupabaseClient.
0c892cf
deleted useless files
003abce
@ryangilbert
get user details from Oauth login
2fc330f
@yiqunzheng
Merge pull request #2 from heat-chicken/yiqun
6b2e49f 
deleted useless files
Add .DS_Store to .gitignore
1ac8559
Merge branch 'dev' into yiqun
4074b0d
@FMcapper
barebones upload functionality
22c5302
@FMcapper
deprecating export button
8a7819d
@FMcapper
ignoring ds store
3b5b8c4
@FMcapper
Merge branch 'dev' of https://github.com/heat-chicken/fashion-selecto…
405ffa8 
…r-2.0 into kidpix
added signup function to signup component
bec1386
@yiqunzheng
Merge pull request #4 from heat-chicken/yiqun
4fdae1a 
Yiqun - added signup function to signup component
added user controller to handle sign up
c01e917
@ryangilbert
Oauth on login and signup & get user details
1ecf9f2
@yiqunzheng
Merge pull request #5 from heat-chicken/yiqun
516da75 
added user controller file to handle standard sign up
@ryangilbert
resolve merge conflicts
1a22b83
implemented login flow
b8f2de1
@ryangilbert
Merge pull request #3 from heat-chicken/ryan/supabase-auth-start
26f27e2 
get user details from Oauth login
resolve merge conflict of login component
9c6252c
@yiqunzheng
Merge pull request #6 from heat-chicken/yiqun
69a6c25 
implemented login flow
@FMcapper
ttrying out cors stuff
faf09c7
@ryangilbert
Add redux toolkit
f928d91
@ryangilbert
Merge pull request #7 from heat-chicken/redux
d14561f 
Add redux state management on login
MZiegler96 and others added 30 commits July 29, 2024 20:22
@MZiegler96
playwright PR
104c01f
@FMcapper
adding ImageForm
42d6bc0
resolve merge conflict
1ba596a
@MZiegler96
resolved merge conflicts
b1e90cc
@yiqunzheng
Merge pull request #9 from heat-chicken/yiqun-redux
548be3b 
save user email to db
@FMcapper
Merge branch 'dev' of https://github.com/heat-chicken/fashion-selecto…
caa1066 
…r-2.0 into kidpix
added closet to nav bar
6b46f00
added some comments to login and signup
4bc035f
@ryangilbert
Write user to database on manual or Oauth signup
32b51a0
@yiqunzheng
Merge pull request #11 from heat-chicken/yiqun-redux
c45bcad 
added closet to nav bar and closet only shows logged in user's items
@ryangilbert
resolve merge conflicts
ad93b17
@ryangilbert
Merge pull request #12 from heat-chicken/oauth-signup-db
7d8b59e 
Write user to database on manual or Oauth signup
@FMcapper
functional bing search from upload
89a87d0
replaced localstorage with cookies
e5de68e
@MZiegler96
Render/Button Functionality tests complete.
9037c31
@MZiegler96
committing for merge
bafe3a7
@MZiegler96
resolved conflicts
f7d14a2
@yiqunzheng
Merge pull request #14 from heat-chicken/yiqun-redux
d2e2e7e 
replaced localstorage with cookies
@FMcapper
Merge pull request #13 from heat-chicken/kidpix
9daedf6 
Kidpix
@MZiegler96
Merge pull request #10 from heat-chicken/testing
81440fb 
PR from Testing Branch - All render and UI functionality testing is complete. Still need to test the "Upload", "Generate Image" functionality.
make closet persistent by cookies
34ce22f
@yiqunzheng
Merge pull request #15 from heat-chicken/yiqun/user-persist
37ee203 
make closet persistent by cookies and refactored closet page
@FMcapper
checking in on the merge
d9cfbcf
@FMcapper
fixing typo
0595c7e
@FMcapper
Merge pull request #16 from heat-chicken/kidpix
31fa77d 
checking in on the merge
search page user persist using cookie
f734c29
@yiqunzheng
Merge pull request #17 from heat-chicken/yiqun/user-persist
2030a7b 
make search page user persistent, using cookies in stead of redux
@FMcapper
stashing progress
8602375
@FMcapper
Merge branch 'dev' of https://github.com/heat-chicken/fashion-selecto…
90a9bdf 
…r-2.0 into kidpix
@FMcapper
Building resize functionality and cleaning up upload interface
1a1fc4e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@FMcapper @MZiegler96 @yiqunzheng @ryangilbert