Verified Commit f0d7627d authored by Sandro Lutz's avatar Sandro Lutz
Browse files

Update dependencies

parent 56a7506a
{
"plugins": ["transform-object-rest-spread"]
}
\ No newline at end of file
This diff is collapsed.
......@@ -22,48 +22,48 @@
"author": "AMIV IT team",
"license": "ISC",
"dependencies": {
"amiv-web-ui-components": "git+https://git@gitlab.ethz.ch/amiv/web-ui-components.git#98ce6951067c93cae5ffc811a580369592f5b9eb",
"babel-polyfill": "^6.26.0",
"amiv-web-ui-components": "git+https://git@gitlab.ethz.ch/amiv/web-ui-components.git#441f87aa23892fd6e92d878aa9f7725cf9e385ea",
"@babel/polyfill": "^7.2.5",
"email-validator": "^2.0.4",
"html-escape": "^2.0.0",
"i18next": "^13.0.1",
"i18next-browser-languagedetector": "^2.2.4",
"marked": "^0.3.18",
"mithril": "^1.1.5",
"marked": "^0.5.2",
"mithril": "^1.1.6",
"polythene-css": "^1.3.2",
"polythene-mithril": "^1.3.2",
"raven-js": "^3.27.0",
"animated-scroll-to": "^1.2.2"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.7.0",
"compression-webpack-plugin": "^1.1.12",
"css-loader": "^0.28.11",
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"babel-loader": "^8.0.4",
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
"@babel/preset-env": "^7.2.3",
"compression-webpack-plugin": "^2.0.0",
"css-loader": "^2.1.0",
"dox": "^0.9.0",
"doxdox": "^2.0.3",
"eslint": "^4.10.0",
"eslint-config-airbnb-base": "^12.1.0",
"eslint-config-prettier": "^2.10.0",
"eslint-import-resolver-webpack": "^0.9.0",
"eslint": "^5.11.1",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-config-prettier": "^3.3.0",
"eslint-import-resolver-webpack": "^0.10.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-prettier": "^2.7.0",
"eslint-plugin-prettier": "^3.0.1",
"favicons-webpack-plugin": "0.0.9",
"file-loader": "^1.1.11",
"file-loader": "^3.0.1",
"html-webpack-inline-svg-plugin": "^1.2.4",
"html-webpack-plugin": "^3.2.0",
"less": "^3.8.1",
"less": "^3.9.0",
"less-loader": "^4.1.0",
"markdown-loader": "^2.0.2",
"prettier": "1.11.1",
"style-loader": "^0.20.3",
"stylelint": "^9.7.1",
"markdown-loader": "^4.0.0",
"prettier": "1.15.3",
"style-loader": "^0.23.1",
"stylelint": "^9.9.0",
"url-loader": "^1.1.2",
"webpack": "^4.16.1",
"webpack": "^4.28.3",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.10"
"webpack-dev-server": "^3.1.14"
}
}
......@@ -3,7 +3,10 @@ import { Search, Shadow, IconButton } from 'polythene-mithril';
import { RadioGroup } from 'amiv-web-ui-components';
import debounce from 'amiv-web-ui-components/src/debounce';
import icons from 'amiv-web-ui-components/src/icons';
import { Button, Checkbox, Dropdown, TextField } from '../components';
import Button from './Button';
import Checkbox from './Checkbox';
import Dropdown from './Dropdown';
import TextField from './TextField';
import './FilterView.less';
/**
......
import icons from 'amiv-web-ui-components';
import icons from 'amiv-web-ui-components/src/icons';
/**
* This is the collection of SVG icons used on the website
......
......@@ -55,7 +55,7 @@ export default class Query {
});
if (queryFunctions.length === 0) return newQuery;
return () => Query.merge(...newQuery, ...queryFunctions.map(queryFunction => queryFunction()));
return () => Query.merge(newQuery, ...queryFunctions.map(queryFunction => queryFunction()));
}
/**
......
......@@ -433,8 +433,9 @@ export class FilteredListPage {
}
}
this.dataStore.listState = LIST_LOADED;
} catch ({ _error: { code } }) {
} catch (e) {
this.dataStore.listState = LIST_ERROR;
error(e);
}
m.redraw();
},
......@@ -446,7 +447,8 @@ export class FilteredListPage {
get _listContainerView() {
if (this.dataStore.listState === LIST_LOADING) {
return m('div.loading', m(Spinner, { show: true, size: '96px' }));
} else if (this.dataStore.listState === LIST_LOADED) {
}
if (this.dataStore.listState === LIST_LOADED) {
if (this._hasItems()) {
let pinnedList;
......
......@@ -2,12 +2,13 @@ import m from 'mithril';
import { logout } from '../models/auth';
import { currentLanguage } from '../models/language';
module.exports = {
oninit() {
export default class Logout {
static oninit() {
logout();
m.route.set(`/${currentLanguage()}/`);
},
view() {
}
static view() {
return m('');
},
};
}
}
......@@ -6,7 +6,7 @@ const path = require('path');
const config = {
context: `${__dirname}/src`, // `__dirname` is root of project and `src` is source
entry: ['babel-polyfill', './index.js'],
entry: ['@babel/polyfill', './index.js'],
output: {
path: `${__dirname}/dist`, // `dist` is the destination
......@@ -34,8 +34,8 @@ const config = {
{
loader: 'babel-loader',
options: {
presets: [['env', { targets: 'last 2 years' }]],
plugins: ['transform-object-rest-spread'],
presets: [['@babel/preset-env', { targets: 'last 2 years' }]],
plugins: ['@babel/plugin-proposal-object-rest-spread'],
},
},
],
......
......@@ -11,7 +11,6 @@ config.mode = 'production';
// Add optimization plugins
config.plugins.push(
new CompressionPlugin({
asset: '[path].gz[query]',
algorithm: 'gzip',
test: /\.js$|\.css$|\.html$/,
threshold: 10240,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment