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

Commit

Permalink
Merge pull request #2 from fabnumdef/feature/site
Browse files Browse the repository at this point in the history
Site : add user site.
  • Loading branch information
RamBoFe authored Mar 26, 2019
2 parents d2db6ac + 3cc41ea commit 7654feb
Show file tree
Hide file tree
Showing 28 changed files with 1,008 additions and 126 deletions.
14 changes: 14 additions & 0 deletions api/campuses.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export const ENTITY_PLURAL = 'campuses';

export default axios => ({
async getCampuses(mask, { search = null } = {}) {
const response = await axios.get(
`/${ENTITY_PLURAL}`,
{
params: { mask, search },
},
);

return response;
},
});
10 changes: 10 additions & 0 deletions api/forms.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export const ENTITY_PLURAL = 'forms';

export default axios => ({
async postFormContact(fields) {
return axios.post(
`/${ENTITY_PLURAL}/contact`,
fields,
);
},
});
4 changes: 4 additions & 0 deletions api/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import rides from './rides';
import routing from './routing';
import status from './status';
import campuses from './campuses';
import forms from './forms';

export default function (ctx, inject) {
const api = {
rides: rides(ctx.$axios),
routing,
status,
campuses: campuses(ctx.$axios),
forms: forms(ctx.$axios),
};
ctx.$api = api;
inject('api', api);
Expand Down
31 changes: 19 additions & 12 deletions assets/css/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/**************
* Colors *
**************/
$blue-medium: #005cee;
$blue-medium: #0053b3;
$blue-light: #006be6;
$blue-dark: #003b80;
$color-input: #abb8cb;

$white: hsl(0, 0%, 100%);
$white-20: rgba($white, 0.2);
Expand All @@ -21,24 +22,30 @@ $background: $blue-light;
$primary: $blue-medium;
$family-sans-serif: 'Source Sans Pro', sans-serif;
$link: $white;
$link-hover: darken($white, 15%);
$link-hover: $white;
$title-color: $text;
$menu-item-radius: 0;

//Navbar
$navbar-item-hover-background-color: transparent;
$navbar-item-color: $white;
$navbar-item-img-max-height: none;

//Title
$subtitle-color: $text;

// Forms
$radius: 0;
$input-background-color: transparent;
$input-border-color: $text;
$input-hover-border-color: $text;
$input-color: $text;
$input-hover-color: $text;
$input-icon-color: $text;
$input-icon-active-color: $text;
$label-color: $blue-medium;
$input-background-color: $white;
$input-border-color: $color-input;
$input-hover-border-color: $color-input;
$input-color: $black;
$input-hover-color: $color-input;
$input-shadow: none;
$input-focus-box-shadow-size: 0;
$input-focus-border-color: $link-hover;
$input-focus-border-color: $color-input;

// Buttons

$button-color: $primary;
$button-hover-color: $button-color;
$button-background-color:transparent;
4 changes: 0 additions & 4 deletions assets/css/elements/button.scss

This file was deleted.

18 changes: 0 additions & 18 deletions assets/css/elements/form.scss

This file was deleted.

22 changes: 7 additions & 15 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@
@import "~bulma/sass/base/helpers.sass";

@import "~bulma/sass/elements/button.sass";
@import "elements/button";
@import "~bulma/sass/elements/container.sass";
//@import "~bulma/sass/elements/content.sass";
@import "~bulma/sass/elements/form.sass";
@import "elements/form";
@import "~bulma/sass/elements/icon.sass";
@import "~bulma/sass/elements/notification.sass";
//@import "~bulma/sass/elements/image.sass";
//@import "~bulma/sass/elements/progress.sass";
//@import "~bulma/sass/elements/table.sass";
//@import "~bulma/sass/elements/tag.sass";
//@import "~bulma/sass/elements/title.sass";
//@import "~bulma/sass/elements/other.sass";
@import "~bulma/sass/elements/title.sass";
@import "~bulma/sass/elements/other.sass";

//@import "~bulma/sass/components/breadcrumb.sass";
//@import "~bulma/sass/components/card.sass";
Expand All @@ -30,17 +29,10 @@
//@import "~bulma/sass/components/pagination.sass";
//@import "~bulma/sass/components/panel.sass";
//@import "~bulma/sass/components/tabs.sass";
@import "~bulma/sass/components/navbar.sass";

//@import "~bulma/sass/grid/columns.sass";
//@import "~bulma/sass/grid/tiles.sass";
@import "~bulma/sass/grid/columns.sass";
@import "~bulma/sass/grid/tiles.sass";

//@import "~bulma/sass/layout/hero.sass";
//@import "~bulma/sass/layout/section.sass";


html, body, #__nuxt, #__layout {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
background: $background;
height: 100%;
}
@import "~bulma/sass/layout/section.sass";
66 changes: 66 additions & 0 deletions components/footer.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<template>
<footer>
<div class="container">
<div class="columns">
<div class="column is-3 has-text-centered-mobile">
<img
src="logo_ec_blue.svg"
alt="E-chauffeur"
>
</div>
<div class="column has-text-centered-mobile">
<img
src="logo_dirisi.png"
alt="DIRISI"
>
<img
src="logo_ma.png"
alt="Ministère des Armées"
>
<img
src="start_up_etat.png"
alt="Une Startup d'Etat"
>
<img
src="logo_fab_num.png"
alt="Fabrique Numérique"
>
</div>
</div>
</div>
</footer>
</template>

<style lang="scss" scoped>
@import "~assets/css/head";
.container {
margin-top: 100px;
padding-top: 50px;
padding-bottom: 50px;
border-top: 1px solid $grey-lighter;
.columns {
.column {
&:last-child {
text-align: right;
img {
vertical-align: middle;
&:first-child {
margin-right: 75px;
}
&:nth-child(3) {
margin-right: 50px;
}
}
}
&:first-child {
margin-top: auto;
margin-bottom: auto;
}
}
}
}
</style>
49 changes: 13 additions & 36 deletions components/form/field.vue
Original file line number Diff line number Diff line change
@@ -1,58 +1,35 @@
<template>
<div
:class="{'is-horizontal': isHorizontal}"
class="field"
>
<div
<div class="field">
<label
v-if="label"
class="field-label is-normal"
:for="id"
class="label"
>
<label
:for="fieldId"
class="label"
>
{{ label }}
</label>
</div>
<div class="field-body">
<div class="field">
<p class="control">
<float-label>
<slot />
</float-label>
</p>
</div>
{{ label }}
</label>
<div class="control">
<slot />
</div>
</div>
</template>

<script>
import floatLabel from 'vue-float-label/components/FloatLabel';
export default {
components: {
floatLabel,
},
props: {
isHorizontal: {
type: Boolean,
default: true,
},
label: {
type: String,
default: null,
},
fieldId: {
id: {
type: String,
default: null,
},
},
};
</script>

<style scoped lang="scss">
@import "~assets/css/head";
.control {
margin-top: 1.3em;
}
<style lang="scss" scoped>
.label::first-letter {
text-transform: capitalize;
}
</style>
Loading

0 comments on commit 7654feb

Please sign in to comment.