MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/Development' into Development

This commit is contained in:
George Kalampokis 2020-06-26 11:50:16 +03:00
parent b0dddeeb51 e01d51d41e
commit 2ca9eede14
9 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dmp-frontend/src/app/app-routing.module.ts
View File

@ -162,13 +162,13 @@ const appRoutes: Routes = [
breadcrumb: true breadcrumb: true
} }
}, },
{ // {
path: 'splash', // path: 'splash',
loadChildren: () => import('./ui/splash/splash.module').then(m => m.SplashModule), // loadChildren: () => import('./ui/splash/splash.module').then(m => m.SplashModule),
data: { // data: {
breadcrumb: true // breadcrumb: true
} // }
}, // },
{ {
path: 'unauthorized', path: 'unauthorized',
loadChildren: () => import('./ui/misc/unauthorized/unauthorized.module').then(m => m.UnauthorizedModule), loadChildren: () => import('./ui/misc/unauthorized/unauthorized.module').then(m => m.UnauthorizedModule),

2
dmp-frontend/src/app/ui/navbar/navbar.component.html
View File

@ -78,7 +78,7 @@
<!-- Login --> <!-- Login -->
<li class="nav-item" *ngIf="isAuthenticated();else loginoption"> <li class="nav-item" *ngIf="isAuthenticated();else loginoption">
<img mat-card-avatar class="my-mat-card-avatar" [src]="this.getPrincipalAvatar()" (error)="this.applyFallbackAvatar($event)" (click)="openProfile()" [matTooltip]="this.getPrincipalName()"> <img mat-card-avatar class="my-mat-card-avatar" [src]="this.getPrincipalAvatar()" (error)="this.applyFallbackAvatar($event)" (click)="openProfile()" [matTooltip]="this.getPrincipalName()">
<!-- <img mat-card-avatar class="my-mat-card-avatar" *ngIf="!this.principalHasAvatar()" [src]="this.getDefaultAvatar()" (click)="openProfile()"> --> <!-- <img mat-card-avatar class="my-mat-card-avatar" *ngIf="!this.principalHasAvatar()" [src]="this.getDefaultAvatar()" (click)="openProfile()"> -->
</li> </li>
<ng-template #loginoption> <ng-template #loginoption>
<button mat-button [routerLink]=" ['/login'] "> <button mat-button [routerLink]=" ['/login'] ">

6
dmp-frontend/src/assets/splash/about/faqs.html
View File

@ -51,7 +51,7 @@
</div> </div>
</li> </li>
<li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li> <li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li>
<li class="nav-item"><li class="nav-item"><a class="nav-link" href="http://localhost:4200/login">SIGN IN</a></li></li> <li class="nav-item"><li class="nav-item"><a class="nav-link" href="/login">SIGN IN</a></li></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -186,8 +186,8 @@
</div> </div>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<a class="col d-flex justify-content-end conditions-policy" href="http://localhost:4200/terms-and-conditions">Terms and conditions</a> <a class="col d-flex justify-content-end conditions-policy" href="/terms-and-conditions">Terms and conditions</a>
<a class="col conditions-policy" href="http://localhost:4200/cookies-policy">Cookies policy</a> <a class="col conditions-policy" href="/cookies-policy">Cookies policy</a>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div> <div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div>

6
dmp-frontend/src/assets/splash/about/how-it-works.html
View File

@ -50,7 +50,7 @@
</div> </div>
</li> </li>
<li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li> <li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li>
<li class="nav-item"><li class="nav-item"><a class="nav-link" href="http://localhost:4200/login">SIGN IN</a></li></li> <li class="nav-item"><li class="nav-item"><a class="nav-link" href="/login">SIGN IN</a></li></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -142,8 +142,8 @@
</div> </div>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<a class="col d-flex justify-content-end conditions-policy" href="http://localhost:4200/terms-and-conditions">Terms and conditions</a> <a class="col d-flex justify-content-end conditions-policy" href="/terms-and-conditions">Terms and conditions</a>
<a class="col conditions-policy" href="http://localhost:4200/cookies-policy">Cookies policy</a> <a class="col conditions-policy" href="/cookies-policy">Cookies policy</a>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div> <div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div>

8
dmp-frontend/src/assets/splash/contact.html
View File

@ -51,7 +51,7 @@
</div> </div>
</li> </li>
<li class="nav-item"><a class="nav-link active-nav-link" href="contact.html">CONTACT</a></li> <li class="nav-item"><a class="nav-link active-nav-link" href="contact.html">CONTACT</a></li>
<li class="nav-item"><a class="nav-link" href="http://localhost:4200/login">SIGN IN</a></li> <li class="nav-item"><a class="nav-link" href="/login">SIGN IN</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -62,7 +62,7 @@
<div class="col "> <div class="col ">
<div class="page-title">Contact</div> <div class="page-title">Contact</div>
</div> </div>
<form class="form" method="POST" action="http://localhost:8081/api/contactEmail/public"> <form class="form" method="POST" action="/api/contactEmail/public">
<div class="main-contact"> <div class="main-contact">
<div class="col page-subtitle"> <div class="col page-subtitle">
<div>Contact us to learn more</div> <div>Contact us to learn more</div>
@ -124,8 +124,8 @@
</div> </div>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<a class="col d-flex justify-content-end conditions-policy" href="http://localhost:4200/terms-and-conditions">Terms and conditions</a> <a class="col d-flex justify-content-end conditions-policy" href="/terms-and-conditions">Terms and conditions</a>
<a class="col conditions-policy" href="http://localhost:4200/cookies-policy">Cookies policy</a> <a class="col conditions-policy" href="/cookies-policy">Cookies policy</a>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<div class="col-auto"><img src="assets/img/Cc.logo.circle.png" width="24" height="24"></div> <div class="col-auto"><img src="assets/img/Cc.logo.circle.png" width="24" height="24"></div>

8
dmp-frontend/src/assets/splash/index.html
View File

@ -51,7 +51,7 @@
</div> </div>
</li> </li>
<li class="nav-item"><a class="nav-link" href="contact.html">CONTACT</a></li> <li class="nav-item"><a class="nav-link" href="contact.html">CONTACT</a></li>
<li class="nav-item"><li class="nav-item"><a class="nav-link" href="http://localhost:4200/login">SIGN IN</a></li></li> <li class="nav-item"><li class="nav-item"><a class="nav-link" href="/login">SIGN IN</a></li></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -81,7 +81,7 @@
analysed and stored.</p> analysed and stored.</p>
</div> </div>
<div class="head-start-dmp"> <div class="head-start-dmp">
<a href="http://localhost:4200/home"> <a href="/home">
<button type="button" class="normal-btn">Start your DMP</button> <button type="button" class="normal-btn">Start your DMP</button>
</a> </a>
</div> </div>
@ -371,8 +371,8 @@
</div> </div>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<a class="col d-flex justify-content-end conditions-policy" href="http://localhost:4200/terms-and-conditions">Terms and conditions</a> <a class="col d-flex justify-content-end conditions-policy" href="/terms-and-conditions">Terms and conditions</a>
<a class="col conditions-policy" href="http://localhost:4200/cookies-policy">Cookies policy</a> <a class="col conditions-policy" href="/cookies-policy">Cookies policy</a>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<div class="col-auto"><img src="assets/img/Cc.logo.circle.png" width="24" height="24"></div> <div class="col-auto"><img src="assets/img/Cc.logo.circle.png" width="24" height="24"></div>

6
dmp-frontend/src/assets/splash/resources/co-branding.html
View File

@ -50,7 +50,7 @@
</div> </div>
</li> </li>
<li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li> <li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li>
<li class="nav-item"><li class="nav-item"><a class="nav-link" href="http://localhost:4200/login">SIGN IN</a></li></li> <li class="nav-item"><li class="nav-item"><a class="nav-link" href="/login">SIGN IN</a></li></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -102,8 +102,8 @@
</div> </div>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<a class="col d-flex justify-content-end conditions-policy" href="http://localhost:4200/terms-and-conditions">Terms and conditions</a> <a class="col d-flex justify-content-end conditions-policy" href="/terms-and-conditions">Terms and conditions</a>
<a class="col conditions-policy" href="http://localhost:4200/cookies-policy">Cookies policy</a> <a class="col conditions-policy" href="/cookies-policy">Cookies policy</a>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div> <div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div>

6
dmp-frontend/src/assets/splash/resources/media-kit.html
View File

@ -50,7 +50,7 @@
</div> </div>
</li> </li>
<li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li> <li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li>
<li class="nav-item"><li class="nav-item"><a class="nav-link" href="http://localhost:4200/login">SIGN IN</a></li></li> <li class="nav-item"><li class="nav-item"><a class="nav-link" href="/login">SIGN IN</a></li></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -177,8 +177,8 @@
</div> </div>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<a class="col d-flex justify-content-end conditions-policy" href="http://localhost:4200/terms-and-conditions">Terms and conditions</a> <a class="col d-flex justify-content-end conditions-policy" href="/terms-and-conditions">Terms and conditions</a>
<a class="col conditions-policy" href="http://localhost:4200/cookies-policy">Cookies policy</a> <a class="col conditions-policy" href="/cookies-policy">Cookies policy</a>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div> <div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div>

10
dmp-frontend/src/assets/splash/resources/user-guide.html
View File

@ -50,7 +50,7 @@
</div> </div>
</li> </li>
<li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li> <li class="nav-item"><a class="nav-link" href="../contact.html">CONTACT</a></li>
<li class="nav-item"><li class="nav-item"><a class="nav-link" href="http://localhost:4200/login">SIGN IN</a></li></li> <li class="nav-item"><li class="nav-item"><a class="nav-link" href="/login">SIGN IN</a></li></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -68,13 +68,13 @@
<p> <p>
Become proficient in using Argos by following the User Guide. Check presentation for additional hints and leave your thoughts for improvements in the feedback form. Become proficient in using Argos by following the User Guide. Check presentation for additional hints and leave your thoughts for improvements in the feedback form.
<ul> <ul>
<li><a href="http://localhost:4200/user-guide">User Guide</a></li> <li><a href="/user-guide">User Guide</a></li>
<li><a href="../assets/presentations/argos.pdf">Presentations</a></li> <li><a href="../assets/presentations/argos.pdf">Presentations</a></li>
<li><a href="https://docs.google.com/forms/d/1KNhgjQyGrA6lYjOOUUL5cqU2BVquS0qdfwzOGxokgAw">Feedback Form</a></li> <li><a href="https://docs.google.com/forms/d/1KNhgjQyGrA6lYjOOUUL5cqU2BVquS0qdfwzOGxokgAw">Feedback Form</a></li>
</ul> </ul>
</p> </p>
</div> </div>
<div class="col d-flex justify-content-center"><button href="http://localhost:4200/user-guide" class="normal-btn">View User Guide <div class="col d-flex justify-content-center"><button href="/user-guide" class="normal-btn">View User Guide
Online</button></div> Online</button></div>
</div> </div>
</section> </section>
@ -106,8 +106,8 @@
</div> </div>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<a class="col d-flex justify-content-end conditions-policy" href="http://localhost:4200/terms-and-conditions">Terms and conditions</a> <a class="col d-flex justify-content-end conditions-policy" href="/terms-and-conditions">Terms and conditions</a>
<a class="col conditions-policy" href="http://localhost:4200/cookies-policy">Cookies policy</a> <a class="col conditions-policy" href="/cookies-policy">Cookies policy</a>
</div> </div>
<div class="row justify-content-center pt-5"> <div class="row justify-content-center pt-5">
<div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div> <div class="col-auto"><img src="../assets/img/Cc.logo.circle.png" width="24" height="24"></div>