Skip to content
This repository has been archived by the owner on May 29, 2020. It is now read-only.

Ui/new ride ui #45

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* Export metrics for prometheus
* Add automatically trim
* Add socket connection event on campus selection
* UI/UX for entire app refreshed
* Added step workflow over ride management
### Fix
* Fix container restart
## Version 1.4.4
Expand Down
2 changes: 2 additions & 0 deletions assets/css/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ $black: #1c1c1c;
$gray: #8192a9;
$light-gray: #eaeff4;
$dark-gray: #adb9c9;
$red: #FF5B5E;
$orange: #FF961D;

/*************
* Bulma *
Expand Down
21 changes: 21 additions & 0 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,24 @@ html, body, #__nuxt, #__layout {
background: $background;
height: 100%;
}

main.full-screen {
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
svg.main-icon, div {
margin: 1em 0;
}
div.half-screen {
width: 50%;
}
strong {
color: inherit;
}
button {
margin: 1em 0;
}
}
85 changes: 0 additions & 85 deletions components/dropdown.vue

This file was deleted.

29 changes: 29 additions & 0 deletions components/elements/button.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<template>
<button>
<fa-icon :icon="['fas', 'chevron-right']" />
<slot />
</button>
</template>

<script>
export default {

};
Comment on lines +9 to +11
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

useless export here

</script>

<style lang="scss" scoped>
@import "~assets/css/head";

button {
padding: .8em 2em;
color: $primary;
font-weight: 700;
font-size: 1em;
text-transform: uppercase;
cursor: pointer;
svg {
font-size: .8em;
margin-right: 1em;
}
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ export default {
@import "~assets/css/head";
.phone-button {
position: fixed;
bottom: 10px;
right: 10px;
bottom: 4em;
right: 1em;
z-index: 3;
background: $primary;
color: findColorInvert($primary);
border: 1px solid $white;
border-radius: 100%;
padding: $size-small;
border: none;
font-size: $size-medium;
box-sizing: border-box;
}
Expand Down
91 changes: 91 additions & 0 deletions components/nav.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<template>
<nav>
<nuxt-link
:class="isActive('campus')"
:to="campus && campus.id ? campusLink(campus.id, driverStatus) : '/'"
>
<fa-icon :icon="['fas', 'car']" />
Courses
</nuxt-link>

<nuxt-link
:class="isActive('history')"
:to="{ name: 'history' }"
>
<fa-icon :icon="['fas', 'history']" />
Historique
</nuxt-link>

<nuxt-link
:class="isActive('account')"
:to="{ name: 'account' }"
>
<fa-icon :icon="['fas', 'user-circle']" />
Compte
</nuxt-link>
</nav>
</template>

<script>
import { mapGetters } from 'vuex';
import campusLink from '~/helpers/generate-campus-link';
import { statuses } from '../store/status';

export default {
data() {
return {
campusLink,
};
},
computed: {
...mapGetters({
campus: 'context/campus',
driverStatus: 'status/workStatus',
}),
},
methods: {
isActive(name) {
if (this.$route.name.split('-').find((string) => string === name)) {
return statuses.ACTIVE;
}
return '';
},
},
};
</script>

<style scoped lang="scss">
@import "~assets/css/head";
@import "~bulma/sass/components/menu.sass";

nav {
position: fixed;
bottom: 0;
width: 100%;
display: flex;
padding-top: 1em;
a {
background-color: $light-gray;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: .5em;
cursor: pointer;
font-size: 1em;
color: $gray;
&.active {
color: $primary;
font-weight: 700;
pointer-events: none;
}
svg {
margin-top: .3em;
color: inherit;
}
}

}
</style>
37 changes: 0 additions & 37 deletions components/passenger-call-button.vue

This file was deleted.

Loading