Merge branch 'master' into 'production'

add new fonctions on deploy

See merge request Romulus21/portal!30

deploy.sh

@@ -22,29 +22,77 @@ day=$(date +"%d")
 hour=$(date +"%H")
 minutes=$(date +"%M")
 
-if [ -d "storage/logs/database" ];
-then
-    echo "storage/logs/database/ exist"
+if [ -z "$1" ]; then
+	echo "save-sql"
+	echo "git-prod"
+	echo "npm"
+	echo "all"
+
+elif [ "$1" = save-sql ]; 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
+
+elif [ "$1" = git-prod ]; then
+
+    if [ "production" == "$env" ];
+    then
+        echo "deploy in production"
+        git pull origin production
+
+        composer install
+        php artisan migrate --force
+        php artisan optimize
+    fi
+
+elif [ "$1" = npm ]; then
+
+    if [ "production" == "$env" ];
+    then
+
+        npm install --no-progress
+        npm run prod
+    fi
+
+elif [ "$1" = all ]; 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
+
 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
+	echo "Nothing"
 fi

resources/js/components/Modal.vue

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