From a5fddd95cb99b55860d25434342481bfea303401 Mon Sep 17 00:00:00 2001 From: Kurt Hutten Date: Tue, 17 Nov 2020 05:32:25 +1100 Subject: [PATCH] Expand the ide toolbar to include the user and a back button --- .../IdeCascadeStudio/IdeCascadeStudio.js | 5 ++++ web/src/components/IdePartCell/IdePartCell.js | 1 + web/src/components/IdeToolbar/IdeToolbar.js | 30 ++++++++++++++++++- web/src/components/Svg/Svg.js | 15 ++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js b/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js index 9b815fc..9a472f7 100644 --- a/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js +++ b/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js @@ -43,6 +43,11 @@ const IdeCascadeStudio = ({ part, saveCode, loading, error }) => { }) }} onExport={(type) => threejsViewport[`saveShape${type}`]()} + userNamePart={{ + userName: part.user.userName, + partTitle: part.title, + image: part?.user?.image, + }} /> diff --git a/web/src/components/IdePartCell/IdePartCell.js b/web/src/components/IdePartCell/IdePartCell.js index a0fb71b..83a87ef 100644 --- a/web/src/components/IdePartCell/IdePartCell.js +++ b/web/src/components/IdePartCell/IdePartCell.js @@ -13,6 +13,7 @@ export const QUERY = gql` createdAt user { id + userName } } } diff --git a/web/src/components/IdeToolbar/IdeToolbar.js b/web/src/components/IdeToolbar/IdeToolbar.js index 947b28c..75e0339 100644 --- a/web/src/components/IdeToolbar/IdeToolbar.js +++ b/web/src/components/IdeToolbar/IdeToolbar.js @@ -1,9 +1,11 @@ import { useState } from 'react' import Popover from '@material-ui/core/Popover' +import { Link, routes, navigate } from '@redwoodjs/router' import Button from 'src/components/Button' +import ImageUploader from 'src/components/ImageUploader' -const IdeToolbar = ({ canEdit, isChanges, onSave, onExport }) => { +const IdeToolbar = ({ canEdit, isChanges, onSave, onExport, userNamePart }) => { const [anchorEl, setAnchorEl] = useState(null) const handleClick = (event) => { @@ -22,6 +24,32 @@ const IdeToolbar = ({ canEdit, isChanges, onSave, onExport }) => { id="cadhub-ide-toolbar" className="flex bg-gradient-to-r from-gray-900 to-indigo-900 pt-1" > +
+
+ {}} + aspectRatio={1} + imageUrl={userNamePart?.image} + width={80} + /> +
+
+ + {userNamePart?.userName} + +
+
+