Skip to content

Commit 9435402

Browse files
committed
removed gulp stuff :))))
1 parent 886b095 commit 9435402

36 files changed

+71
-898
lines changed

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ ENV PATH="$PATH:/opt/conditional/dart-sass"
2121

2222
COPY package.json package-lock.json /opt/conditional/
2323

24-
COPY build*.js webpack.config.js /opt/conditional
24+
COPY build*.js /opt/conditional
2525
COPY frontend /opt/conditional/frontend
26-
COPY gulpfile.js/lib /opt/conditional/gulpfile.js/lib
27-
COPY gulpfile.js/config.json /opt/conditional/gulpfile.js/config.json
2826

2927
RUN /bin/bash -c "source $NVM_DIR/nvm.sh && nvm use --delete-prefix $NODE_VERSION && npm ci && npm run build"
3028

build-webpack.js

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,61 @@
11
var webpack = require("webpack")
2-
var webpackConfig = require("./webpack.config")
2+
var path = require('path');
3+
4+
var jsSrc = path.resolve('./frontend/javascript');
5+
var jsDest = path.resolve('./conditional/static/js');
6+
var publicPath = 'static/js';
7+
8+
var babelQuery = {
9+
"presets": ["es2015", "stage-1"],
10+
"plugins": []
11+
}
12+
13+
var webpackConfig = {
14+
context: jsSrc,
15+
entry: ["./app.js"],
16+
output: {
17+
path: path.normalize(jsDest),
18+
filename: '[name].js',
19+
publicPath: publicPath
20+
},
21+
plugins: [
22+
new webpack.DefinePlugin({
23+
'process.env': {
24+
'NODE_ENV': JSON.stringify('production')
25+
}
26+
}),
27+
new webpack.optimize.DedupePlugin(),
28+
new webpack.optimize.UglifyJsPlugin(),
29+
new webpack.NoErrorsPlugin()
30+
],
31+
resolve: {
32+
root: jsSrc,
33+
extensions: ['', '.js']
34+
},
35+
module: {
36+
loaders: [
37+
{
38+
test: /\.js$/,
39+
loader: 'babel-loader',
40+
exclude: /node_modules/,
41+
query: babelQuery
42+
},
43+
{
44+
test: require.resolve("jquery"),
45+
loader: 'expose?$!expose?jQuery'
46+
},
47+
{
48+
test: /bootstrap-material-datetimepicker/,
49+
loader: 'imports?moment'
50+
},
51+
{
52+
test: /bootstrap-sweetalert.*$/,
53+
loader: 'babel-loader',
54+
query: babelQuery
55+
},
56+
]
57+
},
58+
};
359

460
webpack(webpackConfig, (err, stats) => {
561
console.log("Done!")

frontend/stylesheets/components/_datatables.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,18 @@ div {
2626
.col-sm-7 {
2727
width: 100%;
2828
}
29+
30+
th.sorting::after {
31+
font-family: "bootstrap-icons" !important;
32+
content: "\F127";
33+
}
34+
35+
th.sorting_asc::after {
36+
content: "\F57B";
37+
}
38+
39+
th.sorting_desc::after {
40+
content: "\F575";
41+
}
2942
}
3043
}

gulpfile.js/config.json

Lines changed: 0 additions & 100 deletions
This file was deleted.

gulpfile.js/index.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

gulpfile.js/lib/compileLogger.js

Lines changed: 0 additions & 20 deletions
This file was deleted.

gulpfile.js/lib/getEnabledTasks.js

Lines changed: 0 additions & 31 deletions
This file was deleted.

gulpfile.js/lib/handleErrors.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

gulpfile.js/lib/pathToUrl.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

gulpfile.js/lib/prettifyTime.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)