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
  • Hotfix/1394-cssLogin
  • Hotfix/1911-fixFormatting
  • Hotfix/64-releaseUDE
  • Hotfix/725-authenticationFix
  • Hotfix/948-checkMarksToUPage
  • Issue/1743-changedLink
  • Issue/1756-maintenanceBannerDeployment
  • Issue/1869-LoginForTUDO
  • Issue/1872-addingTUDaToLoginPage
  • Issue/1941-loginPageText
  • Issue/2215-releaseNewsBeGone
  • Issue/2218-updateLinksToDocumentationPage
  • Issue/29-FixContentWarning
  • Issue/912-rearrangeHeader
  • Product/1107-frontendPerformance
  • Product/1149-dfnaai
  • Product/1215-gitlabCleanUp
  • Product/1290-dfnaai
  • Product/1629-onboardingOtherUniversities
  • Product/504-mergeWorkflow
  • Product/505-pidPage
  • Product/708-tosProcess
  • Product/732-bannerForPilotPhase
  • Product/863-noUnsecureLogin
  • Product/878-newsFeed
  • Product/911-pageNames
  • Product/917-maintenanceFunctionality
  • Product/943-NewLogo
  • Sprint/2020-05
  • Sprint/2020-06
  • Sprint/2020-07
  • Sprint/2020-10
  • Sprint/2020-11
  • Sprint/2020-12
  • Sprint/2020-13
  • Sprint/2020-14
  • Sprint/2020-15
  • Sprint/2020-18
  • Sprint/2020-19
  • Sprint/2020-20
  • Sprint/2021-01
  • Sprint/2021-03
  • Sprint/2021-05
  • Sprint/2021-06
  • Sprint/2021-15
  • Sprint/2021-19
  • Sprint/2021-2022
  • Sprint/2021-22
  • Sprint/2022-01
  • Topic/1014-Newsfeed
  • Topic/1016-pageNames
  • Topic/1061-pidPageApp
  • Topic/1087-NewLogo
  • Topic/1227-frontendPerformance
  • Topic/1276-DFN-AAIFrontend
  • Topic/1278-dfnAAI
  • Topic/1297-maintenanceBanner
  • Topic/1711-extendResourceTypeConfiguration
  • Topic/738-createABanner
  • Topic/800-tosProcessFrontend
  • Topic/861-mergeAccounts
  • Topic/890-noUnsecureLogin
  • czepiel-devops
  • dev
  • gitkeep
  • master
  • v1.0.0
  • v1.1.0
  • v1.1.1
  • v1.10.0
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.13.0
  • v1.14.0
  • v1.14.1
  • v1.15.0
  • v1.16.0
  • v1.17.0
  • v1.18.0
  • v1.18.1
  • v1.19.0
  • v1.2.0
  • v1.20.0
  • v1.20.1
  • v1.20.2
  • v1.21.0
  • v1.21.1
  • v1.22.0
  • v1.23.0
  • v1.3.0
  • v1.3.1
  • v1.4.0
  • v1.4.1
  • v1.4.2
  • v1.4.3
  • v1.5.0
  • v1.5.1
  • v1.6.0
  • v1.7.0
  • v1.8.0
  • v1.8.1
  • v1.8.2
  • v1.9.0
  • v1.9.1
105 results

Target

Select target project
  • coscine/frontend/apps/login
1 result
Select Git revision
  • Hotfix/1394-cssLogin
  • Hotfix/1911-fixFormatting
  • Hotfix/64-releaseUDE
  • Hotfix/725-authenticationFix
  • Hotfix/948-checkMarksToUPage
  • Issue/1743-changedLink
  • Issue/1756-maintenanceBannerDeployment
  • Issue/1869-LoginForTUDO
  • Issue/1872-addingTUDaToLoginPage
  • Issue/1941-loginPageText
  • Issue/2215-releaseNewsBeGone
  • Issue/2218-updateLinksToDocumentationPage
  • Issue/29-FixContentWarning
  • Issue/912-rearrangeHeader
  • Product/1107-frontendPerformance
  • Product/1149-dfnaai
  • Product/1215-gitlabCleanUp
  • Product/1290-dfnaai
  • Product/1629-onboardingOtherUniversities
  • Product/504-mergeWorkflow
  • Product/505-pidPage
  • Product/708-tosProcess
  • Product/732-bannerForPilotPhase
  • Product/863-noUnsecureLogin
  • Product/878-newsFeed
  • Product/911-pageNames
  • Product/917-maintenanceFunctionality
  • Product/943-NewLogo
  • Sprint/2020-05
  • Sprint/2020-06
  • Sprint/2020-07
  • Sprint/2020-10
  • Sprint/2020-11
  • Sprint/2020-12
  • Sprint/2020-13
  • Sprint/2020-14
  • Sprint/2020-15
  • Sprint/2020-18
  • Sprint/2020-19
  • Sprint/2020-20
  • Sprint/2021-01
  • Sprint/2021-03
  • Sprint/2021-05
  • Sprint/2021-06
  • Sprint/2021-15
  • Sprint/2021-19
  • Sprint/2021-2022
  • Sprint/2021-22
  • Sprint/2022-01
  • Topic/1014-Newsfeed
  • Topic/1016-pageNames
  • Topic/1061-pidPageApp
  • Topic/1087-NewLogo
  • Topic/1227-frontendPerformance
  • Topic/1276-DFN-AAIFrontend
  • Topic/1278-dfnAAI
  • Topic/1297-maintenanceBanner
  • Topic/1711-extendResourceTypeConfiguration
  • Topic/738-createABanner
  • Topic/800-tosProcessFrontend
  • Topic/861-mergeAccounts
  • Topic/890-noUnsecureLogin
  • czepiel-devops
  • dev
  • gitkeep
  • master
  • v1.0.0
  • v1.1.0
  • v1.1.1
  • v1.10.0
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.13.0
  • v1.14.0
  • v1.14.1
  • v1.15.0
  • v1.16.0
  • v1.17.0
  • v1.18.0
  • v1.18.1
  • v1.19.0
  • v1.2.0
  • v1.20.0
  • v1.20.1
  • v1.20.2
  • v1.21.0
  • v1.21.1
  • v1.22.0
  • v1.23.0
  • v1.3.0
  • v1.3.1
  • v1.4.0
  • v1.4.1
  • v1.4.2
  • v1.4.3
  • v1.5.0
  • v1.5.1
  • v1.6.0
  • v1.7.0
  • v1.8.0
  • v1.8.1
  • v1.8.2
  • v1.9.0
  • v1.9.1
105 results
Show changes
Commits on Source (5)
......@@ -14,6 +14,7 @@ test:
- npm test
except:
refs:
- master
- tags
variables:
- $GITLAB_USER_ID == $GIT_BOT_USER_ID
......@@ -22,6 +23,7 @@ publish:
stage: publish
script:
- npm run build
- npm test
- npx semantic-release
only:
- master
......
{
"name": "@coscine/login",
"version": "1.9.0",
"version": "1.9.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -1191,15 +1191,40 @@
}
},
"@coscine/api-connection": {
"version": "1.21.0",
"resolved": "https://registry.npmjs.org/@coscine/api-connection/-/api-connection-1.21.0.tgz",
"integrity": "sha512-2vl+vWMzPSaB3eLVCDLBYMkK6rW8arRKM+0MiAokt2iDTFYMIZUruTkXEYroqF78AvICD1x+Rmraj74iLOZZBw==",
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@coscine/api-connection/-/api-connection-1.22.0.tgz",
"integrity": "sha512-AledYQcq0qIkmTYAnTTXKVop4q+DDBUUQeewm4xu1zN2DhzrzzPawTuafNnS8k66PwkhiKphIyBuaL5ujQSXGQ==",
"requires": {
"@types/file-saver": "^2.0.1",
"axios": "^0.20.0",
"file-saver": "^2.0.2"
}
},
"@coscine/component-library": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@coscine/component-library/-/component-library-1.2.0.tgz",
"integrity": "sha512-vPmWKdNiQDmPR6CwtfA2Ljs8V0vG+nze3QpSlhwXI0UCEK828qWVM6fI/CqwzetsRdWT0EnTJFANu5g/VPSLWA==",
"requires": {
"@types/jquery": "^3.5.3",
"bootstrap-vue": "^2.17.3",
"jquery": "^3.5.1",
"vue": "^2.6.12",
"vue-i18n": "^8.22.0",
"vue-loading-overlay": "^3.4.2",
"vue-material-design-icons": "^4.9.0",
"vue-runtime-helpers": "^1.1.2"
},
"dependencies": {
"@types/jquery": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.3.tgz",
"integrity": "sha512-IENpHTjGksr2wQS6ZO8eMIE0tIB22Ywg+n3/yAWCa56VSZ26phcwAbFdh9+VNUWk7e83qB27QLax3Rf4G92Y9A==",
"requires": {
"@types/sizzle": "*"
}
}
}
},
"@hapi/address": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
......@@ -21892,6 +21917,11 @@
}
}
},
"vue-loading-overlay": {
"version": "3.4.2",
"resolved": "https://registry.npmjs.org/vue-loading-overlay/-/vue-loading-overlay-3.4.2.tgz",
"integrity": "sha512-xcB+NPjl76eA0uggm707x3ZFgrNosZXpynHipyS3K+rrK1NztOV49R1LY+/4ij5W1KYANp7eRI2EIHrxCpmWAw=="
},
"vue-markdown": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/vue-markdown/-/vue-markdown-2.2.4.tgz",
......@@ -21912,6 +21942,16 @@
"markdown-it-toc-and-anchor": "^4.1.2"
}
},
"vue-material-design-icons": {
"version": "4.10.0",
"resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-4.10.0.tgz",
"integrity": "sha512-BakM+52NYsU9uW/rWvpHJvs+B7kaEaaH0CQGWmpz/PDTUduzVyajrE5/zc+vQltD5EJvtKQ4LCUgkoQOnrcyzg=="
},
"vue-runtime-helpers": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vue-runtime-helpers/-/vue-runtime-helpers-1.1.2.tgz",
"integrity": "sha512-pZfGp+PW/IXEOyETE09xQHR1CKkR9HfHZdnMD/FVLUNI+HxYTa82evx5WrF6Kz4s82qtqHvMZ8MZpbk2zT2E1Q=="
},
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
......
{
"name": "@coscine/login",
"version": "1.9.1",
"version": "1.10.0",
"private": true,
"directories": {
"doc": "docs"
......@@ -12,7 +12,8 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"@coscine/api-connection": "^1.21.0",
"@coscine/api-connection": "^1.22.0",
"@coscine/component-library": "^1.2.0",
"@itcenter-layout/bootstrap": "^1.5.5",
"@itcenter-layout/masterpage": "^1.3.0",
"@types/jquery": "^3.5.2",
......
<template>
<div id="wrap" :style="cssProps">
<RWTHHeader
<coscine-page-header
:rwthImage="rwthImage"
:coscineImageBlack="coscineImageBlack"/>
:coscineImageBlack="coscineImageBlack"
:locale="this.$root.$i18n.locale"
@changeLocale="changeLocale"/>
<div class="container-fluid app-content">
<div class="row">
<div class="col-xl-2"></div>
......@@ -82,7 +84,12 @@
</div>
<div class="col-xl-2"></div>
</div>
<RWTHFooter/>
<coscine-page-footer
:contact="$t('contact')"
:disclaimer="$t('disclaimer')"
:help="$t('help')"
:imprint="$t('imprint')"
/>
</div>
</template>
......@@ -92,8 +99,7 @@ import VueMarkdown from 'vue-markdown';
import LoginMain from './components/LoginMain.vue';
import LogoutMain from './components/LogoutMain.vue';
import TOS from './components/TOS.vue';
import RWTHHeader from './components/RWTHHeader.vue';
import RWTHFooter from './components/RWTHFooter.vue';
import { CoscinePageHeader, CoscinePageFooter } from '@coscine/component-library';
import coscineImageBlackPath from './assets/logo-coscine-black.png';
import coscineImageBluePath from './assets/logo-coscine-blue.png';
......@@ -180,9 +186,9 @@ export default Vue.extend({
LoginMain,
LogoutMain,
TOS,
RWTHHeader,
RWTHFooter,
VueMarkdown,
CoscinePageHeader,
CoscinePageFooter,
},
computed: {
cssProps() {
......@@ -236,6 +242,13 @@ export default Vue.extend({
changeLogoutState() {
this.logoutState = !this.logoutState;
},
changeLocale() {
if (this.$root.$i18n.locale === 'en') {
this.$root.$i18n.locale = 'de';
} else {
this.$root.$i18n.locale = 'en';
}
},
},
created() {
this.retrieveNotices();
......@@ -341,8 +354,7 @@ export default Vue.extend({
transition: opacity 0.3s ease;
}
.component-fade-enter, .component-fade-leave-to
/* .component-fade-leave-active below version 2.1.8 */ {
.component-fade-enter, .component-fade-leave-to {
opacity: 0;
}
......
<template>
<footer id="footer">
<div class="row container">
<div id="servicecol" class="col-xs-12 col-sm-6">
<div class="list-group">
<h2>Service</h2>
<a href="https://help.itc.rwth-aachen.de/service/7ab6210773b04ef28a1a8cb33628be67" class="list-group-item list-group-item-action">{{ $t('help') }}</a>
<a href="https://git.rwth-aachen.de/coscine/terms/-/blob/master/PrivacyPolicy.md" class="list-group-item list-group-item-action">{{ $t('disclaimer') }}</a>
<a href="http://www.itc.rwth-aachen.de/cms/IT-Center/Footer/Service/~epvv/Impressum/" class="list-group-item list-group-item-action">{{ $t('imprint') }}</a>
</div>
</div>
<div id="contactcol" class="col-xs-12 col-sm-6">
<div id="contact-list" class="list-group">
<h2 id="footerContact">{{ $t('contact') }}</h2>
<a id="mail" href="mailto:servicedesk@itc.rwth-aachen.de" class="list-group-item list-group-item-action">
servicedesk@itc.rwth-aachen.de
</a>
<span id="phone" class="list-group-item">
+49 241 / 80-24680
</span>
<span id="fax" class="list-group-item">
+49 241 / 80-22981
</span>
</div>
</div>
</div>
</footer>
</template>
<script lang="ts">
import Vue from 'vue';
export default Vue.extend({
name: 'rwthfooter',
});
</script>
<style scoped></style>
<template>
<header id="header">
<nav id="nav-global" class="navbar rwth-black navbar-dark navbar-expand-md">
<div class="app-header-container">
<div id="DeltaSiteLogo">
<a id="ctl00_onetidProjectPropertyTitleGraphic" title="Team Site" class="ms-siteicon-a" href="/">
<img id="ctl00_onetidHeadbnnr2" class="ms-siteicon-img" name="onetidHeadbnnr0" :src="rwthImage" alt="RWTH Aachen University" data-themekey="#">
</a>
</div>
</div>
<div id="DeltaCoScInESiteLogo">
<a id="ctl00_SPSimpleSiteLink1" title="Team Site" class="ms-siteicon-a coscineSiteIcon" href="/">
<img id="ctl00_SiteLogoImage1" class="ms-siteicon-img" name="onetidHeadbnnr0" :src="coscineImageBlack" alt="Coscine" data-themekey="#">
</a>
<span class="coscineSiteIconLabel">CoScInE</span>
</div>
<ul id="nav-langsearch" class="navbar-nav ml-auto">
<li id="langToggle" class="next-lang" tabindex="0" aria-label="toggle language">
<a class="nav-link lang" href="#" id="Lang" v-on:click="changeLocale()">
<span id="langBox" class="language-box">{{ $t('otherLocale') }}</span>
</a>
</li>
</ul>
</nav>
</header>
</template>
<script lang="ts">
import Vue from 'vue';
export default Vue.extend({
name: 'rwthHeader',
props: {
rwthImage: String,
coscineImageBlack: String,
},
methods: {
changeLocale() {
if (this.$root.$i18n.locale === 'en') {
this.$root.$i18n.locale = 'de';
} else {
this.$root.$i18n.locale = 'en';
}
},
},
});
</script>
<style scoped></style>
......@@ -4,6 +4,7 @@ declare module '*.vue' {
}
declare module '@coscine/api-connection';
declare module '@coscine/component-library';
declare module 'vue-markdown';
declare module '@itcenter-layout/bootstrap';
......