Code

Query/save image#145

Code

Open

JakobBollman wants to merge 75 commits intogarrettgsb:mastergarrettgsb/react-express-boilerplate:masterfrom stufromnorthvan:query/save-imagestufromnorthvan/CurtainDraw:query/save-imageCopy head branch name to clipboard

+45,332-81

Commits

Commits on Nov 26, 2022

• testing canvas and adding roughjs

  stufromnorthvan

  committed
  ef5f1e9

  Copy full SHA for ef5f1e9

• Setup Basic

  Show description for 38f24a2
  JakobBollman

  committed
  38f24a2

  Copy full SHA for 38f24a2

• add functioning drawing test to app with line and rectangle options

  stufromnorthvan

  committed
  c6629c0

  Copy full SHA for c6629c0

• change variable name

  stufromnorthvan

  committed
  9babe9f

  Copy full SHA for 9babe9f

• Changes before pull

  Hanson85711

  committed
  b3c6f62

  Copy full SHA for b3c6f62

• canvas after merge

  Hanson85711

  committed
  7933a65

  Copy full SHA for 7933a65

• add selection tool to canvas to move existing shapes

  stufromnorthvan

  committed
  3d497f5

  Copy full SHA for 3d497f5

Commits on Nov 27, 2022

• improved html and css

  JakobBollman

  committed
  c0d2ab1

  Copy full SHA for c0d2ab1

• commit before pulling

  Hanson85711

  committed
  e28be63

  Copy full SHA for e28be63

• Merge needs to commit

  Hanson85711

  committed
  042c3c7

  Copy full SHA for 042c3c7

• Freestyle pencil working

  Hanson85711

  committed
  b4ef147

  Copy full SHA for b4ef147

• initial database setup

  stufromnorthvan

  committed
  3088865

  Copy full SHA for 3088865

• add env example to backend

  stufromnorthvan

  committed
  6e23410

  Copy full SHA for 6e23410

• Newest copy with working db:reset

  Hanson85711

  committed
  df3bf89

  Copy full SHA for df3bf89

• Merge branch 'canvas' of github.com:stufromnorthvan/CurtainDraw into canvas

  Hanson85711

  committed
  eeaf4eb

  Copy full SHA for eeaf4eb

• add clear button that clears canvas and placeholder save button

  stufromnorthvan

  committed
  4407c1b

  Copy full SHA for 4407c1b

• fixing example

  stufromnorthvan

  committed
  990ff6b

  Copy full SHA for 990ff6b

• add currently broken circle button for hansons review

  stufromnorthvan

  committed
  ad4e9a6

  Copy full SHA for ad4e9a6

• changing favicon and app title

  stufromnorthvan

  committed
  a65271d

  Copy full SHA for a65271d

Commits on Nov 28, 2022

• add undo button

  stufromnorthvan

  committed
  6c4da03

  Copy full SHA for 6c4da03

• correct circle radio button

  stufromnorthvan

  committed
  f2ecdb2

  Copy full SHA for f2ecdb2

• add fill button that currently console logs the colour of the element

  stufromnorthvan

  committed
  81159b8

  Copy full SHA for 81159b8

• fix circle error with break in switch statement and start on fill tool

  stufromnorthvan

  committed
  a7037d5

  Copy full SHA for a7037d5

• fix/db_reset

  JakobBollman

  committed
  cd10c4d

  Copy full SHA for cd10c4d

• fix/db_port problem

  JakobBollman

  committed
  b1d162a

  Copy full SHA for b1d162a

• .env ignore

  JakobBollman

  committed
  2bf34e3

  Copy full SHA for 2bf34e3

• add fill tool

  stufromnorthvan

  committed
  3e15556

  Copy full SHA for 3e15556

• add fill

  stufromnorthvan

  committed
  f46a8e8

  Copy full SHA for f46a8e8

• Implemented eraser

  Hanson85711

  committed
  ea8554f

  Copy full SHA for ea8554f

• fix glitch where selection was erasing fill, refactor elementDetails

  stufromnorthvan

  committed
  dca3616

  Copy full SHA for dca3616

• lint

  stufromnorthvan

  committed
  db483ea

  Copy full SHA for db483ea

• functioning circle tool that works with selection and fill

  stufromnorthvan

  committed
  79d4181

  Copy full SHA for 79d4181

Commits on Nov 29, 2022

• fix selection and fill so that it edits last created element instead of first

  stufromnorthvan

  committed
  09327da

  Copy full SHA for 09327da

• add comments to signify where colour state will go

  stufromnorthvan

  committed
  1844efb

  Copy full SHA for 1844efb

• add bio and location to schema and seeds, db query for total drawings

  stufromnorthvan

  committed
  6a4f711

  Copy full SHA for 6a4f711

• Implement color and size options

  Hanson85711

  committed
  28f4ede

  Copy full SHA for 28f4ede

• Merge branch 'canvas' of github.com:stufromnorthvan/CurtainDraw into canvas

  Show description for d88a982
  Hanson85711

  committed
  d88a982

  Copy full SHA for d88a982

• adjust code to be compatible with stu's and edited fill function

  Hanson85711

  committed
  3ed60c9

  Copy full SHA for 3ed60c9

• finish/basic-wireframe

  JakobBollman

  committed
  f7b4ef9

  Copy full SHA for f7b4ef9

• Merge pull request #1 from stufromnorthvan/react/setup-basic-routes

  Show description for 974a917
  JakobBollman

  authored
  974a917

  Copy full SHA for 974a917

• merge/master

  JakobBollman

  committed
  279de16

  Copy full SHA for 279de16

• fix/.env?

  JakobBollman

  committed
  0148abf

  Copy full SHA for 0148abf

• combine/Canvas+HTML

  JakobBollman

  committed
  b77b6a6

  Copy full SHA for b77b6a6

• Merge pull request #2 from stufromnorthvan/test/canvas

  Show description for a011942
  JakobBollman

  authored
  a011942

  Copy full SHA for a011942

Commits on Nov 30, 2022

• Fixed offset issue

  Hanson85711

  committed
  433325e

  Copy full SHA for 433325e

• made login route and page with form

  stufromnorthvan

  committed
  e76efb2

  Copy full SHA for e76efb2

• create authentication token and authcontext

  stufromnorthvan

  committed
  059efe2

  Copy full SHA for 059efe2

Commits on Dec 1, 2022

• component/Toolbar create

  JakobBollman

  committed
  f725b4d

  Copy full SHA for f725b4d

• complete login system

  stufromnorthvan

  committed
  e40059f

  Copy full SHA for e40059f

• pull jakob changes

  stufromnorthvan

  committed
  bad1c1a

  Copy full SHA for bad1c1a

• bug fix on homepage

  stufromnorthvan

  committed
  3b52d01

  Copy full SHA for 3b52d01

• add error handling on login, add login button to nav

  stufromnorthvan

  committed
  db2b121

  Copy full SHA for db2b121

• Merge pull request #3 from stufromnorthvan/component/Canvas-Sidebar-tools

  Show description for 1004609
  JakobBollman

  authored
  1004609

  Copy full SHA for 1004609

• conditional rendering in nav based on login

  stufromnorthvan

  committed
  70a9340

  Copy full SHA for 70a9340

• example-images

  JakobBollman

  committed
  6d7b1bc

  Copy full SHA for 6d7b1bc

• conditional rendering for pages, login system

  stufromnorthvan

  committed
  bb4d3f1

  Copy full SHA for bb4d3f1

• fix/circular-profile-pictures

  JakobBollman

  committed
  36cff1e

  Copy full SHA for 36cff1e

• Merge pull request #4 from stufromnorthvan/img/home-examples

  Show description for 30a1d38
  JakobBollman

  authored
  30a1d38

  Copy full SHA for 30a1d38

• add local storage to login system, add additional conditional rendering

  stufromnorthvan

  committed
  b5ae8eb

  Copy full SHA for b5ae8eb

• improved-visuals

  Show description for 7fdc086
  JakobBollman

  committed
  7fdc086

  Copy full SHA for 7fdc086

• add jakob css changes, create local storage for login, add conditional rendering

  stufromnorthvan

  committed
  d132737

  Copy full SHA for d132737

• home/font

  JakobBollman

  committed
  010f995

  Copy full SHA for 010f995

• Merge pull request #5 from stufromnorthvan/update/improved-visuals

  Show description for 65af88b
  JakobBollman

  authored
  65af88b

  Copy full SHA for 65af88b

• add conditional rendering to canvas page so user can draw picture if not logged in

  stufromnorthvan

  committed
  0b75192

  Copy full SHA for 0b75192

• removed/sidebars

  JakobBollman

  committed
  d65343e

  Copy full SHA for d65343e

• Merge pull request #6 from stufromnorthvan/update/improved-visuals

  Show description for 2dced79
  JakobBollman

  authored
  2dced79

  Copy full SHA for 2dced79

• Merge branch 'master' into login

  JakobBollman

  authored
  cf56087

  Copy full SHA for cf56087

• Merge pull request #7 from stufromnorthvan/login

  Show description for afdfa4c
  JakobBollman

  authored
  afdfa4c

  Copy full SHA for afdfa4c

• fix/section problem

  JakobBollman

  committed
  73e0264

  Copy full SHA for 73e0264

Commits on Dec 2, 2022

• commit before merging

  Hanson85711

  committed
  e08e208

  Copy full SHA for e08e208

• Merge branch 'master' of github.com:stufromnorthvan/CurtainDraw

  Show description for cde2a38
  Hanson85711

  committed
  cde2a38

  Copy full SHA for cde2a38

• save button saves canvas state as image_url format, need help with query/routes

  Hanson85711

  committed
  3d1e3ed

  Copy full SHA for 3d1e3ed

• attempt fix

  JakobBollman

  committed
  c739682

  Copy full SHA for c739682

• fixed/db-query

  JakobBollman

  committed
  19e610c

  Copy full SHA for 19e610c

Commits on Dec 3, 2022

• user/show-user-images

  JakobBollman

  committed
  93bbd4c

  Copy full SHA for 93bbd4c