Merge branch 'release-3.1'

.travis.yml

@@ -31,8 +31,7 @@ script:
 addons:
   sonarcloud:
     organization: "adorsys"
-    token:
-      secure: $SONARCLOUD_TOKEN
+    token: ${SONAR_TOKEN}
 
 before_deploy:
   - echo $GPG_SECRET_KEY | base64 --decode | $GPG_EXECUTABLE --import || true

certificate-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>psd2-dynamic-sandbox</artifactId>
         <groupId>de.adorsys.psd2.sandbox</groupId>
-        <version>3.0</version>
+        <version>3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

developer-portal-ui/package.json

@@ -49,8 +49,8 @@
     "ramda": "^0.26.1",
     "rxjs": "^6.5.4",
     "tslib": "^1.10.0",
-    "zone.js": "~0.9.1",
-    "vkbeautify": "latest"
+    "vkbeautify": "latest",
+    "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.803.25",

developer-portal-ui/src/app/app.component.html

@@ -125,8 +125,9 @@
 <div class="footer-bar">
   <div class="footer-top-items">
     <img
+      *ngIf="customizeService.getFooterLogo()"
       class="logo"
-      [src]="customizeService.getLogo()"
+      [src]="customizeService.getFooterLogo()"
       (click)="goToPage('home')"
     />
     <div>

developer-portal-ui/src/app/app.component.scss

@@ -272,6 +272,11 @@
   }
 }
 
+.nav,
+.footer-bar {
+  font-weight: normal;
+}
+
 @media screen and (max-width: 720px) {
   .nav {
     .nav-content {

developer-portal-ui/src/app/app.component.spec.ts

@@ -1,6 +1,6 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {RouterTestingModule} from '@angular/router/testing';
-import {AppComponent} from './app.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { AppComponent } from './app.component';
 import {
   TranslateLoader,
   TranslateModule,
@@ -14,13 +14,13 @@ import {
   HttpLoaderFactory,
   LanguageService,
 } from '../services/language.service';
-import {HttpClient} from '@angular/common/http';
-import {DataService} from '../services/data.service';
-import {CustomizeService} from '../services/customize.service';
-import {Pipe, PipeTransform} from '@angular/core';
-import {Router} from '@angular/router';
-import {of} from 'rxjs';
-import {NgHttpLoaderModule} from 'ng-http-loader';
+import { HttpClient } from '@angular/common/http';
+import { DataService } from '../services/data.service';
+import { CustomizeService } from '../services/customize.service';
+import { Pipe, PipeTransform } from '@angular/core';
+import { Router } from '@angular/router';
+import { of } from 'rxjs';
+import { NgHttpLoaderModule } from 'ng-http-loader';
 
 const TRANSLATIONS_EN = require('../assets/i18n/en.json');
 const TRANSLATIONS_DE = require('../assets/i18n/de.json');
@@ -38,20 +38,19 @@ describe('AppComponent', () => {
   let router: Router;
 
   const DataServiceStub = {
-    setRouterUrl: (val: string) => {
-    },
+    setRouterUrl: (val: string) => {},
     getRouterUrl: () => '',
   };
 
   const CustomizeServiceStub = {
     isCustom: () => false,
-    setUserTheme: () => {
-    },
+    setUserTheme: () => {},
     getJSON: () => {
       return new Promise(resolve => {
         resolve({
           globalSettings: {
             logo: '../assets/UI/Logo_XS2ASandbox.png',
+            footerLogo: '../assets/UI/Logo_XS2ASandbox.png',
             cssVariables: {
               colorPrimary: '#054f72',
               colorSecondary: '#eed52f',
@@ -99,18 +98,18 @@ describe('AppComponent', () => {
       });
     },
     getLogo: () => '../assets/UI/Logo_XS2ASandbox.png',
+    getFooterLogo: () => '../assets/UI/Logo_XS2ASandbox.png',
   };
 
   const LanguageServiceStub = {
     language: 'en',
-    initializeTranslation: () => {
-    },
+    initializeTranslation: () => {},
     setLang: (lang: string) => (LanguageServiceStub.language = lang),
     getLang: () => LanguageServiceStub.language,
     getLanguages: () => of(['en', 'de', 'es', 'ua']),
   };
 
-  @Pipe({name: 'translate'})
+  @Pipe({ name: 'translate' })
   class TranslatePipe implements PipeTransform {
     transform(value) {
       const tmp = value.split('.');
@@ -135,9 +134,9 @@ describe('AppComponent', () => {
       ],
       providers: [
         TranslateService,
-        {provide: DataService, useValue: DataServiceStub},
-        {provide: CustomizeService, useValue: CustomizeServiceStub},
-        {provide: LanguageService, useValue: LanguageServiceStub},
+        { provide: DataService, useValue: DataServiceStub },
+        { provide: CustomizeService, useValue: CustomizeServiceStub },
+        { provide: LanguageService, useValue: LanguageServiceStub },
       ],
     })
       .compileComponents()

developer-portal-ui/src/app/app.component.ts

@@ -1,13 +1,10 @@
-import {Component, OnInit} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
-import {DataService} from '../services/data.service';
-import {
-  CustomizeService,
-  GlobalSettings,
-  Theme,
-} from '../services/customize.service';
-import {TranslateService} from '@ngx-translate/core';
-import {LanguageService} from '../services/language.service';
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { DataService } from '../services/data.service';
+import { CustomizeService } from '../services/customize.service';
+import { TranslateService } from '@ngx-translate/core';
+import { LanguageService } from '../services/language.service';
+import { GlobalSettings, Theme } from '../models/theme.model';
 
 @Component({
   selector: 'app-root',
@@ -93,6 +90,12 @@ export class AppComponent implements OnInit {
           (this.customizeService.isCustom() ? '/custom/' : '/') +
           theme.globalSettings.logo;
       }
+      if (theme.globalSettings.footerLogo.indexOf('/') === -1) {
+        theme.globalSettings.footerLogo =
+          '../assets/UI' +
+          (this.customizeService.isCustom() ? '/custom/' : '/') +
+          theme.globalSettings.footerLogo;
+      }
       if (
         theme.globalSettings.favicon &&
         theme.globalSettings.favicon.href.indexOf('/') === -1

developer-portal-ui/src/assets/UI/defaultTheme.json

@@ -1,6 +1,7 @@
 {
   "globalSettings": {
     "logo": "Logo_XS2ASandbox.png",
+    "footerLogo": "Logo_XS2ASandbox.png",
     "facebook": "https://www.facebook.com/adorsysGmbH/",
     "linkedIn": "https://www.linkedin.com/company/adorsys-gmbh-&-co-kg/"
   },

developer-portal-ui/src/assets/themes/_variables.scss

@@ -1,4 +1,3 @@
-$primary-gradient: linear-gradient(129.54deg, #0db0e2 0%, #10317d 100%);
 $light-grey: #a0a0a0;
 $light-grey-10: #f8f8f8;
 $btn-text-color: #f6f6f6;
@@ -22,6 +21,38 @@ $dark-80: #2c2e2f;
   /* Fonts */
   --fontFamily: Arial, sans-serif;
 
+  /* Text sizes and weights */
+
+  --textFontSize: 20px;
+  --textFontWeight: bold;
+  --textFontSize768px: 18px;
+  --textFontWeight768px: bold;
+  --textFontSize1024px: 18px;
+  --textFontWeight1024px: bold;
+
+  /* Headers sizes and weights */
+
+  --h1FontSize: 2rem;
+  --h1FontWeight: bold;
+  --h1FontSize768px: 2rem;
+  --h1FontWeight768px: bold;
+  --h1FontSize1024px: 2rem;
+  --h1FontWeight1024px: bold;
+
+  --h2FontSize: 1.5rem;
+  --h2FontWeight: bold;
+  --h2FontSize768px: 1.5rem;
+  --h2FontWeight768px: bold;
+  --h2FontSize1024px: 1.5rem;
+  --h2FontWeight1024px: bold;
+
+  --h3FontSize: 1rem;
+  --h3FontWeight: normal;
+  --h3FontSize768px: 1rem;
+  --h3FontWeight768px: normal;
+  --h3FontSize1024px: 1rem;
+  --h3FontWeight1024px: normal;
+
   /* Colors */
   --colorPrimary: #054f72;
   --colorSecondary: #eed52f;
@@ -57,4 +88,71 @@ $dark-80: #2c2e2f;
   /* TestCases */
   --testCasesLeftSectionBG: #ffffff;
   --testCasesRightSectionBG: #eeeeee;
+
+  /* Buttons */
+  --buttonTextColor: #fff;
+  --buttonBorderRadius: 3px;
+
+  --buttonBgGradient1: #0db0e2;
+  --buttonBgGradient2: #054f72;
+  --buttonBG: linear-gradient(
+    129.54deg,
+    var(--buttonBgGradient1) 0%,
+    var(--buttonBgGradient2) 100%
+  );
+
+  --buttonHoveredGradient1: #0f62a4;
+  --buttonHoveredGradient2: #054f72;
+  --buttonHovered: linear-gradient(
+    129.54deg,
+    var(--buttonHoveredGradient1) 0%,
+    var(--buttonHoveredGradient2) 100%
+  );
+
+  --buttonClickedGradient1: #0db0e2;
+  --buttonClickedGradient2: #062e72;
+  --buttonClicked: linear-gradient(
+    129.54deg,
+    var(--buttonClickedGradient1) 0%,
+    var(--buttonClickedGradient2) 100%
+  );
+
+  /* Inputs */
+  --inputBG: $COLOR_WHITE;
+  --inputBorderStyleLeft: 1px solid #dcdcdc;
+  --inputBorderStyleRight: 1px solid #dcdcdc;
+  --inputBorderStyleBottom: 1px solid #dcdcdc;
+  --inputBorderStyleTop: 1px solid #dcdcdc;
+  --inputBorderRadius: 0.1rem;
+
+  /* Selects */
+  --selectBG: $COLOR_WHITE;
+  --selectColor: #3b4151;
+  --selectBorderStyleLeft: none;
+  --selectBorderStyleRight: none;
+  --selectBorderStyleBottom: none;
+  --selectBorderStyleTop: none;
+  --selectBorderRadius: none;
+
+  /* Table */
+  --tableColor: black;
+  --tableBG: #fafafa;
+  --tableStripedBG: #f3f3f3;
+  --tableHeaderBG: #f3f3f3;
+
+  --tableBorderStyleBottom: none;
+  --tableBorderStyleLeft: none;
+  --tableBorderStyleRight: none;
+  --tableBorderStyleTop: none;
+
+  /* Checkboxes */
+  --checkBoxBGChecked: var(--colorPrimary);
+  --checkBoxBG: #eee;
+  --checkBoxBGHovered: #ccc;
+
+  --checkBoxMarkColor: white;
+  --checkBoxMarkLeft: 30%;
+  --checkBoxMarkTop: 30%;
+  --checkBoxMarkWidth: 7px;
+  --checkBoxMarkHeight: 8px;
 }

developer-portal-ui/src/custom-elements/code-area/code-area.component.scss

@@ -21,8 +21,6 @@
 .copy-btn {
   position: relative;
   float: right;
-  background-color: rgba(5, 79, 114, 0.6);
-  color: #fff;
   border-radius: 10%;
   width: 3.5vw;
   height: 3vw;

developer-portal-ui/src/models/theme.model.ts

@@ -0,0 +1,80 @@
+
+export interface Theme {
+  globalSettings: GlobalSettings;
+  contactInfo: ContactInfo;
+  officesInfo: OfficeInfo[];
+  supportedLanguages: string[];
+  supportedApproaches: string[];
+  currency: string;
+  tppSettings: TppSettings;
+}
+
+export interface GlobalSettings {
+  logo: string;
+  footerLogo: string;
+  favicon?: Favicon;
+  facebook?: string;
+  linkedIn?: string;
+  cssVariables?: CSSVariables;
+}
+
+export interface Favicon {
+  type: string;
+  href: string;
+}
+
+export interface CSSVariables {
+  [key: string]: string;
+
+  colorPrimary?: string;
+  colorSecondary?: string;
+  fontFamily?: string;
+  bodyBG?: string;
+  bodyFontColor?: string;
+  headerBG?: string;
+  headerFontColor?: string;
+  mainBG?: string;
+  footerBG?: string;
+  footerFontColor?: string;
+  anchorFontColor?: string;
+  anchorFontColorHover?: string;
+  heroBG?: string;
+  stepBG?: string;
+  contactsCardBG?: string;
+  testCasesLeftSectionBG?: string;
+  testCasesRightSectionBG?: string;
+  buttonBG?: string;
+  buttonTextColor?: string;
+  buttonHovered?: string;
+  buttonClicked?: string;
+  h1FontSize?: string,
+  h1FontWeight?: string,
+  h2FontSize?: string,
+  h2FontWeight?: string,
+  h3FontSize?: string,
+  h3FontWeight?: string
+}
+
+export interface ContactInfo {
+  img: string;
+  name: string;
+  position: string;
+  email?: string;
+  phone?: string;
+}
+
+export interface OfficeInfo {
+  city: string;
+  company: string;
+  addressFirstLine: string;
+  addressSecondLine: string;
+  phone?: string;
+  email?: string;
+  facebook?: string;
+  linkedIn?: string;
+}
+
+export interface TppSettings {
+  tppDefaultNokRedirectUrl: string;
+  tppDefaultRedirectUrl: string;
+}