Merge commit 'd0334e66'
Conflicts: package-lock.json
Showing
- __tests__/shape.test.js 626 additions, 0 deletions__tests__/shape.test.js
- package-lock.json 4 additions, 5 deletionspackage-lock.json
- package.json 2 additions, 1 deletionpackage.json
- public/index.html 11 additions, 7 deletionspublic/index.html
- public/styles.css 6 additions, 45 deletionspublic/styles.css
- src/app.js 132 additions, 34 deletionssrc/app.js
- src/canvas.js 7 additions, 2 deletionssrc/canvas.js
- src/elements.js 3 additions, 2 deletionssrc/elements.js
- src/room.js 13 additions, 3 deletionssrc/room.js
- src/shapes.js 191 additions, 0 deletionssrc/shapes.js
- src/tool-selection.js 27 additions, 12 deletionssrc/tool-selection.js
- src/y-union.js 1 addition, 1 deletionsrc/y-union.js
- src/yjs 1 addition, 1 deletionsrc/yjs
Loading
Please register or sign in to comment