From 815ac109511e21afa70417314dfa774e30d458a6 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 12 Apr 2018 16:36:06 +0200 Subject: [PATCH 01/69] WIP. --- .gitignore | 5 ++ frontend/.babelrc | 18 +++++ frontend/.editorconfig | 9 +++ frontend/.eslintignore | 5 ++ frontend/.eslintrc.js | 30 +++++++++ frontend/.gitignore | 15 +++++ frontend/.postcssrc.js | 10 +++ frontend/README.md | 27 ++++++++ frontend/config/dev.env.js | 7 ++ frontend/config/index.js | 76 +++++++++++++++++++++ frontend/config/prod.env.js | 4 ++ frontend/config/test.env.js | 7 ++ frontend/index.html | 12 ++++ frontend/package.json | 84 ++++++++++++++++++++++++ frontend/src/App.vue | 32 +++++++++ frontend/src/api.js | 14 ++++ frontend/src/components/DomainForm.vue | 34 ++++++++++ frontend/src/components/DomainList.vue | 49 ++++++++++++++ frontend/src/main.js | 18 +++++ frontend/src/router/index.js | 21 ++++++ frontend/static/.gitkeep | 0 frontend/test/unit/.eslintrc | 7 ++ frontend/test/unit/jest.conf.js | 27 ++++++++ frontend/test/unit/setup.js | 3 + modoboa/admin/templates/admin/index.html | 49 +++++++------- modoboa/admin/urls.py | 6 +- modoboa/admin/views/__init__.py | 2 + modoboa/admin/views/base.py | 11 ++++ 28 files changed, 553 insertions(+), 29 deletions(-) create mode 100644 frontend/.babelrc create mode 100644 frontend/.editorconfig create mode 100644 frontend/.eslintignore create mode 100644 frontend/.eslintrc.js create mode 100644 frontend/.gitignore create mode 100644 frontend/.postcssrc.js create mode 100644 frontend/README.md create mode 100644 frontend/config/dev.env.js create mode 100644 frontend/config/index.js create mode 100644 frontend/config/prod.env.js create mode 100644 frontend/config/test.env.js create mode 100644 frontend/index.html create mode 100644 frontend/package.json create mode 100644 frontend/src/App.vue create mode 100644 frontend/src/api.js create mode 100644 frontend/src/components/DomainForm.vue create mode 100644 frontend/src/components/DomainList.vue create mode 100644 frontend/src/main.js create mode 100644 frontend/src/router/index.js create mode 100644 frontend/static/.gitkeep create mode 100644 frontend/test/unit/.eslintrc create mode 100644 frontend/test/unit/jest.conf.js create mode 100644 frontend/test/unit/setup.js create mode 100644 modoboa/admin/views/base.py diff --git a/.gitignore b/.gitignore index 3acc3bbff..c2ee00353 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,8 @@ modoboa_test .coverage build/ dist/ + +# JS stuff +node_modules +/static/dist +/frontend/webpack-stats.json diff --git a/frontend/.babelrc b/frontend/.babelrc new file mode 100644 index 000000000..9390d164e --- /dev/null +++ b/frontend/.babelrc @@ -0,0 +1,18 @@ +{ + "presets": [ + ["env", { + "modules": false, + "targets": { + "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] + } + }], + "stage-2" + ], + "plugins": ["transform-vue-jsx", "transform-runtime"], + "env": { + "test": { + "presets": ["env", "stage-2"], + "plugins": ["transform-vue-jsx", "transform-es2015-modules-commonjs", "dynamic-import-node"] + } + } +} diff --git a/frontend/.editorconfig b/frontend/.editorconfig new file mode 100644 index 000000000..9d08a1a82 --- /dev/null +++ b/frontend/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/frontend/.eslintignore b/frontend/.eslintignore new file mode 100644 index 000000000..e2192c5c2 --- /dev/null +++ b/frontend/.eslintignore @@ -0,0 +1,5 @@ +/build/ +/config/ +/dist/ +/*.js +/test/unit/coverage/ diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js new file mode 100644 index 000000000..b8fb6d906 --- /dev/null +++ b/frontend/.eslintrc.js @@ -0,0 +1,30 @@ +// https://eslint.org/docs/user-guide/configuring + +module.exports = { + root: true, + parserOptions: { + parser: 'babel-eslint' + }, + env: { + browser: true, + }, + extends: [ + // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention + // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules. + 'plugin:vue/essential', + // https://github.com/standard/standard/blob/master/docs/RULES-en.md + 'standard' + ], + // required to lint *.vue files + plugins: [ + 'vue' + ], + // add your custom rules here + rules: { + // allow async-await + 'generator-star-spacing': 'off', + // allow debugger during development + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'indent': ['error', 4] + } +} diff --git a/frontend/.gitignore b/frontend/.gitignore new file mode 100644 index 000000000..895e84421 --- /dev/null +++ b/frontend/.gitignore @@ -0,0 +1,15 @@ +.DS_Store +node_modules/ +/dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +/test/unit/coverage/ + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln diff --git a/frontend/.postcssrc.js b/frontend/.postcssrc.js new file mode 100644 index 000000000..eee3e92d7 --- /dev/null +++ b/frontend/.postcssrc.js @@ -0,0 +1,10 @@ +// https://github.com/michael-ciniawsky/postcss-load-config + +module.exports = { + "plugins": { + "postcss-import": {}, + "postcss-url": {}, + // to edit target browsers: use "browserslist" field in package.json + "autoprefixer": {} + } +} diff --git a/frontend/README.md b/frontend/README.md new file mode 100644 index 000000000..d18862530 --- /dev/null +++ b/frontend/README.md @@ -0,0 +1,27 @@ +# frontend + +> Vue.js frontend for Modoboa + +## Build Setup + +``` bash +# install dependencies +npm install + +# serve with hot reload at localhost:8080 +npm run dev + +# build for production with minification +npm run build + +# build for production and view the bundle analyzer report +npm run build --report + +# run unit tests +npm run unit + +# run all tests +npm test +``` + +For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). diff --git a/frontend/config/dev.env.js b/frontend/config/dev.env.js new file mode 100644 index 000000000..1e22973ae --- /dev/null +++ b/frontend/config/dev.env.js @@ -0,0 +1,7 @@ +'use strict' +const merge = require('webpack-merge') +const prodEnv = require('./prod.env') + +module.exports = merge(prodEnv, { + NODE_ENV: '"development"' +}) diff --git a/frontend/config/index.js b/frontend/config/index.js new file mode 100644 index 000000000..32f60374c --- /dev/null +++ b/frontend/config/index.js @@ -0,0 +1,76 @@ +'use strict' +// Template version: 1.3.1 +// see http://vuejs-templates.github.io/webpack for documentation. + +const path = require('path') + +module.exports = { + dev: { + + // Paths + assetsSubDirectory: 'static', + assetsPublicPath: 'http://localhost:8080/', + proxyTable: {}, + + // Various Dev Server settings + host: 'localhost', // can be overwritten by process.env.HOST + port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + autoOpenBrowser: false, + errorOverlay: true, + notifyOnErrors: true, + poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- + + // Use Eslint Loader? + // If true, your code will be linted during bundling and + // linting errors and warnings will be shown in the console. + useEslint: true, + // If true, eslint errors and warnings will also be shown in the error overlay + // in the browser. + showEslintErrorsInOverlay: false, + + /** + * Source Maps + */ + + // https://webpack.js.org/configuration/devtool/#development + devtool: 'cheap-module-eval-source-map', + + // If you have problems debugging vue-files in devtools, + // set this to false - it *may* help + // https://vue-loader.vuejs.org/en/options.html#cachebusting + cacheBusting: true, + + cssSourceMap: true + }, + + build: { + // Template for index.html + index: path.resolve(__dirname, '../dist/index.html'), + + // Paths + assetsRoot: path.resolve(__dirname, '../../modoboa/static'), + assetsSubDirectory: 'admin', + assetsPublicPath: '/sitestatic/', + + /** + * Source Maps + */ + + productionSourceMap: true, + // https://webpack.js.org/configuration/devtool/#production + devtool: '#source-map', + + // Gzip off by default as many popular static hosts such as + // Surge or Netlify already gzip all static assets for you. + // Before setting to `true`, make sure to: + // npm install --save-dev compression-webpack-plugin + productionGzip: false, + productionGzipExtensions: ['js', 'css'], + + // Run the build command with an extra argument to + // View the bundle analyzer report after build finishes: + // `npm run build --report` + // Set to `true` or `false` to always turn it on or off + bundleAnalyzerReport: process.env.npm_config_report + } +} diff --git a/frontend/config/prod.env.js b/frontend/config/prod.env.js new file mode 100644 index 000000000..a6f997616 --- /dev/null +++ b/frontend/config/prod.env.js @@ -0,0 +1,4 @@ +'use strict' +module.exports = { + NODE_ENV: '"production"' +} diff --git a/frontend/config/test.env.js b/frontend/config/test.env.js new file mode 100644 index 000000000..c2824a307 --- /dev/null +++ b/frontend/config/test.env.js @@ -0,0 +1,7 @@ +'use strict' +const merge = require('webpack-merge') +const devEnv = require('./dev.env') + +module.exports = merge(devEnv, { + NODE_ENV: '"testing"' +}) diff --git a/frontend/index.html b/frontend/index.html new file mode 100644 index 000000000..12bce148a --- /dev/null +++ b/frontend/index.html @@ -0,0 +1,12 @@ + + + + + + frontend + + +
+ + + diff --git a/frontend/package.json b/frontend/package.json new file mode 100644 index 000000000..d6470f118 --- /dev/null +++ b/frontend/package.json @@ -0,0 +1,84 @@ +{ + "name": "frontend", + "version": "1.0.0", + "description": "Vue.js frontend for Modoboa", + "author": "Antoine Nguyen ", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "test": "npm run unit", + "lint": "eslint --ext .js,.vue src test/unit", + "build": "node build/build.js" + }, + "dependencies": { + "buefy": "^0.6.5", + "vue": "^2.5.2", + "vue-resource": "^1.5.0", + "vue-router": "^3.0.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "chalk": "^2.0.1", + "copy-webpack-plugin": "^4.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "node-notifier": "^5.1.2", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-bundle-tracker": "^0.3.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/frontend/src/App.vue b/frontend/src/App.vue new file mode 100644 index 000000000..77ab93e35 --- /dev/null +++ b/frontend/src/App.vue @@ -0,0 +1,32 @@ + + + diff --git a/frontend/src/api.js b/frontend/src/api.js new file mode 100644 index 000000000..6e9cd8aa4 --- /dev/null +++ b/frontend/src/api.js @@ -0,0 +1,14 @@ +import Vue from 'vue' +import VueResource from 'vue-resource' + +Vue.use(VueResource) + +var domainResource = Vue.resource('/api/v1/domains{/pk}/') + +export const getDomains = () => { + return domainResource.get() +} + +export const createDomain = (data) => { + return domainResource.save(data) +} diff --git a/frontend/src/components/DomainForm.vue b/frontend/src/components/DomainForm.vue new file mode 100644 index 000000000..88b7a1099 --- /dev/null +++ b/frontend/src/components/DomainForm.vue @@ -0,0 +1,34 @@ + + + diff --git a/frontend/src/components/DomainList.vue b/frontend/src/components/DomainList.vue new file mode 100644 index 000000000..98c56a6e6 --- /dev/null +++ b/frontend/src/components/DomainList.vue @@ -0,0 +1,49 @@ + + + diff --git a/frontend/src/main.js b/frontend/src/main.js new file mode 100644 index 000000000..01b0f4174 --- /dev/null +++ b/frontend/src/main.js @@ -0,0 +1,18 @@ +import Vue from 'vue' +import Buefy from 'buefy' +import 'buefy/lib/buefy.css' + +import App from './App' +import router from './router' + +Vue.use(Buefy) + +Vue.config.productionTip = false + +/* eslint-disable no-new */ +new Vue({ + el: '#app', + router, + components: { App }, + template: '' +}) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js new file mode 100644 index 000000000..fa5e3bfd4 --- /dev/null +++ b/frontend/src/router/index.js @@ -0,0 +1,21 @@ +import Vue from 'vue' +import Router from 'vue-router' +import DomainList from '@/components/DomainList' +import DomainForm from '@/components/DomainForm' + +Vue.use(Router) + +export default new Router({ + routes: [ + { + path: '/domains/', + name: 'DomainList', + component: DomainList + }, + { + path: '/domains/add/', + name: 'DomainAdd', + component: DomainForm + } + ] +}) diff --git a/frontend/static/.gitkeep b/frontend/static/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/frontend/test/unit/.eslintrc b/frontend/test/unit/.eslintrc new file mode 100644 index 000000000..4d5d98f3e --- /dev/null +++ b/frontend/test/unit/.eslintrc @@ -0,0 +1,7 @@ +{ + "env": { + "jest": true + }, + "globals": { + } +} diff --git a/frontend/test/unit/jest.conf.js b/frontend/test/unit/jest.conf.js new file mode 100644 index 000000000..ebd8b611a --- /dev/null +++ b/frontend/test/unit/jest.conf.js @@ -0,0 +1,27 @@ +const path = require('path') + +module.exports = { + rootDir: path.resolve(__dirname, '../../'), + moduleFileExtensions: [ + 'js', + 'json', + 'vue' + ], + moduleNameMapper: { + '^@/(.*)$': '/src/$1' + }, + transform: { + '^.+\\.js$': '/node_modules/babel-jest', + '.*\\.(vue)$': '/node_modules/vue-jest' + }, + snapshotSerializers: ['/node_modules/jest-serializer-vue'], + setupFiles: ['/test/unit/setup'], + mapCoverage: true, + coverageDirectory: '/test/unit/coverage', + collectCoverageFrom: [ + 'src/**/*.{js,vue}', + '!src/main.js', + '!src/router/index.js', + '!**/node_modules/**' + ] +} diff --git a/frontend/test/unit/setup.js b/frontend/test/unit/setup.js new file mode 100644 index 000000000..edbdbae81 --- /dev/null +++ b/frontend/test/unit/setup.js @@ -0,0 +1,3 @@ +import Vue from 'vue' + +Vue.config.productionTip = false diff --git a/modoboa/admin/templates/admin/index.html b/modoboa/admin/templates/admin/index.html index 3f7c3e2a5..19660f463 100644 --- a/modoboa/admin/templates/admin/index.html +++ b/modoboa/admin/templates/admin/index.html @@ -1,29 +1,24 @@ -{% extends "fluid.html" %} - {% load i18n lib_tags static %} {% load render_bundle from webpack_loader %} - -{% block pagetitle %}{% trans "Admin" %}{% endblock %} - -{% block extra_css %} - {% if not debug %} - {% render_bundle 'app' 'css' 'ADMIN' %} - {% endif %} -{% endblock %} - -{% block extra_js %} - {% if not debug %} - {% render_bundle 'manifest' 'js' 'ADMIN' %} - {% render_bundle 'vendor' 'js' 'ADMIN' %} - {% render_bundle 'app' 'js' 'ADMIN' %} - {% else %} - {% render_bundle 'app' 'js' 'ADMIN' %} - {% endif %} -{% endblock %} - -{% block container_content %} - -
-
- -{% endblock %} + + + + + + Modoboa + {% if not debug %} + {% render_bundle 'app' 'css' 'ADMIN' %} + {% endif %} + + +
+ + {% if not debug %} + {% render_bundle 'manifest' 'js' 'ADMIN' %} + {% render_bundle 'vendor' 'js' 'ADMIN' %} + {% render_bundle 'app' 'js' 'ADMIN' %} + {% else %} + {% render_bundle 'app' 'js' 'ADMIN' %} + {% endif %} + + diff --git a/modoboa/admin/urls.py b/modoboa/admin/urls.py index bb299ae19..275ebf06b 100644 --- a/modoboa/admin/urls.py +++ b/modoboa/admin/urls.py @@ -9,11 +9,13 @@ from django.conf.urls import url from . import views from .views import ( alias as alias_views, domain as domain_views, export as export_views, - identity as identity_views, import_ as import_views + identity as identity_views, import_ as import_views, + base as base_views ) urlpatterns = [ - url(r'^$', domain_views.index, name="index"), + # url(r'^$', domain_views.index, name="index"), + url(r'^$', base_views.AdminIndexView.as_view(), name="index"), url(r'^domains/$', domain_views.domains, name="domain_list"), url(r'^domains/(?P\d+)/$', views.DomainDetailView.as_view(), name="domain_detail"), diff --git a/modoboa/admin/views/__init__.py b/modoboa/admin/views/__init__.py index 501c59517..8ab2041a7 100644 --- a/modoboa/admin/views/__init__.py +++ b/modoboa/admin/views/__init__.py @@ -8,6 +8,7 @@ from .alias import AliasDetailView from .dns import DNSBLDomainDetailView, MXDomainDetailView from .domain import DomainDetailView from .identity import AccountDetailView +from .base import AdminIndexView __all__ = [ "AccountDetailView", @@ -15,4 +16,5 @@ __all__ = [ "DNSBLDomainDetailView", "DomainDetailView", "MXDomainDetailView", + "AdminIndexView", ] diff --git a/modoboa/admin/views/base.py b/modoboa/admin/views/base.py new file mode 100644 index 000000000..418a89e5b --- /dev/null +++ b/modoboa/admin/views/base.py @@ -0,0 +1,11 @@ +"""Admin views.""" + +from __future__ import unicode_literals + +from django.views import generic + + +class AdminIndexView(generic.TemplateView): + """Admin index view.""" + + template_name = "admin/index.html" From 18a0f5610cec7ccf56c52d8ddb6d914b520cf505 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 12 Apr 2018 16:48:40 +0200 Subject: [PATCH 02/69] Load admin settings. --- modoboa/admin/settings.py | 27 +++++++++++++++++++ .../core/commands/templates/settings.py.tpl | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 modoboa/admin/settings.py diff --git a/modoboa/admin/settings.py b/modoboa/admin/settings.py new file mode 100644 index 000000000..4898b0ddf --- /dev/null +++ b/modoboa/admin/settings.py @@ -0,0 +1,27 @@ +"""Default admin app settings.""" + +import os + +PLUGIN_BASE_DIR = os.path.dirname(__file__) + +ADMIN_STATS_FILES = { + "dev": os.path.join( + PLUGIN_BASE_DIR, "../frontend/webpack-stats.json"), + "prod": os.path.join( + PLUGIN_BASE_DIR, "static/admin/webpack-stats.json") +} + + +def apply(settings): + """Modify settings.""" + DEBUG = settings['DEBUG'] + if "webpack_loader" not in settings["INSTALLED_APPS"]: + settings["INSTALLED_APPS"] += ("webpack_loader", ) + settings["WEBPACK_LOADER"] = { + "CALENDAR": { + "CACHE": not DEBUG, + "BUNDLE_DIR_NAME": "admin/", + "STATS_FILE": ADMIN_STATS_FILES.get("dev" if DEBUG else "prod"), + "IGNORE": [".+\.hot-update.js", ".+\.map"] + } + } diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl index 3f7ec5cf8..6b0c9f68f 100644 --- a/modoboa/core/commands/templates/settings.py.tpl +++ b/modoboa/core/commands/templates/settings.py.tpl @@ -299,6 +299,10 @@ SILENCED_SYSTEM_CHECKS = [ "security.W019", # modoboa uses iframes to display e-mails ] +# Load admin settings +from modoboa.admin import settings as admin_settings +admin_settings.apply(globals()) + # Load settings from extensions {% for extension in extra_settings %} try: From 3aa5a0bf26d4fa0cd2c501425b56b94cd59a8bd5 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 12 Apr 2018 16:49:11 +0200 Subject: [PATCH 03/69] Added requirement. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 65a9d4195..923e17cd1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ django-ckeditor==5.2.2 django-reversion==2.0.12 django-subcommand2==0.1.1 django-xforwardedfor-middleware==2.0 +django-webpack-loader dj-database-url From 6235373a1d56cc1987f8edec3807e0b87ec089d9 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 12 Apr 2018 17:00:11 +0200 Subject: [PATCH 04/69] Added build dir. --- .gitignore | 2 +- frontend/build/build.js | 41 ++++++++ frontend/build/check-versions.js | 54 ++++++++++ frontend/build/logo.png | Bin 0 -> 6849 bytes frontend/build/utils.js | 101 +++++++++++++++++++ frontend/build/vue-loader.conf.js | 22 ++++ frontend/build/webpack.base.conf.js | 99 ++++++++++++++++++ frontend/build/webpack.dev.conf.js | 95 ++++++++++++++++++ frontend/build/webpack.prod.conf.js | 149 ++++++++++++++++++++++++++++ 9 files changed, 562 insertions(+), 1 deletion(-) create mode 100644 frontend/build/build.js create mode 100644 frontend/build/check-versions.js create mode 100644 frontend/build/logo.png create mode 100644 frontend/build/utils.js create mode 100644 frontend/build/vue-loader.conf.js create mode 100644 frontend/build/webpack.base.conf.js create mode 100755 frontend/build/webpack.dev.conf.js create mode 100644 frontend/build/webpack.prod.conf.js diff --git a/.gitignore b/.gitignore index c2ee00353..3b6be60c5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ modoboa.iml .eggs/ modoboa_test .coverage -build/ +./build/ dist/ # JS stuff diff --git a/frontend/build/build.js b/frontend/build/build.js new file mode 100644 index 000000000..8f2ad8ad4 --- /dev/null +++ b/frontend/build/build.js @@ -0,0 +1,41 @@ +'use strict' +require('./check-versions')() + +process.env.NODE_ENV = 'production' + +const ora = require('ora') +const rm = require('rimraf') +const path = require('path') +const chalk = require('chalk') +const webpack = require('webpack') +const config = require('../config') +const webpackConfig = require('./webpack.prod.conf') + +const spinner = ora('building for production...') +spinner.start() + +rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { + if (err) throw err + webpack(webpackConfig, (err, stats) => { + spinner.stop() + if (err) throw err + process.stdout.write(stats.toString({ + colors: true, + modules: false, + children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build. + chunks: false, + chunkModules: false + }) + '\n\n') + + if (stats.hasErrors()) { + console.log(chalk.red(' Build failed with errors.\n')) + process.exit(1) + } + + console.log(chalk.cyan(' Build complete.\n')) + console.log(chalk.yellow( + ' Tip: built files are meant to be served over an HTTP server.\n' + + ' Opening index.html over file:// won\'t work.\n' + )) + }) +}) diff --git a/frontend/build/check-versions.js b/frontend/build/check-versions.js new file mode 100644 index 000000000..3ef972a08 --- /dev/null +++ b/frontend/build/check-versions.js @@ -0,0 +1,54 @@ +'use strict' +const chalk = require('chalk') +const semver = require('semver') +const packageConfig = require('../package.json') +const shell = require('shelljs') + +function exec (cmd) { + return require('child_process').execSync(cmd).toString().trim() +} + +const versionRequirements = [ + { + name: 'node', + currentVersion: semver.clean(process.version), + versionRequirement: packageConfig.engines.node + } +] + +if (shell.which('npm')) { + versionRequirements.push({ + name: 'npm', + currentVersion: exec('npm --version'), + versionRequirement: packageConfig.engines.npm + }) +} + +module.exports = function () { + const warnings = [] + + for (let i = 0; i < versionRequirements.length; i++) { + const mod = versionRequirements[i] + + if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { + warnings.push(mod.name + ': ' + + chalk.red(mod.currentVersion) + ' should be ' + + chalk.green(mod.versionRequirement) + ) + } + } + + if (warnings.length) { + console.log('') + console.log(chalk.yellow('To use this template, you must update following to modules:')) + console.log() + + for (let i = 0; i < warnings.length; i++) { + const warning = warnings[i] + console.log(' ' + warning) + } + + console.log() + process.exit(1) + } +} diff --git a/frontend/build/logo.png b/frontend/build/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 { + const notifier = require('node-notifier') + + return (severity, errors) => { + if (severity !== 'error') return + + const error = errors[0] + const filename = error.file && error.file.split('!').pop() + + notifier.notify({ + title: packageConfig.name, + message: severity + ': ' + error.name, + subtitle: filename || '', + icon: path.join(__dirname, 'logo.png') + }) + } +} diff --git a/frontend/build/vue-loader.conf.js b/frontend/build/vue-loader.conf.js new file mode 100644 index 000000000..33ed58bc0 --- /dev/null +++ b/frontend/build/vue-loader.conf.js @@ -0,0 +1,22 @@ +'use strict' +const utils = require('./utils') +const config = require('../config') +const isProduction = process.env.NODE_ENV === 'production' +const sourceMapEnabled = isProduction + ? config.build.productionSourceMap + : config.dev.cssSourceMap + +module.exports = { + loaders: utils.cssLoaders({ + sourceMap: sourceMapEnabled, + extract: isProduction + }), + cssSourceMap: sourceMapEnabled, + cacheBusting: config.dev.cacheBusting, + transformToRequire: { + video: ['src', 'poster'], + source: 'src', + img: 'src', + image: 'xlink:href' + } +} diff --git a/frontend/build/webpack.base.conf.js b/frontend/build/webpack.base.conf.js new file mode 100644 index 000000000..ce5e72587 --- /dev/null +++ b/frontend/build/webpack.base.conf.js @@ -0,0 +1,99 @@ +'use strict' +const path = require('path') +const utils = require('./utils') +const config = require('../config') +const vueLoaderConfig = require('./vue-loader.conf') +const BundleTracker = require('webpack-bundle-tracker') + +function resolve (dir) { + return path.join(__dirname, '..', dir) +} + +const createLintingRule = () => ({ + test: /\.(js|vue)$/, + loader: 'eslint-loader', + enforce: 'pre', + include: [resolve('src'), resolve('test')], + options: { + formatter: require('eslint-friendly-formatter'), + emitWarning: !config.dev.showEslintErrorsInOverlay + } +}) + +module.exports = { + context: path.resolve(__dirname, '../'), + entry: { + app: './src/main.js' + }, + plugins: process.env.NODE_ENV === 'production' + ? [new BundleTracker({ + path: config.build.assetsRoot, + filename: utils.assetsPath('webpack-stats.json') + })] + : [new BundleTracker({filename: './webpack-stats.json'})], + output: { + path: config.build.assetsRoot, + filename: '[name].js', + publicPath: process.env.NODE_ENV === 'production' + ? config.build.assetsPublicPath + : config.dev.assetsPublicPath + }, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: { + 'vue$': 'vue/dist/vue.esm.js', + '@': resolve('src'), + } + }, + module: { + rules: [ + ...(config.dev.useEslint ? [createLintingRule()] : []), + { + test: /\.vue$/, + loader: 'vue-loader', + options: vueLoaderConfig + }, + { + test: /\.js$/, + loader: 'babel-loader', + include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')] + }, + { + test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('img/[name].[hash:7].[ext]') + } + }, + { + test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('media/[name].[hash:7].[ext]') + } + }, + { + test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, + loader: 'url-loader', + options: { + limit: 10000, + name: utils.assetsPath('fonts/[name].[hash:7].[ext]') + } + } + ] + }, + node: { + // prevent webpack from injecting useless setImmediate polyfill because Vue + // source contains it (although only uses it if it's native). + setImmediate: false, + // prevent webpack from injecting mocks to Node native modules + // that does not make sense for the client + dgram: 'empty', + fs: 'empty', + net: 'empty', + tls: 'empty', + child_process: 'empty' + } +} diff --git a/frontend/build/webpack.dev.conf.js b/frontend/build/webpack.dev.conf.js new file mode 100755 index 000000000..070ae221f --- /dev/null +++ b/frontend/build/webpack.dev.conf.js @@ -0,0 +1,95 @@ +'use strict' +const utils = require('./utils') +const webpack = require('webpack') +const config = require('../config') +const merge = require('webpack-merge') +const path = require('path') +const baseWebpackConfig = require('./webpack.base.conf') +const CopyWebpackPlugin = require('copy-webpack-plugin') +const HtmlWebpackPlugin = require('html-webpack-plugin') +const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') +const portfinder = require('portfinder') + +const HOST = process.env.HOST +const PORT = process.env.PORT && Number(process.env.PORT) + +const devWebpackConfig = merge(baseWebpackConfig, { + module: { + rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) + }, + // cheap-module-eval-source-map is faster for development + devtool: config.dev.devtool, + + // these devServer options should be customized in /config/index.js + devServer: { + clientLogLevel: 'warning', + historyApiFallback: { + rewrites: [ + { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') }, + ], + }, + hot: true, + contentBase: false, // since we use CopyWebpackPlugin. + compress: true, + host: HOST || config.dev.host, + port: PORT || config.dev.port, + open: config.dev.autoOpenBrowser, + overlay: config.dev.errorOverlay + ? { warnings: false, errors: true } + : false, + publicPath: config.dev.assetsPublicPath, + proxy: config.dev.proxyTable, + quiet: true, // necessary for FriendlyErrorsPlugin + watchOptions: { + poll: config.dev.poll, + } + }, + plugins: [ + new webpack.DefinePlugin({ + 'process.env': require('../config/dev.env') + }), + new webpack.HotModuleReplacementPlugin(), + new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update. + new webpack.NoEmitOnErrorsPlugin(), + // https://github.com/ampedandwired/html-webpack-plugin + new HtmlWebpackPlugin({ + filename: 'index.html', + template: 'index.html', + inject: true + }), + // copy custom static assets + new CopyWebpackPlugin([ + { + from: path.resolve(__dirname, '../static'), + to: config.dev.assetsSubDirectory, + ignore: ['.*'] + } + ]) + ] +}) + +module.exports = new Promise((resolve, reject) => { + portfinder.basePort = process.env.PORT || config.dev.port + portfinder.getPort((err, port) => { + if (err) { + reject(err) + } else { + // publish the new Port, necessary for e2e tests + process.env.PORT = port + // add port to devServer config + devWebpackConfig.devServer.port = port + + // Add FriendlyErrorsPlugin + devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ + compilationSuccessInfo: { + messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], + }, + onErrors: config.dev.notifyOnErrors + ? utils.createNotifierCallback() + : undefined + })) + + resolve(devWebpackConfig) + } + }) +}) diff --git a/frontend/build/webpack.prod.conf.js b/frontend/build/webpack.prod.conf.js new file mode 100644 index 000000000..2f172596d --- /dev/null +++ b/frontend/build/webpack.prod.conf.js @@ -0,0 +1,149 @@ +'use strict' +const path = require('path') +const utils = require('./utils') +const webpack = require('webpack') +const config = require('../config') +const merge = require('webpack-merge') +const baseWebpackConfig = require('./webpack.base.conf') +const CopyWebpackPlugin = require('copy-webpack-plugin') +const HtmlWebpackPlugin = require('html-webpack-plugin') +const ExtractTextPlugin = require('extract-text-webpack-plugin') +const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') +const UglifyJsPlugin = require('uglifyjs-webpack-plugin') + +const env = process.env.NODE_ENV === 'testing' + ? require('../config/test.env') + : require('../config/prod.env') + +const webpackConfig = merge(baseWebpackConfig, { + module: { + rules: utils.styleLoaders({ + sourceMap: config.build.productionSourceMap, + extract: true, + usePostCSS: true + }) + }, + devtool: config.build.productionSourceMap ? config.build.devtool : false, + output: { + path: config.build.assetsRoot, + filename: utils.assetsPath('js/[name].[chunkhash].js'), + chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') + }, + plugins: [ + // http://vuejs.github.io/vue-loader/en/workflow/production.html + new webpack.DefinePlugin({ + 'process.env': env + }), + new UglifyJsPlugin({ + uglifyOptions: { + compress: { + warnings: false + } + }, + sourceMap: config.build.productionSourceMap, + parallel: true + }), + // extract css into its own file + new ExtractTextPlugin({ + filename: utils.assetsPath('css/[name].[contenthash].css'), + // Setting the following option to `false` will not extract CSS from codesplit chunks. + // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. + // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, + // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 + allChunks: true, + }), + // Compress extracted CSS. We are using this plugin so that possible + // duplicated CSS from different components can be deduped. + new OptimizeCSSPlugin({ + cssProcessorOptions: config.build.productionSourceMap + ? { safe: true, map: { inline: false } } + : { safe: true } + }), + // generate dist index.html with correct asset hash for caching. + // you can customize output by editing /index.html + // see https://github.com/ampedandwired/html-webpack-plugin + new HtmlWebpackPlugin({ + filename: process.env.NODE_ENV === 'testing' + ? 'index.html' + : config.build.index, + template: 'index.html', + inject: true, + minify: { + removeComments: true, + collapseWhitespace: true, + removeAttributeQuotes: true + // more options: + // https://github.com/kangax/html-minifier#options-quick-reference + }, + // necessary to consistently work with multiple chunks via CommonsChunkPlugin + chunksSortMode: 'dependency' + }), + // keep module.id stable when vendor modules does not change + new webpack.HashedModuleIdsPlugin(), + // enable scope hoisting + new webpack.optimize.ModuleConcatenationPlugin(), + // split vendor js into its own file + new webpack.optimize.CommonsChunkPlugin({ + name: 'vendor', + minChunks (module) { + // any required modules inside node_modules are extracted to vendor + return ( + module.resource && + /\.js$/.test(module.resource) && + module.resource.indexOf( + path.join(__dirname, '../node_modules') + ) === 0 + ) + } + }), + // extract webpack runtime and module manifest to its own file in order to + // prevent vendor hash from being updated whenever app bundle is updated + new webpack.optimize.CommonsChunkPlugin({ + name: 'manifest', + minChunks: Infinity + }), + // This instance extracts shared chunks from code splitted chunks and bundles them + // in a separate chunk, similar to the vendor chunk + // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk + new webpack.optimize.CommonsChunkPlugin({ + name: 'app', + async: 'vendor-async', + children: true, + minChunks: 3 + }), + + // copy custom static assets + new CopyWebpackPlugin([ + { + from: path.resolve(__dirname, '../static'), + to: config.build.assetsSubDirectory, + ignore: ['.*'] + } + ]) + ] +}) + +if (config.build.productionGzip) { + const CompressionWebpackPlugin = require('compression-webpack-plugin') + + webpackConfig.plugins.push( + new CompressionWebpackPlugin({ + asset: '[path].gz[query]', + algorithm: 'gzip', + test: new RegExp( + '\\.(' + + config.build.productionGzipExtensions.join('|') + + ')$' + ), + threshold: 10240, + minRatio: 0.8 + }) + ) +} + +if (config.build.bundleAnalyzerReport) { + const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin + webpackConfig.plugins.push(new BundleAnalyzerPlugin()) +} + +module.exports = webpackConfig From 09c2ce7972a78cbd47f5129abad274752b755f80 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 12 Apr 2018 17:08:00 +0200 Subject: [PATCH 05/69] Updated test config. --- test_project/test_project/settings.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py index 364b38f22..c2a1635f4 100644 --- a/test_project/test_project/settings.py +++ b/test_project/test_project/settings.py @@ -55,6 +55,7 @@ INSTALLED_APPS = ( "ckeditor_uploader", "rest_framework", "rest_framework.authtoken", + "webpack_loader", ) # A dedicated place to register Modoboa applications @@ -264,4 +265,8 @@ LOGGING = { } } +# Load admin settings +from modoboa.admin import settings as admin_settings # noqa +admin_settings.apply(globals()) + # Load settings from extensions From 9bebc8b04e1a4351767ea6e14d7b33a5e8d0bc3c Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 12 Apr 2018 17:26:10 +0200 Subject: [PATCH 06/69] Few fixes. --- frontend/package.json | 1 + frontend/src/App.vue | 8 +++++++- frontend/src/main.js | 6 ++++++ modoboa/admin/settings.py | 2 +- test_project/test_project/settings.py | 2 ++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index d6470f118..a982d7397 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -14,6 +14,7 @@ }, "dependencies": { "buefy": "^0.6.5", + "js-cookie": "^2.2.0", "vue": "^2.5.2", "vue-resource": "^1.5.0", "vue-router": "^3.0.1" diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 77ab93e35..47e74acd3 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -9,11 +9,17 @@

diff --git a/frontend/src/main.js b/frontend/src/main.js index 01b0f4174..94611b76f 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -2,6 +2,8 @@ import Vue from 'vue' import Buefy from 'buefy' import 'buefy/lib/buefy.css' +import Cookies from 'js-cookie' + import App from './App' import router from './router' @@ -9,6 +11,10 @@ Vue.use(Buefy) Vue.config.productionTip = false +/* Deal with django CSRF protection */ +let csrftoken = Cookies.get('csrftoken') +Vue.http.headers.common['X-CSRFTOKEN'] = csrftoken + /* eslint-disable no-new */ new Vue({ el: '#app', diff --git a/modoboa/admin/settings.py b/modoboa/admin/settings.py index 4898b0ddf..e2f59b84d 100644 --- a/modoboa/admin/settings.py +++ b/modoboa/admin/settings.py @@ -18,7 +18,7 @@ def apply(settings): if "webpack_loader" not in settings["INSTALLED_APPS"]: settings["INSTALLED_APPS"] += ("webpack_loader", ) settings["WEBPACK_LOADER"] = { - "CALENDAR": { + "ADMIN": { "CACHE": not DEBUG, "BUNDLE_DIR_NAME": "admin/", "STATS_FILE": ADMIN_STATS_FILES.get("dev" if DEBUG else "prod"), diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py index c2a1635f4..0c5d9c54d 100644 --- a/test_project/test_project/settings.py +++ b/test_project/test_project/settings.py @@ -35,6 +35,8 @@ ALLOWED_HOSTS = [ "localhost", ] +INTERNAL_IPS = ['127.0.0.1'] + SITE_ID = 1 # Security settings From 05ea4ad6bb670d0409d85082f9cba23407009dd1 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 12 Apr 2018 21:52:12 +0200 Subject: [PATCH 07/69] Fixed CORS issue with dev server. --- frontend/build/webpack.dev.conf.js | 7 +++++-- frontend/package.json | 1 + frontend/src/App.vue | 4 ++-- frontend/src/main.js | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/build/webpack.dev.conf.js b/frontend/build/webpack.dev.conf.js index 070ae221f..303564eeb 100755 --- a/frontend/build/webpack.dev.conf.js +++ b/frontend/build/webpack.dev.conf.js @@ -42,10 +42,13 @@ const devWebpackConfig = merge(baseWebpackConfig, { quiet: true, // necessary for FriendlyErrorsPlugin watchOptions: { poll: config.dev.poll, + }, + headers: { + 'Access-Control-Allow-Origin': '*' } }, - plugins: [ - new webpack.DefinePlugin({ + plugins: [ + new webpack.DefinePlugin({ 'process.env': require('../config/dev.env') }), new webpack.HotModuleReplacementPlugin(), diff --git a/frontend/package.json b/frontend/package.json index a982d7397..11654fc1c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -13,6 +13,7 @@ "build": "node build/build.js" }, "dependencies": { + "@mdi/font": "^2.2.43", "buefy": "^0.6.5", "js-cookie": "^2.2.0", "vue": "^2.5.2", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 47e74acd3..ae3e7c736 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -9,10 +9,10 @@