From 1ccff60b3e0b35f7781f8a280b639f2336ca519a Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi <256895@studenti.unimore.it> Date: Fri, 7 May 2021 04:48:03 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Redesign=20dashboard=20areas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/frontend/src/routes/PageDashboard.js | 2 ++ .../src/routes/PageDashboard.module.css | 22 +++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/code/frontend/src/routes/PageDashboard.js b/code/frontend/src/routes/PageDashboard.js index 662d91a..ce5dc81 100644 --- a/code/frontend/src/routes/PageDashboard.js +++ b/code/frontend/src/routes/PageDashboard.js @@ -14,6 +14,7 @@ import BoxConditionHashtag from "../components/interactive/BoxConditionHashtag" import BoxConditions from "../components/interactive/BoxConditions" import BoxConditionDatetime from "../components/interactive/BoxConditionDatetime" import BoxConditionMap from "../components/interactive/BoxConditionMap" +import BoxConditionUser from "../components/interactive/BoxConditionUser" export default function PageDashboard({ children, className, ...props }) { @@ -25,6 +26,7 @@ export default function PageDashboard({ children, className, ...props }) { + diff --git a/code/frontend/src/routes/PageDashboard.module.css b/code/frontend/src/routes/PageDashboard.module.css index f383f89..4c79208 100644 --- a/code/frontend/src/routes/PageDashboard.module.css +++ b/code/frontend/src/routes/PageDashboard.module.css @@ -2,13 +2,13 @@ display: grid; grid-template-areas: - "a a" - "b c" - "b d" - "b e" - "b f" + "a a a" + "b c d" + "b e e" + "b f f" + "b g g" ; - grid-template-columns: 400px 1fr; + grid-template-columns: 400px 1fr 1fr; grid-template-rows: auto auto auto 1fr auto; grid-gap: 10px; @@ -29,14 +29,18 @@ grid-area: c; } -.SearchByTimePeriod { +.SearchByUser { grid-area: d; } -.Conditions { +.SearchByTimePeriod { grid-area: e; } -.CreateDialog { +.Conditions { grid-area: f; } + +.CreateDialog { + grid-area: g; +}