Skip to content

Commit e496007

Browse files
Kayoshi-devKayoshi-dev
authored
Merge pull request #9 from GroupeNRM/feat/create-project
Add a new page located at /creer-projet to create new project and store them in a database
2 parents 261566e + 39c103c commit e496007

18 files changed

+2361
-416
lines changed

‎client/assets/logo_madera.svg

+23
Loading

‎client/assets/scss/_variables.scss

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$primary: #3498DB;
2+
$primary-dark: #484848;
3+
4+
$selection-grey: #ecf0f1;
5+
6+
7+
$main-title-size: 75px;

‎client/assets/scss/main.scss

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
@import "variables";
2+
3+
::selection {
4+
background-color: $selection-grey;
5+
}
6+
7+
body {
8+
color: $primary-dark;
9+
10+
.navbar {
11+
font-family: "Roboto", serif;
12+
font-weight: bold;
13+
}
14+
15+
.main-title {
16+
font-family: "Poppins", serif;
17+
font-weight: bold;
18+
font-size: $main-title-size;
19+
20+
.colored-text {
21+
color: $primary;
22+
}
23+
}
24+
25+
.is-fixed-top {
26+
position: fixed;
27+
z-index: 100;
28+
top: 100px;
29+
right: 0;
30+
max-width: 450px;
31+
}
32+
33+
.form-container {
34+
max-width: 998px;
35+
margin: auto;
36+
}
37+
}
38+
39+
// Import bulma styles
40+
@import "~bulma";
41+
42+
// Import buefy styles
43+
@import "~buefy/src/scss/buefy";

‎client/components/MainTitle.vue

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<template>
2+
<div class="main-title pb-6">
3+
<div class="is-block">
4+
<slot name="first-line"></slot>
5+
</div>
6+
7+
<div class="colored-text is-block">
8+
<slot name="second-line"></slot>
9+
</div>
10+
</div>
11+
</template>
12+
13+
<script>
14+
export default {
15+
name: "MainTitle"
16+
}
17+
</script>
18+
19+
<style scoped>
20+
21+
</style>

‎client/layouts/Header.vue

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<template>
2+
<div class="container mb-6">
3+
<b-navbar class="is-spaced">
4+
<template #brand>
5+
<b-navbar-item tag="router-link" :to="{ path: '/' }">
6+
<img
7+
src="~assets/logo_madera.svg"
8+
alt="The Madera Logo!"
9+
>
10+
</b-navbar-item>
11+
</template>
12+
13+
<template #end>
14+
<NuxtLink to="/creer-projet" class="navbar-item">Créer un projet</NuxtLink>
15+
16+
<b-navbar-item href="#">
17+
Créer un devis
18+
</b-navbar-item>
19+
<b-navbar-item href="#">
20+
Consulter les projets
21+
</b-navbar-item>
22+
<b-navbar-item href="#">
23+
Consulter les devis
24+
</b-navbar-item>
25+
</template>
26+
</b-navbar>
27+
</div>
28+
</template>
29+
30+
<script>
31+
32+
export default {
33+
name: "Header"
34+
}
35+
</script>
36+
37+
<style scoped>
38+
39+
</style>

‎client/layouts/default.vue

+6-65
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,15 @@
11
<template>
22
<div>
3-
<nav
4-
class="navbar header has-shadow is-primary"
5-
role="navigation"
6-
aria-label="main navigation"
7-
>
8-
<div class="navbar-brand">
9-
<a
10-
class="navbar-item"
11-
href="/"
12-
>
13-
<img
14-
src="~assets/buefy.png"
15-
alt="Buefy"
16-
height="28"
17-
>
18-
</a>
19-
20-
<div class="navbar-burger">
21-
<span />
22-
<span />
23-
<span />
24-
</div>
25-
</div>
26-
</nav>
27-
28-
<section class="main-content columns">
29-
<aside class="column is-2 section">
30-
<p class="menu-label is-hidden-touch">
31-
General
32-
</p>
33-
<ul class="menu-list">
34-
<li
35-
v-for="(item, key) of items"
36-
:key="key"
37-
>
38-
<nuxt-link
39-
:to="item.to"
40-
exact-active-class="is-active"
41-
>
42-
<b-icon :icon="item.icon" /> {{ item.title }}
43-
</nuxt-link>
44-
</li>
45-
</ul>
46-
</aside>
47-
48-
<div class="container column is-10">
49-
<nuxt />
50-
</div>
51-
</section>
3+
<Header/>
4+
<div class="container">
5+
<nuxt />
6+
</div>
527
</div>
538
</template>
549

5510
<script>
11+
import Header from "~/layouts/Header";
5612
export default {
57-
data () {
58-
return {
59-
items: [
60-
{
61-
title: 'Home',
62-
icon: 'home',
63-
to: { name: 'index' }
64-
},
65-
{
66-
title: 'Inspire',
67-
icon: 'lightbulb',
68-
to: { name: 'inspire' }
69-
}
70-
]
71-
}
72-
}
13+
components: {Header}
7314
}
7415
</script>

‎client/nuxt.config.js

+17-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export default {
1414

1515
// Global CSS: https://go.nuxtjs.dev/config-css
1616
css: [
17+
'@/assets/scss/main.scss'
1718
],
1819

1920
// Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
@@ -30,11 +31,13 @@ export default {
3031
// Modules: https://go.nuxtjs.dev/config-modules
3132
modules: [
3233
// https://go.nuxtjs.dev/buefy
33-
'nuxt-buefy',
34+
['nuxt-buefy', {css: false}],
3435
// https://go.nuxtjs.dev/axios
3536
'@nuxtjs/axios',
3637
// https://go.nuxtjs.dev/pwa
3738
'@nuxtjs/pwa',
39+
// https://github.com/Developmint/nuxt-webfontloader
40+
'nuxt-webfontloader'
3841
],
3942

4043
// Axios module configuration: https://go.nuxtjs.dev/config-axios
@@ -47,6 +50,19 @@ export default {
4750
}
4851
},
4952

53+
webfontloader: {
54+
custom: {
55+
families: [
56+
'Poppins:n3,n4,n6,n7',
57+
'Roboto:n3,n4,n7'
58+
],
59+
urls: [
60+
'https://fonts.googleapis.com/css?family=Poppins:300,400,600,700&display=swap',
61+
'https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap'
62+
]
63+
}
64+
},
65+
5066
// Build Configuration: https://go.nuxtjs.dev/config-build
5167
build: {
5268
}

0 commit comments

Comments
 (0)