Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernize frontend build #295

Merged
merged 8 commits into from
Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25,341 changes: 17,291 additions & 8,050 deletions devday/devday/static/css/style.css

Large diffs are not rendered by default.

Binary file modified devday/devday/static/fonts/fa-brands-400.ttf
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-brands-400.woff2
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-regular-400.ttf
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-regular-400.woff2
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-solid-900.ttf
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-solid-900.woff2
Binary file not shown.
Binary file added devday/devday/static/fonts/fa-v4compatibility.ttf
Binary file not shown.
Binary file not shown.
10,881 changes: 10,881 additions & 0 deletions devday/devday/static/js/jquery.js

Large diffs are not rendered by default.

5,656 changes: 3,283 additions & 2,373 deletions devday/devday/static/js/main.js

Large diffs are not rendered by default.

10 changes: 1 addition & 9 deletions frontend/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
FROM node:8.12-stretch
FROM node:lts
MAINTAINER Jan Dittberner <jan.dittberner@t-systems.com>
LABEL vendor=T-Systems\ Multimedia\ Solutions\ GmbH
LABEL devday.release=0.1

VOLUME /app /app/frontend/node_modules

ARG http_proxy
ARG no_proxy

ENV http_proxy ${http_proxy}
ENV https_proxy ${http_proxy}
ENV no_proxy ${no_proxy}

WORKDIR /app/frontend

ENV PATH=/app/frontend/node_modules/.bin:$PATH
Expand Down
42 changes: 20 additions & 22 deletions frontend/gulp/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,38 @@
*
*/

var basepath = './';
var assets = '../devday/devday/static';
var srcDir = 'src';
var nodemodules = 'node_modules';
var srcTest = 'src-test';
var fs = require('fs');
var pkg = JSON.parse(fs.readFileSync('./package.json'));
const basepath = './';
const assets = '../devday/devday/static';
const srcDir = 'src';
const nodemodules = 'node_modules';
const fs = require('fs');
const pkg = JSON.parse(fs.readFileSync('./package.json'));

module.exports = {
basepath: basepath,
strings: {
banner: [
'/**',
' * Build on <%= new Date().getFullYear() %>-<%= new Date().getMonth() + 1 %>-<%= new Date().getDate() %>',
' * @package ' + pkg.name + '',
' * @version v' + pkg.version + '',
' * @version v' + pkg.version + '',
' */',
''].join('\n')
},


environment: {
string: 'env',
default: { env: process.env.NODE_ENV || 'development' },
default: {env: process.env.NODE_ENV || 'development'},
production: 'production',
development: 'development'
},

sass: {
src: srcDir + '/scss/style.scss',
allsrc: [
srcDir + '/scss/*.scss',
srcDir + '/scss/components/*.scss',
nodemodules + '@fortawesome/fontawesome-free/scss/*.scss'
src: srcDir + '/scss/style.scss',
all_src: [
srcDir + '/scss/*.scss',
srcDir + '/scss/components/*.scss',
nodemodules + '@fortawesome/fontawesome-free/scss/*.scss'
],
dest: assets + '/css',
options: {
Expand All @@ -61,13 +59,13 @@ module.exports = {
config: srcDir + '/scss/.scss-lint.yml',
filePipeOutput: 'scss-lint-report.json',
reporterOutputFormat: 'JSON',
maxBuffer: 600*1024,
maxBuffer: 600 * 1024,
endless: true
}
},

js: {
src: [
src: [
nodemodules + '/jquery/dist/jquery.js',
nodemodules + '/popper.js/dist/umd/popper.js',
nodemodules + '/popper.js/dist/umd/popper-utils.js',
Expand Down Expand Up @@ -104,22 +102,22 @@ module.exports = {
},

jquery: {
src: [
'bower_components/jquery/dist/jquery.js'
src: [
nodemodules + '/jquery/dist/jquery.js'
],
dest: assets + '/js/'
dest: assets + '/js'
},

images: {
src: [
src: [
srcDir + '/assets/img/*.*',
nodemodules + '/cropperjs/src/images/bg.png',
],
dest: assets + '/img'
},

fonts: {
src: [
src: [
srcDir + '/assets/fonts/**/*',
nodemodules + '/@fortawesome/fontawesome-free/webfonts/*'
],
Expand Down
9 changes: 0 additions & 9 deletions frontend/gulp/tasks/content/copy-assets.js

This file was deleted.

13 changes: 0 additions & 13 deletions frontend/gulp/tasks/default.js

This file was deleted.

16 changes: 0 additions & 16 deletions frontend/gulp/tasks/development/clean.js

This file was deleted.

25 changes: 0 additions & 25 deletions frontend/gulp/tasks/development/dev.js

This file was deleted.

7 changes: 0 additions & 7 deletions frontend/gulp/tasks/development/fonts.js

This file was deleted.

8 changes: 0 additions & 8 deletions frontend/gulp/tasks/development/images.js

This file was deleted.

7 changes: 0 additions & 7 deletions frontend/gulp/tasks/development/jquery.js

This file was deleted.

55 changes: 0 additions & 55 deletions frontend/gulp/tasks/development/js.js

This file was deleted.

22 changes: 0 additions & 22 deletions frontend/gulp/tasks/development/lint-js.js

This file was deleted.

22 changes: 0 additions & 22 deletions frontend/gulp/tasks/development/lint-sass.js

This file was deleted.

44 changes: 0 additions & 44 deletions frontend/gulp/tasks/development/sass.js

This file was deleted.

8 changes: 0 additions & 8 deletions frontend/gulp/tasks/development/watch.js

This file was deleted.

Loading