Skip to content

Commit 9391053

Browse files
committed
Merge branch 'v1-dev-bootstrap-version' into v1-dev
2 parents 56d0dea + 0b2c990 commit 9391053

File tree

17 files changed

+3570
-1702
lines changed

17 files changed

+3570
-1702
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ ARG DEBIAN_FRONTEND=noninteractive
88
RUN apk update \
99
&& apk upgrade \
1010
&& apk add --no-cache bash git openssh \
11-
&& npm install -g bower \
1211
&& npm install \
1312
&& chown -R node:node /app \
1413
&& npm rebuild node-sass \
1514
&& npm cache clean --force
1615

1716
USER node
1817
WORKDIR /app
19-
RUN bower install
2018

2119
EXPOSE 4000
2220

README.md

Lines changed: 47 additions & 60 deletions
Large diffs are not rendered by default.

bower.json

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

build/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ var path = require('path');
22

33
module.exports = {
44
rootDir: "../", // Root dir
5-
srcDir: path.resolve("../src"), // Source files
5+
srcDir: path.resolve("../src"), // Source files
66
destDir: path.resolve("../dist"), // Build destination
77
bowerDir: "../bower_components", // Bower dir
8-
npmDir: "../node_modules", // Npm dir
8+
npmDir: path.resolve("../node_modules"), // Npm dir
99
port: 4000
10-
};
10+
};

build/paths/vendor.js

Lines changed: 51 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2,110 +2,79 @@ var mainBowerFiles = require('main-bower-files');
22

33
var config = require('../config');
44

5-
var rootDir = config.rootDir;
5+
var rootDir = config.rootDir;
66
var srcDir = config.srcDir;
7-
var destDir = config.destDir;
8-
var bowerDir = config.bowerDir;
9-
10-
11-
12-
/*******************************************************************************
13-
14-
...Few words about vendor files
15-
16-
For not including all scripts manually we use plugin
17-
called main-bower-files.
18-
19-
It returns glob of files based on "main" field in vendor packages "bower.json".
20-
Orders of files will be as per our bower.json, so if you have some libraries
21-
that should be loaded on first, just move them upwards in project "bower.json".
22-
23-
If any of files that you want to access is not listed in vendor package, you can
24-
define files for that package manually in bower.json "overrides" field.
25-
26-
For more docs visit.
27-
https://github.com/ck86/main-bower-files#main-bower-files
28-
29-
If for any reasons you don't like this approach, and want list your files
30-
manually, you can just pass manual glob string or array to "src" option
31-
32-
eg.
33-
34-
export.scripts: [
35-
bowerDir + "jquery/dist/jquery.js",
36-
bowerDir + "angular/jquery.js",
37-
]
38-
39-
********************************************************************************/
7+
var destDir = config.destDir;
8+
var bowerDir = config.bowerDir;
409

4110

4211

4312
/***********************************************
4413
* Vendor script files
4514
************************************************/
46-
4715

48-
exports.scripts = mainBowerFiles({
49-
filter: [
50-
'**/*.js',
51-
'!**/*.min.js'
52-
],
53-
paths: rootDir
54-
});
16+
var npmScripts = [
17+
config.npmDir + '/jquery/dist/jquery.js',
18+
config.npmDir + '/jquery-flot/jquery.flot.js',
19+
config.npmDir + '/jquery-flot/jquery.flot.resize.js',
20+
config.npmDir + '/jquery-flot/jquery.flot.pie.js',
21+
config.npmDir + '/jquery-flot/jquery.flot.time.js',
22+
config.npmDir + '/jquery.flot.tooltip/js/jquery.flot.tooltip.js',
23+
config.npmDir + '/jquery-validation/dist/jquery.validate.js',
24+
config.npmDir + '/jquery-sparkline/jquery.sparkline.js',
25+
config.npmDir + '/jqvmap/dist/jquery.vmap.js',
26+
config.npmDir + '/jqvmap/dist/maps/jquery.vmap.world.js',
27+
config.npmDir + '/metismenu/dist/metisMenu.js',
28+
config.npmDir + '/nprogress/nprogress.js',
29+
config.npmDir + '/quill/dist/quill.js',
30+
config.npmDir + '/responsive-toolkit/dist/bootstrap-toolkit.js',
31+
config.npmDir + '/sortablejs/Sortable.js',
32+
config.npmDir + '/tether/dist/js/tether.js',
33+
config.npmDir + '/tinycolor2/tinycolor.js',
34+
config.npmDir + '/dropzone/dist/dropzone.js',
35+
config.npmDir + '/jquery-touchswipe/jquery.touchSwipe.js',
36+
config.npmDir + '/jquery.browser/dist/jquery.browser.js',
37+
config.npmDir + '/popper.js/dist/umd/popper.js',
38+
config.npmDir + '/bootstrap/dist/js/bootstrap.js',
39+
config.npmDir + '/raphael/raphael.js',
40+
config.npmDir + '/morris.js/morris.js',
41+
];
42+
43+
exports.scripts = npmScripts;
5544

5645

5746
/***********************************************
5847
* Vendor style files
5948
************************************************/
6049

61-
exports.styles = mainBowerFiles({
62-
filter: [
63-
'**/*.css',
64-
'!**/*.min.css'
65-
],
66-
paths: rootDir
67-
});
50+
var npmStyles = [
51+
config.npmDir + '/animate.css/animate.css',
52+
config.npmDir + '/font-awesome/css/font-awesome.css',
53+
config.npmDir + '/jqvmap/dist/jqvmap.css',
54+
config.npmDir + '/metismenu/dist/metisMenu.css',
55+
config.npmDir + '/nprogress/nprogress.css',
56+
config.npmDir + '/dropzone/dist/dropzone.css',
57+
config.npmDir + '/quill/dist/quill.core.css',
58+
config.npmDir + '/quill/dist/quill.snow.css',
59+
config.npmDir + '/morris.js/morris.css',
60+
config.npmDir + '/bootstrap/dist/css/bootstrap.css',
61+
];
62+
63+
exports.styles = npmStyles;
6864

6965

7066
/***********************************************
71-
* Vendor assets files
67+
* Vendor asset files
7268
************************************************/
7369

74-
/*
75-
All files which are not .js, .css, .less and fonts
76-
*/
77-
78-
exports.assets = mainBowerFiles({
79-
filter: [
80-
'**/*',
81-
'!**/*.js',
82-
'!**/*.css',
83-
'!**/*.less',
84-
85-
// Ingore fonts
86-
87-
'!**/*.otf',
88-
'!**/*.eot',
89-
'!**/*.ttf',
90-
'!**/*.woff',
91-
'!**/*.woff2'
92-
],
93-
paths: rootDir
94-
});
70+
exports.assets = [];
9571

9672
/***********************************************
9773
* Vendor font files
9874
************************************************/
9975

76+
var npmFonts = [
77+
config.npmDir + '/font-awesome/fonts/*'
78+
];
10079

101-
exports.fonts = mainBowerFiles({
102-
filter: [
103-
'**/*.otf',
104-
'**/*.eot',
105-
'**/*.ttf',
106-
'**/*.woff',
107-
'**/*.woff2',
108-
'**/*.svg'
109-
],
110-
paths: rootDir
111-
});
80+
exports.fonts = npmFonts;

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ services:
88
- .:/app
99
# http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html
1010
- /app/node_modules
11-
- /app/bower_components
1211
ports:
1312
# Expose container port.
1413
- "4000:4000"

0 commit comments

Comments
 (0)