Skip to content

Commit dab4b78

Browse files
leonardoelias4leonardoelias4
committed
new structure
1 parent 386f22a commit dab4b78

File tree

133 files changed

+82
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+82
-57
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ coverage
2828
# Compiled binary addons (http://nodejs.org/api/addons.html)
2929
build/Release
3030
/static/.DS_Store
31+
.DS_Store

‎static/.babelrc renamed to ‎src/.babelrc

File renamed without changes.

‎static/.editorconfig renamed to ‎src/.editorconfig

File renamed without changes.

‎static/.eslintrc renamed to ‎src/.eslintrc

File renamed without changes.

‎static/config.js renamed to ‎src/config.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,24 @@
22
import { join } from 'path';
33
import babelify from 'babelify';
44

5-
const sourceFolder = 'app';
6-
const distFolder = 'dist';
5+
const sourceFolder = 'site';
6+
const distFolder = '../dist';
77

88
module.exports = {
99
// ----------------------------
1010
// LIBRARIES module
1111
// ----------------------------
1212
libraries: {
13-
// The entries in js are needed to be a *glob*
1413
js: [
1514
join(__dirname, 'node_modules', 'jquery', 'dist', 'jquery.min.js'),
16-
join(__dirname, 'source', 'scripts', 'lib', '**', '*.js'),
1715
join(__dirname, 'node_modules', 'fotorama', '*.js'),
1816
join(__dirname, 'node_modules', 'jquery.maskedinput', 'src', '*.js'),
19-
// TODO: Add some more libraries to work with them in your js files
17+
join(__dirname, 'source', 'scripts', 'lib', '**', '*.js'),
2018
],
21-
22-
// The entries in scss are needed to be *folders*
2319
scss: [
2420
join(__dirname, 'node_modules', 'bootstrap', 'scss'),
2521
join(__dirname, 'node_modules', 'fotorama', '*.css'),
2622
join(__dirname, 'node_modules', 'nouislider', 'distribute', 'nouislider', '*.css')
27-
// TODO: Add some more libraries to include them in your scss files
2823
],
2924
},
3025

@@ -51,7 +46,7 @@ module.exports = {
5146
watch: {
5247
images: join(sourceFolder, 'images', '**/*'),
5348
scss: join(sourceFolder, 'styles', '**/*.{scss,sass}'),
54-
js: undefined, // JavaScript is watched using watchify
49+
js: undefined,
5550
html: join(sourceFolder, 'html', '**/*.ejs'),
5651
fonts: join(sourceFolder, 'fonts', '**/*'),
5752
},
@@ -85,5 +80,11 @@ module.exports = {
8580
transform: [
8681
babelify,
8782
],
83+
shim: {
84+
jQuery: {
85+
path: './node_modules/jquery/dist/jquery.js',
86+
exports: '$'
87+
}
88+
}
8889
},
8990
}

‎static/gulpfile.babel.js renamed to ‎src/gulpfile.babel.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// Kreativgebiet GmbH
2-
//
31
// Require all gulp tasks from the subfolder
42
// and let them call themselves
53

‎static/package-lock.json renamed to ‎src/package-lock.json

File renamed without changes.

‎static/package.json renamed to ‎src/package.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,11 @@
22
"name": "Codercokr",
33
"version": "1.0.0",
44
"description": "Website Codercokr",
5-
"repository": "git@github.com:kreativgebiet/kickup.git",
65
"main": "gulpfile.babel.js",
76
"scripts": {
87
"lint": "eslint --format=node_modules/eslint-formatter-pretty . *.js",
98
"test": "ava"
109
},
11-
"browserify": {
12-
"transform": [
13-
"browserify-global-shim"
14-
]
15-
},
16-
"browserify-global-shim": {
17-
"jQuery": "$"
18-
},
1910
"author": "Codercokr",
2011
"license": "MIT",
2112
"devDependencies": {
@@ -36,7 +27,6 @@
3627
"eslint-plugin-import": "^2.2.0",
3728
"eslint-plugin-jsx-a11y": "^4.0.0",
3829
"flow-bin": "latest",
39-
"fotorama": "^4.6.4",
4030
"gulp": "^3.9.1",
4131
"gulp-changed": "^2.0.0",
4232
"gulp-cheerio": "^0.6.2",
@@ -68,8 +58,10 @@
6858
"dependencies": {
6959
"bootstrap-sass": "^3.3.7",
7060
"browserify-global-shim": "^1.0.3",
61+
"derequire": "^2.0.6",
62+
"fotorama": "^4.6.4",
63+
"gulp-derequire": "^2.1.0",
7164
"jquery": "3.1.1",
72-
"jquery-bridget": "^2.0.1",
7365
"jquery-validation": "^1.17.0",
7466
"jquery.maskedinput": "^1.4.1",
7567
"material-design-lite": "^1.3.0",

‎static/app/fonts/aller_std_bd-webfont.woff renamed to ‎src/site/fonts/aller_std_bd-webfont.woff

File renamed without changes.

0 commit comments

Comments
 (0)