Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • coscine/frontend/apps/userprofile
1 result
Select Git revision
Loading items
Show changes
Commits on Source (3)
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-multiselect@*":
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": "*"
module.exports = {
presets: [
'@vue/app'
]
}
Source diff could not be displayed: it is too large. Options to address this: view the blob.
{ {
"name": "@coscine/userprofile", "name": "@coscine/userprofile",
"version": "1.2.1", "version": "1.3.0",
"private": true, "private": true,
"directories": { "directories": {
"doc": "docs" "doc": "docs"
...@@ -8,13 +8,12 @@ ...@@ -8,13 +8,12 @@
"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/app-util": "^1.7.1", "@coscine/app-util": "^1.8.1",
"@coscine/component-library": "1.4.1", "@coscine/component-library": "1.5.0",
"@types/jquery": "^3.5.2", "@types/jquery": "^3.5.2",
"@types/vuelidate": "^0.7.13", "@types/vuelidate": "^0.7.13",
"@voerro/vue-tagsinput": "^2.4.0", "@voerro/vue-tagsinput": "^2.4.0",
...@@ -23,7 +22,6 @@ ...@@ -23,7 +22,6 @@
"moment": "^2.29.1", "moment": "^2.29.1",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-i18n": "^8.22.0", "vue-i18n": "^8.22.0",
"vue-loading-overlay": "^3.4.2",
"vue-multiselect": "^2.1.6", "vue-multiselect": "^2.1.6",
"vue-runtime-helpers": "^1.1.2", "vue-runtime-helpers": "^1.1.2",
"vuejs-datepicker": "^1.6.2", "vuejs-datepicker": "^1.6.2",
...@@ -36,15 +34,15 @@ ...@@ -36,15 +34,15 @@
"@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",
"semantic-release": "^17.3.0", "eslint": "^7.17.0",
"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: {}
}
}
...@@ -189,15 +189,9 @@ ...@@ -189,15 +189,9 @@
>{{ $t('save') }}</b-button >{{ $t('save') }}</b-button
> >
</b-form> </b-form>
<loading <coscine-loading-spinner
:active.sync="isWaitingForResponse" :isWaitingForResponse="isWaitingForResponse"
:can-cancel="false" />
:height="128"
:width="128"
:z-index="1500"
:color="color"
:is-full-page="true"
></loading>
</div> </div>
<div class="col-sm-2"></div> <div class="col-sm-2"></div>
</b-row> </b-row>
...@@ -219,8 +213,8 @@ import '@voerro/vue-tagsinput/dist/style.css'; ...@@ -219,8 +213,8 @@ import '@voerro/vue-tagsinput/dist/style.css';
import Multiselect from 'vue-multiselect'; import Multiselect from 'vue-multiselect';
import 'vue-multiselect/dist/vue-multiselect.min.css'; import 'vue-multiselect/dist/vue-multiselect.min.css';
import Loading from 'vue-loading-overlay'; import { CoscineLoadingSpinner } from '@coscine/component-library';
import 'vue-loading-overlay/dist/vue-loading.css'; import '@coscine/component-library/dist/index.css';
import AccessToken from './components/AccessToken.vue'; import AccessToken from './components/AccessToken.vue';
Vue.use(BootstrapVue); Vue.use(BootstrapVue);
...@@ -230,7 +224,7 @@ export default Vue.extend({ ...@@ -230,7 +224,7 @@ export default Vue.extend({
name: 'UserProfile', name: 'UserProfile',
components: { components: {
Multiselect, Multiselect,
Loading, CoscineLoadingSpinner,
AccessToken, AccessToken,
}, },
validations: { validations: {
...@@ -268,7 +262,6 @@ export default Vue.extend({ ...@@ -268,7 +262,6 @@ export default Vue.extend({
currentUserComponent: 'UserProfileComponent', currentUserComponent: 'UserProfileComponent',
isWaitingForResponse: false, isWaitingForResponse: false,
externalUser: true, externalUser: true,
color: '#00549F',
disciplineLabel: 'displayNameEn', disciplineLabel: 'displayNameEn',
form: { form: {
Givenname: '', Givenname: '',
...@@ -435,7 +428,7 @@ export default Vue.extend({ ...@@ -435,7 +428,7 @@ export default Vue.extend({
if (search.length < 3) { if (search.length < 3) {
return; return;
} }
this.queryTimer = setTimeout(() => (this.fetchOrganizationOptions(search)), 1000); this.queryTimer = window.setTimeout(() => (this.fetchOrganizationOptions(search)), 1000);
}, },
fetchOrganizationOptions(search: string) { fetchOrganizationOptions(search: string) {
this.loadingOrganizations = true; this.loadingOrganizations = true;
......
...@@ -134,6 +134,7 @@ import Datepicker from 'vuejs-datepicker'; ...@@ -134,6 +134,7 @@ import Datepicker from 'vuejs-datepicker';
import { de, en } from 'vuejs-datepicker/dist/locale'; import { de, en } from 'vuejs-datepicker/dist/locale';
import { CoscineModal } from '@coscine/component-library'; import { CoscineModal } from '@coscine/component-library';
import '@coscine/component-library/dist/index.css';
import moment from 'moment'; import moment from 'moment';
......
...@@ -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
}
}
Source diff could not be displayed: it is too large. Options to address this: view the blob.