From 5aa519ea725fac26118939bce20111b9bffd7b29 Mon Sep 17 00:00:00 2001 From: Alessio Date: Fri, 19 Jun 2020 10:26:55 +0200 Subject: [PATCH] add list of components and arch-interface to the dashboard --- .../wwwroot/assets/styles/base/dashboard.less | 225 +++++++++------- .../wwwroot/assets/styles/base/layout.less | 1 + .../wwwroot/assets/styles/base/piece.less | 79 ++++++ Thermo.Active/wwwroot/assets/styles/style.css | 94 ++++++- .../dashboard/base-components/clock.vue | 3 +- .../base-components/piece-sub-menu.ts | 26 ++ .../base-components/piece-sub-menu.vue | 44 ++++ .../dashboard/base-components/piece.ts | 20 ++ .../dashboard/base-components/piece.vue | 22 ++ .../app_modules_thermo/dashboard/dashboard.ts | 7 +- .../dashboard/dashboard.vue | 243 +++++++++--------- 11 files changed, 557 insertions(+), 207 deletions(-) create mode 100644 Thermo.Active/wwwroot/assets/styles/base/piece.less create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece-sub-menu.ts create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece-sub-menu.vue create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.vue diff --git a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less index 797d4524..71de45d5 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less +++ b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less @@ -5,39 +5,83 @@ .dashboard { - font-family: "Work Sans"; - height: calc(~'100% - 60px'); - width: 100%; - background-image: url("../../assets/icons/png/bg.png"); - position: fixed; - z-index: 1001; - display: grid; - grid-template-rows: 144px 1fr; + font-family : "Work Sans"; + height : calc(~'100% - 60px'); + width : 100%; + background-image : url("../../assets/icons/png/bg.png"); + position : fixed; + z-index : 1001; + display : grid; + grid-template-rows : 144px 1fr; grid-template-columns: 152px 1fr 610px 1fr 152px; - grid-row-gap: 40px; - padding-top: 20px; - padding-bottom: 40px; - color: #4b4b4b; + grid-row-gap : 40px; + padding-top : 20px; + padding-bottom : 40px; + color : #4b4b4b; header { - grid-row: 1; + grid-row : 1; grid-column-start: 1; - grid-column-end: -1; - width: 100% !important; - justify-content: space-between; - height: 144px !important; - position: relative !important; + grid-column-end : -1; + width : 100% !important; + justify-content : space-between; + height : 144px !important; + position : relative !important; + + .arch{ + justify-content: center; + + .box-gauge{ + width: 126px; + + div { + + &:last-of-type { + + label { + color: #4b4b4b; + + &:first-of-type{ + font-size: 18px; + } + + &:last-of-type{ + font-size: 26px; + } + + } + + } + + } + + .gauge-container{ + width: 126px; + height: 126px; + } + + .gauge-container>.gauge>.value { + stroke: #1791ff; + } + + .gauge-container.three>.gauge>.value-text { + fill: #4b4b4b; + } + + } + + } .ribbon-container, .app-ribbon { - height: 144px; - width: 152px; - border-top-right-radius: 72px; + height : 144px; + width : 152px; + border-top-right-radius : 72px; border-bottom-right-radius: 72px; .status-icon { - width: 114px; - height: 114px; + width : 114px; + height : 114px; border-radius: 57px; * { @@ -48,12 +92,12 @@ } .header-buttons { - padding-right: 21px; - display: flex; - flex-flow: column; - align-items: flex-end; + padding-right : 21px; + display : flex; + flex-flow : column; + align-items : flex-end; justify-content: space-between; - height: 100%; + height : 100%; .user-info { font-size: 14px; @@ -64,43 +108,43 @@ } button.modal-close { - box-shadow: none; + box-shadow : none; background-color: @color-darkish-blue; - color: white; + color : white; } } } .first_col { - grid-row: 2; + grid-row : 2; grid-column: 2; - height: 100%; - display: flex; - flex-flow: column; + height : 100%; + display : flex; + flex-flow : column; .timing-area { - display: grid; + display : grid; grid-template-rows: 1fr 1fr 1fr; - height: 610px; + height : 610px; .start, .current, .end { - display: flex; - flex-flow: column; - align-items: center; - justify-content: center; - background-color: rgba(153, 207, 255, 0.6); - border-top-left-radius: 100px; + display : flex; + flex-flow : column; + align-items : center; + justify-content : center; + background-color : rgba(153, 207, 255, 0.6); + border-top-left-radius : 100px; border-bottom-left-radius: 100px; small { - font-size: 26px; + font-size : 26px; text-transform: uppercase; } time { - font-size: 120px; + font-size : 120px; font-weight: 300; } } @@ -109,68 +153,68 @@ background-color: transparent; time { - font-size: 54px; + font-size : 54px; font-weight: 500; } } } .setpoint { - margin: auto; - display: grid; - grid-template-rows: 1fr 1fr; + margin : auto; + display : grid; + grid-template-rows : 1fr 1fr; grid-template-columns: 65px 125px 65px; - grid-row-gap: 1rem; + grid-row-gap : 1rem; img { - grid-row: 1; + grid-row : 1; grid-column: 1; - margin: auto; - height: 41px; - width: 41px; + margin : auto; + height : 41px; + width : 41px; } label { - margin: auto; - grid-row: 1; + margin : auto; + grid-row : 1; grid-column-start: 2; - grid-column-end: -1; + grid-column-end : -1; - font-size: 54px; + font-size : 54px; text-align: right; } div { - display: flex; + display : flex; flex-flow: column; font-weight: 500; align-items: center; small { - font-size: 12px; - line-height: 25px; + font-size : 12px; + line-height : 25px; text-transform: uppercase; } span { line-height: 25px; - font-size: 25px; + font-size : 25px; } } button { - border: 2px solid #4b4b4b; - border-radius: 50%; - width: 65px; - height: 65px; - font-size: 36px; - box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.5); - font-size: 28px; + border : 2px solid #4b4b4b; + border-radius : 50%; + width : 65px; + height : 65px; + font-size : 36px; + box-shadow : 0 2px 10px 0 rgba(0, 0, 0, 0.5); + font-size : 28px; justify-content: center; - align-items: center; - display: flex; - color: #4b4b4b; + align-items : center; + display : flex; + color : #4b4b4b; } } @@ -178,40 +222,49 @@ } .second_col { - grid-row: 2; + grid-row : 2; grid-column: 3; - height: 100%; - display: flex; - flex-flow: column; + height : 100%; + display : flex; + flex-flow : column; .remaining_time { - margin: auto; - display: flex; + margin : auto; + display : flex; flex-flow: column; align-items: center; small { - font-size: 26px; - font-weight: 500; + font-size : 26px; + font-weight : 500; text-transform: uppercase; } time { - font-size: 120px; + font-size : 120px; font-weight: 300; } } } .third_col { - grid-row: 2; + grid-row : 2; grid-column-start: 4; - grid-column-end: -1; - height: 100%; - display: flex; - flex-flow: column; - justify-content: flex-end; + grid-column-end : -1; + height : 100%; + display : flex; + flex-flow : column; + + .pieces { + height: 400px; + + aside { + margin-top: 10px; + height : 100%; + } + } + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less index 1c15caea..9035b496 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/layout.less +++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less @@ -3,6 +3,7 @@ @import "colors.less"; @import "modals.less"; @import "dashboard-gauge.less"; +@import "piece.less"; @import "dashboard.less"; @import "riscaldi.less"; @import "slider.less"; diff --git a/Thermo.Active/wwwroot/assets/styles/base/piece.less b/Thermo.Active/wwwroot/assets/styles/base/piece.less new file mode 100644 index 00000000..a670c6c3 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/piece.less @@ -0,0 +1,79 @@ +// out: false, sourceMap: false, main: ../style.less + +.piece_info{ + display: flex; + align-items: center; + justify-content: space-evenly; + height: 84px; + border-bottom: 2px solid black; + + label{ + font-size: 54px; + font-weight: 500; + text-align: right; + color: #4b4b4b; + } + + div{ + display: flex; + flex-flow: column; + + span{ + font-family: "Work Sans"; + font-weight: 500; + line-height: 1; + letter-spacing: normal; + text-align: center; + color: #4b4b4b; + + &:first-of-type{ + font-size: 12px; + text-transform: uppercase; + } + + &:last-of-type{ + font-size: 25px; + } + + } + } + + button{ + height: 16px; + width: 16px; + background-color: black; + } + +} + +.sub_menu{ + margin-left: 250px; + display: grid; + grid-template-rows: repeat(3,60px); + + .piece_info{ + height: 60px; + + button{ + background-color: white; + border-color: black; + border-radius: 50%; + width: 50px; + height: 50px; + } + + } + + .row_1{ + grid-row: 1; + } + + .row_2{ + grid-row: 2; + } + + .row_3{ + grid-row: 3; + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index a895938d..6b4ccfb9 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4102,6 +4102,67 @@ article .box .body { stroke: #4caaff; stroke-width: 1; } +.piece_info { + display: flex; + align-items: center; + justify-content: space-evenly; + height: 84px; + border-bottom: 2px solid black; +} +.piece_info label { + font-size: 54px; + font-weight: 500; + text-align: right; + color: #4b4b4b; +} +.piece_info div { + display: flex; + flex-flow: column; +} +.piece_info div span { + font-family: "Work Sans"; + font-weight: 500; + line-height: 1; + letter-spacing: normal; + text-align: center; + color: #4b4b4b; +} +.piece_info div span:first-of-type { + font-size: 12px; + text-transform: uppercase; +} +.piece_info div span:last-of-type { + font-size: 25px; +} +.piece_info button { + height: 16px; + width: 16px; + background-color: black; +} +.sub_menu { + margin-left: 250px; + display: grid; + grid-template-rows: repeat(3, 60px); +} +.sub_menu .piece_info { + height: 60px; +} +.sub_menu .piece_info button { + background-color: white; + border-color: black; + border-radius: 50%; + width: 50px; + height: 50px; +} +.sub_menu .row_1 { + grid-row: 1; +} +.sub_menu .row_2 { + grid-row: 2; +} +.sub_menu .row_3 { + grid-row: 3; +} .dashboard { font-family: "Work Sans"; height: calc(100% - 60px); @@ -4126,6 +4187,31 @@ article .box .body { height: 144px !important; position: relative !important; } +.dashboard header .arch { + justify-content: center; +} +.dashboard header .arch .box-gauge { + width: 126px; +} +.dashboard header .arch .box-gauge div:last-of-type label { + color: #4b4b4b; +} +.dashboard header .arch .box-gauge div:last-of-type label:first-of-type { + font-size: 18px; +} +.dashboard header .arch .box-gauge div:last-of-type label:last-of-type { + font-size: 26px; +} +.dashboard header .arch .box-gauge .gauge-container { + width: 126px; + height: 126px; +} +.dashboard header .arch .box-gauge .gauge-container > .gauge > .value { + stroke: #1791ff; +} +.dashboard header .arch .box-gauge .gauge-container.three > .gauge > .value-text { + fill: #4b4b4b; +} .dashboard header .ribbon-container, .dashboard header .app-ribbon { height: 144px; @@ -4283,7 +4369,13 @@ article .box .body { height: 100%; display: flex; flex-flow: column; - justify-content: flex-end; +} +.dashboard .third_col .pieces { + height: 400px; +} +.dashboard .third_col .pieces aside { + margin-top: 10px; + height: 100%; } .warmers { position: relative; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/clock.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/clock.vue index a865edd9..33a59b20 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/clock.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/clock.vue @@ -10,7 +10,8 @@