Skip to content
Snippets Groups Projects
Commit 1d1a46b1 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Sprint/2020-22' into 'master' 

Sprint/2020 22

See merge request coscine/app/supportadmin!2
parents 75ac6d54 c7696d9f
No related branches found
No related tags found
1 merge request!2Sprint/2020 22
Pipeline #371263 passed
Stage: publish
Show whitespace changes
Inline Side-by-side
Showing
with 22903 additions and 254 deletions
.gitignore
+ 0
− 2
View file @ 1d1a46b1
.DS_Store .DS_Store
node_modules node_modules
/dist /dist
package-lock.json
# local env files # local env files
.env.local .env.local
......
.gitlab-ci.yml
+ 18
− 22
View file @ 1d1a46b1
stages: stages:
- build
- test - test
- docs
- publish - publish
- release - release
- pre_release
before_script: before_script:
- npm install - npm install
build:
stage: build
script:
- npm run build
except:
variables:
- $GITLAB_USER_ID == $GIT_BOT_USER_ID
test: test:
stage: test stage: test
script: script:
- npm run test:unit - npm run build
except: - npm test
variables:
- $GITLAB_USER_ID == $GIT_BOT_USER_ID
docs:
stage: docs
script:
- .\publishDocs.ps1 $GITLAB_TOKEN
except: except:
refs:
- master
- tags
variables: variables:
- $GITLAB_USER_ID == $GIT_BOT_USER_ID - $GITLAB_USER_ID == $GIT_BOT_USER_ID
publish: publish:
stage: publish stage: publish
script: script:
- npm run build - npm run build
- npm test
- npx semantic-release - npx semantic-release
only: only:
- master - master
...@@ -54,5 +41,14 @@ release: ...@@ -54,5 +41,14 @@ release:
only: only:
- tags - tags
after_script: pre_release:
- Cmd /C "rmdir /S /Q node_modules" stage: pre_release
\ No newline at end of file script:
- npm run build
artifacts:
paths:
- dist
when: manual
except:
- tags
- master
docs/ESLintConvention.md deleted 100644 → 0
+ 0
− 45
View file @ 75ac6d54
## ESLint Convention
Make the changes to the code and tests and then commit to your branch. Be sure to follow the commit message conventions.
Commit message summaries must follow this basic format:
```
Tag: Message (fixes #1234)
```
`Tag` should not be confused with git tag.
`Message` should not be confused with git commit message.
The `Tag` is one of the following:
* `Fix` - for a bug fix.
* `Update` - for a backwards-compatible enhancement.
* `Breaking` - for a backwards-incompatible enhancement.
* `Docs` - changes to documentation only.
* `Build` - changes to build process only.
* `New` - implemented a new feature.
* `Upgrade` - for a dependency upgrade.
The message summary should be a one-sentence description of the change. The issue number should be mentioned at the end. * The commit message should say "(fixes #1234)" at the end of the description if it closes out an existing issue (replace 1234 with the issue number). If the commit doesn't completely fix the issue, then use `(refs #1234)` instead of `(fixes #1234)`.
Here are some good commit message summary examples:
```
Build: Update Travis to only test Node 0.10 (refs #734)
Fix: Semi rule incorrectly flagging extra semicolon (fixes #840)
Upgrade: Esprima to 1.2, switch to using Esprima comment attachment (fixes #730)
```
The commit message format is important because these messages are used to create a changelog for each release. The tag and issue number help to create more consistent and useful changelogs.
Based on https://github.com/eslint/eslint.github.io/blob/master/docs/developer-guide/contributing.md#step-2-make-your-changes
[npm-image]: https://badge.fury.io/js/conventional-changelog-eslint.svg
[npm-url]: https://npmjs.org/package/conventional-changelog-eslint
[travis-image]: https://travis-ci.org/stevemao/conventional-changelog-eslint.svg?branch=master
[travis-url]: https://travis-ci.org/stevemao/conventional-changelog-eslint
[daviddm-image]: https://david-dm.org/stevemao/conventional-changelog-eslint.svg?theme=shields.io
[daviddm-url]: https://david-dm.org/stevemao/conventional-changelog-eslint
[coveralls-image]: https://coveralls.io/repos/stevemao/conventional-changelog-eslint/badge.svg
[coveralls-url]: https://coveralls.io/r/stevemao/conventional-changelog-eslint
\ No newline at end of file
docs/home.md deleted 100644 → 0
+ 0
− 53
View file @ 75ac6d54
# vue-template
This template includes:
* Vue.js application template
* Linting using TSLint and the Vue builders
* Automatic releases using semantic-release (ESLint Code Convention) and Gitlab CI / CD
* Automatic Unit tests using Mocha/Chai and the Vue cli
* Automatic documentation publishing using Gitlab CI / CD and a self written script which puts the docs in the docs folder to the wiki
* For public registry: Publishing of packages, for usage add the following lines to package.json, add the npm publish module in .releaserc and provide a valid NPM token:
```
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/",
"tag": "latest"
}
```
## Project setup
```
npm install
```
### Compiles and hot-reloads for development
```
npm run serve
```
### Compiles and minifies for production
```
npm run build
```
### Run your tests
```
npm run test
```
### Lints and fixes files
```
npm run lint
```
### Run your unit tests
```
npm run test:unit
```
### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
### Commit convention
See [Commit convention](ESLintConvention) for the commit convention.
\ No newline at end of file
package-lock.json 0 → 100644
+ 22572
− 0
View file @ 1d1a46b1
Source diff could not be displayed: it is too large. Options to address this: view the blob.
package.json
+ 33
− 21
View file @ 1d1a46b1
{ {
"name": "ts-vue-template", "name": "@coscine/supportadmin",
"version": "1.0.0", "version": "1.0.0",
"private": true, "private": true,
"directories": { "directories": {
...@@ -12,30 +12,42 @@ ...@@ -12,30 +12,42 @@
"test:unit": "vue-cli-service test:unit" "test:unit": "vue-cli-service test:unit"
}, },
"dependencies": { "dependencies": {
"vue": "^2.6.6" "@coscine/api-connection": "^1.23.0",
"@coscine/app-util": "^1.7.0",
"@coscine/component-library": "1.4.0",
"@itcenter-layout/bootstrap": "^1.5.5",
"@itcenter-layout/masterpage": "^1.3.0",
"@types/jquery": "^3.5.2",
"bootstrap-vue": "^2.19.0",
"jquery": "^3.5.1",
"vue": "^2.6.12",
"vue-i18n": "^8.22.0",
"vue-loading-overlay": "^3.4.2",
"vue-runtime-helpers": "^1.1.2",
"vuelidate": "^0.7.5"
}, },
"devDependencies": { "devDependencies": {
"@semantic-release/commit-analyzer": "^6.1.0", "@hutson/semantic-delivery-gitlab": "^9.1.0",
"@semantic-release/git": "^7.0.5", "@semantic-release/commit-analyzer": "^8.0.1",
"@semantic-release/gitlab": "^3.0.5", "@semantic-release/git": "^9.0.0",
"@semantic-release/npm": "^5.1.1", "@semantic-release/gitlab": "^6.0.5",
"@semantic-release/release-notes-generator": "^7.1.4", "@semantic-release/npm": "^7.0.6",
"@types/chai": "^4.1.0", "@semantic-release/release-notes-generator": "^9.0.1",
"@types/mocha": "^5.2.4", "@types/chai": "^4.2.13",
"@vue/cli-plugin-babel": "^3.5.0", "@types/mocha": "^8.0.3",
"@vue/cli-plugin-typescript": "^3.5.0", "@vue/cli-plugin-babel": "^4.5.7",
"@vue/cli-plugin-unit-mocha": "^3.5.0", "@vue/cli-plugin-typescript": "^4.5.7",
"@vue/cli-service": "^3.5.0", "@vue/cli-plugin-unit-mocha": "^4.5.7",
"@vue/test-utils": "1.0.0-beta.29", "@vue/cli-service": "^4.5.7",
"chai": "^4.1.2", "@vue/test-utils": "1.1.0",
"typescript": "^3.2.1", "chai": "^4.2.0",
"vue-template-compiler": "^2.5.21", "semantic-release": "^17.1.2",
"semantic-release": "^15.12.0", "typescript": "^4.0.3",
"semantic-release-gitlab": "^7.1.0" "vue-template-compiler": "^2.6.12"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://git.rwth-aachen.de/coscine/templates/vue-template.git" "url": "https://git.rwth-aachen.de/coscine/app/quotamanagement.git"
}, },
"license": "ISC" "license": "MIT"
} }
public/index.html
+ 4
− 4
View file @ 1d1a46b1
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>ts-template</title> <title>Support Admin Page</title>
</head> </head>
<body> <body class="fullwidth">
<noscript> <noscript>
<strong>We're sorry but ts-template doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but pidpage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript> </noscript>
<div id="app"></div> <supportadmin></supportadmin>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
</html> </html>
src/App.vue deleted 100644 → 0
+ 0
− 29
View file @ 75ac6d54
<template>
<div id="app">
<img alt="Vue logo" src="./assets/logo.png">
<HelloWorld msg="Welcome to Your Vue.js + TypeScript App"/>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import HelloWorld from './components/HelloWorld.vue';
export default Vue.extend({
name: 'app',
components: {
HelloWorld,
},
});
</script>
<style>
#app {
font-family: 'Avenir', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #2c3e50;
margin-top: 60px;
}
</style>
src/SupportAdminApp.vue 0 → 100644
+ 227
− 0
View file @ 1d1a46b1
<template>
<div id="SupportAdmin" class="container">
<b-row>
<div class="col-sm-8">
<div>
<h4>{{ $t('headline') }}</h4>
</div>
</div>
</b-row>
<b-row>
<div class="col-sm-2"></div>
<div class="col-sm-8">
<b-form id="project_request_form" @submit.stop.prevent="onSubmit">
<b-input-group class="mt-3">
<b-form-input
id="projectId"
ref="projectId"
v-model="form.projectId"
aria-describedby="projectHelp"
:placeholder="$t('projectInputTooltip')">
</b-form-input>
<b-input-group-append>
<b-button variant="primary" id="query_project_button" @click="queryProject()">{{ $t('projectSelectButton') }}</b-button>
</b-input-group-append>
</b-input-group>
</b-form>
<h5 id='project_query_status'>{{ requestStatus }}</h5>
<b-container fluid>
<b-row class="my-1">
<b-col sm="2">
<label for="project_name">{{ $t('projectName') }}</label>
</b-col>
<b-col sm="10">
<b-form-input id="project_name" v-model="form.projectName" :readonly="true"></b-form-input>
</b-col>
</b-row>
<b-row class="my-1">
<b-col sm="2">
<label for="project_short_name">{{ $t('projectShortName') }}</label>
</b-col>
<b-col sm="10">
<b-form-input id="project_short_name" v-model="form.projectShortName" :readonly="true"></b-form-input>
</b-col>
</b-row>
<b-row class="my-1">
<b-col sm="2">
<label for="project_guid">{{ $t('projectGuid') }}</label>
</b-col>
<b-col sm="10">
<b-form-input id="project_guid" v-model="form.projectGuid" :readonly="true"></b-form-input>
</b-col>
</b-row>
</b-container>
<h5 style="text-align: left;">{{ $t('projectQuotaHeadline') }}:</h5>
<b-table
id="project_qouta_table"
:fields="headers"
:items="projectQuotas"
:busy="busy"
:locale="$i18n.locale"
:sort-by.sync="sortBy"
:sort-desc.sync="sortDesc"
:show-empty="true"
:empty-text="emptyText"
fixed
sticky-header="100%"
no-border-collapse
sort-icon-right
striped
bordered
outlined
hover
head-variant="dark">
<template #cell(newQuota)="row">
<b-form-input
id="data"
v-model="row.item.newQuota"
aria-describedby="projectHelp"
:placeholder="$t('newQuotaInputPlaceHolder')">
</b-form-input>
</template>
<template #cell(action)="row">
<button id=action v-on:click.stop.prevent="saveNewQuota(row.item)" class="btn btn-primary float-right">{{ $t('save') }}</button>
</template>
</b-table>
</div>
</b-row>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import { GuidUtil } from '@coscine/app-util';
import { AdminApi } from '@coscine/api-connection';
import { ToastPlugin } from 'bootstrap-vue';
import { error } from 'jquery';
Vue.use(ToastPlugin);
export default Vue.extend({
name: 'supportadmin',
components: {
},
data() {
return {
requestStatus: this.$t('projectNotSelected'),
form: {
projectId: '',
projectName: '',
projectShortName: '',
projectGuid: '',
},
projectQuotas: [] as any,
filter: String,
busy: false,
emptyText: 'No Quotas',
sortBy: 'resourceType',
sortDesc: false,
filteredRows: 0,
headers: [
{
label: this.$t('resourceType'),
key: 'resourceType',
sortable: true,
},
{
label: this.$t('currentQuota'),
key: 'currentQuota',
sortable: true,
},
{
label: this.$t('newQuota'),
key: 'newQuota',
sortable: true,
},
{
label: this.$t('action'),
key: 'action',
sortable: true,
},
],
};
},
methods: {
getProjectQuotas() {
AdminApi.GetProject(this.form.projectId,
(response: any) => {
this.clearResults('');
if (response.data.guid) {
this.requestStatus = this.$t('projectFound');
this.form.projectName = response.data.name;
this.form.projectShortName = response.data.shortName;
this.form.projectGuid = response.data.guid;
const quotas = response.data.quotas;
for (const d of quotas) {
this.projectQuotas.push({quotaId: d.quotaId, resourceType: d.resourceType, currentQuota: d.quota});
}
} else {
this.clearResults('projectNotFound');
}
},
(errorState: any) => {
const message = this.$t('queryProjectFailureText').toString();
this.makeToast(message, this.$t('queryProjectFailureHeadline').toString());
},
);
},
queryProject() {
// if the field is empty:
if (!this.form.projectId.trim()) {
this.clearResults('projectNotSelected');
} else {
this.getProjectQuotas();
}
},
saveNewQuota(selectedQuota: any) {
let message: string = '' + this.$t('successNotificationText');
message = message.replace('{projectName}', this.form.projectShortName);
message = message.replace('{resourceType}', selectedQuota.resourceType);
if (selectedQuota.newQuota) {
message = message.replace('{newQuota}', '' + selectedQuota.newQuota);
}
const updatedQuota = {
quotaId: selectedQuota.quotaId,
quota: selectedQuota.newQuota,
};
if (updatedQuota.quota) {
AdminApi.UpdateQuota(updatedQuota,
(response: any) => {
this.makeToast(message, this.$t('successNotificationHeadline').toString());
this.getProjectQuotas();
},
(errorState: any) => {
message = this.$t('failureNotificationText').toString();
this.makeToast(message, this.$t('failureNotificationHeadline').toString());
},
);
}
},
clearResults(headline: string) {
this.requestStatus = this.$t(headline);
this.projectQuotas = [];
this.form.projectName = '';
this.form.projectShortName = '';
this.form.projectGuid = '';
},
makeToast(text: string = 'Message', givenTitle: string = 'Title') {
this.$bvToast.toast(
text,
{
title: givenTitle,
autoHideDelay: 5000,
toaster: 'b-toaster-bottom-right',
noCloseButton: true,
},
);
},
},
});
</script>
<style scoped>
h5 {
margin-top: 0.4em;
}
</style>
\ No newline at end of file
src/assets/logo.png deleted 100644 → 0
+ 0
− 0
View file @ 75ac6d54
src/assets/logo.png

6.69 KiB

src/components/HelloWorld.vue deleted 100644 → 0
+ 0
− 61
View file @ 75ac6d54
<template>
<div class="hello">
<h1>{{ msg }}</h1>
<p>
For a guide and recipes on how to configure / customize this project,<br>
check out the
<a href="https://cli.vuejs.org" target="_blank" rel="noopener">vue-cli documentation</a>.
</p>
<h3>Installed CLI Plugins</h3>
<ul>
<li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel" target="_blank" rel="noopener">babel</a></li>
<li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-typescript" target="_blank" rel="noopener">typescript</a></li>
<li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-unit-mocha" target="_blank" rel="noopener">unit-mocha</a></li>
</ul>
<h3>Essential Links</h3>
<ul>
<li><a href="https://vuejs.org" target="_blank" rel="noopener">Core Docs</a></li>
<li><a href="https://forum.vuejs.org" target="_blank" rel="noopener">Forum</a></li>
<li><a href="https://chat.vuejs.org" target="_blank" rel="noopener">Community Chat</a></li>
<li><a href="https://twitter.com/vuejs" target="_blank" rel="noopener">Twitter</a></li>
<li><a href="https://news.vuejs.org" target="_blank" rel="noopener">News</a></li>
</ul>
<h3>Ecosystem</h3>
<ul>
<li><a href="https://router.vuejs.org" target="_blank" rel="noopener">vue-router</a></li>
<li><a href="https://vuex.vuejs.org" target="_blank" rel="noopener">vuex</a></li>
<li><a href="https://github.com/vuejs/vue-devtools#vue-devtools" target="_blank" rel="noopener">vue-devtools</a></li>
<li><a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener">vue-loader</a></li>
<li><a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">awesome-vue</a></li>
</ul>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
export default Vue.extend({
name: 'HelloWorld',
props: {
msg: String,
},
});
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped>
h3 {
margin: 40px 0 0;
}
ul {
list-style-type: none;
padding: 0;
}
li {
display: inline-block;
margin: 0 10px;
}
a {
color: #42b983;
}
</style>
src/coscine.d.ts 0 → 100644
+ 5
− 0
View file @ 1d1a46b1
declare var coscine: {
i18n: {
supportadmin: {},
},
};
src/main.ts
+ 21
− 4
View file @ 1d1a46b1
import jQuery from 'jquery';
import BootstrapVue from 'bootstrap-vue';
import Vue from 'vue'; import Vue from 'vue';
import App from './App.vue'; import SupportAdmin from './SupportAdminApp.vue';
import VueI18n from 'vue-i18n';
import { LanguageUtil } from '@coscine/app-util';
Vue.config.productionTip = false; Vue.config.productionTip = false;
Vue.use(BootstrapVue);
Vue.use(VueI18n);
jQuery(() => {
const i18n = new VueI18n({
locale: LanguageUtil.getLanguage(),
messages: coscine.i18n.supportadmin,
silentFallbackWarn: true,
});
new Vue({ new Vue({
render: (h) => h(App), render: (h) => h(SupportAdmin),
}).$mount('#app'); i18n,
}).$mount('supportadmin');
});
src/shims-vue.d.ts
+ 4
− 0
View file @ 1d1a46b1
...@@ -2,3 +2,7 @@ declare module '*.vue' { ...@@ -2,3 +2,7 @@ declare module '*.vue' {
import Vue from 'vue'; import Vue from 'vue';
export default Vue; export default Vue;
} }
declare module '@coscine/api-connection';
declare module '@coscine/app-util';
declare module '@coscine/component-library';
tests/unit/example.spec.ts deleted 100644 → 0
+ 0
− 13
View file @ 75ac6d54
import { expect } from 'chai';
import { shallowMount } from '@vue/test-utils';
import HelloWorld from '@/components/HelloWorld.vue';
describe('HelloWorld.vue', () => {
it('renders props.msg when passed', () => {
const msg = 'new message';
const wrapper = shallowMount(HelloWorld, {
propsData: { msg },
});
expect(wrapper.text()).to.include(msg);
});
});
vue.config.js 0 → 100644
+ 19
− 0
View file @ 1d1a46b1
module.exports = {
devServer: {
disableHostCheck: true,
},
publicPath: './',
configureWebpack: {
devtool: 'source-map',
devServer: {
port: 9369,
}
},
filenameHashing: false,
chainWebpack: config => {
config.optimization.delete('splitChunks')
},
css: {
extract: false,
},
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment