Misterzym
/
OpenVPN-Admin
mirror of https://github.com/misterzym/OpenVPN-Admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactoring and migration from npm+bower to npm+gulp

feature/refractoring
Paul Rock 7 years ago
parent
3d5f44cf21
commit
2b548cc2e2
33 changed files with 80 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .bowerrc
  2. 12
      .gitignore
  3. 41
      gulpfile.js
  4. 33
      package.json
  5. 0
      public/desinstall.sh
  6. 0
      public/include/config.php
  7. 0
      public/include/connect.php
  8. 0
      public/include/functions.php
  9. 0
      public/include/grids.php
  10. 0
      public/include/html/form/configuration.php
  11. 0
      public/include/html/form/installation.php
  12. 0
      public/include/html/form/login.php
  13. 0
      public/include/html/grids.php
  14. 0
      public/include/html/menu.php
  15. 12
      public/index.php
  16. 0
      public/install.sh
  17. 0
      public/installation/client-conf/gnu-linux/client.conf
  18. 0
      public/installation/client-conf/gnu-linux/update-resolv.sh
  19. 0
      public/installation/client-conf/osx-viscosity/client.conf
  20. 0
      public/installation/client-conf/windows/client.ovpn
  21. 0
      public/installation/scripts/config.sh
  22. 0
      public/installation/scripts/connect.sh
  23. 0
      public/installation/scripts/disconnect.sh
  24. 0
      public/installation/scripts/functions.sh
  25. 0
      public/installation/scripts/login.sh
  26. 0
      public/installation/server.conf
  27. 0
      public/migration.php
  28. 0
      public/sql/schema-0.sql
  29. 0
      public/sql/schema-5.sql
  30. 0
      public/update.sh
  31. 0
      resources/css/index.css
  32. 0
      resources/img/icon.png
  33. 0
      resources/js/grids.js

3
.bowerrc
Unescape View File

@ -1,3 +0,0 @@
{
"directory": "vendor"
}

12
.gitignore vendored
Unescape View File

@ -1,2 +1,10 @@
.phpintel /.phpintel
vendor/ /.env
/.idea/
/vendor/
/node_modules/
/composer.lock
/package-lock.json
/public/css/
/public/js/
/public/img/

41
gulpfile.js
Unescape View File

@ -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'));
});

33
bower.json → package.json
Unescape View File

@ -2,21 +2,34 @@
"name": "openvpn-admin", "name": "openvpn-admin",
"version": "0.3.2", "version": "0.3.2",
"description": "Setup and administration of openvpn with a web interface", "description": "Setup and administration of openvpn with a web interface",
"dependencies": { "homepage": "https://github.com/EvilFreelancer/OpenVPN-Admin#readme",
"bootstrap": "^3.3.7", "repository": {
"bootstrap-table": "^1.11.0", "type": "git",
"jquery": "^2.2.4", "url": "git+https://github.com/EvilFreelancer/OpenVPN-Admin.git"
"x-editable": "^1.5.1",
"bootstrap-datepicker": "^1.6.4"
}, },
"authors": [
"Florian Bigard <florian.bigard@gmail.com>"
],
"keywords": [ "keywords": [
"openvpn", "openvpn",
"admin", "admin",
"setup" "setup"
], ],
"authors": [
"Florian Bigard <florian.bigard@gmail.com>"
],
"license": "GPLv3", "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"
}
} }

0
desinstall.sh → public/desinstall.sh
Unescape View File

0
include/config.php → public/include/config.php
Unescape View File

0
include/connect.php → public/include/connect.php
Unescape View File

0
include/functions.php → public/include/functions.php
Unescape View File

0
include/grids.php → public/include/grids.php
Unescape View File

0
include/html/form/configuration.php → public/include/html/form/configuration.php
Unescape View File

0
include/html/form/installation.php → public/include/html/form/installation.php
Unescape View File

0
include/html/form/login.php → public/include/html/form/login.php
Unescape View File

0
include/html/grids.php → public/include/html/grids.php
Unescape View File

0
include/html/menu.php → public/include/html/menu.php
Unescape View File

12
index.php → public/index.php
Unescape View File

@ -95,13 +95,13 @@
<title>OpenVPN-Admin</title> <title>OpenVPN-Admin</title>
<link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap.min.css" type="text/css" /> <link rel="stylesheet" href="/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="/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="/css/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/bootstrap-datepicker3.css" type="text/css" />
<link rel="stylesheet" href="css/index.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> </head>
<body class='container-fluid'> <body class='container-fluid'>
<?php <?php

0
install.sh → public/install.sh
Unescape View File

0
installation/client-conf/gnu-linux/client.conf → public/installation/client-conf/gnu-linux/client.conf
Unescape View File

0
installation/client-conf/gnu-linux/update-resolv.sh → public/installation/client-conf/gnu-linux/update-resolv.sh
Unescape View File

0
installation/client-conf/osx-viscosity/client.conf → public/installation/client-conf/osx-viscosity/client.conf
Unescape View File

0
installation/client-conf/windows/client.ovpn → public/installation/client-conf/windows/client.ovpn
Unescape View File

0
installation/scripts/config.sh → public/installation/scripts/config.sh
Unescape View File

0
installation/scripts/connect.sh → public/installation/scripts/connect.sh
Unescape View File

0
installation/scripts/disconnect.sh → public/installation/scripts/disconnect.sh
Unescape View File

0
installation/scripts/functions.sh → public/installation/scripts/functions.sh
Unescape View File

0
installation/scripts/login.sh → public/installation/scripts/login.sh
Unescape View File

0
installation/server.conf → public/installation/server.conf
Unescape View File

0
migration.php → public/migration.php
Unescape View File

0
sql/schema-0.sql → public/sql/schema-0.sql
Unescape View File

0
sql/schema-5.sql → public/sql/schema-5.sql
Unescape View File

0
update.sh → public/update.sh
Unescape View File

0
css/index.css → resources/css/index.css
Unescape View File

0
css/icon.png → resources/img/icon.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
js/grids.js → resources/js/grids.js
Unescape View File

Write Preview
Loading…
Cancel
Save