Aufgrund einer Wartung wird GitLab am 29.10. zwischen 9:00 und 10:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 29.10. between 9:00 and 10:00 am.

Commit 5b222228 authored by Marcel Nellesen's avatar Marcel Nellesen

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

Sprint/2020 15

See merge request !41
parents c6aed9e4 537d5971
This diff is collapsed.
......@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>Login</title>
<title>Login - CoScInE</title>
</head>
<body class="fullwidth">
<noscript>
......
......@@ -14,26 +14,22 @@
</h1>
<div v-if="!tos" class="row">
<div class="col-sm-12 col-md-7">
<div class="alert alert-warning" role="alert">
<h5 class="alert-heading">{{ $t('alert_headline') }}</h5>
<p class="alert-title">{{ $t('alert_text1') }}
<div class="alert alert-warning" role="alert">
<h5 class="alert-heading">{{ $t('alert_headline') }}</h5>
<p class="alert-title">{{ $t('alert_text1') }}
<a href="mailto:servicedesk@itc.rwth-aachen.de?subject=CoScInE%20Pilot%20Program">Servicedesk</a>
{{ $t('alert_text2') }}
</p>
</div>
<div class="card bg-light mb-3 w-100">
<div class="card-body">
<p class="card-text">
<vue-markdown :source="news"></vue-markdown>
</p>
</div>
<div class="card bg-light mb-3 w-100">
<div class="card-body">
<h5 class="card-title">{{ $t('description_headline') }}</h5>
<p class="card-text">{{ $t('description_text') }}</p>
<h5 class="card-title">{{ $t('description_help_headline') }}</h5>
<p class="card-text">
{{ $t('description_help') }}
<a href="mailto:servicedesk@itc.rwth-aachen.de">Servicedesk</a>
</p>
</div>
</div>
</div>
<div class="col-sm-12 col-md-5">
<div class="col-sm-12 col-md-5">
<div class="row">
<div class="card bg-light mb-3 w-100">
<div class="card-body">
......@@ -60,6 +56,19 @@
id="signup-toggle"
>{{ $t('signup') }}</button>
</div>
<div class="row">
<div class="card bg-light mb-3 w-100">
<div class="card-body">
<h5 class="card-title">{{ $t('description_headline') }}</h5>
<p class="card-text">{{ $t('description_text') }}</p>
<h5 class="card-title">{{ $t('description_help_headline') }}</h5>
<p class="card-text">
{{ $t('description_help') }}
<a href="mailto:servicedesk@itc.rwth-aachen.de">Servicedesk</a>
</p>
</div>
</div>
</div>
</div>
</div>
<div v-else class="row">
......@@ -79,6 +88,7 @@
<script lang="ts">
import Vue from 'vue';
import VueMarkdown from 'vue-markdown';
import LoginMain from './components/LoginMain.vue';
import LogoutMain from './components/LogoutMain.vue';
import TOS from './components/TOS.vue';
......@@ -93,6 +103,8 @@ import mailGreyPath from './assets/mail_grey.svg';
import phoneGreyPath from './assets/phone_grey.svg';
import faxGreyPath from './assets/fax_grey.svg';
import { NoticeApi } from '@coscine/api-connection';
let scriptPath = '';
let imageEnabled = false;
if (document.currentScript !== undefined) {
......@@ -170,6 +182,7 @@ export default Vue.extend({
TOS,
RWTHHeader,
RWTHFooter,
VueMarkdown,
},
computed: {
cssProps() {
......@@ -198,9 +211,22 @@ export default Vue.extend({
currentInputCard: 'LoginMain',
logoutComponent: 'LogoutMain',
tos: getIsTOS(),
news: '',
};
},
watch: {
'$i18n.locale'() {
this.retrieveNotices();
},
},
methods: {
retrieveNotices() {
NoticeApi.getNotices('changelog', this.$i18n.locale, (response: any) => {
let splitArray = response.data.data.body.split(/\s(?:#{3})\s/g, 5);
splitArray = splitArray.join('### ');
this.news = splitArray.toString();
});
},
loginBack() {
this.currentInputCard = 'LoginMain';
},
......@@ -211,6 +237,9 @@ export default Vue.extend({
this.logoutState = !this.logoutState;
},
},
created() {
this.retrieveNotices();
},
});
</script>
......
......@@ -4,13 +4,14 @@ declare module '*.vue' {
}
declare module '@coscine/api-connection';
declare module 'vue-markdown';
declare module '@itcenter-layout/bootstrap'
declare module "*.png" {
declare module '@itcenter-layout/bootstrap';
declare module '*.png' {
const value: any;
export default value;
}
declare module "*.svg" {
declare module '*.svg' {
const value: any;
export default value;
}
\ No newline at end of file
}
Markdown is supported
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