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.

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

Toolbar5 #330

Closed
wants to merge 40 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
eb426a6
Added the ShapeSelector omponent
arcteggzz Sep 1, 2021
db14a81
Update Whiteboard.js
arcteggzz Sep 1, 2021
0e07f44
Toolbar
itz-jherie Sep 1, 2021
27e21a1
Submission for issue #250 by Dorcas Bamisile
Dorcas-BD Sep 1, 2021
5e04396
Added Whiteboard Canvas to the component
Dorcas-BD Sep 1, 2021
1c702b4
Merge pull request #255 from itz-jherie/toolbar
kenny-67 Sep 2, 2021
512b7b9
Merge pull request #254 from arcteggzz/ShapeSelector_Issue248
kenny-67 Sep 2, 2021
a1bd140
Make Some Changes on the Whiteboard Canvas
Dorcas-BD Sep 2, 2021
fb13a54
Commit
Dorcas-BD Sep 2, 2021
8cb7bc5
Commit
Dorcas-BD Sep 2, 2021
f8b24a6
Merge branch 'main' into issue-250
Dorcas-BD Sep 2, 2021
e6b8c3b
Update Whiteboard.js
Dorcas-BD Sep 2, 2021
03a6f9c
Merge pull request #256 from Dorcas-BD/issue-250
kenny-67 Sep 2, 2021
df6b9f2
organised the way components are displayed
jefedcreator Sep 1, 2021
5175ea5
feat: Implement the participant avatar view
abdulsalamcodes Sep 1, 2021
4bfeade
merge develop to main
abdulsalamcodes Sep 1, 2021
3a0eb6d
showed created component to screen
kenny-67 Sep 2, 2021
00ecb3f
code cleanup for merge to main branch
kenny-67 Sep 2, 2021
0cc6e2e
Merge pull request #261 from zurichat/merge-to-develop
kenny-67 Sep 2, 2021
27d3863
toolbar 5 issue 268
dretoba91 Sep 3, 2021
840d61f
colorpicker component
Diseyi Sep 3, 2021
770cc12
Merge pull request #284 from Diseyi/colorpicker
kenny-67 Sep 3, 2021
bd59053
toolbar5 issues 268
dretoba91 Sep 3, 2021
90ec060
remove conflicts
FunsoAdetola Sep 3, 2021
01e8cf5
created saved file view
FunsoAdetola Sep 3, 2021
4724905
resolve conflict
FunsoAdetola Sep 3, 2021
811ac18
correction
FunsoAdetola Sep 3, 2021
ef2bed0
Merge branch 'zurichat-main' into main
FunsoAdetola Sep 3, 2021
ebdfb73
toolbar5 issues 268
dretoba91 Sep 3, 2021
f2bd963
Merge pull request #287 from FunsoAdetola/main
kenny-67 Sep 3, 2021
abca304
toolbar5
dretoba91 Sep 3, 2021
fd4060d
Update main.yml
themobileprof Sep 3, 2021
ba9100d
Merge branch 'main' of https://github.com/zurichat/zc_plugin_whiteboa…
dretoba91 Sep 3, 2021
4b4f5c8
Update main.yml
themobileprof Sep 3, 2021
384c299
Update main.yml
themobileprof Sep 3, 2021
dd8845c
Update start.yml
themobileprof Sep 3, 2021
f9cee2e
Update start.yml
themobileprof Sep 3, 2021
5e51eb2
Update start.yml
themobileprof Sep 3, 2021
48469e9
Merge branch 'main' of github.com:dretoba91/zc_plugin_whiteboard into…
dretoba91 Sep 4, 2021
bac4087
toolbar5
dretoba91 Sep 5, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
toolbar 5 issue 268
  • Loading branch information
dretoba91 committed Sep 3, 2021
commit 27d3863993f220bc9b3f73d7dd8625a523b2aaaa
20,949 changes: 31 additions & 20,918 deletions whiteboard-client/package-lock.json

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions whiteboard-client/src/components/toolbar-5/Toolbar5.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.toolContainer {
height: 45px;
width: 306px;
left: 822px;
top: 364px;
display: flex;
justify-content: space-between;
}
52 changes: 52 additions & 0 deletions whiteboard-client/src/components/toolbar-5/Toolbar5.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import React from "react";
import "./Toolbar5.css";
import bullets from "./asset/bullets.svg";
import trash from "./asset/trash.svg";
import eclipse from "./asset/eclipse.svg";
import line_icon from "./asset/line_icon.svg";
import link from "./asset/link.svg";
import pin from "./asset/pin.svg";
import twosquares from "./asset/twosquares.svg";
import active from "./asset/active.svg";

function Toolbar5() {
return (
<div className="toobar">
<div className="toolContainer">
<div className="tools">
<img src={pin} alt="" />
</div>

<div className="tools">
<img src={eclipse} alt="" />
</div>

<div className="tools">
<img src={line_icon} alt="" />
</div>

<div className="tools">
<img src={active} alt="" />
</div>

<div className="tools">
<img src={twosquares} alt="" />
</div>

<div className="tools">
<img src={link} alt="" />
</div>

<div className="tools">
<img src={trash} alt="" />
</div>

<div className="tools">
<img src={bullets} alt="" />
</div>
</div>
</div>
);
}

export default Toolbar5;
3 changes: 3 additions & 0 deletions whiteboard-client/src/components/toolbar-5/asset/active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions whiteboard-client/src/components/toolbar-5/asset/bullets.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions whiteboard-client/src/components/toolbar-5/asset/eclipse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions whiteboard-client/src/components/toolbar-5/asset/link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions whiteboard-client/src/components/toolbar-5/asset/pin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions whiteboard-client/src/components/toolbar-5/asset/trash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions whiteboard-client/src/components/toolbar-5/asset/twosquares.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions whiteboard-client/src/pages/Whiteboard.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import React from "react";
import "../App.css";
import Participants from "../components/Participants";
import Toolbar5 from "../components/toolbar-5/Toolbar5";

function Whiteboard() {
return (
<div className="App">
{/* <header className="App-header">Zuri whiteboard plugin</header> */}
<Participants />

{/* issues 268 Tool bar */}
<Toolbar5 />
</div>
);
}