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 #341

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions whiteboard-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "4.0.3",

"styled-components": "^5.3.1",
"web-vitals": "^1.0.1"
"web-vitals": "^1.1.2",
"styled-components": "^5.3.1"

"styled-components": "^5.3.1",
"web-vitals": "^1.1.2",
"styled-components": "^5.3.1"

},
"scripts": {
"start": "react-scripts start",
Expand Down
33 changes: 33 additions & 0 deletions whiteboard-client/src/components/toolbar-5/Toolbar5.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.toolContainer {
display: flex;
justify-content: space-between;
position: absolute;
width: 430px;
height: 45px;
left: 822px;
top: 364px;
background: #ffffff;
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1);
border-radius: 9px;
}

.tools {
height: 34px;
width: 34px;
left: 1089px;
top: 370px;
display: flex;
justify-content: center;
align-items: center;
background: #ffffff;
border: 1px solid #c4c4c4;
border-radius: 10px;
margin: 5px 5px 0px 5px;
}

img {
background: whitesmoke;
width: inherit;
margin: 5px;
border-radius: 9px;
}
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>
<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.
31 changes: 31 additions & 0 deletions whiteboard-client/src/pages/Whiteboard.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,53 @@
import React from "react";
import "../App.css";

import Participants from "../components/Participants";
import Toolbar5 from "../components/toolbar-5/Toolbar5";
import WhiteboardCanvas from "../components/Whiteboard-Canvas/WhiteboardCanvas";
import Participants from "../components/Participants";
import ToolBar from "../components/ToolBar";
import SideBar from "../components/sidebar-component/sidebar.js";
import ShapeSelector from "../components/ShapesSelector/ShapeSelector";
import SavedFileView from "../components/SavedFileView/SavedFileView";
import ColorPicker from "../components/Colorpicker/Colorpicker";
// import WhiteboardCanvas from "../components/Whiteboard-Canvas/WhiteboardCanvas";
import ToolBar from "../components/ToolBar/ToolBar";
import SearchBar from "../components/SearchBar/SearchBar";
import Zoom from "../components/Zoom/Zoom";
import Header from "../components/Header/Header";
import Board from "../components/Whiteboard-Canvas/Board";


function Whiteboard() {
return (
<div className="App">


{/* <header className="App-header">Zuri whiteboard plugin</header> */}
<Participants />

{/* issues 268 Tool bar */}
<Toolbar5 />

<SideBar />
<WhiteboardCanvas />
{/* <header className="App-header">Zuri whiteboard plugin</header> */}
<Participants />
<ToolBar />
<ColorPicker />
<ShapeSelector />

<SavedFileView />


<SearchBar />
<Header />
{/* <WhiteboardCanvas /> */}
<Board />
<ToolBar />
<Zoom />
</div>

);
}

Expand Down
Loading