refactoring and migration from npm+bower to npm+gulp

7 years ago · 2b548cc2e2
33 changed files with 80 additions and 21 deletions
--- a/.bowerrc
+++ b/.bowerrc
@ -1,3 +0,0 @@
-{
-  "directory": "vendor"
-}
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,10 @@
-.phpintel
-vendor/
+/.phpintel
+/.env
+/.idea/
+/vendor/
+/node_modules/
+/composer.lock
+/package-lock.json
+/public/css/
+/public/js/
+/public/img/
--- a/gulpfile.js
+++ b/gulpfile.js
@ -0,0 +1,41 @@
+var gulp = require('gulp');
+var copy = require('gulp-copy');
+var del = require('del');
+
+gulp.task('default', ['img', 'css', 'js']);
+
+gulp.task('clean:img', function () {
+    return del(['public/img']);
+});
+
+gulp.task('img', ['clean:img'], function () {
+    return gulp.src('resources/img/**/*')
+        .pipe(gulp.dest('public/img'));
+});
+
+gulp.task('clean:css', function () {
+    return del(['public/css']);
+});
+
+gulp.task('css', ['clean:css'], function () {
+    gulp.src(['resources/css/**/*.css'])
+        .pipe(gulp.dest('public/css'));
+
+    gulp
+        .src([
+            'node_modules/bootstrap/dist/css/bootstrap.min.css',
+            'node_modules/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css',
+            'node_modules/bootstrap-table/dist/bootstrap-table.min.css',
+            'node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css'
+        ])
+        .pipe(gulp.dest('public/css'));
+});
+
+gulp.task('clean:js', function () {
+    return del(['public/assets/js']);
+});
+
+gulp.task('js', ['clean:js'], function () {
+    gulp.src(['resources/js/**/*.js'])
+        .pipe(gulp.dest('public/js'));
+});
--- a/package.json
+++ b/package.json
@ -2,21 +2,34 @@
  "name": "openvpn-admin",
  "version": "0.3.2",
  "description": "Setup and administration of openvpn with a web interface",
-  "dependencies": {
-    "bootstrap": "^3.3.7",
-    "bootstrap-table": "^1.11.0",
-    "jquery": "^2.2.4",
-    "x-editable": "^1.5.1",
-    "bootstrap-datepicker": "^1.6.4"
+  "homepage": "https://github.com/EvilFreelancer/OpenVPN-Admin#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/EvilFreelancer/OpenVPN-Admin.git"
  },
+  "authors": [
+    "Florian Bigard <florian.bigard@gmail.com>"
+  ],
  "keywords": [
    "openvpn",
    "admin",
    "setup"
  ],
-  "authors": [
-    "Florian Bigard <florian.bigard@gmail.com>"
-  ],
  "license": "GPLv3",
-  "private": true
+  "bugs": {
+    "url": "https://github.com/EvilFreelancer/OpenVPN-Admin/issues"
+  },
+  "dependencies": {
+    "gulp": "^3.9.0",
+    "gulp-copy": "^1.1.0",
+    "del": "^2.0.0",
+    "bootstrap": "^3.3.7",
+    "bootstrap-table": "^1.11.0",
+    "jquery": "^2.2.4",
+    "x-editable": "^1.5.1",
+    "bootstrap-datepicker": "^1.6.4"
+  },
+  "scripts": {
+    "postinstall": "gulp"
+  }
 }
--- a/public/desinstall.sh
+++ b/public/desinstall.sh
--- a/public/include/config.php
+++ b/public/include/config.php
--- a/public/include/connect.php
+++ b/public/include/connect.php
--- a/public/include/functions.php
+++ b/public/include/functions.php
--- a/public/include/grids.php
+++ b/public/include/grids.php
--- a/public/include/html/form/configuration.php
+++ b/public/include/html/form/configuration.php
--- a/public/include/html/form/installation.php
+++ b/public/include/html/form/installation.php
--- a/public/include/html/form/login.php
+++ b/public/include/html/form/login.php
--- a/public/include/html/grids.php
+++ b/public/include/html/grids.php
--- a/public/include/html/menu.php
+++ b/public/include/html/menu.php
--- a/public/index.php
+++ b/public/index.php
@ -95,13 +95,13 @@

    <title>OpenVPN-Admin</title>

-    <link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap.min.css" type="text/css" />
-    <link rel="stylesheet" href="vendor/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css" type="text/css" />
-    <link rel="stylesheet" href="vendor/bootstrap-table/dist/bootstrap-table.min.css" type="text/css" />
-    <link rel="stylesheet" href="vendor/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css" type="text/css" />
-    <link rel="stylesheet" href="css/index.css" type="text/css" />
+    <link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css" />
+    <link rel="stylesheet" href="/css/bootstrap-editable.css" type="text/css" />
+    <link rel="stylesheet" href="/css/bootstrap-table.min.css" type="text/css" />
+    <link rel="stylesheet" href="/css/bootstrap-datepicker3.css" type="text/css" />
+    <link rel="stylesheet" href="/css/index.css" type="text/css" />

-    <link rel="icon" type="image/png" href="css/icon.png">
+    <link rel="icon" type="image/png" href="/img/icon.png">
  </head>
  <body class='container-fluid'>
  <?php
--- a/public/install.sh
+++ b/public/install.sh
--- a/public/installation/client-conf/gnu-linux/client.conf
+++ b/public/installation/client-conf/gnu-linux/client.conf
--- a/public/installation/client-conf/gnu-linux/update-resolv.sh
+++ b/public/installation/client-conf/gnu-linux/update-resolv.sh
--- a/public/installation/client-conf/osx-viscosity/client.conf
+++ b/public/installation/client-conf/osx-viscosity/client.conf
--- a/public/installation/client-conf/windows/client.ovpn
+++ b/public/installation/client-conf/windows/client.ovpn
--- a/public/installation/scripts/config.sh
+++ b/public/installation/scripts/config.sh
--- a/public/installation/scripts/connect.sh
+++ b/public/installation/scripts/connect.sh
--- a/public/installation/scripts/disconnect.sh
+++ b/public/installation/scripts/disconnect.sh
--- a/public/installation/scripts/functions.sh
+++ b/public/installation/scripts/functions.sh
--- a/public/installation/scripts/login.sh
+++ b/public/installation/scripts/login.sh
--- a/public/installation/server.conf
+++ b/public/installation/server.conf
--- a/public/migration.php
+++ b/public/migration.php
--- a/public/sql/schema-0.sql
+++ b/public/sql/schema-0.sql
--- a/public/sql/schema-5.sql
+++ b/public/sql/schema-5.sql
--- a/public/update.sh
+++ b/public/update.sh
--- a/resources/css/index.css
+++ b/resources/css/index.css
--- a/resources/img/icon.png
+++ b/resources/img/icon.png
--- a/resources/js/grids.js
+++ b/resources/js/grids.js