Romain/portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'production'

Browse Source 
fix some css

See merge request Romulus21/portal!1
This commit is contained in:
Romain Delanoë
2020-03-28 11:05:41 +00:00
parent 80c5eb53b6 53ad9586a2
commit 97701cd506
12 changed files with 114 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,6 +4,7 @@
/storage/*.key
/vendor
.env
.env.prod
.env.backup
.phpunit.result.cache
Homestead.json

10
public/css/app.css vendored
View File

@@ -68,6 +68,10 @@ body {
.flex-center {
display: flex;
justify-content: center;
}
.flex-middle {
display: flex;
align-items: center;
}
@@ -496,7 +500,7 @@ input {
background-color: #eeeeee;
font-size: 1.6rem;
font-family: "Open Sans", sans-serif;
padding: 0.5rem;
padding: 0.5rem 1rem;
border-radius: 0.5rem;
}
@@ -714,3 +718,7 @@ nav .nav-item:hover svg {
opacity: 0.6;
}
.memo-edit .memo-text-area textarea {
height: 50vh;
}

111
public/js/app.js vendored
View File

@@ -2368,6 +2368,11 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
//
//
//
//
/* harmony default export */ __webpack_exports__["default"] = ({
@@ -2765,32 +2770,28 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
mounted: function mounted() {
var _this = this;
if (authUser.data.attributes.is_admin) {
axios.get('/api/users').then(function (response) {
_this.users = response.data.data;
_this.loading = false;
})["catch"](function (error) {
_this.loading = false;
alert('Unable to fetch users.');
});
}
axios.get('/api/users').then(function (response) {
_this.users = response.data.data;
_this.loading = false;
})["catch"](function (error) {
_this.loading = false;
alert('Unable to fetch users.');
});
},
methods: {
addMember: function addMember() {
var _this2 = this;
if (authUser.data.attributes.is_admin && this.form.name.length >= 4 && this.form.email.length >= 12) {
if (this.form.name.length >= 4 && this.form.email.length >= 12) {
axios.post('/api/users', {
name: this.form.name,
email: this.form.email
}).then(function (res) {
console.log(res);
_this2.form.name = '';
_this2.form.email = '';
_this2.alertType = 'success';
_this2.alertMessage = "".concat(res.data.data.attributes.name, " a bien \xE9t\xE9 cr\xE9\xE9");
})["catch"](function (errors) {
console.log(errors);
_this2.alertType = 'error';
_this2.alertMessage = 'L\'utilisateur n\'a pas été créé';
});
@@ -29508,28 +29509,7 @@ var render = function() {
})
]
),
_vm._v("\n Activitées\n ")
]),
_vm._v(" "),
_c("router-link", { staticClass: "nav-item", attrs: { to: "/memos" } }, [
_c(
"svg",
{
staticClass: "fill-current site-logo",
attrs: { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24" }
},
[
_c("title", [_vm._v("Paramètres")]),
_vm._v(" "),
_c("path", {
attrs: {
d:
"M22.9 10.1c-.1-.1-.2-.2-.3-.2L20 9.5c-.1-.5-.3-.9-.6-1.4.2-.2.4-.6.8-1 .3-.4.6-.8.7-1 .1 0 .1-.2.1-.3 0-.1 0-.2-.1-.3-.3-.5-1.1-1.3-2.4-2.4-.1-.1-.2-.1-.4-.1-.1 0-.3 0-.3.1l-2 1.5c-.4-.2-.8-.4-1.3-.5l-.4-2.6c0-.1-.1-.2-.2-.3-.1-.2-.2-.2-.3-.2h-3.2c-.3 0-.4.1-.5.4-.1.5-.3 1.4-.4 2.7-.5.1-.9.3-1.3.5l-2-1.5c-.1-.1-.3-.2-.4-.2-.2 0-.7.3-1.4 1-.6.7-1.1 1.3-1.4 1.6-.1.1-.1.2-.1.3 0 .1 0 .2.1.3.6.8 1.2 1.4 1.5 2-.2.5-.3.9-.5 1.4l-2.6.4c-.1 0-.2.1-.3.2-.1.1-.1.2-.1.3v3.2c0 .1 0 .2.1.3.1.1.2.2.3.2l2.6.4c.1.5.3.9.6 1.4-.2.2-.4.6-.8 1-.3.4-.6.8-.7 1-.1.1-.1.2-.1.3 0 .1 0 .2.1.3.4.5 1.2 1.3 2.4 2.4.1.1.2.2.4.2.1 0 .3 0 .4-.1l2-1.5c.3.1.7.3 1.2.5l.4 2.6c0 .1.1.2.2.3.1.1.2.1.4.1h3.2c.3 0 .4-.1.5-.4.1-.5.3-1.4.4-2.7.4-.1.9-.3 1.3-.5l2 1.5c.1.1.3.1.4.1.2 0 .7-.3 1.3-1 .7-.7 1.2-1.2 1.4-1.5.1-.1.1-.2.1-.3 0-.1 0-.2-.1-.4-.7-.8-1.2-1.5-1.5-2 .2-.4.4-.8.6-1.3l2.7-.4c.1 0 .2-.1.3-.2.1-.1.1-.2.1-.3v-3.2c-.2-.1-.2-.2-.3-.3zm-8.3 4.5c-.7.7-1.6 1.1-2.6 1.1s-1.9-.4-2.6-1.1c-.7-.7-1.1-1.6-1.1-2.6s.4-1.9 1.1-2.6c.7-.7 1.6-1.1 2.6-1.1s1.9.4 2.6 1.1c.7.7 1.1 1.6 1.1 2.6s-.4 1.9-1.1 2.6z"
}
})
]
),
_vm._v("\n Memos\n ")
_vm._v("\n Memos\n ")
])
],
1
@@ -29557,12 +29537,12 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("div", { staticClass: "relative pb-2" }, [
_c(
"label",
{ staticClass: "form-label absolute pt-1", attrs: { for: _vm.name } },
[_vm._v(_vm._s(_vm.label))]
),
return _c("div", { staticClass: "relative" }, [
_vm.label
? _c("label", { staticClass: "pb-1", attrs: { for: _vm.name } }, [
_vm._v(_vm._s(_vm.label))
])
: _vm._e(),
_vm._v(" "),
_c(
"textarea",
@@ -29575,7 +29555,7 @@ var render = function() {
expression: "value"
}
],
staticClass: "form-textarea pt-4 pb-1",
staticClass: "p-1",
class: _vm.errorClassObject(),
attrs: { id: _vm.name, type: "text" },
domProps: { value: _vm.value },
@@ -29978,7 +29958,23 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("div", { staticClass: "p-2" }, [
return _c("div", { staticClass: "memo-edit p-2" }, [
_c("div", { staticClass: "flex-between mb-1" }, [
_c(
"a",
{
staticClass: "link",
attrs: { href: "#" },
on: {
click: function($event) {
return _vm.$router.back()
}
}
},
[_vm._v("\n < Back\n ")]
)
]),
_vm._v(" "),
_c(
"form",
{
@@ -29993,7 +29989,7 @@ var render = function() {
_c("InputField", {
attrs: {
name: "name",
label: "Memo Title",
label: "Title",
placeholder: "Your Title",
errors: _vm.errors
},
@@ -30005,12 +30001,8 @@ var render = function() {
}),
_vm._v(" "),
_c("TextAreaField", {
attrs: {
name: "memo",
label: "Memo",
placeholder: "Your Memo",
errors: _vm.errors
},
staticClass: "memo-text-area",
attrs: { name: "memo", placeholder: "Your Memo", errors: _vm.errors },
on: {
"update:field": function($event) {
_vm.form.memo = $event
@@ -30022,7 +30014,7 @@ var render = function() {
_c(
"button",
{
staticClass: "btn-alert mr-3",
staticClass: "btn-alert mr-1",
on: {
click: function($event) {
return _vm.$router.back()
@@ -30061,8 +30053,8 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("div", { staticClass: "p-2" }, [
_c("div", { staticClass: "flex-between" }, [
return _c("div", { staticClass: "memo-edit p-2" }, [
_c("div", { staticClass: "flex-between mb-1" }, [
_c(
"a",
{
@@ -30093,7 +30085,7 @@ var render = function() {
attrs: {
name: "name",
data: _vm.form.name,
label: "Memo Title",
label: "Title",
placeholder: "Your Title",
errors: _vm.errors
},
@@ -30105,10 +30097,10 @@ var render = function() {
}),
_vm._v(" "),
_c("TextAreaField", {
staticClass: "memo-text-area",
attrs: {
name: "memo",
data: _vm.form.memo,
label: "Memo",
placeholder: "Your Memo",
errors: _vm.errors
},
@@ -30131,7 +30123,7 @@ var staticRenderFns = [
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("div", { staticClass: "flex-end" }, [
_c("button", { staticClass: "btn-alert mr-3" }, [_vm._v("Cancel")]),
_c("button", { staticClass: "btn-alert mr-1" }, [_vm._v("Cancel")]),
_vm._v(" "),
_c("button", { staticClass: "btn-primary" }, [_vm._v("Save")])
])
@@ -30439,6 +30431,7 @@ var render = function() {
_c(
"form",
{
staticClass: "mb-2",
on: {
submit: function($event) {
$event.preventDefault()
@@ -30477,12 +30470,14 @@ var render = function() {
}
}),
_vm._v(" "),
_c("button", [_vm._v("Ajouter")])
_c("button", { staticClass: "btn-primary" }, [
_vm._v("Ajouter")
])
],
1
),
_vm._v(" "),
_c("div", [
_c("div", { staticClass: "mb-2" }, [
_c("h2", [_vm._v("Liste des utilisateurs")]),
_vm._v(" "),
_c(
@@ -47390,7 +47385,7 @@ var actions = {
};
var mutations = {
setTitle: function setTitle(state, title) {
state.title = title + ' | Facebook';
state.title = title + ' | Portal';
}
};
/* harmony default export */ __webpack_exports__["default"] = ({

14
resources/js/components/Nav.vue
View File

@@ -7,13 +7,13 @@
</svg>
</router-link>
<hr>
<router-link to="/memos" class="nav-item">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="fill-current site-logo">
<title>Paramètres</title>
<path d="M22.9 10.1c-.1-.1-.2-.2-.3-.2L20 9.5c-.1-.5-.3-.9-.6-1.4.2-.2.4-.6.8-1 .3-.4.6-.8.7-1 .1 0 .1-.2.1-.3 0-.1 0-.2-.1-.3-.3-.5-1.1-1.3-2.4-2.4-.1-.1-.2-.1-.4-.1-.1 0-.3 0-.3.1l-2 1.5c-.4-.2-.8-.4-1.3-.5l-.4-2.6c0-.1-.1-.2-.2-.3-.1-.2-.2-.2-.3-.2h-3.2c-.3 0-.4.1-.5.4-.1.5-.3 1.4-.4 2.7-.5.1-.9.3-1.3.5l-2-1.5c-.1-.1-.3-.2-.4-.2-.2 0-.7.3-1.4 1-.6.7-1.1 1.3-1.4 1.6-.1.1-.1.2-.1.3 0 .1 0 .2.1.3.6.8 1.2 1.4 1.5 2-.2.5-.3.9-.5 1.4l-2.6.4c-.1 0-.2.1-.3.2-.1.1-.1.2-.1.3v3.2c0 .1 0 .2.1.3.1.1.2.2.3.2l2.6.4c.1.5.3.9.6 1.4-.2.2-.4.6-.8 1-.3.4-.6.8-.7 1-.1.1-.1.2-.1.3 0 .1 0 .2.1.3.4.5 1.2 1.3 2.4 2.4.1.1.2.2.4.2.1 0 .3 0 .4-.1l2-1.5c.3.1.7.3 1.2.5l.4 2.6c0 .1.1.2.2.3.1.1.2.1.4.1h3.2c.3 0 .4-.1.5-.4.1-.5.3-1.4.4-2.7.4-.1.9-.3 1.3-.5l2 1.5c.1.1.3.1.4.1.2 0 .7-.3 1.3-1 .7-.7 1.2-1.2 1.4-1.5.1-.1.1-.2.1-.3 0-.1 0-.2-.1-.4-.7-.8-1.2-1.5-1.5-2 .2-.4.4-.8.6-1.3l2.7-.4c.1 0 .2-.1.3-.2.1-.1.1-.2.1-.3v-3.2c-.2-.1-.2-.2-.3-.3zm-8.3 4.5c-.7.7-1.6 1.1-2.6 1.1s-1.9-.4-2.6-1.1c-.7-.7-1.1-1.6-1.1-2.6s.4-1.9 1.1-2.6c.7-.7 1.6-1.1 2.6-1.1s1.9.4 2.6 1.1c.7.7 1.1 1.6 1.1 2.6s-.4 1.9-1.1 2.6z"/>
</svg>
Activitées
</router-link>
<!-- <router-link to="/memos" class="nav-item">-->
<!-- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="fill-current site-logo">-->
<!-- <title>Paramètres</title>-->
<!-- <path d="M22.9 10.1c-.1-.1-.2-.2-.3-.2L20 9.5c-.1-.5-.3-.9-.6-1.4.2-.2.4-.6.8-1 .3-.4.6-.8.7-1 .1 0 .1-.2.1-.3 0-.1 0-.2-.1-.3-.3-.5-1.1-1.3-2.4-2.4-.1-.1-.2-.1-.4-.1-.1 0-.3 0-.3.1l-2 1.5c-.4-.2-.8-.4-1.3-.5l-.4-2.6c0-.1-.1-.2-.2-.3-.1-.2-.2-.2-.3-.2h-3.2c-.3 0-.4.1-.5.4-.1.5-.3 1.4-.4 2.7-.5.1-.9.3-1.3.5l-2-1.5c-.1-.1-.3-.2-.4-.2-.2 0-.7.3-1.4 1-.6.7-1.1 1.3-1.4 1.6-.1.1-.1.2-.1.3 0 .1 0 .2.1.3.6.8 1.2 1.4 1.5 2-.2.5-.3.9-.5 1.4l-2.6.4c-.1 0-.2.1-.3.2-.1.1-.1.2-.1.3v3.2c0 .1 0 .2.1.3.1.1.2.2.3.2l2.6.4c.1.5.3.9.6 1.4-.2.2-.4.6-.8 1-.3.4-.6.8-.7 1-.1.1-.1.2-.1.3 0 .1 0 .2.1.3.4.5 1.2 1.3 2.4 2.4.1.1.2.2.4.2.1 0 .3 0 .4-.1l2-1.5c.3.1.7.3 1.2.5l.4 2.6c0 .1.1.2.2.3.1.1.2.1.4.1h3.2c.3 0 .4-.1.5-.4.1-.5.3-1.4.4-2.7.4-.1.9-.3 1.3-.5l2 1.5c.1.1.3.1.4.1.2 0 .7-.3 1.3-1 .7-.7 1.2-1.2 1.4-1.5.1-.1.1-.2.1-.3 0-.1 0-.2-.1-.4-.7-.8-1.2-1.5-1.5-2 .2-.4.4-.8.6-1.3l2.7-.4c.1 0 .2-.1.3-.2.1-.1.1-.2.1-.3v-3.2c-.2-.1-.2-.2-.3-.3zm-8.3 4.5c-.7.7-1.6 1.1-2.6 1.1s-1.9-.4-2.6-1.1c-.7-.7-1.1-1.6-1.1-2.6s.4-1.9 1.1-2.6c.7-.7 1.6-1.1 2.6-1.1s1.9.4 2.6 1.1c.7.7 1.1 1.6 1.1 2.6s-.4 1.9-1.1 2.6z"/>-->
<!-- </svg>-->
<!-- Activitées-->
<!-- </router-link>-->
<router-link to="/memos" class="nav-item">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="fill-current site-logo">
<title>Paramètres</title>

6
resources/js/components/TextAreaField.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="relative pb-2">
<label :for="name" class="form-label absolute pt-1">{{ label }}</label>
<textarea :id="name" type="text" v-model="value" @input="updateField()" :class="errorClassObject()" class="form-textarea pt-4 pb-1">
<div class="relative">
<label v-if="label" :for="name" class="pb-1">{{ label }}</label>
<textarea :id="name" type="text" v-model="value" @input="updateField()" :class="errorClassObject()" class="p-1">
{{ placeholder }}
</textarea>
<p class="text-alert" v-text="errorMessage()">Error Here</p>

2
resources/js/store/modules/title.js vendored
View File

@@ -18,7 +18,7 @@ const actions = {
const mutations = {
setTitle(state, title) {
state.title = title + ' | Facebook'
state.title = title + ' | Portal'
}
}

13
resources/js/views/Memo/MemoCreate.vue
View File

@@ -1,11 +1,16 @@
<template>
<div class="p-2">
<div class="memo-edit p-2">
<div class="flex-between mb-1">
<a href="#" @click="$router.back()" class="link">
< Back
</a>
</div>
<form @submit.prevent="submitForm">
<InputField name="name" label="Memo Title" placeholder="Your Title" @update:field="form.name = $event" :errors="errors" />
<TextAreaField name="memo" label="Memo" placeholder="Your Memo" @update:field="form.memo = $event" :errors="errors" />
<InputField name="name" label="Title" placeholder="Your Title" @update:field="form.name = $event" :errors="errors" />
<TextAreaField class="memo-text-area" name="memo" placeholder="Your Memo" @update:field="form.memo = $event" :errors="errors" />
<div class="flex-end">
<button @click="$router.back()" class="btn-alert mr-3">Cancel</button>
<button @click="$router.back()" class="btn-alert mr-1">Cancel</button>
<button class="btn-primary">Add New Memo</button>
</div>
</form>

10
resources/js/views/Memo/MemoEdit.vue
View File

@@ -1,16 +1,16 @@
<template>
<div class="p-2">
<div class="flex-between">
<div class="memo-edit p-2">
<div class="flex-between mb-1">
<a href="#" @click="$router.back()" class="link">
< Back
</a>
</div>
<form @submit.prevent="submitForm">
<InputField name="name" :data="form.name" label="Memo Title" placeholder="Your Title" @update:field="form.name = $event" :errors="errors" />
<TextAreaField name="memo" :data="form.memo" label="Memo" placeholder="Your Memo" @update:field="form.memo = $event" :errors="errors" />
<InputField name="name" :data="form.name" label="Title" placeholder="Your Title" @update:field="form.name = $event" :errors="errors" />
<TextAreaField class="memo-text-area" name="memo" :data="form.memo" placeholder="Your Memo" @update:field="form.memo = $event" :errors="errors" />
<div class="flex-end">
<button class="btn-alert mr-3">Cancel</button>
<button class="btn-alert mr-1">Cancel</button>
<button class="btn-primary">Save</button>
</div>

30
resources/js/views/User/UserAdmin.vue
View File

@@ -23,7 +23,7 @@
:message="alertMessage"
class="mb-1"
/>
<form @submit.prevent="addMember">
<form @submit.prevent="addMember" class="mb-2">
<InputField
name="name"
type="text"
@@ -33,9 +33,9 @@
@update:field="form.name = $event"
/>
<InputField name="email" type="email" label="Adresse email du nouveau membre" placeholder="E-mail" :errors="errors" @update:field="form.email = $event" />
<button>Ajouter</button>
<button class="btn-primary">Ajouter</button>
</form>
<div>
<div class="mb-2">
<h2>Liste des utilisateurs</h2>
<ul>
<li v-if="loading">> Loading...</li>
@@ -79,31 +79,27 @@
})
},
mounted() {
if(authUser.data.attributes.is_admin) {
axios.get('/api/users')
.then(response => {
this.users = response.data.data
this.loading = false
})
.catch(error => {
this.loading = false
alert('Unable to fetch users.')
})
}
axios.get('/api/users')
.then(response => {
this.users = response.data.data
this.loading = false
})
.catch(error => {
this.loading = false
alert('Unable to fetch users.')
})
},
methods: {
addMember: function () {
if(authUser.data.attributes.is_admin && this.form.name.length >= 4 && this.form.email.length >= 12) {
if(this.form.name.length >= 4 && this.form.email.length >= 12) {
axios.post('/api/users', {name: this.form.name, email: this.form.email})
.then(res => {
console.log(res)
this.form.name = ''
this.form.email = ''
this.alertType = 'success'
this.alertMessage = `${res.data.data.attributes.name} a bien été créé`
})
.catch(errors => {
console.log(errors)
this.alertType = 'error'
this.alertMessage = 'L\'utilisateur n\'a pas été créé'
})

2
resources/sass/components/_elements.scss vendored
View File

@@ -11,7 +11,7 @@ input {
background-color: $greyLight;
font-size: 1.6rem;
font-family: $fontMain;
padding: 0.5rem;
padding: 0.5rem 1rem;
border-radius: 0.5rem;
&:focus {

8
resources/sass/pages/memos.scss vendored
View File

@@ -26,5 +26,13 @@
&-date {
opacity: 0.6;
}
}
.memo-edit {
.memo-text-area textarea {
height: 50vh;
}
}

4
resources/sass/setup/_positions.scss vendored
View File

@@ -30,6 +30,10 @@ $base: 1rem;
.flex-center {
display: flex;
justify-content: center;
}
.flex-middle {
display: flex;
align-items: center;
}