From 284050889a0fc7efe526dfcb8432da77fbf4bf41 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 25 Jan 2021 16:50:27 +0100
Subject: [PATCH] FEAT #15827 TIME 3:30 moved about page to login
---
package.json | 2 +-
.../controllers/AuthenticationController.php | 2 +-
src/frontend/app/about-us.component.html | 146 ++++++++----------
src/frontend/app/about-us.component.ts | 4 +-
src/frontend/app/app-routing.module.ts | 1 -
src/frontend/app/home/home.component.html | 6 +-
src/frontend/app/login/login.component.html | 4 +-
src/frontend/app/login/login.component.scss | 6 +-
src/frontend/app/login/login.component.ts | 5 +
9 files changed, 84 insertions(+), 92 deletions(-)
diff --git a/package.json b/package.json
index dbe4df2f3cc..1c2592da95e 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "MaarchCourrier",
- "version": "20.10.1",
+ "version": "21.03.1",
"description": "MaarchCourrier",
"scripts": {
"build-css": "node-sass --include-path scss src/frontend/css/maarch-material.scss src/frontend/css/maarch-material.css --output-style compressed",
diff --git a/src/core/controllers/AuthenticationController.php b/src/core/controllers/AuthenticationController.php
index 50216064b4a..cdb0ba9b33b 100755
--- a/src/core/controllers/AuthenticationController.php
+++ b/src/core/controllers/AuthenticationController.php
@@ -36,7 +36,7 @@ class AuthenticationController
const ROUTES_WITHOUT_AUTHENTICATION = [
'GET/authenticationInformations', 'PUT/versionsUpdateSQL', 'GET/validUrl', 'GET/authenticate/token', 'GET/images', 'POST/password', 'PUT/password', 'GET/passwordRules',
'GET/jnlp/{jnlpUniqueId}', 'GET/onlyOffice/mergedFile', 'POST/onlyOfficeCallback', 'POST/authenticate',
- 'GET/wopi/files/{id}', 'GET/wopi/files/{id}/contents', 'POST/wopi/files/{id}/contents','GET/onlyOffice/content', 'GET/languages/{lang}', 'GET/languages'
+ 'GET/wopi/files/{id}', 'GET/wopi/files/{id}/contents', 'POST/wopi/files/{id}/contents','GET/onlyOffice/content', 'GET/languages/{lang}', 'GET/languages', 'GET/commitInformation'
];
public function getInformations(Request $request, Response $response)
diff --git a/src/frontend/app/about-us.component.html b/src/frontend/app/about-us.component.html
index 75ad6a01968..0c6a77a52f4 100755
--- a/src/frontend/app/about-us.component.html
+++ b/src/frontend/app/about-us.component.html
@@ -1,83 +1,73 @@
-<mat-sidenav-container autosize class="maarch-container">
- <mat-sidenav-content>
- <div class="bg-head">
- <div class="bg-head-title" [class.customContainerRight]="appService.getViewMode()">
- <div class="bg-head-title-label">
- <header-left></header-left>
- </div>
- <div class="bg-head-title-tool">
- <header-right></header-right>
- </div>
- </div>
- <div class="bg-head-content" [class.fullContainer]="appService.getViewMode()">
+<div class="mat-dialog-content-container">
+ <h1 mat-dialog-title>
+ <span style="flex: 1;">
+ {{'lang.aboutUs' | translate}}
+ </span>
+ <button *ngIf="!loading" [title]="'lang.close' | translate" mat-icon-button (click)="dialogRef.close();">
+ <mat-icon class="fa fa-times"></mat-icon>
+ </button>
+ </h1>
+ <div *ngIf="loading" style="display:flex;height:100%;">
+ <mat-spinner style="margin:auto;"></mat-spinner>
+ </div>
+ <mat-card mat-dialog-content *ngIf="!loading" class="card-app-content" style="min-height: 90% !important;">
+ <div class="col-sm-8">
+ <h3>Maarch Courrier {{applicationVersion}} </h3>
+ <em>Version : <a target="blank" href="https://labs.maarch.org/maarch/MaarchCourrier/commit/{{commitHash}}">{{commitHash}}</a></em>
+ <hr />
+ <p><em>Copyright © 2008-2020 Maarch SAS {{'lang.groupeCompany' | translate}}</em></p>
+ <p>{{'lang.maarchLicence' | translate}}
+ <a target="blank" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">licence GNU GPLv3</a>.</p>
+ <div>
+ <ul>
+ <li>{{'lang.officialWebsite' | translate}} : <a target="blank" href="https://maarch.com/">https://maarch.com</a></li>
+ <li>{{'lang.community' | translate}} : <a target="blank"
+ href="https://community.maarch.org/">https://community.maarch.org</a></li>
+ <li>{{'lang.documentation' | translate}} : <a target="blank"
+ href="https://docs.maarch.org/">https://docs.maarch.org</a></li>
+ </ul>
</div>
+ <p> </p>
+ <h3>{{'lang.externalComponents' | translate}}</h3>
+ <hr />
+ <em>{{'lang.thanksToExtDev' | translate}}</em>
+ <p> </p>
+ <ul>
+ <li><a target="blank" href="https://angular.io/">Angular</a></li>
+ <li><a target="blank" href="https://material.angular.io/">Angular Material</a></li>
+ <li><a target="blank" href="http://getbootstrap.com/">Bootstrap</a></li>
+ <li><a target="blank" href="http://fortawesome.github.io/Font-Awesome/">Font Awesome</a></li>
+ <li><a target="blank" href="http://www.fpdf.org/">Fpdf</a></li>
+ <li><a target="blank" href="http://www.setasign.de/products/pdf-php-solutions/fpdi/">fpdi</a></li>
+ <li><a target="blank" href="https://jquery.com/">Jquery</a></li>
+ <li><a target="blank" href="https://github.com/running-coder/jquery-typeahead">Jquery Typeahead</a></li>
+ <li><a target="blank" href="http://logging.apache.org/log4php/">log4php</a></li>
+ <li><a target="blank" href="http://chir.ag/tech/download/pdfb">Pdfb</a></li>
+ <li><a target="blank" href="http://www.foolabs.com/xpdf/">Pdftotext</a></li>
+ <li><a target="blank" href="http://www.tinybutstrong.com/">Tiny But Strong</a></li>
+ <li><a target="blank" href="http://www.tinymce.com/">TinyMCE</a></li>
+ <li><a target="blank" href="http://framework.zend.com/">Zend Lucene Search</a></li>
+ </ul>
</div>
- <div class="container" [class.fullContainer]="appService.getViewMode()">
- <div class="container-content">
- <div *ngIf="loading" style="display:flex;height:100%;">
- <mat-spinner style="margin:auto;"></mat-spinner>
- </div>
- <mat-card *ngIf="!loading" class="card-app-content">
- <div class="col-sm-8">
- <h3>Maarch Courrier {{applicationVersion}} </h3>
- <em>Version : <a target="blank" href="https://labs.maarch.org/maarch/MaarchCourrier/commit/{{commitHash}}">{{commitHash}}</a></em>
- <hr />
- <p><em>Copyright © 2008-2020 Maarch SAS {{'lang.groupeCompany' | translate}}</em></p>
- <p>{{'lang.maarchLicence' | translate}}
- <a target="blank" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">licence GNU GPLv3</a>.</p>
- <div>
- <ul>
- <li>{{'lang.officialWebsite' | translate}} : <a target="blank" href="https://maarch.com/">https://maarch.com</a></li>
- <li>{{'lang.community' | translate}} : <a target="blank"
- href="https://community.maarch.org/">https://community.maarch.org</a></li>
- <li>{{'lang.documentation' | translate}} : <a target="blank"
- href="https://docs.maarch.org/">https://docs.maarch.org</a></li>
- </ul>
- </div>
- <p> </p>
- <h3>{{'lang.externalComponents' | translate}}</h3>
- <hr />
- <em>{{'lang.thanksToExtDev' | translate}}</em>
- <p> </p>
- <ul>
- <li><a target="blank" href="https://angular.io/">Angular</a></li>
- <li><a target="blank" href="https://material.angular.io/">Angular Material</a></li>
- <li><a target="blank" href="http://getbootstrap.com/">Bootstrap</a></li>
- <li><a target="blank" href="http://fortawesome.github.io/Font-Awesome/">Font Awesome</a></li>
- <li><a target="blank" href="http://www.fpdf.org/">Fpdf</a></li>
- <li><a target="blank" href="http://www.setasign.de/products/pdf-php-solutions/fpdi/">fpdi</a></li>
- <li><a target="blank" href="https://jquery.com/">Jquery</a></li>
- <li><a target="blank" href="https://github.com/running-coder/jquery-typeahead">Jquery Typeahead</a></li>
- <li><a target="blank" href="http://logging.apache.org/log4php/">log4php</a></li>
- <li><a target="blank" href="http://chir.ag/tech/download/pdfb">Pdfb</a></li>
- <li><a target="blank" href="http://www.foolabs.com/xpdf/">Pdftotext</a></li>
- <li><a target="blank" href="http://www.tinybutstrong.com/">Tiny But Strong</a></li>
- <li><a target="blank" href="http://www.tinymce.com/">TinyMCE</a></li>
- <li><a target="blank" href="http://framework.zend.com/">Zend Lucene Search</a></li>
- </ul>
- </div>
- <div class="col-sm-4">
- <h3>Crédits</h3>
- <hr />
- <ul>
- <li>Florian AZIZIAN, Damien BUREL, Bruno CARLIN, Carole COTIN, Prosper DE LAURE, Driss DEMIRAY, Gaël DE
- VILLEBLANCHE, Emmanuel DILLARD, Mathieu DONZEL, Jean-Louis ERCOLANI, Claire FIGUERAS, Laurent
- GIOVANNONI,
- Guillaume HEURTIER, Henri QUENEAU, Kader KANE, Yves-Christian KPAKPO, Alexandre MORIN, Sébastien
- NANABONDJA, Fodé NDIAYE, Cédric NDOUMBA, Alex ORLUC, Alexis RAGOT, Alexandre STEFANOVIC, Serge
- THIERRY-MIEG,
- Cyril VAZQUEZ, Arnaud VEBER, Loic VINET</li>
- <br>
- <li><em>{{'lang.thanksToCommunity' | translate}}</em></li>
- </ul>
- <p> </p>
- <div class="img_credits_maarch_box">
- <mat-icon svgIcon="maarchBox" style="width: 100%;height: auto;"></mat-icon>
- </div>
- </div>
- </mat-card>
+ <div class="col-sm-4">
+ <h3>Crédits</h3>
+ <hr />
+ <ul>
+ <li>Florian AZIZIAN, Damien BUREL, Bruno CARLIN, Carole COTIN, Prosper DE LAURE, Driss DEMIRAY, Gaël DE
+ VILLEBLANCHE, Emmanuel DILLARD, Mathieu DONZEL, Jean-Louis ERCOLANI, Claire FIGUERAS, Laurent
+ GIOVANNONI,
+ Guillaume HEURTIER, Henri QUENEAU, Kader KANE, Yves-Christian KPAKPO, Alexandre MORIN, Sébastien
+ NANABONDJA, Fodé NDIAYE, Cédric NDOUMBA, Alex ORLUC, Alexis RAGOT, Alexandre STEFANOVIC, Serge
+ THIERRY-MIEG,
+ Cyril VAZQUEZ, Arnaud VEBER, Loic VINET</li>
+ <br>
+ <li><em>{{'lang.thanksToCommunity' | translate}}</em></li>
+ </ul>
+ <p> </p>
+ <div class="img_credits_maarch_box">
+ <mat-icon svgIcon="maarchBox" style="width: 100%;height: auto;"></mat-icon>
</div>
</div>
- </mat-sidenav-content>
-</mat-sidenav-container>
+ </mat-card>
+</div>
diff --git a/src/frontend/app/about-us.component.ts b/src/frontend/app/about-us.component.ts
index f356112fc6e..76832f3991b 100755
--- a/src/frontend/app/about-us.component.ts
+++ b/src/frontend/app/about-us.component.ts
@@ -7,6 +7,7 @@ import { catchError, tap } from 'rxjs/operators';
import { HttpClient } from '@angular/common/http';
import { NotificationService } from '@service/notification/notification.service';
import { of } from 'rxjs';
+import { MatDialogRef } from '@angular/material/dialog';
@Component({
templateUrl: 'about-us.component.html',
@@ -26,7 +27,8 @@ export class AboutUsComponent implements OnInit {
public http: HttpClient,
private notify: NotificationService,
private headerService: HeaderService,
- public appService: AppService) { }
+ public appService: AppService,
+ public dialogRef: MatDialogRef<AboutUsComponent>) { }
async ngOnInit() {
this.headerService.setHeader(this.translate.instant('lang.aboutUs'));
diff --git a/src/frontend/app/app-routing.module.ts b/src/frontend/app/app-routing.module.ts
index 76c40ede39b..d8097ad48dc 100755
--- a/src/frontend/app/app-routing.module.ts
+++ b/src/frontend/app/app-routing.module.ts
@@ -41,7 +41,6 @@ const routes: Routes = [
{ path: 'password-modification', component: PasswordModificationComponent },
{ path: 'folders/:folderId', canActivate: [AppGuard], component: FolderDocumentListComponent },
{ path: 'profile', canActivate: [AppGuard], component: ProfileComponent },
- { path: 'about-us', canActivate: [AppGuard], component: AboutUsComponent },
{ path: 'home', canActivate: [AppGuard], component: HomeComponent },
{ path: 'basketList/users/:userSerialId/groups/:groupSerialId/baskets/:basketId', canActivate: [AppGuard], component: BasketListComponent },
{ path: 'login', canActivate: [AppLightGuard], component: LoginComponent },
diff --git a/src/frontend/app/home/home.component.html b/src/frontend/app/home/home.component.html
index 1e829afcc6b..3f9ae528c79 100644
--- a/src/frontend/app/home/home.component.html
+++ b/src/frontend/app/home/home.component.html
@@ -20,10 +20,6 @@
<span [innerHTML]="homeMessage"></span>
</div>
</div>
- <div style="text-align: right;opacity: 0.5;">
- <button mat-button routerLink="/about-us"
- style="position:absolute;font-size:10px;right: 0px;bottom: 0px;">{{'lang.aboutUs' | translate}}</button>
- </div>
</mat-card>
</div>
</div>
@@ -120,4 +116,4 @@
</div>
</div>
</mat-sidenav-content>
-</mat-sidenav-container>
\ No newline at end of file
+</mat-sidenav-container>
diff --git a/src/frontend/app/login/login.component.html b/src/frontend/app/login/login.component.html
index e6da8a5dd17..1a2a9859048 100644
--- a/src/frontend/app/login/login.component.html
+++ b/src/frontend/app/login/login.component.html
@@ -26,8 +26,8 @@
style="color: white;border-color: #24b0ed;background: #24b0ed;">{{'lang.LOGIN' | translate}}</button>
</form>
</div>
- <footer>
- Maarch courrier {{environment.VERSION}} Powered by {{environment.AUTHOR}}
+ <footer style="padding: 8px; backdrop-filter: blur(8px)">
+ <a (click)="openAboutModal()" style="color: white;cursor: pointer">Maarch courrier {{environment.VERSION}}</a> Powered by {{environment.AUTHOR}}
</footer>
</div>
</div>
diff --git a/src/frontend/app/login/login.component.scss b/src/frontend/app/login/login.component.scss
index 09f6360080d..4223acac992 100644
--- a/src/frontend/app/login/login.component.scss
+++ b/src/frontend/app/login/login.component.scss
@@ -44,8 +44,8 @@ footer {
color: white;
position: absolute;
bottom: 5px;
- font-size: 10px;
- opacity: 0.5;
+ //font-size: 10px;
+ opacity: 0.8;
left: 10px;
}
@@ -109,4 +109,4 @@ footer {
padding-bottom: 0px !important;
}
-}
\ No newline at end of file
+}
diff --git a/src/frontend/app/login/login.component.ts b/src/frontend/app/login/login.component.ts
index 6a5224b5531..9a54751f935 100644
--- a/src/frontend/app/login/login.component.ts
+++ b/src/frontend/app/login/login.component.ts
@@ -13,6 +13,7 @@ import { FunctionsService } from '@service/functions.service';
import { TimeLimitPipe } from '../../plugins/timeLimit.pipe';
import { TranslateService } from '@ngx-translate/core';
import { LocalStorageService } from '@service/local-storage.service';
+import { AboutUsComponent } from '@appRoot/about-us.component';
@Component({
templateUrl: 'login.component.html',
@@ -147,4 +148,8 @@ export class LoginComponent implements OnInit {
}
}
}
+
+ openAboutModal() {
+ this.dialog.open(AboutUsComponent, { panelClass: 'maarch-modal', autoFocus: false, disableClose: false });
+ }
}
--
GitLab