Commit a1593835 authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

Merge branch 'dev'

parents 48ec3a1c e4b21fc0

.bowerrc

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
{

    "directory": "ui/js/lib"

}
 
 No newline at end of file

.gitignore

+3 −1
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ 
/ui/js/lib

/editions/*

/configuration/configuration.xml

.idea

.DS_Store
 
 No newline at end of file

Dockerfile

+11 −1
Original line number Diff line number Diff line 
FROM basex/basexhttp:latest

MAINTAINER Certic-Pdn TEAM <contact.certic@unicaen.fr>

COPY . /srv/BaseXWeb
 
 No newline at end of file
 
COPY max.xq /srv/basex/webapp

COPY rxq /srv/basex/webapp/rxq

COPY configuration /srv/basex/webapp/configuration

COPY editions /srv/basex/webapp/editions

COPY plugins /srv/basex/webapp/plugins

COPY ui /srv/basex/webapp/ui

COPY node_modules/bootstrap/dist/js/bootstrap.bundle.min.js /srv/basex/webapp/ui/lib

COPY node_modules/bootstrap/dist/css/bootstrap.min.css /srv/basex/webapp/ui/lib

COPY node_modules/bootstrap/dist/js/bootstrap.min.js /srv/basex/webapp/ui/lib

COPY node_modules/jquery/dist/jquery.min.js /srv/basex/webapp/ui/lib

COPY node_modules/popper.js/dist/popper.min.js /srv/basex/webapp/ui/lib

bower.json

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
{

  "name": "max",

  "description": "Moteur d'Affichage XML",

  "main": "",

  "moduleType": [],

  "license": "MIT",

  "homepage": "",

  "private": true,

  "ignore": [

    "**/.*",

    "node_modules",

    "bower_components",

    "test",

    "tests"

  ],

  "dependencies": {

    "MathJax": "~2.5.3",

    "jquery": "~2.1.4",

    "jstree": "~3.2.1",

    "jquery-ui": "~1.11.4",

    "openseadragon": "~2.1.0"

  },

  "devDependencies": {

    "jquery": "~2.1.4",

    "MathJax": "~2.5.3",

    "jstree": "~3.2.1",

    "less": "~2.5.3",

    "jQuery.dotdotdot": "~1.7.4",

    "bootstrap": "~3.3.6"

  }

}

gulpfile.js

deleted100644 → 0
+0 −73
Original line number Diff line number Diff line 
var gulp      = require('gulp'),

    rename    = require('gulp-rename'),// Renommage des fichiers

    less      = require('gulp-less'),// Conversion LESS en CSS

    uglify    = require('gulp-uglify'), //Minification/Obfuscation des JS

    gutil = require('gulp-util');



//COMPILATION DES FICHIERS LESS

gulp.task('compile-less', function () {

    gulp.src('./ui/css/*.less') // path to your file

    .pipe(less().on('error', function(err) {

        console.log(err);

    }))

    .pipe(gulp.dest('./ui/css/'));

});

gulp.task('compile-less-addons', function () {

    gulp.src('./plugins/**/*.less') // path to your file

    .pipe(less().on('error', function(err) {

        console.log(err);

    }))

    .pipe(gulp.dest('./plugins'));

});





//MINIFICATION DES FICHIER JS

gulp.task('js-uglify', function() 

{

    return gulp.src('./ui/js/src/*.js')    // Prend en entrée les fichiers *.js

	.pipe(rename(function(path){

	    // Il y a différentes méthodes pour renommer les fichiers

	    // Voir ici pour plus d'infos : https://www.npmjs.org/package/gulp-rename

	    path.basename = path.basename.replace(".src", ".min");

	}))

	.pipe(uglify())

	.pipe(gulp.dest('./ui/js/dist/'));

});



gulp.task('js-uglify-addons', function() 

{

    return gulp.src(//todo: auto list uiAddons and plugins js files...

        [

          './plugins/correction/*.js',

          './plugins/equations/*.js',

          './plugins/pager/*.js',

          './plugins/search/*.js',

          './plugins/apparat_critique/*.js',

	  './plugins/img_viewer/*.js',

	  './plugins/breadcrumb/*.js',

          

        ]) 

	    .pipe(rename(function(path){

	    // Il y a différentes méthodes pour renommer les fichiers

	    // Voir ici pour plus d'infos : https://www.npmjs.org/package/gulp-rename

      console.log("Minification de " + path.basename +".js")

	    path.basename = path.basename.replace(".src", ".min");

	  }))

	.pipe(uglify().on('error',gutil.log))

	.pipe(gulp.dest('./ui/js/dist/'));

});





gulp.task('watch', function(){

    gulp.watch('./ui/js/src/*.js', ['js-uglify']);

    gulp.watch('./ui/uiAddons/**/*.js', ['js-uglify-addons']);

    gulp.watch('./plugins/**/*.js', ['js-uglify-addons']);

    gulp.watch('./plugins/**/*.less', ['compile-less-addons']);

    gulp.watch('./ui/css/*.less', ['compile-less']);

});



//building task 

gulp.task('build',['compile-less', 'compile-less-addons', 'js-uglify','js-uglify-addons']);





gulp.task('default', ['watch']);