From 8c5d9579b3e18981653b2bea7fbc41f373009163 Mon Sep 17 00:00:00 2001 From: Tim Wundenberg Date: Wed, 28 Jul 2021 13:55:44 +0200 Subject: [PATCH] add skeleton for mapview --- PoinCloudWeb.Web/public/javascripts/map.js | 0 .../stylesheets/{style.css => layout.css} | 4 +-- PoinCloudWeb.Web/public/stylesheets/map.css | 25 +++++++++++++++++++ PoinCloudWeb.Web/views/index.pug | 7 +++--- PoinCloudWeb.Web/views/layout.pug | 7 +++--- PoinCloudWeb.Web/views/map.pug | 17 ++++++++++--- PoinCloudWeb.Web/views/scanner.pug | 7 +++--- 7 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 PoinCloudWeb.Web/public/javascripts/map.js rename PoinCloudWeb.Web/public/stylesheets/{style.css => layout.css} (97%) create mode 100644 PoinCloudWeb.Web/public/stylesheets/map.css diff --git a/PoinCloudWeb.Web/public/javascripts/map.js b/PoinCloudWeb.Web/public/javascripts/map.js new file mode 100644 index 0000000..e69de29 diff --git a/PoinCloudWeb.Web/public/stylesheets/style.css b/PoinCloudWeb.Web/public/stylesheets/layout.css similarity index 97% rename from PoinCloudWeb.Web/public/stylesheets/style.css rename to PoinCloudWeb.Web/public/stylesheets/layout.css index dc01dab..296bbab 100644 --- a/PoinCloudWeb.Web/public/stylesheets/style.css +++ b/PoinCloudWeb.Web/public/stylesheets/layout.css @@ -12,9 +12,9 @@ a { color: #00B7FF; } -.content { +.content-padding { padding: 50px; -} +} .navbar { padding: 10px; diff --git a/PoinCloudWeb.Web/public/stylesheets/map.css b/PoinCloudWeb.Web/public/stylesheets/map.css new file mode 100644 index 0000000..680e8b8 --- /dev/null +++ b/PoinCloudWeb.Web/public/stylesheets/map.css @@ -0,0 +1,25 @@ + + + +#map-settings { + grid-area: right; + border-left: 1px solid black; + height: 100vw; + padding: 0px; +} + +#map { + grid-area: main; +} + + +.map-grid-container { + display: grid; + grid-template-areas: + 'header header header header header header' + 'main main main main main right' + 'footer footer footer footer footer footer'; + height: 100vw; + grid-gap: 0px; + padding: 0px; +} diff --git a/PoinCloudWeb.Web/views/index.pug b/PoinCloudWeb.Web/views/index.pug index 0086d22..620cb79 100644 --- a/PoinCloudWeb.Web/views/index.pug +++ b/PoinCloudWeb.Web/views/index.pug @@ -1,8 +1,9 @@ extends layout block content - h1 Welcome to #{title} - p With this tool the scanning and managing of Point Clouds is possible - p Please select a feature in the Nav-Bar. + div.content-padding + h1 Welcome to #{title} + p With this tool the scanning and managing of Point Clouds is possible + p Please select a feature in the Nav-Bar. diff --git a/PoinCloudWeb.Web/views/layout.pug b/PoinCloudWeb.Web/views/layout.pug index 084be10..4b9dd98 100644 --- a/PoinCloudWeb.Web/views/layout.pug +++ b/PoinCloudWeb.Web/views/layout.pug @@ -2,7 +2,9 @@ doctype html html head title= title - link(rel='stylesheet', href='/stylesheets/style.css') + block scripts + block links + link(rel='stylesheet', href='/stylesheets/layout.css') script(src='/javascripts/layout.js') body div.navbar @@ -10,5 +12,4 @@ html div button(onclick="onClickScanner()") Scanner button(onclick="onClickMap()") Map - div.content - block content \ No newline at end of file + block content \ No newline at end of file diff --git a/PoinCloudWeb.Web/views/map.pug b/PoinCloudWeb.Web/views/map.pug index c97e6e8..87a051a 100644 --- a/PoinCloudWeb.Web/views/map.pug +++ b/PoinCloudWeb.Web/views/map.pug @@ -1,7 +1,16 @@ extends layout -block content - h1 Welcome to #{title} - h1 Map - +block scripts + script(src='/javascripts/map.js') +block links + link(rel='stylesheet', href='/stylesheets/map.css') + +block content + div.map-grid-container + div#map-settings + ul + li Item 1 + li Item 2 + div(id="map", class="content-padding") + p content diff --git a/PoinCloudWeb.Web/views/scanner.pug b/PoinCloudWeb.Web/views/scanner.pug index 3302b43..991cf99 100644 --- a/PoinCloudWeb.Web/views/scanner.pug +++ b/PoinCloudWeb.Web/views/scanner.pug @@ -1,7 +1,6 @@ extends layout block content - h1 Welcome to #{title} - h1 Scanner - - + div.content-padding + h1 Welcome to #{title} + h1 Scanner