Commit d4c13e40 authored by Thomas Frion's avatar Thomas Frion

Merge branch 'dev'

parents 78f9934f dc4c36ca
This diff is collapsed.
......@@ -193,7 +193,7 @@
<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers compodoc-sourcecode"><code class="language-typescript">import { Component } from &#x27;@angular/core&#x27;;
<pre class="line-numbers compodoc-sourcecode"><code class="language-typescript">import { Component, NgModule } from &#x27;@angular/core&#x27;;
/**
* @AppComponent :
......
......@@ -109,7 +109,7 @@
<td>AuthComponent</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/6)</span>
<span class="coverage-count">(0/8)</span>
</td>
</tr>
<tr class="low">
......@@ -148,6 +148,186 @@
<span class="coverage-count">(0/3)</span>
</td>
</tr>
<tr class="very-good">
<td>
<!-- miscellaneous -->
<a href="./interfaces/IApiService.html">src/app/services/api/api-client.interface.ts</a>
</td>
<td>interface</td>
<td>IApiService</td>
<td align="right" data-sort="100">
<span class="coverage-percent">100 %</span>
<span class="coverage-count">(5/5)</span>
</td>
</tr>
<tr class="very-good">
<td>
<!-- miscellaneous -->
<a href="./classes/ApiService.html">src/app/services/api/api.service.ts</a>
</td>
<td>class</td>
<td>ApiService</td>
<td align="right" data-sort="77">
<span class="coverage-percent">77 %</span>
<span class="coverage-count">(7/9)</span>
</td>
</tr>
<tr class="good">
<td>
<!-- miscellaneous -->
<a href="./injectables/ServiceApi.html">src/app/services/api/clients/service.api.ts</a>
</td>
<td>injectable</td>
<td>ServiceApi</td>
<td align="right" data-sort="53">
<span class="coverage-percent">53 %</span>
<span class="coverage-count">(7/13)</span>
</td>
</tr>
<tr class="good">
<td>
<!-- miscellaneous -->
<a href="./injectables/TokenApi.html">src/app/services/api/clients/token.api.ts</a>
</td>
<td>injectable</td>
<td>TokenApi</td>
<td align="right" data-sort="63">
<span class="coverage-percent">63 %</span>
<span class="coverage-count">(7/11)</span>
</td>
</tr>
<tr class="good">
<td>
<!-- miscellaneous -->
<a href="./injectables/UnitApi.html">src/app/services/api/clients/unit.api.ts</a>
</td>
<td>injectable</td>
<td>UnitApi</td>
<td align="right" data-sort="53">
<span class="coverage-percent">53 %</span>
<span class="coverage-count">(7/13)</span>
</td>
</tr>
<tr class="good">
<td>
<!-- miscellaneous -->
<a href="./injectables/UserApi.html">src/app/services/api/clients/user.api.ts</a>
</td>
<td>injectable</td>
<td>UserApi</td>
<td align="right" data-sort="53">
<span class="coverage-percent">53 %</span>
<span class="coverage-count">(7/13)</span>
</td>
</tr>
<tr class="good">
<td>
<!-- miscellaneous -->
<a href="./injectables/WebcamApi.html">src/app/services/api/clients/webcam.api.ts</a>
</td>
<td>injectable</td>
<td>WebcamApi</td>
<td align="right" data-sort="53">
<span class="coverage-percent">53 %</span>
<span class="coverage-count">(7/13)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/Service.html">src/app/services/api/models/service.ts</a>
</td>
<td>interface</td>
<td>Service</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/7)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/ServiceSettings.html">src/app/services/api/models/service.ts</a>
</td>
<td>interface</td>
<td>ServiceSettings</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/5)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/Token.html">src/app/services/api/models/token.ts</a>
</td>
<td>interface</td>
<td>Token</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/3)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/TokenRefresh.html">src/app/services/api/models/token.ts</a>
</td>
<td>interface</td>
<td>TokenRefresh</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/2)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/Unit.html">src/app/services/api/models/unit.ts</a>
</td>
<td>interface</td>
<td>Unit</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/8)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/PghmUser.html">src/app/services/api/models/user.ts</a>
</td>
<td>interface</td>
<td>PghmUser</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/4)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/User.html">src/app/services/api/models/user.ts</a>
</td>
<td>interface</td>
<td>User</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/14)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/Webcam.html">src/app/services/api/models/webcam.ts</a>
</td>
<td>interface</td>
<td>Webcam</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/7)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
......@@ -160,16 +340,28 @@
<span class="coverage-count">(0/4)</span>
</td>
</tr>
<tr class="low">
<tr class="medium">
<td>
<!-- miscellaneous -->
<a href="./classes/AuthService.html">src/app/services/auth.service.ts</a>
<a href="./injectables/AuthService.html">src/app/services/auth.service.ts</a>
</td>
<td>class</td>
<td>injectable</td>
<td>AuthService</td>
<td align="right" data-sort="44">
<span class="coverage-percent">44 %</span>
<span class="coverage-count">(4/9)</span>
</td>
</tr>
<tr class="low">
<td>
<!-- miscellaneous -->
<a href="./interfaces/Token.html">src/app/services/authentication.ts</a>
</td>
<td>interface</td>
<td>Token</td>
<td align="right" data-sort="0">
<span class="coverage-percent">0 %</span>
<span class="coverage-count">(0/4)</span>
<span class="coverage-count">(0/3)</span>
</td>
</tr>
<tr class="medium">
......@@ -191,9 +383,9 @@
</td>
<td>component</td>
<td>SidebarLeftComponent</td>
<td align="right" data-sort="25">
<span class="coverage-percent">25 %</span>
<span class="coverage-count">(1/4)</span>
<td align="right" data-sort="11">
<span class="coverage-percent">11 %</span>
<span class="coverage-count">(1/9)</span>
</td>
</tr>
<tr class="low">
......
......@@ -119,7 +119,7 @@
<tbody>
<tr>
<td class="col-md-4">
<code>constructor(authService: <a href="../classes/AuthService.html">AuthService</a>, router: <a href="https://angular.io/api/router/Router" target="_blank">Router</a>)</code>
<code>constructor(authService: <a href="../injectables/AuthService.html">AuthService</a>, router: <a href="https://angular.io/api/router/Router" target="_blank">Router</a>)</code>
</td>
</tr>
<tr>
......@@ -145,7 +145,7 @@
<td>authService</td>
<td>
<code><a href="../classes/AuthService.html" target="_self" >AuthService</a></code>
<code><a href="../injectables/AuthService.html" target="_self" >AuthService</a></code>
</td>
<td>
......@@ -240,7 +240,7 @@ export class AuthGuard implements CanActivate {
constructor(private authService: AuthService, public router: Router) { }
canActivate(): boolean{
if(!this.authService.isAuth) {
if(!this.authService.loggedIn()) {
this.router.navigate([&#x27;auth&#x27;]);
return false;
} else {
......
......@@ -4,6 +4,6 @@
<rect id="svg_2" height="20" width="40" y="0" x="92" stroke-width="1.5" stroke="#d8604b" fill="#d8604b" rx="7" ry="7"/>
<rect id="svg_3" height="20" width="22" y="0" x="92" stroke-width="1.5" stroke="#d8604b" fill="#d8604b"/>
<text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="12" id="svg_4" y="14" x="6" stroke-width="0" stroke="#5d5d5d" fill="#ffffff">documentation</text>
<text xml:space="preserve" text-anchor="middle" font-family="Helvetica, Arial, sans-serif" font-size="12" id="svg_5" y="14" x="112" stroke-width="0" stroke="#5d5d5d" fill="#ffffff" style="text-anchor: middle">4%</text>
<text xml:space="preserve" text-anchor="middle" font-family="Helvetica, Arial, sans-serif" font-size="12" id="svg_5" y="14" x="112" stroke-width="0" stroke="#5d5d5d" fill="#ffffff" style="text-anchor: middle">17%</text>
</g>
</svg>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -60,13 +60,13 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<a href="modules/AppModule.html" data-type="entity-link">AppModule</a>
<li class="chapter inner">
<div class="simple menu-toggler" data-toggle="collapse" ${ isNormalMode ?
'data-target="#components-links-module-AppModule-c833ba07f1313ad908caa4f9c70e82c7"' : 'data-target="#xs-components-links-module-AppModule-c833ba07f1313ad908caa4f9c70e82c7"' }>
'data-target="#components-links-module-AppModule-880ed79562aeaf027597e58e3def908d"' : 'data-target="#xs-components-links-module-AppModule-880ed79562aeaf027597e58e3def908d"' }>
<span class="icon ion-md-cog"></span>
<span>Components</span>
<span class="icon ion-ios-arrow-down"></span>
</div>
<ul class="links collapse" ${ isNormalMode ? 'id="components-links-module-AppModule-c833ba07f1313ad908caa4f9c70e82c7"' :
'id="xs-components-links-module-AppModule-c833ba07f1313ad908caa4f9c70e82c7"' }>
<ul class="links collapse" ${ isNormalMode ? 'id="components-links-module-AppModule-880ed79562aeaf027597e58e3def908d"' :
'id="xs-components-links-module-AppModule-880ed79562aeaf027597e58e3def908d"' }>
<li class="link">
<a href="components/AppComponent.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules">AppComponent</a>
......@@ -101,6 +101,41 @@ customElements.define('compodoc-menu', class extends HTMLElement {
</li>
</ul>
</li>
<li class="chapter inner">
<div class="simple menu-toggler" data-toggle="collapse" ${ isNormalMode ?
'data-target="#injectables-links-module-AppModule-880ed79562aeaf027597e58e3def908d"' : 'data-target="#xs-injectables-links-module-AppModule-880ed79562aeaf027597e58e3def908d"' }>
<span class="icon ion-md-arrow-round-down"></span>
<span>Injectables</span>
<span class="icon ion-ios-arrow-down"></span>
</div>
<ul class="links collapse" ${ isNormalMode ? 'id="injectables-links-module-AppModule-880ed79562aeaf027597e58e3def908d"' :
'id="xs-injectables-links-module-AppModule-880ed79562aeaf027597e58e3def908d"' }>
<li class="link">
<a href="injectables/AuthService.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" }>AuthService</a>
</li>
<li class="link">
<a href="injectables/ServiceApi.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" }>ServiceApi</a>
</li>
<li class="link">
<a href="injectables/TokenApi.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" }>TokenApi</a>
</li>
<li class="link">
<a href="injectables/UnitApi.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" }>UnitApi</a>
</li>
<li class="link">
<a href="injectables/UserApi.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" }>UserApi</a>
</li>
<li class="link">
<a href="injectables/WebcamApi.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" }>WebcamApi</a>
</li>
</ul>
</li>
</li>
<li class="link">
<a href="modules/AppRoutingModule.html" data-type="entity-link">AppRoutingModule</a>
......@@ -116,10 +151,10 @@ customElements.define('compodoc-menu', class extends HTMLElement {
</div>
<ul class="links collapse " ${ isNormalMode ? 'id="classes-links"' : 'id="xs-classes-links"' }>
<li class="link">
<a href="classes/AppPage.html" data-type="entity-link">AppPage</a>
<a href="classes/ApiService.html" data-type="entity-link">ApiService</a>
</li>
<li class="link">
<a href="classes/AuthService.html" data-type="entity-link">AuthService</a>
<a href="classes/AppPage.html" data-type="entity-link">AppPage</a>
</li>
</ul>
</li>
......@@ -147,6 +182,36 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<li class="link">
<a href="interfaces/Fonctionnalite.html" data-type="entity-link">Fonctionnalite</a>
</li>
<li class="link">
<a href="interfaces/IApiService.html" data-type="entity-link">IApiService</a>
</li>
<li class="link">
<a href="interfaces/PghmUser.html" data-type="entity-link">PghmUser</a>
</li>
<li class="link">
<a href="interfaces/Service.html" data-type="entity-link">Service</a>
</li>
<li class="link">
<a href="interfaces/ServiceSettings.html" data-type="entity-link">ServiceSettings</a>
</li>
<li class="link">
<a href="interfaces/Token.html" data-type="entity-link">Token</a>
</li>
<li class="link">
<a href="interfaces/Token-1.html" data-type="entity-link">Token</a>
</li>
<li class="link">
<a href="interfaces/TokenRefresh.html" data-type="entity-link">TokenRefresh</a>
</li>
<li class="link">
<a href="interfaces/Unit.html" data-type="entity-link">Unit</a>
</li>
<li class="link">
<a href="interfaces/User.html" data-type="entity-link">User</a>
</li>
<li class="link">
<a href="interfaces/Webcam.html" data-type="entity-link">Webcam</a>
</li>
</ul>
</li>
<li class="chapter">
......@@ -157,6 +222,9 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<span class="icon ion-ios-arrow-down"></span>
</div>
<ul class="links collapse " ${ isNormalMode ? 'id="miscellaneous-links"' : 'id="xs-miscellaneous-links"' }>
<li class="link">
<a href="miscellaneous/enumerations.html" data-type="entity-link">Enums</a>
</li>
<li class="link">
<a href="miscellaneous/variables.html" data-type="entity-link">Variables</a>
</li>
......
var ROUTES_INDEX = {"name":"<root>","kind":"module","className":"AppModule","children":[{"name":"routes","filename":"src/app/app-routing.module.ts","module":"AppRoutingModule","children":[{"path":"auth","component":"AuthComponent"},{"path":"home","canActivate":["AuthGuard"],"component":"AppFrontComponent"},{"path":"demo","component":"AppFrontComponent"},{"path":"","redirectTo":"auth","pathMatch":"full"},{"path":"not-found","component":"ErrorPageComponent"},{"path":"**","redirectTo":"not-found"}],"kind":"module"}]}
var ROUTES_INDEX = {"name":"<root>","kind":"module","className":"AppModule","children":[{"name":"routes","filename":"src/app/app-routing.module.ts","module":"AppRoutingModule","children":[{"path":"auth","component":"AuthComponent"},{"path":"home","canActivate":["AuthGuard"],"component":"AppFrontComponent"},{"path":"","redirectTo":"home","pathMatch":"full"},{"path":"not-found","component":"ErrorPageComponent"},{"path":"**","redirectTo":"not-found"}],"kind":"module"}]}
This diff is collapsed.
......@@ -177,7 +177,8 @@
<tr>
<td class="col-md-4">
<i>Default value : </i><code>{
production: false
production: false,
pghmApi: &quot;http://127.0.0.1:8000&quot;
}</code>
</td>
</tr>
......
......@@ -89,8 +89,7 @@ import {AuthGuard} from &#x27;./services/auth-guard.service&#x27;;
const routes: Routes &#x3D; [
{ path: &#x27;auth&#x27;, component: AuthComponent},
{ path: &#x27;home&#x27;, canActivate:[AuthGuard],component: AppFrontComponent},
{ path: &#x27;demo&#x27;,component: AppFrontComponent},
{ path: &#x27;&#x27;, redirectTo: &#x27;auth&#x27;, pathMatch: &#x27;full&#x27;},
{ path: &#x27;&#x27;, redirectTo: &#x27;home&#x27;, pathMatch: &#x27;full&#x27;},
{ path: &#x27;not-found&#x27;, component: ErrorPageComponent },
{ path: &#x27;**&#x27;, redirectTo: &#x27;not-found&#x27;}
];
......
This diff is collapsed.
......@@ -7208,6 +7208,11 @@
"invert-kv": "^2.0.0"
}
},
"leaflet": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.6.0.tgz",
"integrity": "sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ=="
},
"less": {
"version": "3.10.3",
"resolved": "https://registry.npmjs.org/less/-/less-3.10.3.tgz",
......
......@@ -20,6 +20,7 @@
"@angular/platform-browser": "~9.0.7",
"@angular/platform-browser-dynamic": "~9.0.7",
"@angular/router": "~9.0.7",
"leaflet": "^1.6.0",
"rxjs": "~6.5.4",
"rxjs-compat": "^6.5.5",
"tslib": "^1.10.0",
......
<app-sidebar-left></app-sidebar-left>
<div class="main-container">
<app-sidebar-left class="left-menu"></app-sidebar-left>
<app-map></app-map>
</div>
<!-- NOT DONE YET:
<app-sidebar-right></app-sidebar-right>
<app-sidebar-right class='right-menu'></app-sidebar-right> #}
<app-coord-map></app-coord-map>
<app-map></app-map>
-->
.main-container{
display: grid;
grid-template-columns: max-content auto;
height: 100vh;
.left-menu {
display: grid;
width: auto;
grid-template-columns: 40px calc(100% - 40px);
height: 100vh;
}
}
.right-menu{
position: absolute;
top: 100px;
right: 100px;
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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