Commit 826056a8 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Product/1107-frontendPerformance' into 'master'

Product/1107 frontend performance

See merge request !53
parents 44b3aae2 81ec5862
include:
- project: coscine/tools/gitlab-ci-templates
file:
- /docker-runner.yml
- /nodejs.yml
stages: stages:
- test - build
# there are more stages in the imported file but we only want to import some
# - test
- publish - publish
- release
- pre_release
before_script:
- npm install
test:
stage: test
script:
- npm run build
- npm test
except:
refs:
- master
- tags
variables:
- $GITLAB_USER_ID == $GIT_BOT_USER_ID
publish: build-branch:
stage: publish extends: .build-branch
script:
- npm run build
- npm test
- npx semantic-release
only:
- master
except:
variables:
- $GITLAB_USER_ID == $GIT_BOT_USER_ID
release: build-npm-release:
stage: release extends: .build-npm-release
script:
- npm run build
artifacts:
paths:
- dist
only:
- tags
pre_release: publish-gitlab:
stage: pre_release extends: .publish-gitlab-release
script:
- npm run build
artifacts:
paths:
- dist
when: manual
except:
- tags
- master
packageExtensions:
"@vue/cli-service@*":
peerDependencies:
"@vue/cli-plugin-babel": "*"
"@vue/cli-plugin-eslint": "*"
"@vue/cli-plugin-typescript": "*"
"@vue/cli-plugin-typescript@*":
peerDependencies:
"babel-loader": "*"
"fork-ts-checker-webpack-plugin@*":
dependencies:
"vue-template-compiler": "*"
peerDependencies:
"typescript": "*"
"vue-i18n@*":
dependencies:
"vue": "^2.6.12"
"vue-material-design-icons@*":
dependencies:
"vue": "^2.6.12"
"vue-router@*":
dependencies:
"vue": "^2.6.12"
"vuex@*":
dependencies:
"vue": "^2.6.12"
"bootstrap-vue@*":
dependencies:
"vue": "^2.6.12"
"jquery": "*"
"markdown-it-toc-and-anchor@*":
dependencies:
"markdown-it": "*"
"vue-markdown@*":
dependencies:
"babel-runtime": "*"
module.exports = {
presets: [
'@vue/app'
]
}
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -8,12 +8,11 @@ ...@@ -8,12 +8,11 @@
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint"
"test:unit": "vue-cli-service test:unit"
}, },
"dependencies": { "dependencies": {
"@coscine/api-connection": "^1.23.1", "@coscine/api-connection": "^1.24.2",
"@coscine/component-library": "^1.4.1", "@coscine/component-library": "^1.5.0",
"@itcenter-layout/bootstrap": "^1.5.5", "@itcenter-layout/bootstrap": "^1.5.5",
"@itcenter-layout/masterpage": "^1.3.0", "@itcenter-layout/masterpage": "^1.3.0",
"@types/jquery": "^3.5.2", "@types/jquery": "^3.5.2",
...@@ -23,6 +22,7 @@ ...@@ -23,6 +22,7 @@
"bootstrap-vue": "^2.17.3", "bootstrap-vue": "^2.17.3",
"jquery": "^3.5.1", "jquery": "^3.5.1",
"jsonp": "^0.2.1", "jsonp": "^0.2.1",
"markdown-it": "^12.0.4",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-i18n": "^8.22.0", "vue-i18n": "^8.22.0",
"vue-markdown": "^2.2.4" "vue-markdown": "^2.2.4"
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
"@semantic-release/gitlab": "^6.0.5", "@semantic-release/gitlab": "^6.0.5",
"@semantic-release/npm": "^7.0.6", "@semantic-release/npm": "^7.0.6",
"@semantic-release/release-notes-generator": "^9.0.1", "@semantic-release/release-notes-generator": "^9.0.1",
"@types/chai": "^4.2.13", "@types/node": "^14.14.20",
"@types/mocha": "^8.0.3", "@typescript-eslint/eslint-plugin": "^4.12.0",
"@vue/cli-plugin-babel": "^4.5.7", "@typescript-eslint/parser": "^4.12.0",
"@vue/cli-plugin-typescript": "^4.5.7", "@vue/cli-plugin-typescript": "^4.5.7",
"@vue/cli-plugin-unit-mocha": "^4.5.7",
"@vue/cli-service": "^4.5.7", "@vue/cli-service": "^4.5.7",
"@vue/test-utils": "1.1.0", "conventional-changelog-eslint": "3.0.9",
"chai": "^4.2.0", "core-js": "^3.8.2",
"eslint": "^7.17.0",
"semantic-release": "^17.3.1", "semantic-release": "^17.3.1",
"typescript": "^4.0.3", "typescript": "^4.0.3",
"vue-template-compiler": "^2.6.12" "vue-template-compiler": "^2.6.12"
......
module.exports = {
plugins: {
autoprefixer: {}
}
}
...@@ -98,6 +98,7 @@ import LoginMain from './components/LoginMain.vue'; ...@@ -98,6 +98,7 @@ import LoginMain from './components/LoginMain.vue';
import LogoutMain from './components/LogoutMain.vue'; import LogoutMain from './components/LogoutMain.vue';
import TOS from './components/TOS.vue'; import TOS from './components/TOS.vue';
import { CoscinePageHeader, CoscinePageFooter } from '@coscine/component-library'; import { CoscinePageHeader, CoscinePageFooter } from '@coscine/component-library';
import '@coscine/component-library/dist/index.css';
import coscineImageBluePath from './assets/rwth_coscine_rgb.svg'; import coscineImageBluePath from './assets/rwth_coscine_rgb.svg';
import rwthImagePath from './assets/rwth_coscine_weiss_rgb.svg'; import rwthImagePath from './assets/rwth_coscine_weiss_rgb.svg';
......
...@@ -10,10 +10,13 @@ ...@@ -10,10 +10,13 @@
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"sourceMap": true, "sourceMap": true,
"baseUrl": ".", "baseUrl": ".",
"skipLibCheck": true,
"outDir": "dist",
"declaration": true,
"declarationDir": "dist",
"types": [ "types": [
"webpack-env", "webpack-env",
"mocha", "node"
"chai"
], ],
"paths": { "paths": {
"@/*": [ "@/*": [
......
{
"defaultSeverity": "warning",
"extends": [
"tslint:recommended"
],
"linterOptions": {
"exclude": [
"node_modules/**"
]
},
"rules": {
"quotemark": [true, "single"],
"indent": [true, "spaces", 2],
"interface-name": false,
"ordered-imports": false,
"object-literal-sort-keys": false,
"no-consecutive-blank-lines": false
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
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