Mercurial > gemma

annotate client/src/App.vue @ 904:e4b72a199258

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New default bottleneck colors Mainly to make the stroke color one actually selectable in the ui. In addition the pink does better match the collors used on the ECDIS layer.
author Sascha Wilde <wilde@intevation.de>
date Tue, 02 Oct 2018 13:34:59 +0200
parents d7ae7338872d
children d7f34791b18d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
1 <template>
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
2 <div id="app" class="main">
649
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
3 <div v-if="isAuthenticated" class="d-flex flex-column userinterface">
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
4 <div class="topcontainer">
649
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
5 <Topbar :routeName="routeName"></Topbar>
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
6 </div>
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
7 <div class="midcontainer d-flex flex-row">
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
8 <div class="leftcontainer">
649
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
9 <Sidebar></Sidebar>
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
10 </div>
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
11 <div class="middle">
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
12
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
13 </div>
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
14 <div class="rightcontainer">
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
15
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
16 </div>
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
17 </div>
626
d4fa28bfa6ec fix: layout minor fixes of buttons and menu
Thomas Junk <thomas.junk@intevation.de>
parents: 621
diff changeset
18 <div class="bottomcontainer d-flex flex-row align-items-end">
649
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
19 <Userbar></Userbar>
816
cd79f62794dd client: prepare survey selection
Bernhard Reiter <bernhard@intevation.de>
parents: 713
diff changeset
20 <Morphtool v-if="routeName == 'mainview'"></Morphtool>
713
badbc0207418 feat: systeminformation feature added
Thomas Junk <thomas.junk@intevation.de>
parents: 649
diff changeset
21 <Linetool v-if="routeName == 'mainview'"></Linetool>
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
22 </div>
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
23 </div>
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
24 <div class="d-flex flex-column">
823
d7ae7338872d client: add morphtool again
Bernhard Reiter <bernhard@intevation.de>
parents: 819
diff changeset
25 <router-view/>
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
26 </div>
581
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
27 </div>
3
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
28 </template>
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
29
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
30 <style lang="scss">
161
b7ac2e4f9c5c feat: collapsible sidebar
Thomas Junk <thomas.junk@intevation.de>
parents: 30
diff changeset
31 html {
b7ac2e4f9c5c feat: collapsible sidebar
Thomas Junk <thomas.junk@intevation.de>
parents: 30
diff changeset
32 height: 100%;
539
924490b3395b refac: Loginmask reworked
Thomas Junk <thomas.junk@intevation.de>
parents: 161
diff changeset
33 width: 100%;
924490b3395b refac: Loginmask reworked
Thomas Junk <thomas.junk@intevation.de>
parents: 161
diff changeset
34 margin: 0 auto;
161
b7ac2e4f9c5c feat: collapsible sidebar
Thomas Junk <thomas.junk@intevation.de>
parents: 30
diff changeset
35 }
17
7d242100af46 Adjusted the look and feel of the login page according to ISC
Thomas Junk <thomas.junk@intevation.de>
parents: 13
diff changeset
36 body {
542
505656a9947f refac: layout refactored
Thomas Junk <thomas.junk@intevation.de>
parents: 539
diff changeset
37 height: 100%;
505656a9947f refac: layout refactored
Thomas Junk <thomas.junk@intevation.de>
parents: 539
diff changeset
38 width: 100%;
17
7d242100af46 Adjusted the look and feel of the login page according to ISC
Thomas Junk <thomas.junk@intevation.de>
parents: 13
diff changeset
39 background-color: #efefef !important;
7d242100af46 Adjusted the look and feel of the login page according to ISC
Thomas Junk <thomas.junk@intevation.de>
parents: 13
diff changeset
40 }
7d242100af46 Adjusted the look and feel of the login page according to ISC
Thomas Junk <thomas.junk@intevation.de>
parents: 13
diff changeset
41
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
42 .topcontainer {
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
43 height: 10vh;
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
44 }
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
45
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
46 .bottomcontainer {
626
d4fa28bfa6ec fix: layout minor fixes of buttons and menu
Thomas Junk <thomas.junk@intevation.de>
parents: 621
diff changeset
47 height: 10vh;
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
48 }
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
49
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
50 .midcontainer {
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
51 height: 80vh;
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
52 }
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
53
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
54 .rightcontainer {
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
55 width: 20vw;
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
56 }
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
57
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
58 .leftcontainer {
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
59 width: 20vw;
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
60 }
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
61
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
62 .middle {
631
13bccabbf7c5 fix: usermenu or sidebar trigger arrangement of user/userdetailsview
Thomas Junk <thomas.junk@intevation.de>
parents: 626
diff changeset
63 width: 60vw;
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
64 }
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
65
581
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
66 .userinterface {
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
67 position: absolute;
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
68 top: 0;
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
69 left: 0;
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
70 height: 100vh;
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
71 width: 100vw;
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
72 z-index: 4;
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
73 pointer-events: none;
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
74 }
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
75
3
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
76 #app {
581
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
77 height: 100vh;
fb5d9d5ff320 refac: UI redesign
Thomas Junk <thomas.junk@intevation.de>
parents: 553
diff changeset
78 width: 100vw;
3
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
79 font-family: "Avenir", Helvetica, Arial, sans-serif;
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
80 -webkit-font-smoothing: antialiased;
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
81 -moz-osx-font-smoothing: grayscale;
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
82 text-align: center;
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
83 color: #2c3e50;
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
84 }
1597506a2241 merge with vue-cli
Thomas Junk <thomas.junk@intevation.de>
parents:
diff changeset
85 </style>
551
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
86
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
87 <script>
585
ef307bd6b5d8 refac: restructured client application
Thomas Junk <thomas.junk@intevation.de>
parents: 581
diff changeset
88 import Sidebar from "./application/Sidebar";
ef307bd6b5d8 refac: restructured client application
Thomas Junk <thomas.junk@intevation.de>
parents: 581
diff changeset
89 import Topbar from "./application/Topbar";
553
f41c74b8af9c fix: Sidebar/Topmenu only visible when logged in
Thomas Junk <thomas.junk@intevation.de>
parents: 551
diff changeset
90 import { mapGetters } from "vuex";
641
14dfab4e6e32 refac: rename application/user to application/userbar to improve naming consistency
Thomas Junk <thomas.junk@intevation.de>
parents: 631
diff changeset
91 import Userbar from "./application/Userbar";
649
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
92 import Linetool from "./application/Linetool";
823
d7ae7338872d client: add morphtool again
Bernhard Reiter <bernhard@intevation.de>
parents: 819
diff changeset
93 import Morphtool from "./application/Morphtool";
553
f41c74b8af9c fix: Sidebar/Topmenu only visible when logged in
Thomas Junk <thomas.junk@intevation.de>
parents: 551
diff changeset
94
551
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
95 export default {
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
96 name: "app",
553
f41c74b8af9c fix: Sidebar/Topmenu only visible when logged in
Thomas Junk <thomas.junk@intevation.de>
parents: 551
diff changeset
97 computed: {
649
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
98 ...mapGetters("user", ["isAuthenticated"]),
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
99 routeName() {
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
100 const routeName = this.$route.name;
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
101 return routeName;
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
102 }
553
f41c74b8af9c fix: Sidebar/Topmenu only visible when logged in
Thomas Junk <thomas.junk@intevation.de>
parents: 551
diff changeset
103 },
551
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
104 components: {
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
105 Sidebar,
621
b17a4482d07d feat: UI adaptation of 4 slots
Thomas Junk <thomas.junk@intevation.de>
parents: 590
diff changeset
106 Topbar,
649
83081ba6c9c1 feat: Linetool added
Thomas Junk <thomas.junk@intevation.de>
parents: 641
diff changeset
107 Userbar,
823
d7ae7338872d client: add morphtool again
Bernhard Reiter <bernhard@intevation.de>
parents: 819
diff changeset
108 Linetool,
d7ae7338872d client: add morphtool again
Bernhard Reiter <bernhard@intevation.de>
parents: 819
diff changeset
109 Morphtool
551
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
110 }
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
111 };
89bc8111563a refac: Layout adjustments
Thomas Junk <thomas.junk@intevation.de>
parents: 542
diff changeset
112 </script>