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

Merge branch 'master' into 'production'

Browse Source 
Master

See merge request Romulus21/portal!31
This commit is contained in:
Romain Delanoë
2020-04-15 16:40:02 +00:00
parent e7efd25782 e9b4fb573f
commit ecb231ee2a
8 changed files with 76 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
deploy.sh
View File

@@ -23,10 +23,33 @@ hour=$(date +"%H")
minutes=$(date +"%M")
if [ -z "$1" ]; then
echo "save-sql"
echo "git-prod"
echo "npm"
echo "all"
if [ -d "storage/logs/database" ];
then
echo "storage/logs/database/ exist"
else
mkdir database
fi
mysqldump --user="$user" --password="$pass" -B "$database" > storage/logs/database/save-"$database"-"$year""$month""$day"-"$hour""$minutes".sql
if [ "$rsync" ]; then
echo 'save by Rsync'
rsync -avz --progress storage/logs/database/save-"$database"-"$year""$month""$day"-"$hour""$minutes".sql ssh $rsync
fi
if [ "production" == "$env" ];
then
echo "deploy in production"
git pull origin production
composer install
php artisan migrate --force
php artisan optimize
npm install --no-progress
npm run prod
fi
elif [ "$1" = save-sql ]; then
if [ -d "storage/logs/database" ];
@@ -64,34 +87,12 @@ elif [ "$1" = npm ]; then
npm run prod
fi
elif [ "$1" = all ]; then
elif [ "$1" = --help ]; then
if [ -d "storage/logs/database" ];
then
echo "storage/logs/database/ exist"
else
mkdir database
fi
mysqldump --user="$user" --password="$pass" -B "$database" > storage/logs/database/save-"$database"-"$year""$month""$day"-"$hour""$minutes".sql
if [ "$rsync" ]; then
echo 'save by Rsync'
rsync -avz --progress storage/logs/database/save-"$database"-"$year""$month""$day"-"$hour""$minutes".sql ssh $rsync
fi
if [ "production" == "$env" ];
then
echo "deploy in production"
git pull origin production
composer install
php artisan migrate --force
php artisan optimize
npm install --no-progress
npm run prod
fi
echo "save-sql"
echo "git-prod"
echo "npm"
echo "all"
else
echo "Nothing"

13
resources/js/components/Modal.vue
View File

@@ -1,13 +0,0 @@
<template>
$END$
</template>
<script>
export default {
name: "Modal"
}
</script>
<style scoped>
</style>

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

@@ -2,12 +2,10 @@
<div class="memo-edit p-2">
<div class="flex-between mb-1">
<router-link :to="'/memos/' + this.$route.params.id" class="btn">< Back</router-link>
<button class="btn-alert mr-1">Cancel</button>
</div>
<form @submit.prevent="submitForm">
<InputField name="name" :data="form.name" label="Title" placeholder="Your Title" required @update:field="form.name = $event" :errors="errors" />
<TextAreaField class="memo-text-area" name="memo" :data="form.memo" placeholder="Your Memo" required @update:field="form.memo = $event" :errors="errors" />
<div class="flex-end mt-1">
<button class="btn-primary">Save</button>
</div>

21
resources/js/views/Memo/MemoShow.vue
View File

@@ -2,20 +2,21 @@
<div class="p-2">
<Loader v-if="loading" />
<div v-else>
<div class="flex-between flex-center mb-1">
<div class="flex-between flex-center mb-1 relative">
<router-link to="/memos/" class="btn">< Back</router-link>
<div class="relative">
<router-link :to="'/memos/' + memo.memo_id + '/edit'" class="btn-secondary mr-1" >Edit</router-link>
<a href="#" class="btn-alert" @click="modal = ! modal">Delete</a>
<div v-if="modal" class="absolute modal mt-2">
<p>Are you sure you want to delete this record ?</p>
<div class="flex-end flex-center mt-2">
<button class="btn mr-2" @click="modal = ! modal">Cancel</button>
<button class="btn-alert-strong" @click="destroy"> Delete</button>
<div v-if="modal" class="modal-container" @click="modal = ! modal">
<div class="modal">
<p class="m-1 text-center">Are you sure you want to delete this record ?</p>
<div class="flex-center m-1 mt-2">
<button class="btn-secondary mr-2" @click="modal = ! modal">Cancel</button>
<button class="btn-alert" @click="destroy"> Delete</button>
</div>
</div>
</div>
<div v-if="modal" class="modal-background" @click="modal = ! modal" />
<div class="flex-middle">
<router-link :to="'/memos/' + memo.memo_id + '/edit'" class="btn-secondary mr-1" >Edit</router-link>
<a href="#" class="btn-alert" @click="modal = ! modal">Delete</a>
</div>
</div>
<!-- <TagBox :memo="memo" />-->
<h1 class="memo-title flex-center">{{ memo.name }}</h1>

1
resources/sass/app.scss vendored
View File

@@ -14,6 +14,7 @@
@import "components/main";
@import "components/nav";
@import "components/topbar";
@import "components/modal";
@import "components/avatar";
@import "components/alert_box";
@import "components/search_box";

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

@@ -36,3 +36,7 @@ a {
color: $dark;
}
}
pre {
}

26
resources/sass/components/modal.scss vendored
View File

@@ -0,0 +1,26 @@
$modal-duration: 1s;
.modal-container {
background-color: rgba(0,0,0,0.6);
//display: none;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
.modal {
background-color: #fff;
border-radius: 5px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
position: absolute;
overflow: hidden;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
max-width: 100%;
width: 400px;
animation-name: modalopen;
animation-duration: $modal-duration;
}
}

2
resources/sass/setup/_containers.scss vendored
View File

@@ -14,6 +14,7 @@
text-decoration: none;
flex-direction: column;
justify-content: space-between;
cursor: pointer;
img,
svg {
@@ -58,6 +59,7 @@
background-color: $light;
padding: 0.5rem 1rem;
border-radius: 0.2rem;
cursor: pointer;
svg {
width: 2rem;