feat(.env file + flash messages)

Author: betaWeb

.env

@@ -0,0 +1,14 @@
+APP_ENV="production"
+
+API_PROTOCOL="http"
+API_HOST="localhost"
+API_PORT=8905
+API_URL=
+
+APP_PROTOCOL=http
+APP_PORT=3000
+
+CONF_PATH="/etc/apache2/"
+CONF_EXTENSION=".conf"
+CONF_AVAILABLES="sites-available/"
+CONF_ENABLED="sites-enabled/"

README.md

@@ -19,4 +19,20 @@ To run application, just run the following command :
 npm run serve:prod
 ```
 
-The server starts by default on port 3000.
+The server starts by default on port `3000`. To launch app with other port, or define other environment variables, you can edit `.env` file.
+```
+APP_ENV="production"
+
+API_PROTOCOL="http"
+API_HOST="localhost"
+API_PORT=8905
+API_URL=
+
+APP_PROTOCOL=http
+APP_PORT=3000
+
+CONF_PATH="/etc/apache2/"
+CONF_EXTENSION=".conf"
+CONF_AVAILABLES="sites-available/"
+CONF_ENABLED="sites-enabled/"
+```

app/config/index.js

@@ -1,11 +1,32 @@
+const re = /^(https?):\/\/(\S+):([0-9]+)$/
+const appProtocol = process.env.APP_PROTOCOL || 'http'
+const appPort = process.env.APP_PORT || 3000
+
+let url = process.env.API_URL || null
+let protocol = process.env.API_PROTOCOL || 'http'
+let host = process.env.API_HOST || 'localhost'
+let port = process.env.API_PORT || 8905
+
+if (url && re.test(url)) [,protocol,host,port,] = url.match(re)
+
 module.exports = {
 
     api: {
-        port: 8905
+        protocol,
+        host,
+        port
     },
 
     app: {
-        port: 3000
+        port: appPort,
+        protocol: appProtocol
+    },
+
+    params: {
+        basepath: process.env.CONF_PATH || '/etc/apache2/',
+        availablesPath: process.env.CONF_AVAILABLES || 'sites-available/',
+        enabledPath: process.env.CONF_ENABLED || 'sites-enabled/',
+        extension: process.env.CONF_EXTENSION || '.conf'
     }
 
 }

app/src/VirtualHostsHandler.js

@@ -8,22 +8,14 @@ const { userInfo } = require('os')
 const { exec } = require('child_process')
 const { error } = require('./Utils')
 
-// const filesRegexp = '([0-9]{3,}-)(.*)(.conf)'
-const DEFAULT_SETTINGS = {
-    extension: '.conf',
-    availablesPath: 'sites-available/',
-    enabledPath: 'sites-enabled/'
-}
-
 class VirtualHostsHandler {
 
-    constructor (basepath = "/etc/apache2/", settings = {}) {
+    constructor (settings = {}) {
         this._availables = null
         this._enabled = null
         this._files = {}
-        this.basepath = basepath
         this.settings = {
-            ...DEFAULT_SETTINGS,
+            ...global.config.params,
             ...settings
         }
         this._commands = {
@@ -43,8 +35,8 @@ class VirtualHostsHandler {
 
     async _init () {
         this.paths = {
-            available: path.join(this.basepath, this.settings.availablesPath),
-            enabled: path.join(this.basepath, this.settings.enabledPath)
+            available: path.join(this.settings.basepath, this.settings.availablesPath),
+            enabled: path.join(this.settings.basepath, this.settings.enabledPath)
         }
         await this.updateList()
         this._enabled = (await this.enabledList()).map(item => path.basename(item))
@@ -314,7 +306,7 @@ class VirtualHostsHandler {
             : this._toId(datum.filename)
 
         if (this._isEnabled(datum.filename))
-            datum.enabled = path.join(this.basepath, this.settings.enabledPath, datum.filename)
+            datum.enabled = path.join(this.settings.basepath, this.settings.enabledPath, datum.filename)
 
         return datum
     }

package-lock.json

@@ -5,24 +5,23 @@
   "author": "Cyprien GLEPIN <cyprien.glepin@gmail.com>",
   "private": true,
   "scripts": {
-    "serve:dev": "forever -w start server.js",
-    "serve:prod": "NODE_ENV=production node server.js",
-    "serve:stop": "forever stop server.js",
-    "serve:stopall": "forever stopall",
+    "serve:dev": "APP_ENV=development forever -w start server.js",
+    "serve:prod": "node server.js",
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-    "start": "npm run dev",
     "build": "node build/build.js"
   },
   "dependencies": {
     "apacheconf": "0.0.5",
     "body-parser": "^1.18.2",
     "codemirror": "^5.34.0",
     "cors": "^2.8.4",
+    "dotenv": "^5.0.0",
     "express": "^4.16.2",
     "fs-extra": "^5.0.0",
     "glob-promise": "^3.3.0",
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
+    "lodash.uniqueid": "^4.0.1",
     "node-dir": "^0.1.17",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1"

package.json

@@ -1,13 +1,16 @@
+require('dotenv').config()
+
+global.config = require('./app/config')
+
 const express = require('express')
 const cors = require('cors')
 const bodyParser = require('body-parser')
 const { readFileSync } = require('fs')
-const config = require('./app/config')
 const VirtualHostsHandler = require('./app/src/VirtualHostsHandler')
 const { success, error } = require('./app/src/Utils')
 const api = express()
 const vh = new VirtualHostsHandler
-const env = process.env.NODE_ENV || 'development'
+const env = process.env.APP_ENV || 'development'
 
 api.use(cors())
 api.use(bodyParser.json())
@@ -126,11 +129,11 @@ api.put('/api/vh/:id/disable', async (req, res) => {
     return res.finish(json)
 })
 
-api.listen(config.api.port, () => console.log(`API started on http://localhost:${config.api.port}`))
+api.listen(config.api.port, () => console.log(`API started on ${config.api.protocol}://${config.api.host}:${config.api.port}`))
 
 if (env === 'production') {
     const app = express()
     app.use(express.static(__dirname + '/dist/'));
     app.get('/', (req, res) => res.sendFile(__dirname + '/dist/index.html'))
-    app.listen(config.app.port, () => console.log(`App started on http://localhost:${config.app.port}`))
+    app.listen(config.app.port, () => console.log(`App started on ${config.app.protocol}://localhost:${config.app.port}`))
 }

server.js

@@ -1,6 +1,6 @@
 <template>
   <div id="app" class="wrapper">
-    <Flash />
+    <FlashContainer />
     <div class="container">
       <h1 class="app-title">Apache2 VHosts manager</h1>
       <router-view/>
@@ -9,13 +9,13 @@
 </template>
 
 <script>
-  import Flash from './components/Flash.vue'
+  import FlashContainer from './components/FlashComponent/FlashContainer.vue'
   
   export default {
     
     name: 'App',
 
-    components: { Flash }
+    components: { FlashContainer }
 
   }
 </script>

src/App.vue

@@ -8,7 +8,7 @@ export default class VHMaganer {
     }
 
     static pathFor (path = '') {
-        return `http://localhost:${config.app.port}/${path}`
+        return `${config.api.protocol}://${config.api.host}:${config.api.port}/${path}`
     }
 
     static async all () {