Dev by faymarie · Pull Request #6 · codeuniversity/s2_move_app

Commits on Mar 9, 2018

got a response for Firebase working fine. Just need to work on the filter now

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
implemented iteration throw new Firebase data file

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Merge branch 'master' of https://github.com/codeuniversity/s2_move_app into feat/search

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Implemented User Profile in the user menu
Marie Klaus
committed
Merge branch 'master' of github.com:codeuniversity/s2_move_app into feat/menu
Marie Klaus
committed
Added loader dependency to externalize css
Marie Klaus
committed
added style in a separate css sheet

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Removes vuefire
Marie Klaus
committed

Commits on Mar 10, 2018

Implemented basic location navigation menu
Marie Klaus
committed

Commits on Mar 11, 2018

created profile

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
changed the name of the css folder to styles

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Merge branch 'feat/search' into dev

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Merge branch 'feat/profile' into dev

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Implemented burger menu location navigation.
Marie Klaus
committed
started changing the profile

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Mar 12, 2018

Made submenus inline.
Marie Klaus
committed

Commits on Mar 13, 2018

Made menu 75% of screensize while keeping image ratio 4x3. Added toggle column. Set-up basic media queries. Added feedback icon.
Marie Klaus
committed
Removed submenu2 (buildings) from menu.
Marie Klaus
committed
Won war over borders.
Marie Klaus
committed
Made menu open and close after selection of route.
Marie Klaus
committed
Made content overlay togglble to close burger menu.
Marie Klaus
committed

Commits on Mar 18, 2018

added profile

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Apr 1, 2018

testing Vuex

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
externalized axios as well as some of the methods and properties to Vuex

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
fixed some issues with the profile

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Made size of search responsive.
Marie Klaus
committed
fixed ux/ui problems, by addid black background to the overlay. Also fixed some click outside patterns

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
deleted test files and migrated the code to HamburgOttensen component (/maps)

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
fixed merging conflicts

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Styled searchlist.
Marie Klaus
committed
Implemented profile component.
Marie Klaus
committed

Commits on Apr 2, 2018

Minor changes
Marie Klaus
committed
added coordinates

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Made profile height responsive.
Marie Klaus
committed
Made profile reponsive for very small screens.
Marie Klaus
committed
Turned all contact infos into link.
Marie Klaus
committed
Fixed broken menu.
Marie Klaus
committed
Made team searchable.
Marie Klaus
committed

Commits on Apr 3, 2018

changed style of seats

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Apr 5, 2018

Replaced Sinnerschrader Logo.
Marie Klaus
committed
Implemented no user found option in SEARCH.
Marie Klaus
committed
Implemented clear search function in SEARCH.
Marie Klaus
committed
Implemented clear search button in PROFILE.
Marie Klaus
committed

Commits on Apr 6, 2018

fixed css

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
change dthe order

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Swapped email/phone icons.
Marie Klaus
committed
Merge pull request #5 from codeuniversity/feat/maps_dev
dani-santos-code
authored
fixed merging conflicts

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Minor changes.
Marie Klaus
committed
fixed css issues

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Apr 8, 2018

made the axios to desks globally accessible

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Apr 9, 2018

maps

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
experimenting with Vuex and Firebase

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Minor changes.
Marie Klaus
committed

Commits on Apr 10, 2018

Resolved merging conflicts.
Marie Klaus
committed
Made slack a firebase request.
Marie Klaus
committed
Minor changes
Marie Klaus
committed
Updated all users, iso only users with assigned seat.
Marie Klaus
committed
Resolved merging conflict.
Marie Klaus
committed
Implemented basic desktop styling of Login.
Marie Klaus
committed

Commits on Apr 11, 2018

Improved styling for desktop.
Marie Klaus
committed
Implemented logout button.
Marie Klaus
committed
Added close menu functionality on signout.
Marie Klaus
committed
Minor changes
Marie Klaus
committed
Implemented deskref.
Marie Klaus
committed
Responsive styling.
Marie Klaus
committed
Fixed styling of different components due to change of scope of CSS.
Marie Klaus
committed
Implemented deskinfo in search list. And not checked in option.
Marie Klaus
committed
Implemented deskref in profile component.
Marie Klaus
committed
Solved merging conflicts.
Marie Klaus
committed

Commits on Apr 12, 2018

added user from Google

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
added pitcure and name from Google to our user that is logged in

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
fixed the behaviour when you click outside the search. Now it won't clear the search field anymore. It will only be cleared once you click the dropdown

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
refactoring

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
added style to the dropdown

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
styling

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
minor improvements dropdown

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
minor layout improvements (dropdown)

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
deleted the vue logo

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
changed z/index of desk

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
fixed issue with the seats overlapping our search

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
fixes to the latest change

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
fixed the priblem with the seats overlapping the profile

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
fixed the problem we had during sign out

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
added comment to make it easier to understand

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Apr 13, 2018

Added auth user to store.
Marie Klaus
committed

Commits on Apr 14, 2018

added latest changes in the dev

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Apr 15, 2018

changed user desk

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Created Google auth user in Vuex. Made user in menu auth user.
Marie Klaus
committed
added user image

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Replaced auth user img and name in menu searchlist.
Marie Klaus
committed
Replaced auth user img and name in profile.
Marie Klaus
committed
Restored no user found (<p>) visibility in search.
Marie Klaus
committed
Minor changes.
Marie Klaus
committed
changed style of pic

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Apr 16, 2018

made some changes

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Fixed vuex auth user
Marie Klaus
committed
minor adjustments

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
Added userref to desks. Added authUserRef to user.
Marie Klaus
committed
Moved images, icons and fonts to static folder. Removed folders in assets.
Marie Klaus
committed
Cleaned up store file.
Marie Klaus
committed

Commits on Apr 19, 2018

small changes

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Commits on Apr 20, 2018

fixed the issue of having nobody sittingon the desk

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
fixed merging conflicts

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
merged feat/checkin into dev

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed
new build to be deployed

Daniele de Araujo dos Santos
authored and
Daniele de Araujo dos Santos
committed

Dev#6faymarie wants to merge 123 commits intomastercodeuniversity/s2_move_app:masterfrom devcodeuniversity/s2_move_app:devCopy head branch name to clipboard

Commits

Commits on Mar 9, 2018

Commits on Mar 10, 2018

Commits on Mar 11, 2018

Commits on Mar 12, 2018

Commits on Mar 13, 2018

Commits on Mar 18, 2018

Commits on Mar 19, 2018

Commits on Mar 22, 2018

Commits on Mar 23, 2018

Commits on Mar 24, 2018

Commits on Mar 29, 2018

Commits on Mar 31, 2018

Commits on Apr 1, 2018

Commits on Apr 2, 2018

Commits on Apr 3, 2018

Commits on Apr 5, 2018

Commits on Apr 6, 2018

Commits on Apr 8, 2018

Commits on Apr 9, 2018

Commits on Apr 10, 2018

Commits on Apr 11, 2018

Commits on Apr 12, 2018

Commits on Apr 13, 2018

Commits on Apr 14, 2018

Commits on Apr 15, 2018

Commits on Apr 16, 2018

Dev#6
faymarie wants to merge 123 commits intomasterfrom
dev