From 400c3e5606d2c40982031c6aea9bda7926ebeba4 Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Fri, 9 Mar 2018 09:31:58 +0100 Subject: [PATCH 001/109] got a response for Firebase working fine. Just need to work on the filter now --- src/components/Search.vue | 179 +++++++++++++++++++++++++++++++++++++- 1 file changed, 175 insertions(+), 4 deletions(-) diff --git a/src/components/Search.vue b/src/components/Search.vue index 018bea5..da64117 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -1,13 +1,184 @@ + + \ No newline at end of file From cda2225c91fe7adb8f43c8b33a03174550780943 Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Fri, 9 Mar 2018 15:01:39 +0100 Subject: [PATCH 002/109] implemented iteration throw new Firebase data file --- src/components/Header.vue | 2 -- src/components/Search.vue | 57 +++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/src/components/Header.vue b/src/components/Header.vue index 06e304f..68d90bc 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -3,8 +3,6 @@
- -

I am the header and I only show up together with my siblings (Profile, Search and Maps) whenever you sign in. If you don't, then you;'re not to be trusted

diff --git a/src/components/Search.vue b/src/components/Search.vue index da64117..aa17e55 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -12,7 +12,7 @@ />
-
+

{{ user.fName }} @@ -32,57 +32,54 @@ + + diff --git a/src/main.js b/src/main.js index 9e13429..906c156 100644 --- a/src/main.js +++ b/src/main.js @@ -3,8 +3,10 @@ import VueRouter from 'vue-router'; import App from './App' import router from './routes'; import { config } from "../helpers/firebaseconfig.js" -import firebase from "firebase" -import firebaseui from "firebaseui" +import firebase from "firebase"; +import firebaseui from "firebaseui"; +import vuefire from 'vuefire'; +import axios from 'axios'; Vue.use(VueRouter); @@ -29,3 +31,5 @@ new Vue({ }); Vue.config.productionTip = false + +//Vue.use(VueFire); diff --git a/src/routes.js b/src/routes.js index 3a189e4..e0bb201 100644 --- a/src/routes.js +++ b/src/routes.js @@ -8,6 +8,7 @@ import Login from "./components/Login.vue" import Header from "./components/Header.vue" import Profile from "./components/Profile.vue" import Search from "./components/Search.vue" +import Menu from "./components/Menu.vue" //## Maps @@ -40,8 +41,8 @@ const router = new VueRouter({ { path: '/search', component: Search }, { path: '/berlin', component: Berlin }, { path: '/frankfurt', component: Frankfurt }, - { path: '/ottensen', component: HamburgOttensen }, - { path: '/schlump', component: HamburgSchlump }, + { path: '/hamburg/ottensen', component: HamburgOttensen }, + { path: '/hamburg/schlump', component: HamburgSchlump }, { path: '/munich', component: Munich }, { path: '/prague', component: Prague } ]} diff --git a/static/data/person.json b/static/data/person.json index 4b06bb1..28f7424 100644 --- a/static/data/person.json +++ b/static/data/person.json @@ -1,5 +1,6 @@ -[ - { +users: { + + user1: { "fName": "Julian", "lName": "Kodlin", "id": "5d8f6a73-8d3a-4519-ba6c-7846e129edb8", @@ -389,4 +390,4 @@ "wiki":"https://de.wikipedia.org/wiki/SinnerSchrader", "image": "https://www.disneyclips.com/imagesnewb/images/daisysecret.gif" } -] \ No newline at end of file +} \ No newline at end of file From e4fc8104aa832a9dc32ab0b45f0e3d3aac1bb6fa Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Fri, 9 Mar 2018 16:01:32 +0100 Subject: [PATCH 004/109] Added loader dependency to externalize css --- src/components/Menu.vue | 116 +++++----------------------------- vendor/css/menu.component.css | 86 +++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 100 deletions(-) create mode 100644 vendor/css/menu.component.css diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 46e8763..de93e0b 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -20,25 +20,25 @@

-
+ - - HAMBURG + HAMBURG --> -
    + -
      + @@ -95,15 +95,15 @@ - BERLIN - + --> - @@ -133,10 +133,10 @@
    - + --> - @@ -160,7 +160,7 @@ - @@ -174,7 +174,7 @@ -
+
-->
@@ -211,95 +211,11 @@ export default { } - diff --git a/vendor/css/menu.component.css b/vendor/css/menu.component.css new file mode 100644 index 0000000..6737256 --- /dev/null +++ b/vendor/css/menu.component.css @@ -0,0 +1,86 @@ +*{ + margin: 0; + padding: 0; +} + +*{ + box-sizing: border-box; +} + +.burger-menu { + width: 308px; + background-color: yellow; +} + .user-info { + width: 100%; + height: 231px; + background-color: #1e212a; + position: relative; + z-index: 0; + overflow: hidden; +} + +.user-text{ + color: white; + position: absolute; + z-index: 2; + left:0; + right:0; +} + +.user-text h2 { + position: absolute; + font-size: 28px; + font-weight: bold; + letter-spacing: -0.9px; + color: #f4f7fa; + text-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); + z-index: 2; + top: 170px; + left: 50%; + margin-right: -50%; + transform: translate(-50%, -50%); +} + +.desk-text { + position: absolute; + width: 100%; + z-index: 2; + top: 202px; +} + +.desk-text ul { + position: absolute; + + left: 50%; + margin-right: -50%; + transform: translate(-50%, -50%); +} + +.desk-text ul li { + display: inline; + font-size: 20px; + font-weight: bold; + letter-spacing: -0.6px; + text-align: center; + color: #1e212a; + padding:1px; + background-color: #03ffb7; +} + +.desk-text li { + margin: 3px; +} + +img { + position: absolute; + /*max-height:100%;*/ + /*object-fit: contain;*/ + width: 100%; + margin: auto; + top: 0; + left: 0; + bottom: 0; + right: 0; + z-index: 1 +} \ No newline at end of file From 03dcc6973e2259efec946ad4f5b85ce514a0c9cd Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Fri, 9 Mar 2018 16:13:51 +0100 Subject: [PATCH 005/109] added style in a separate css sheet --- src/components/Search.vue | 89 +-------------------------------- vendor/css/search.component.css | 86 +++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 87 deletions(-) diff --git a/src/components/Search.vue b/src/components/Search.vue index aa17e55..15ec165 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -89,93 +89,8 @@ export default { - \ No newline at end of file diff --git a/vendor/css/search.component.css b/vendor/css/search.component.css index e69de29..a5bc49d 100644 --- a/vendor/css/search.component.css +++ b/vendor/css/search.component.css @@ -0,0 +1,86 @@ +*, *:before, *:after { + box-sizing: border-box; +} + +body { + font-family: 'MaisonNeue', sans-serif; +} + +.search__input { + background-color: rgb(76, 19, 209); + color: white; + margin: 8px 0; + padding: 4px; + font-family: 'MaisonNeue', sans-serif; + font-size: 16px; + position: absolute; + border: none; + width: 100%; + height: 40px; +} + .email { + width: 100%; + } + +::-webkit-input-placeholder { /* Chrome/Opera/Safari */ + color: white; + opacity: 0.8; + font-family: 'MaisonNeue', sans-serif; +} +::-moz-placeholder { /* Firefox 19+ */ + color: white; + opacity: 0.8; + font-family: 'MaisonNeue', sans-serif; +} + +:-ms-input-placeholder { /* IE 10+ */ + color: white; + opacity: 0.8; + font-family: 'MaisonNeue', sans-serif; +} + +:-moz-placeholder { /* Firefox 18- */ + color: white; + opacity: 0.8; + font-family: 'MaisonNeue', sans-serif; +} + +.search { + height: 35px; + border: none; + position: relative; + margin-top: 1%; + float: right; + width: 400px; +} + +@media (max-width: 650px) { + .search { + width: 100%; + } +} + +.search__list { + position: absolute; + width: 100%; + background-color: #4502da; + top: 50px; + color: white; +} +.search__item { + padding: 10px; +} + +a { + color: white; + text-decoration: none; + border: 2px solid white; + padding: 10px; + margin: 10px; + display: inline-block; +} + +a:hover { + text-decoration: none; + background-color: #020249 ; +} \ No newline at end of file From 0a7857d2b78dc25f2db26b0326a9188f786051ac Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Fri, 9 Mar 2018 16:27:50 +0100 Subject: [PATCH 006/109] Removes vuefire --- package-lock.json | 5 ----- package.json | 1 - src/main.js | 3 --- 3 files changed, 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index dc189fa..ad6e270 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16865,11 +16865,6 @@ "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==", "dev": true }, - "vuefire": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/vuefire/-/vuefire-1.4.5.tgz", - "integrity": "sha512-lYk0Yk7ExwGN8G/datDMKxNeLLxfkL/cCU/B5Dw5ggNabCPwKnUEv3OE3ShMwberDDN+9wzm8AEPiLvI9aG/9Q==" - }, "watchpack": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", diff --git a/package.json b/package.json index ff8ad5d..c911fc3 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "vue": "^2.5.2", "vue-resource": "^1.3.6", "vue-router": "^3.0.1", - "vuefire": "^1.4.5" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/main.js b/src/main.js index 906c156..2f79a88 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,6 @@ import router from './routes'; import { config } from "../helpers/firebaseconfig.js" import firebase from "firebase"; import firebaseui from "firebaseui"; -import vuefire from 'vuefire'; import axios from 'axios'; @@ -31,5 +30,3 @@ new Vue({ }); Vue.config.productionTip = false - -//Vue.use(VueFire); From 4222da269ebada742a70570b0b3d912293e9d14c Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Sat, 10 Mar 2018 17:27:11 +0100 Subject: [PATCH 007/109] Implemented basic location navigation menu --- package.json | 2 +- src/components/Menu.vue | 166 +++++++++++----------------------- src/main.js | 2 +- vendor/css/menu.component.css | 103 +++++++++++++++++++-- 4 files changed, 150 insertions(+), 123 deletions(-) diff --git a/package.json b/package.json index c911fc3..8ed1b0c 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "svg-url-loader": "^2.3.1", "vue": "^2.5.2", "vue-resource": "^1.3.6", - "vue-router": "^3.0.1", + "vue-router": "^3.0.1" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/src/components/Menu.vue b/src/components/Menu.vue index de93e0b..842f759 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -20,163 +20,105 @@ - - + HAMBURG - + S2 - - + + - - Ottensen - S2D & Swipe --> - - - - - - - - - - - + - > Level 2 + S2S - - > Level 6 + S2C - - - + + - + + + BERLIN + - - - --> + + + FRANKFURT + - - + + FRANKFURT - - - - - - --> + + - \ No newline at end of file From 4a387b5944d975bb1904411777996546648ccd12 Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Sun, 11 Mar 2018 12:43:14 +0100 Subject: [PATCH 009/109] changed the name of the css folder to styles --- src/components/Search.vue | 2 +- {vendor => styles}/css/search.component.css | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {vendor => styles}/css/search.component.css (100%) diff --git a/src/components/Search.vue b/src/components/Search.vue index 15ec165..7535e87 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -91,6 +91,6 @@ export default { \ No newline at end of file diff --git a/vendor/css/search.component.css b/styles/css/search.component.css similarity index 100% rename from vendor/css/search.component.css rename to styles/css/search.component.css From 28aa92cadc306a52d388c96dd37d9594215923ee Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Sun, 11 Mar 2018 13:14:00 +0100 Subject: [PATCH 010/109] Implemented burger menu location navigation. --- src/components/Menu.vue | 34 ++++++++++------ src/routes.js | 1 + vendor/css/menu.component.css | 75 +++++++++++------------------------ 3 files changed, 45 insertions(+), 65 deletions(-) diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 842f759..e6039fc 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -24,23 +24,29 @@
    + - HAMBURG + active-class="active" exact + @click.native="toggleSubmenu1=!toggleSubmenu1"> + HAMBURG + + + -
      +
        - S2 + active-class="active" + @click.native="toggleSubmenu2=!toggleSubmenu2"> + S2+ -
          +
            + active-class="active" exact> B + active-class="active" exact> H
          @@ -68,14 +74,14 @@ + active-class="active" exact> S2S + active-class="active" exact> S2C
        @@ -108,10 +114,10 @@ - FRANKFURT + PRAGUE
      @@ -130,7 +136,9 @@ export default { data () { return { user: {}, - desk: {} + desk: {}, + toggleSubmenu1: false, + toggleSubmenu2: false, } }, created () { diff --git a/src/routes.js b/src/routes.js index e0bb201..3c3a668 100644 --- a/src/routes.js +++ b/src/routes.js @@ -41,6 +41,7 @@ const router = new VueRouter({ { path: '/search', component: Search }, { path: '/berlin', component: Berlin }, { path: '/frankfurt', component: Frankfurt }, + { path: '/hamburg', component: HamburgOttensen }, { path: '/hamburg/ottensen', component: HamburgOttensen }, { path: '/hamburg/schlump', component: HamburgSchlump }, { path: '/munich', component: Munich }, diff --git a/vendor/css/menu.component.css b/vendor/css/menu.component.css index d0f3215..52f1ab6 100644 --- a/vendor/css/menu.component.css +++ b/vendor/css/menu.component.css @@ -24,6 +24,7 @@ border: solid 2px #1e212a; } +/* style user name*/ .user-text{ color: white; position: absolute; @@ -46,11 +47,12 @@ transform: translate(-50%, -50%); } +/* style desk location of user */ .desk-text { position: absolute; width: 100%; z-index: 2; - top: 202px; + top: 204px; } .desk-text ul { @@ -66,14 +68,15 @@ font-weight: bold; letter-spacing: 1px; color: #1e212a; - padding:2px; + padding:1px; background-color: #03ffb7; } .desk-text li { - margin: 3px; + margin: 8px; } +/* style user image*/ img { position: absolute; width: 100%; @@ -87,25 +90,20 @@ img { /* LOCATION NAVIGATION */ +/*style location navigation*/ .nav { position: relative; width: 100%; background-color: #f4f7fa; } - -/* underline active routes*/ -.active > a:link { - text-decoration: underline; -} - /* Define styles for all links*/ .nav__locations a { display: block; text-decoration: none; line-height: 60px; - /*padding: 1px;*/ font-size: 20px; + letter-spacing: 0.8px; font-weight: bold; color: #1e212a; border-bottom: solid 2px #1e212a; @@ -114,58 +112,31 @@ img { text-align: center; } -.nav__locations li { - width: 315px; -} -/* reset lists to remove bullet points and padding */ -/*.nav__locations { - list-style: none; - padding: 0; +/* invert colors of parent active routes,*/ +.active > a:link { + background-color: #1e212a; } -.submenu-1 { - list-style: none; -} -.submenu-2 { - list-style: none; +.active > a { + color: #f4f7fa; } -*/ - -/* add hover behaviour */ -.mainmenu a:hover { - background-color: #889EFC; -} -/* hover behaviour for links inside .submenu */ -.submenu_1 a:hover { - background-color: #889EFC; -} -/* when hovering over a .mainmenu item, - display the submenu inside it. - Change the submenu's max-height from 0 to 500px; -*/ -.mainmenu li:hover .submenu_1, -.mainmenu .submenu_1 li:hover .submenu_2 { - display: block; +/* overwrite styles for submenu */ +.submenu-1 a, .submenu-2 a { max-height: 500px; + color: green; + background-color: green; } -/* overwrite padding and font-size of submenues */ -.submenu_1 a, .submenu_2 a { - font-size: 1.2em; - padding: 10px 0px 10px 0px; -} -/* overwrite padding and font-size of submenue 2 */ -.submenu_2 a { - font-size: 1.2em; - padding: 10px 0px;; -} + + /* Set initial state of all submenus. - Set it to max-height: 0, and hide the overflowed content. + Set it to max-height: 0, and hide the overflowing content. Use a transition to fade-in content. */ -.submenu_1, .submenu_2 { +.submenu-1, .submenu-2 { overflow: hidden; max-height: 0; -webkit-transition: all 0.5s ease-out; -} \ No newline at end of file +} + From acd03098507481b17fe80319b24fd23daf53024d Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Sun, 11 Mar 2018 14:13:12 +0100 Subject: [PATCH 011/109] started changing the profile --- src/components/Profile.vue | 4 ++-- styles/css/profile.component.css | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 styles/css/profile.component.css diff --git a/src/components/Profile.vue b/src/components/Profile.vue index 2eab26b..a30d592 100644 --- a/src/components/Profile.vue +++ b/src/components/Profile.vue @@ -12,8 +12,8 @@


      diff --git a/styles/css/profile.component.css b/styles/css/profile.component.css new file mode 100644 index 0000000..bc25f71 --- /dev/null +++ b/styles/css/profile.component.css @@ -0,0 +1,34 @@ +.profile { + background-color: rgb(76, 19, 209); + color: white; + position: absolute; + width: 100%; + top: 50px; + padding: 10px; +} + +.profile__header { + width: 100%; + float: left; +} + +.profile__img { + width: 100px; + height: 100px; + border-radius: 50px; + float: right; +} + +.profile__name { + width: calc(100% - 100px); + float: left; +} +.profile__text { + float: left; + width: 100%; +} + +.profile__social { + width: 100%; + float: left; +} From d508584b217bf2ccf2911f8837130a5c15b9ec05 Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Mon, 12 Mar 2018 09:49:20 +0100 Subject: [PATCH 012/109] Made submenus inline. --- src/components/Menu.vue | 57 ++++++++++++++++++----------------- vendor/css/menu.component.css | 41 +++++++++++++++++++------ 2 files changed, 61 insertions(+), 37 deletions(-) diff --git a/src/components/Menu.vue b/src/components/Menu.vue index e6039fc..bcd9c6c 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -24,33 +24,50 @@
        - - HAMBURG + - - -
          +
            - S2+ + S2 + + + + S2S + + + + S2C + + + -
              +
                + active-class="active" exact> A @@ -68,26 +85,10 @@ H
              - - - - - S2S - - - - S2C -
            - - + + a { color: #f4f7fa; + /*border-bottom: solid 1px #f4f7fa;*/ } + /* overwrite styles for submenu */ -.submenu-1 a, .submenu-2 a { +/*.submenu-1 li, .submenu-2 li { + display: inline-block; + position: relative; max-height: 500px; - color: green; background-color: green; + text-decoration: none; +}*/ + +ul.submenu-1 li, ul.submenu-2 li { + display: inline-block; + margin: 0px; + padding:0px; +} + +.submenu-2 { + border-top: solid 2px #1e212a; + border-bottom: solid 1px #1e212a; + margin: 0px; +} + + +.submenu-1 a { + width: 96px; + border-bottom: 0px; + margin: 0px; + padding:0px; } @@ -134,9 +158,8 @@ img { Set it to max-height: 0, and hide the overflowing content. Use a transition to fade-in content. */ -.submenu-1, .submenu-2 { +.submenu-1-visible, .submenu-2-visible { overflow: hidden; max-height: 0; - -webkit-transition: all 0.5s ease-out; -} - + /*-webkit-transition: all 3s ease-out;*/ +} \ No newline at end of file From 7a479fd1198554cc0743608d82844cb103ab780f Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Tue, 13 Mar 2018 19:48:13 +0100 Subject: [PATCH 013/109] Made menu 75% of screensize while keeping image ratio 4x3. Added toggle column. Set-up basic media queries. Added feedback icon. --- src/App.vue | 3 + src/components/Dashboard.vue | 2 +- src/components/Header.vue | 10 ++- src/components/Menu.vue | 11 +++ src/components/Profile.vue | 13 ++- vendor/css/menu.component.css | 152 ++++++++++++++++++++++++---------- 6 files changed, 144 insertions(+), 47 deletions(-) diff --git a/src/App.vue b/src/App.vue index ae989b5..2b3aacb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,11 +33,14 @@ body { .body__text { font-size: 20px; } + .header { margin-top: 180px; } + h1 { font size: 45px; } + diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue index 586dd50..7550b78 100644 --- a/src/components/Dashboard.vue +++ b/src/components/Dashboard.vue @@ -1,8 +1,8 @@ diff --git a/src/components/Search.vue b/src/components/Search.vue index 814247c..caf2baa 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -17,7 +17,6 @@
            -

            NO USER FOUND

            @@ -48,6 +47,12 @@
            + +
            + +

            No user found. Retry.

            +
            + @@ -111,13 +116,13 @@ export default { return this.searchTerm.length >=2 && Object.keys(this.selectedUser).length == 0; }, isListEmpty(){ - return this.searchTerm.length >=2; + return this.searchTerm.length >=2 && Object.keys(this.filteredList).length == 0; } }, watch: { searchTerm () { this.selectedUser = { }; - }, + } } } diff --git a/styles/css/header.component.css b/styles/css/header.component.css index 80557da..9118138 100644 --- a/styles/css/header.component.css +++ b/styles/css/header.component.css @@ -20,7 +20,6 @@ width: 100%; height: 65px; background-color: #1e212a; - color: #ff0354; } .app-header__logos { diff --git a/styles/css/profile.component.css b/styles/css/profile.component.css index a4834fc..1cc2b6d 100644 --- a/styles/css/profile.component.css +++ b/styles/css/profile.component.css @@ -129,6 +129,9 @@ f*, *:before, *:after { } #wiki-icon { - width: 60px; + position: relative; + top: 10px; + left: 5px; + width: 65px; height: auto; } \ No newline at end of file diff --git a/styles/css/search.component.css b/styles/css/search.component.css index d5cf5fc..3d6743c 100644 --- a/styles/css/search.component.css +++ b/styles/css/search.component.css @@ -149,5 +149,18 @@ div.btn:hover { margin-right: 4px; } +.search__no-user { + position: absolute; + top:70px; + width: 100%; + text-align: center; + color: red; +} + +.search__no-user img { + position: relative; + width: 100%; + height: auto; +} From 456d17cfb253da1c260ad3c9a08b212e8aac6da4 Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Thu, 5 Apr 2018 17:52:01 +0200 Subject: [PATCH 052/109] Implemented clear search function in SEARCH. --- src/components/Menu.vue | 3 +- src/components/Search.vue | 57 +++++++++++++++++++++++---------- styles/css/search.component.css | 14 +++++++- 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 227618e..625b384 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -124,7 +124,8 @@ export default { return { user: {}, desk: {}, - showSubmenu: false + showSubmenu: false, + authUser: {} } }, methods: { diff --git a/src/components/Search.vue b/src/components/Search.vue index caf2baa..72d44f6 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -1,7 +1,7 @@ - - diff --git a/styles/css/ottensen.component.css b/styles/css/ottensen.component.css index 8034a09..d88b102 100644 --- a/styles/css/ottensen.component.css +++ b/styles/css/ottensen.component.css @@ -11,6 +11,7 @@ position: relative; width: 100%; height: calc(100vh - 65px); + z-index: -10; } .dropdown { From dd71aaab075773ef5160c1c81a2fe373b0111774 Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Fri, 6 Apr 2018 11:23:40 +0200 Subject: [PATCH 055/109] change dthe order --- src/components/Header.vue | 2 +- src/components/Search.vue | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/Header.vue b/src/components/Header.vue index 866834d..728bd04 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -6,7 +6,7 @@ - + diff --git a/src/components/Search.vue b/src/components/Search.vue index b90a790..cacd3c4 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -7,10 +7,10 @@ autocomplete="off" class="search__input" name="mySearch" - @input="dispatchSearchTerm" type="text" - placeholder="Who are you looking for?" + @input="dispatchSearchTerm" :value="getSearchTerm" + placeholder="Who are you looking for?" />
            @@ -22,7 +22,6 @@
            -
            From 2de943db17454657d86521c7eac5e6ffbb1c01cd Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Fri, 6 Apr 2018 11:23:59 +0200 Subject: [PATCH 056/109] Swapped email/phone icons. --- src/components/Profile.vue | 6 +++--- src/components/Search.vue | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/Profile.vue b/src/components/Profile.vue index 3cc514c..778c05b 100644 --- a/src/components/Profile.vue +++ b/src/components/Profile.vue @@ -27,15 +27,15 @@ - + - + - +
            {{ selectedUser.gmailAcc }}
            {{ selectedUser.mobile }}
            {{ selectedUser.landline }}
            diff --git a/src/components/Search.vue b/src/components/Search.vue index 640a26d..3043256 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -11,7 +11,6 @@ v-model="searchTerm" type="text" placeholder="Who are you looking for?" - id="clearSearch" /> @@ -125,7 +124,7 @@ export default { return this.$store.commit('toggleMenu'); }, clearSearch() { - document.getElementById('clearSearch').value = ''; + // document.getElementById('clearSearch').value = ''; this.searchTerm = ''; } }, From 021b3d653306f5767e2fc2226851280ba29c06b2 Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Fri, 6 Apr 2018 15:04:52 +0200 Subject: [PATCH 057/109] Minor changes. --- src/components/Search.vue | 2 +- src/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Search.vue b/src/components/Search.vue index 3043256..e038349 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -64,7 +64,7 @@ id="btn__clear-search-profile" src="../assets/icons/close-black-icon.png" @click="clearSearch()"> - + diff --git a/src/main.js b/src/main.js index c9187b3..bfb1507 100644 --- a/src/main.js +++ b/src/main.js @@ -22,7 +22,7 @@ new Vue({ this.$router.push("/login") } else if (user) { var userEmail = user.email; - console.log(userEmail) + // console.log(userEmail) this.$router.push("/dashboard") } }) From e3b8bde4f98776d5b3d4ef257a92cfc18194898e Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Fri, 6 Apr 2018 15:12:07 +0200 Subject: [PATCH 058/109] fixed css issues --- src/api/desks.js | 5 +++-- src/components/maps/HamburgOttensen.vue | 2 +- src/store/store.js | 2 +- styles/css/ottensen.component.css | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/desks.js b/src/api/desks.js index c7f9263..103e2f6 100644 --- a/src/api/desks.js +++ b/src/api/desks.js @@ -5,18 +5,19 @@ const desks = [] import axios from "axios"; export default { - fetchDesks() { + fetchDesks(desks, {commit}) { axios.get("https://s2-move.firebaseio.com/desks.json") .then(res => { const data = res.data const deskList = [] for (let key in data) { const desk = data[key] - desk.id = key + // desk.id = key deskList.push(desk) } this.desks = deskList console.log(deskList) + commit("setDesks",desks) }) .catch(error => console.log(error)) } diff --git a/src/components/maps/HamburgOttensen.vue b/src/components/maps/HamburgOttensen.vue index 2657477..a4acfff 100644 --- a/src/components/maps/HamburgOttensen.vue +++ b/src/components/maps/HamburgOttensen.vue @@ -72,7 +72,7 @@ export default { methods: { selectDesk(deskId) { this.selectedDesk = deskId; - // console.log(this.selectedDesk); + console.log(this.selectedDesk); }, handler(deskId) { this.selectDesk(deskId) diff --git a/src/store/store.js b/src/store/store.js index 5c89067..9f41c57 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -15,7 +15,7 @@ export const store = new Vuex.Store({ }, getters: { getFilteredUsers(state) { - return state.filteredUsers = state.users.filter(user => { + return state.filteredUsers = state.users.filter(user => { var fullName = `${user.fName} ${user.lName}`; //search by name return fullName.toLowerCase().includes(state.searchTerm.toLowerCase()) diff --git a/styles/css/ottensen.component.css b/styles/css/ottensen.component.css index d88b102..8034a09 100644 --- a/styles/css/ottensen.component.css +++ b/styles/css/ottensen.component.css @@ -11,7 +11,6 @@ position: relative; width: 100%; height: calc(100vh - 65px); - z-index: -10; } .dropdown { From 3c4803f3f9a8f2ce0c4aaf9b0a79ab2bd35334f6 Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Sun, 8 Apr 2018 12:16:53 +0200 Subject: [PATCH 059/109] made the axios to desks globally accessible --- src/api/desks.js | 16 +++++------ src/api/users.js | 6 +++-- src/components/Menu.vue | 15 +---------- src/components/Search.vue | 6 ++++- src/store/store.js | 44 ++++++++++++++++++++++++++----- styles/css/ottensen.component.css | 1 - 6 files changed, 56 insertions(+), 32 deletions(-) diff --git a/src/api/desks.js b/src/api/desks.js index 103e2f6..6a2eb0b 100644 --- a/src/api/desks.js +++ b/src/api/desks.js @@ -5,20 +5,20 @@ const desks = [] import axios from "axios"; export default { - fetchDesks(desks, {commit}) { + getDesks(desks, {commit}) { axios.get("https://s2-move.firebaseio.com/desks.json") .then(res => { const data = res.data - const deskList = [] + let desks =[] for (let key in data) { const desk = data[key] - // desk.id = key - deskList.push(desk) + desk.id = key + desks.push(desk) } - this.desks = deskList - console.log(deskList) - commit("setDesks",desks) + this.desks = desks + // console.log(deskList) + commit("setDesks", desks) }) - .catch(error => console.log(error)) + .catch(error => console.log(error)) } } \ No newline at end of file diff --git a/src/api/users.js b/src/api/users.js index e651d76..7061100 100644 --- a/src/api/users.js +++ b/src/api/users.js @@ -3,7 +3,9 @@ const users = [] import axios from "axios"; + export default { + getUsers(users, {commit}) { axios.get("https://s2-move.firebaseio.com/users.json") .then(res => { @@ -19,5 +21,5 @@ export default { // console.log("I'm the user List being called from an external file!", users) }) .catch(error => console.log(error)) - } -} \ No newline at end of file + } + } diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 0f1132e..44f00bf 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -116,6 +116,7 @@ - + diff --git a/styles/css/auth.component.css b/styles/css/auth.component.css new file mode 100644 index 0000000..44679e7 --- /dev/null +++ b/styles/css/auth.component.css @@ -0,0 +1,106 @@ +*{ + margin: 0; + padding: 0; +} +/*include padding and border into total width and height of elements*/ +*{ + box-sizing: border-box; +} + +.login { + position: absolute; + width: 100%; + height:100vh; + background-color: #1e212a; + color: #f4f7fa; + text-align: center; +} + +#s2-logo { + position: relative; + top: 10px; + float: left; + margin-left: 10px; + max-height:60%; + width: auto; +} + +#move-logo { + position: relative; + top: 100px; + display: block; + /*margin: 0 auto;*/ + left: 41%; + max-height:20%; + width: auto; +} + +h1.login__headline { + position: relative; + top: 300px; + /*margin:0, auto;*/ + /*left: 45%;*/ + font-size: 24px; + letter-spacing: 1.3px; +} + +p.login__text { + position: relative; + top: 350px; + font-size: 18px; + letter-spacing: 0.8px; +} + +span.firebaseui-idp-text.firebaseui-idp-text-short { + display: none; +} + +/* Hide text within button*/ +span.firebaseui-idp-text.firebaseui-idp-text-long +{ + display: none; +} + +li.firebaseui-list-item { + position: relative; + top: 400px; + list-style-type: none; +} + +button.firebaseui-idp-button.mdl-button.mdl-js-button.mdl-button--raised.firebaseui-idp-google.firebaseui-id-idp-button { + position: relative; + width: 150px; + height: 60px; + margin:0, auto; + background-color: transparent; + border: 2px solid #f4f7fa; + padding: 10px; + padding-left: 100px; + cursor: pointer; + +} + +/*Style Google logo*/ +img.firebaseui-idp-icon { + display: none; + position: relative; + width: 30px; + height: auto; +} + +h1.button-text { + position: relative; + top: 440px; + font-size: 22px; +} + +/*ul.firebaseui-idp-list { + +}*/ + +/*div#firebaseui-auth-container { + width: 300px; + margin-left: 500px; + margin-top: 100px; +}*/ + From 55637794fe2fec3600a77d4061d55a9f54599511 Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Wed, 11 Apr 2018 11:19:58 +0200 Subject: [PATCH 067/109] Improved styling for desktop. --- styles/css/auth.component.css | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/styles/css/auth.component.css b/styles/css/auth.component.css index 44679e7..6cd7707 100644 --- a/styles/css/auth.component.css +++ b/styles/css/auth.component.css @@ -26,29 +26,34 @@ } #move-logo { - position: relative; + position: absolute; top: 100px; - display: block; + margin: initial; + right: 50%; + /*display: block;*/ /*margin: 0 auto;*/ - left: 41%; + /*left: 41%;*/ max-height:20%; width: auto; } h1.login__headline { - position: relative; - top: 300px; - /*margin:0, auto;*/ - /*left: 45%;*/ + position: absolute; + top: 250px; + margin:initial; + /*right: 50%;*/ + left: 38%; font-size: 24px; letter-spacing: 1.3px; } p.login__text { - position: relative; - top: 350px; + position: absolute; + top: 310px; font-size: 18px; letter-spacing: 0.8px; + margin: initial; + left: 15%; } span.firebaseui-idp-text.firebaseui-idp-text-short { @@ -62,7 +67,8 @@ span.firebaseui-idp-text.firebaseui-idp-text-long } li.firebaseui-list-item { - position: relative; + position: absolute; + left: 40%; top: 400px; list-style-type: none; } @@ -77,20 +83,17 @@ button.firebaseui-idp-button.mdl-button.mdl-js-button.mdl-button--raised.firebas padding: 10px; padding-left: 100px; cursor: pointer; - } /*Style Google logo*/ img.firebaseui-idp-icon { display: none; - position: relative; - width: 30px; - height: auto; } h1.button-text { - position: relative; - top: 440px; + position: absolute; + top: 417px; + left: 42%; font-size: 22px; } From e18312b21427d72052ae51ee2b295d707b47b0f9 Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Wed, 11 Apr 2018 12:41:36 +0200 Subject: [PATCH 068/109] Implemented logout button. --- src/components/Auth.vue | 1 + src/components/Menu.vue | 16 +++++++++++++++- styles/css/menu.component.css | 31 ++++++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/components/Auth.vue b/src/components/Auth.vue index 2f4cd72..9903d17 100644 --- a/src/components/Auth.vue +++ b/src/components/Auth.vue @@ -30,6 +30,7 @@ export default { signInSuccess: function(currentUser, credential, redirectUrl) { // Return type determines whether we continue the redirect automatically or whether we leave that to developer to handle. var user = signInSucces.currentUser; + alert("Great. Let's move it!"); console.log("hello", user) return true; // console.log("Hello", currentUser.email) diff --git a/src/components/Menu.vue b/src/components/Menu.vue index a6f8574..7996564 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -105,7 +105,13 @@ @@ -116,7 +122,10 @@ - diff --git a/styles/css/auth.component.css b/styles/css/auth.component.css index 62660dc..6179c19 100644 --- a/styles/css/auth.component.css +++ b/styles/css/auth.component.css @@ -1,109 +1,101 @@ *{ margin: 0; padding: 0; -} -/*include padding and border into total width and height of elements*/ -*{ box-sizing: border-box; } .login { position: absolute; width: 100%; - height:100vh; + min-height:100vh; background-color: #1e212a; color: #f4f7fa; text-align: center; + z-index: -2; } -#s2-logo { - position: relative; +.login #s2-logo { + position: absolute; top: 10px; - float: left; - margin-left: 10px; + left: 10px; max-height:60%; width: auto; + height: 30px; } -#move-logo { - position: absolute; - top: 100px; - margin: initial; - right: 50%; - /*display: block;*/ - /*margin: 0 auto;*/ - /*left: 41%;*/ +.login #move-logo { + display: block; + margin: 0 auto; + margin-top: 110px; max-height:20%; width: auto; } -h1.login__headline { - position: absolute; - top: 250px; - margin:initial; - /*right: 50%;*/ - left: 38%; +.login h1.login__headline { + margin-top: 60px; font-size: 24px; letter-spacing: 1.3px; } - -p.login__text { - position: absolute; - top: 310px; +/*Login text*/ +.login p.login__text { + margin-top: 30px; font-size: 18px; letter-spacing: 0.8px; - margin: initial; - left: 15%; } -span.firebaseui-idp-text.firebaseui-idp-text-short { +.login #loader { + margin-top: 30px; +} + +/* Hide firebase text*/ +.login span.firebaseui-idp-text.firebaseui-idp-text-short { display: none; } /* Hide text within button*/ -span.firebaseui-idp-text.firebaseui-idp-text-long -{ +.login span.firebaseui-idp-text.firebaseui-idp-text-long { display: none; } -li.firebaseui-list-item { - position: absolute; - left: 40%; - top: 400px; +/* Login button container*/ +.login div#firebaseui-auth-container { + margin-top: 80px; +} + +/* Google button list item*/ +.login li.firebaseui-list-item { list-style-type: none; } -button.firebaseui-idp-button.mdl-button.mdl-js-button.mdl-button--raised.firebaseui-idp-google.firebaseui-id-idp-button { - position: relative; - width: 150px; +/* Login button */ +.login button.firebaseui-idp-button.mdl-button.mdl-js-button.mdl-button--raised.firebaseui-idp-google.firebaseui-id-idp-button { + position: absolute; + left: 50%; + transform: translate(-50%, 0); + top: 460px; + width: 170px; height: 60px; - margin:0, auto; background-color: transparent; border: 2px solid #f4f7fa; padding: 10px; - padding-left: 100px; cursor: pointer; + z-index: 1; } /*Style Google logo*/ -img.firebaseui-idp-icon { +.login img.firebaseui-idp-icon { display: none; } - -h1.button-text { +/* lays underneath */ +.login h1.button__text { position: absolute; - top: 417px; - left: 42%; + left: 50%; + transform: translate(-50%, 0); + top: 475px; + /*margin-top: 15px;*/ font-size: 22px; + z-index: -1; } -ul.firebaseui-idp-list { - -} -div#firebaseui-auth-container { - width: 300px; - margin-left: 500px; - margin-top: 100px; -} diff --git a/styles/css/header.component.css b/styles/css/header.component.css index 8115a32..2ddaf6d 100644 --- a/styles/css/header.component.css +++ b/styles/css/header.component.css @@ -27,7 +27,7 @@ height: 100%; } -#s2-logo { +.app-header #s2-logo { position: absolute; display: block; float: left; @@ -41,7 +41,7 @@ width: auto; }*/ -#move-logo { +.app-header #move-logo { position: absolute; display: block; margin-left: auto; From 84ac985f40429978f2aadcdd5d7dcb242750137d Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Wed, 11 Apr 2018 22:49:14 +0200 Subject: [PATCH 073/109] Fixed styling of different components due to change of scope of CSS. --- styles/css/header.component.css | 17 ++++------------- styles/css/profile.component.css | 12 +++++++++++- styles/css/search.component.css | 5 ++++- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/styles/css/header.component.css b/styles/css/header.component.css index 2ddaf6d..f7c5836 100644 --- a/styles/css/header.component.css +++ b/styles/css/header.component.css @@ -1,15 +1,11 @@ *{ margin: 0; padding: 0; -} - -/*include padding and border into total width and height of elements*/ -*{ box-sizing: border-box; } /*hide logo for small screens*/ -@media (max-width: 1050px) { +@media (max-width: 850px) { .app-header__logos { display: none; } @@ -28,24 +24,19 @@ } .app-header #s2-logo { - position: absolute; - display: block; float: left; margin-left: 10px; + margin-top: 20px; bottom: 0px; width: 130px; height: auto; } -/* max-height:60%; - width: auto; -}*/ - .app-header #move-logo { position: absolute; display: block; - margin-left: auto; - margin-right: auto; + left: 50%; + transform: translate(-50%, 0); max-height:100%; width: auto; } diff --git a/styles/css/profile.component.css b/styles/css/profile.component.css index 019106c..67c5d0d 100644 --- a/styles/css/profile.component.css +++ b/styles/css/profile.component.css @@ -40,12 +40,22 @@ f*, *:before, *:after { } /* position user image*/ -.profile__img { +.profile__img{ position: relative; width: 100%; height: 190px; overflow: hidden; +} +.profile__img img { + position: absolute; + width: 100%; + margin: auto; + top: 0; + left: 0; + bottom: 0; + right: 0; + z-index: 1; } /* POSITION USER INFO*/ diff --git a/styles/css/search.component.css b/styles/css/search.component.css index 5caf4d6..53195b5 100644 --- a/styles/css/search.component.css +++ b/styles/css/search.component.css @@ -31,27 +31,30 @@ f*, *:before, *:after { } /* Placeholder text search input*/ - /* Chrome/Opera/Safari */ ::-webkit-input-placeholder { color: #1e212a; + opacity: 0.6; font-family: 'MaisonNeue', sans-serif; } /* Firefox 19+ */ ::-moz-placeholder { color: #1e212a; + opacity: 0.6; font-family: 'MaisonNeue', sans-serif; } /* IE 10+ */ :-ms-input-placeholder { color: #1e212a; + opacity: 0.6; font-family: 'MaisonNeue', sans-serif; } /* Firefox 18- */ :-moz-placeholder { color: #1e212a; + opacity: 0.6; font-family: 'MaisonNeue', sans-serif; } From fa6b30548615a490ee88873fe598b18fc73a924f Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Wed, 11 Apr 2018 23:27:17 +0200 Subject: [PATCH 074/109] Implemented deskinfo in search list. And not checked in option. --- src/components/Profile.vue | 8 ++++++++ src/components/Search.vue | 16 ++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/components/Profile.vue b/src/components/Profile.vue index 778c05b..fd0c90e 100644 --- a/src/components/Profile.vue +++ b/src/components/Profile.vue @@ -11,6 +11,14 @@ {{ selectedUser.lName }} +
            • HAM
            • S2
              • diff --git a/src/components/Search.vue b/src/components/Search.vue index 04893de..baad278 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -34,10 +34,10 @@
                -
              • HAM
                • -
              • !!!{{user.deskref.building}}
                • -
              • S2
                • -
              • A-3
                • +
              • {{ user.deskref.acronym }}
                • +
              • {{ user.division }}
                • +
              • {{ user.deskref.building }} {{ user.deskref.level }}
                • +
              • Not checked in.
              @@ -80,12 +80,8 @@ export default { action: Function }, created() { - let a = this.fetchUsers(); - let b = this.fetchDesks(); - Promise.all([a, b]) - .then(function() { - console.log("a, b fertig"); - }) + this.fetchUsers(); + this.fetchDesks(); // this.addDeskRef(); }, methods: { From 9b6ced8982da4441a9c78a835e23e1033dd2eb8f Mon Sep 17 00:00:00 2001 From: Marie Klaus Date: Wed, 11 Apr 2018 23:53:38 +0200 Subject: [PATCH 075/109] Implemented deskref in profile component. --- src/api/desks.js | 2 +- src/api/users.js | 3 +- src/components/Profile.vue | 22 +++++------- src/store/store.js | 58 +++++++++++++------------------- styles/css/profile.component.css | 2 ++ 5 files changed, 37 insertions(+), 50 deletions(-) diff --git a/src/api/desks.js b/src/api/desks.js index 552573d..3ab563f 100644 --- a/src/api/desks.js +++ b/src/api/desks.js @@ -9,8 +9,8 @@ export default { return axios.get("https://s2-move.firebaseio.com/desks.json") .then(res => { this.desks = res.data - // console.log(deskList) commit("setDesks", this.desks) + // promise to update user commit('updateUser'); }) .catch(error => console.log(error)) diff --git a/src/api/users.js b/src/api/users.js index 0e588bb..0ef10fb 100644 --- a/src/api/users.js +++ b/src/api/users.js @@ -10,10 +10,9 @@ export default { return axios.get("https://s2-move.firebaseio.com/users.json") .then(res => { let users = res.data - // this.users = userList commit("setUsers",users) + //promise to update users commit('updateUser'); - // console.log("I'm the user List being called from an external file!", users) }) .catch(error => console.log(error)) } diff --git a/src/components/Profile.vue b/src/components/Profile.vue index fd0c90e..f5a604c 100644 --- a/src/components/Profile.vue +++ b/src/components/Profile.vue @@ -11,19 +11,15 @@ {{ selectedUser.lName }} - -
                -
              • HAM
                • -
              • S2
                • -
              • A-3
                • -
              +
              +
                +
              • {{ selectedUser.deskref.acronym }}
                • +
              • {{ selectedUser.division }}
                • +
              • {{ selectedUser.deskref.building }} {{ selectedUser.deskref.level }}
                • +
              • Not checked in.
                • +
              +
              +

              {{ selectedUser.jobTitle }} diff --git a/src/store/store.js b/src/store/store.js index c2d2799..3619cf6 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -12,20 +12,20 @@ export const store = new Vuex.Store({ searchTerm: '', selectedUser: {}, hideMenu: true, - filteredUsers: [], + filteredUsers: {}, desks: {} }, getters: { getFilteredUsers(state) { return state.filteredUsers = Object.values(state.users).filter(user => { - var fullName = `${user.fName} ${user.lName}`; - //search by name - return fullName.toLowerCase().includes(state.searchTerm.toLowerCase()) - //search by email - || user.gmailAcc.toLowerCase().includes(state.searchTerm.toLowerCase()) - // search by team - || user.team.toLowerCase().includes(state.searchTerm.toLowerCase()) - }) + var fullName = `${user.fName} ${user.lName}`; + //search by name + return fullName.toLowerCase().includes(state.searchTerm.toLowerCase()) + //search by email + || user.gmailAcc.toLowerCase().includes(state.searchTerm.toLowerCase()) + // search by team + || user.team.toLowerCase().includes(state.searchTerm.toLowerCase()) + }) }, getSearchTerm(state) { return state.searchTerm; @@ -63,9 +63,7 @@ export const store = new Vuex.Store({ }, mutations: { setUsers(state, users) { - //update users state.users = users; - console.log("This is setUsers", users) }, setDesks(state, desks) { state.desks = desks; @@ -83,27 +81,19 @@ export const store = new Vuex.Store({ toggleMenu(state) { state.hideMenu=!state.hideMenu; }, - - fetchFilteredUsers(state, filteredUsers) { - state.filteredUsers = fetchFilteredUsers; // ??? - }, - updateUser(state) { - Object.values(state.users).forEach(user => { - if(user.desk) { - let desk = state.desks[user.desk]; - console.log("found desk in user", user) - if (desk) { - user.deskref = desk; - console.log("found desk", desk.acronym, user.deskref.division, user.deskref.building, user.deskref.level); - } else { - console.log('invalid desk for user ') - } - } else { - console.log("no desk") - } - }, - console.log("This is updateUser", users) - ); - } + fetchFilteredUsers(state) { + state.filteredUsers = fetchFilteredUsers; + }, + updateUser(state) { + //assign deskref to user object. Waits for desks and users axios request + Object.values(state.users).forEach(user => { + if(user.desk) { + let desk = state.desks[user.desk]; + if (desk) { + user.deskref = desk; + } + } + }); + } } - }) \ No newline at end of file +}) \ No newline at end of file diff --git a/styles/css/profile.component.css b/styles/css/profile.component.css index 019106c..3d685f5 100644 --- a/styles/css/profile.component.css +++ b/styles/css/profile.component.css @@ -72,6 +72,8 @@ f*, *:before, *:after { margin-right: 4px; } + + /* JOB TITLE AND TEAM INFO*/ .profile__user-info h2 { position: relative; From 56f8385466b21eb558e99eebf0d543b88e202866 Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Thu, 12 Apr 2018 07:15:02 +0200 Subject: [PATCH 076/109] added user from Google --- src/components/Menu.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 8b7ed09..cf9475c 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -152,6 +152,13 @@ export default { } }, created () { + this.user = firebase.auth().currentUser; + if(this.user) { + this.name = this.user.displayName; + this.email = this.user.email; + this.photo = this.user.photoURL; + this.userId = this.user.uid; + } //request user info } } From b6bb578249ea7999010cbfff0aa097d5a41b7e3f Mon Sep 17 00:00:00 2001 From: Daniele de Araujo dos Santos Date: Thu, 12 Apr 2018 07:18:30 +0200 Subject: [PATCH 077/109] added pitcure and name from Google to our user that is logged in --- src/components/Menu.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/Menu.vue b/src/components/Menu.vue index cf9475c..d8886e3 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -10,7 +10,7 @@