From 530e1d02e80146f39a67e0d4b06c1d2f9a7f82c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Fri, 18 Jun 2021 22:54:20 +0200
Subject: [PATCH] Add auth, core and shared modules
---
client/package.json | 8 +-
client/src/app/app.component.html | 509 ------------------
client/src/app/app.component.ts | 23 -
client/src/app/app.module.ts | 8 +-
client/src/app/auth/auth.action.ts | 10 +
client/src/app/auth/auth.effects.ts | 69 +++
client/src/app/auth/auth.module.spec.ts | 1 +
client/src/app/auth/auth.module.ts | 22 +
client/src/app/auth/auth.reducer.ts | 36 ++
client/src/app/auth/auth.selector.ts | 20 +
client/src/app/auth/init.keycloak.ts | 45 ++
client/src/app/auth/user-profile.model.ts | 11 +
.../app/core/components/nav.component.html | 96 ++++
.../src/app/core/components/nav.component.ts | 11 +
.../app/core/containers/app.component.html | 1 +
.../{ => core/containers}/app.component.scss | 0
.../containers}/app.component.spec.ts | 0
.../src/app/core/containers/app.component.ts | 12 +
client/src/app/core/core.module.ts | 25 +
client/src/app/shared/shared.module.ts | 9 +
client/src/environments/environment.ts | 12 +-
client/yarn.lock | 49 ++
22 files changed, 437 insertions(+), 540 deletions(-)
delete mode 100644 client/src/app/app.component.html
delete mode 100644 client/src/app/app.component.ts
create mode 100644 client/src/app/auth/auth.action.ts
create mode 100644 client/src/app/auth/auth.effects.ts
create mode 100644 client/src/app/auth/auth.module.spec.ts
create mode 100644 client/src/app/auth/auth.module.ts
create mode 100644 client/src/app/auth/auth.reducer.ts
create mode 100644 client/src/app/auth/auth.selector.ts
create mode 100644 client/src/app/auth/init.keycloak.ts
create mode 100644 client/src/app/auth/user-profile.model.ts
create mode 100644 client/src/app/core/components/nav.component.html
create mode 100644 client/src/app/core/components/nav.component.ts
create mode 100644 client/src/app/core/containers/app.component.html
rename client/src/app/{ => core/containers}/app.component.scss (100%)
rename client/src/app/{ => core/containers}/app.component.spec.ts (100%)
create mode 100644 client/src/app/core/containers/app.component.ts
create mode 100644 client/src/app/core/core.module.ts
create mode 100644 client/src/app/shared/shared.module.ts
diff --git a/client/package.json b/client/package.json
index fa81825f..2f31966b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -18,11 +18,17 @@
"@angular/platform-browser": "~12.0.4",
"@angular/platform-browser-dynamic": "~12.0.4",
"@angular/router": "~12.0.4",
+ "@fortawesome/fontawesome-free": "^5.15.3",
"@ngrx/effects": "12.1.0",
"@ngrx/entity": "12.1.0",
"@ngrx/router-store": "12.1.0",
"@ngrx/store": "12.1.0",
"@ngrx/store-devtools": "12.1.0",
+ "bootstrap": "4.6",
+ "keycloak-angular": "^8.2.0",
+ "keycloak-js": "^14.0.0",
+ "ngx-bootstrap": "^7.0.0-rc.1",
+ "ngx-toastr": "^14.0.0",
"rxjs": "~6.6.0",
"tslib": "^2.1.0",
"zone.js": "~0.11.4"
@@ -41,4 +47,4 @@
"karma-jasmine-html-reporter": "^1.5.0",
"typescript": "~4.2.3"
}
-}
\ No newline at end of file
+}
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
deleted file mode 100644
index a751c67c..00000000
--- a/client/src/app/app.component.html
+++ /dev/null
@@ -1,509 +0,0 @@
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * Delete the template below * * * * * * * * * * -->
-<!-- * * * * * * * to get started with your project! * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-<style>
- :host {
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
- font-size: 14px;
- color: #333;
- box-sizing: border-box;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- }
-
- h1,
- h2,
- h3,
- h4,
- h5,
- h6 {
- margin: 8px 0;
- }
-
- p {
- margin: 0;
- }
-
- .spacer {
- flex: 1;
- }
-
- .toolbar {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- height: 60px;
- display: flex;
- align-items: center;
- background-color: #1976d2;
- color: white;
- font-weight: 600;
- }
-
- .toolbar img {
- margin: 0 16px;
- }
-
- .toolbar #twitter-logo {
- height: 40px;
- margin: 0 8px;
- }
-
- .toolbar #youtube-logo {
- height: 40px;
- margin: 0 16px;
- }
-
- .toolbar #twitter-logo:hover,
- .toolbar #youtube-logo:hover {
- opacity: 0.8;
- }
-
- .content {
- display: flex;
- margin: 82px auto 32px;
- padding: 0 16px;
- max-width: 960px;
- flex-direction: column;
- align-items: center;
- }
-
- svg.material-icons {
- height: 24px;
- width: auto;
- }
-
- svg.material-icons:not(:last-child) {
- margin-right: 8px;
- }
-
- .card svg.material-icons path {
- fill: #888;
- }
-
- .card-container {
- display: flex;
- flex-wrap: wrap;
- justify-content: center;
- margin-top: 16px;
- }
-
- .card {
- border-radius: 4px;
- border: 1px solid #eee;
- background-color: #fafafa;
- height: 40px;
- width: 200px;
- margin: 0 8px 16px;
- padding: 16px;
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
- transition: all 0.2s ease-in-out;
- line-height: 24px;
- }
-
- .card-container .card:not(:last-child) {
- margin-right: 0;
- }
-
- .card.card-small {
- height: 16px;
- width: 168px;
- }
-
- .card-container .card:not(.highlight-card) {
- cursor: pointer;
- }
-
- .card-container .card:not(.highlight-card):hover {
- transform: translateY(-3px);
- box-shadow: 0 4px 17px rgba(0, 0, 0, 0.35);
- }
-
- .card-container .card:not(.highlight-card):hover .material-icons path {
- fill: rgb(105, 103, 103);
- }
-
- .card.highlight-card {
- background-color: #1976d2;
- color: white;
- font-weight: 600;
- border: none;
- width: auto;
- min-width: 30%;
- position: relative;
- }
-
- .card.card.highlight-card span {
- margin-left: 60px;
- }
-
- svg#rocket {
- width: 80px;
- position: absolute;
- left: -10px;
- top: -24px;
- }
-
- svg#rocket-smoke {
- height: calc(100vh - 95px);
- position: absolute;
- top: 10px;
- right: 180px;
- z-index: -10;
- }
-
- a,
- a:visited,
- a:hover {
- color: #1976d2;
- text-decoration: none;
- }
-
- a:hover {
- color: #125699;
- }
-
- .terminal {
- position: relative;
- width: 80%;
- max-width: 600px;
- border-radius: 6px;
- padding-top: 45px;
- margin-top: 8px;
- overflow: hidden;
- background-color: rgb(15, 15, 16);
- }
-
- .terminal::before {
- content: "\2022 \2022 \2022";
- position: absolute;
- top: 0;
- left: 0;
- height: 4px;
- background: rgb(58, 58, 58);
- color: #c2c3c4;
- width: 100%;
- font-size: 2rem;
- line-height: 0;
- padding: 14px 0;
- text-indent: 4px;
- }
-
- .terminal pre {
- font-family: SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace;
- color: white;
- padding: 0 1rem 1rem;
- margin: 0;
- }
-
- .circle-link {
- height: 40px;
- width: 40px;
- border-radius: 40px;
- margin: 8px;
- background-color: white;
- border: 1px solid #eeeeee;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
- transition: 1s ease-out;
- }
-
- .circle-link:hover {
- transform: translateY(-0.25rem);
- box-shadow: 0px 3px 15px rgba(0, 0, 0, 0.2);
- }
-
- footer {
- margin-top: 8px;
- display: flex;
- align-items: center;
- line-height: 20px;
- }
-
- footer a {
- display: flex;
- align-items: center;
- }
-
- .github-star-badge {
- color: #24292e;
- display: flex;
- align-items: center;
- font-size: 12px;
- padding: 3px 10px;
- border: 1px solid rgba(27,31,35,.2);
- border-radius: 3px;
- background-image: linear-gradient(-180deg,#fafbfc,#eff3f6 90%);
- margin-left: 4px;
- font-weight: 600;
- font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;
- }
-
- .github-star-badge:hover {
- background-image: linear-gradient(-180deg,#f0f3f6,#e6ebf1 90%);
- border-color: rgba(27,31,35,.35);
- background-position: -.5em;
- }
-
- .github-star-badge .material-icons {
- height: 16px;
- width: 16px;
- margin-right: 4px;
- }
-
- svg#clouds {
- position: fixed;
- bottom: -160px;
- left: -230px;
- z-index: -10;
- width: 1920px;
- }
-
-
- /* Responsive Styles */
- @media screen and (max-width: 767px) {
-
- .card-container > *:not(.circle-link) ,
- .terminal {
- width: 100%;
- }
-
- .card:not(.highlight-card) {
- height: 16px;
- margin: 8px 0;
- }
-
- .card.highlight-card span {
- margin-left: 72px;
- }
-
- svg#rocket-smoke {
- right: 120px;
- transform: rotate(-5deg);
- }
- }
-
- @media screen and (max-width: 575px) {
- svg#rocket-smoke {
- display: none;
- visibility: hidden;
- }
- }
-</style>
-
-<!-- Toolbar -->
-<div class="toolbar" role="banner">
- <img
- width="40"
- alt="Angular Logo"
- src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg=="
- />
- <span>Welcome</span>
- <div class="spacer"></div>
- <a aria-label="Angular on twitter" target="_blank" rel="noopener" href="https://twitter.com/angular" title="Twitter">
- <svg id="twitter-logo" height="24" data-name="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400">
- <rect width="400" height="400" fill="none"/>
- <path d="M153.62,301.59c94.34,0,145.94-78.16,145.94-145.94,0-2.22,0-4.43-.15-6.63A104.36,104.36,0,0,0,325,122.47a102.38,102.38,0,0,1-29.46,8.07,51.47,51.47,0,0,0,22.55-28.37,102.79,102.79,0,0,1-32.57,12.45,51.34,51.34,0,0,0-87.41,46.78A145.62,145.62,0,0,1,92.4,107.81a51.33,51.33,0,0,0,15.88,68.47A50.91,50.91,0,0,1,85,169.86c0,.21,0,.43,0,.65a51.31,51.31,0,0,0,41.15,50.28,51.21,51.21,0,0,1-23.16.88,51.35,51.35,0,0,0,47.92,35.62,102.92,102.92,0,0,1-63.7,22A104.41,104.41,0,0,1,75,278.55a145.21,145.21,0,0,0,78.62,23" fill="#fff"/>
- </svg>
- </a>
- <a aria-label="Angular on YouTube" target="_blank" rel="noopener" href="https://youtube.com/angular" title="YouTube">
- <svg id="youtube-logo" height="24" width="24" data-name="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#fff">
- <path d="M0 0h24v24H0V0z" fill="none"/>
- <path d="M21.58 7.19c-.23-.86-.91-1.54-1.77-1.77C18.25 5 12 5 12 5s-6.25 0-7.81.42c-.86.23-1.54.91-1.77 1.77C2 8.75 2 12 2 12s0 3.25.42 4.81c.23.86.91 1.54 1.77 1.77C5.75 19 12 19 12 19s6.25 0 7.81-.42c.86-.23 1.54-.91 1.77-1.77C22 15.25 22 12 22 12s0-3.25-.42-4.81zM10 15V9l5.2 3-5.2 3z"/>
- </svg>
- </a>
-</div>
-
-<div class="content" role="main">
-
- <!-- Highlight Card -->
- <div class="card highlight-card card-small">
-
- <svg id="rocket" xmlns="http://www.w3.org/2000/svg" width="101.678" height="101.678" viewBox="0 0 101.678 101.678">
- <title>Rocket Ship</title>
- <g id="Group_83" data-name="Group 83" transform="translate(-141 -696)">
- <circle id="Ellipse_8" data-name="Ellipse 8" cx="50.839" cy="50.839" r="50.839" transform="translate(141 696)" fill="#dd0031"/>
- <g id="Group_47" data-name="Group 47" transform="translate(165.185 720.185)">
- <path id="Path_33" data-name="Path 33" d="M3.4,42.615a3.084,3.084,0,0,0,3.553,3.553,21.419,21.419,0,0,0,12.215-6.107L9.511,30.4A21.419,21.419,0,0,0,3.4,42.615Z" transform="translate(0.371 3.363)" fill="#fff"/>
- <path id="Path_34" data-name="Path 34" d="M53.3,3.221A3.09,3.09,0,0,0,50.081,0,48.227,48.227,0,0,0,18.322,13.437c-6-1.666-14.991-1.221-18.322,7.218A33.892,33.892,0,0,1,9.439,25.1l-.333.666a3.013,3.013,0,0,0,.555,3.553L23.985,43.641a2.9,2.9,0,0,0,3.553.555l.666-.333A33.892,33.892,0,0,1,32.647,53.3c8.55-3.664,8.884-12.326,7.218-18.322A48.227,48.227,0,0,0,53.3,3.221ZM34.424,9.772a6.439,6.439,0,1,1,9.106,9.106,6.368,6.368,0,0,1-9.106,0A6.467,6.467,0,0,1,34.424,9.772Z" transform="translate(0 0.005)" fill="#fff"/>
- </g>
- </g>
- </svg>
-
- <span>{{ title }} app is running!</span>
-
- <svg id="rocket-smoke" xmlns="http://www.w3.org/2000/svg" width="516.119" height="1083.632" viewBox="0 0 516.119 1083.632">
- <title>Rocket Ship Smoke</title>
- <path id="Path_40" data-name="Path 40" d="M644.6,141S143.02,215.537,147.049,870.207s342.774,201.755,342.774,201.755S404.659,847.213,388.815,762.2c-27.116-145.51-11.551-384.124,271.9-609.1C671.15,139.365,644.6,141,644.6,141Z" transform="translate(-147.025 -140.939)" fill="#f5f5f5"/>
- </svg>
-
- </div>
-
- <!-- Resources -->
- <h2>Resources</h2>
- <p>Here are some links to help you get started:</p>
-
- <div class="card-container">
- <a class="card" target="_blank" rel="noopener" href="https://angular.io/tutorial">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 13.18v4L12 21l7-3.82v-4L12 17l-7-3.82zM12 3L1 9l11 6 9-4.91V17h2V9L12 3z"/></svg>
-
- <span>Learn Angular</span>
-
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg> </a>
-
- <a class="card" target="_blank" rel="noopener" href="https://angular.io/cli">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
-
- <span>CLI Documentation</span>
-
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
- </a>
-
- <a class="card" target="_blank" rel="noopener" href="https://blog.angular.io/">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 17.41 3.8 13.5.67zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 4.04 0 2.65-2.15 4.8-4.8 4.8z"/></svg>
-
- <span>Angular Blog</span>
-
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
- </a>
-
- </div>
-
- <!-- Next Steps -->
- <h2>Next Steps</h2>
- <p>What do you want to do next with your app?</p>
-
- <input type="hidden" #selection>
-
- <div class="card-container">
- <div class="card card-small" (click)="selection.value = 'component'" tabindex="0">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
- <span>New Component</span>
- </div>
-
- <div class="card card-small" (click)="selection.value = 'material'" tabindex="0">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
- <span>Angular Material</span>
- </div>
-
- <div class="card card-small" (click)="selection.value = 'pwa'" tabindex="0">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
- <span>Add PWA Support</span>
- </div>
-
- <div class="card card-small" (click)="selection.value = 'dependency'" tabindex="0">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
- <span>Add Dependency</span>
- </div>
-
- <div class="card card-small" (click)="selection.value = 'test'" tabindex="0">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
- <span>Run and Watch Tests</span>
- </div>
-
- <div class="card card-small" (click)="selection.value = 'build'" tabindex="0">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
- <span>Build for Production</span>
- </div>
- </div>
-
- <!-- Terminal -->
- <div class="terminal" [ngSwitch]="selection.value">
- <pre *ngSwitchDefault>ng generate component xyz</pre>
- <pre *ngSwitchCase="'material'">ng add @angular/material</pre>
- <pre *ngSwitchCase="'pwa'">ng add @angular/pwa</pre>
- <pre *ngSwitchCase="'dependency'">ng add _____</pre>
- <pre *ngSwitchCase="'test'">ng test</pre>
- <pre *ngSwitchCase="'build'">ng build</pre>
- </div>
-
- <!-- Links -->
- <div class="card-container">
- <a class="circle-link" title="Animations" href="https://angular.io/guide/animations" target="_blank" rel="noopener">
- <svg id="Group_20" data-name="Group 20" xmlns="http://www.w3.org/2000/svg" width="21.813" height="23.453" viewBox="0 0 21.813 23.453">
- <path id="Path_15" data-name="Path 15" d="M4099.584,972.736h0l-10.882,3.9,1.637,14.4,9.245,5.153,9.245-5.153,1.686-14.4Z" transform="translate(-4088.702 -972.736)" fill="#ffa726"/>
- <path id="Path_16" data-name="Path 16" d="M4181.516,972.736v23.453l9.245-5.153,1.686-14.4Z" transform="translate(-4170.633 -972.736)" fill="#fb8c00"/>
- <path id="Path_17" data-name="Path 17" d="M4137.529,1076.127l-7.7-3.723,4.417-2.721,7.753,3.723Z" transform="translate(-4125.003 -1058.315)" fill="#ffe0b2"/>
- <path id="Path_18" data-name="Path 18" d="M4137.529,1051.705l-7.7-3.723,4.417-2.721,7.753,3.723Z" transform="translate(-4125.003 -1036.757)" fill="#fff3e0"/>
- <path id="Path_19" data-name="Path 19" d="M4137.529,1027.283l-7.7-3.723,4.417-2.721,7.753,3.723Z" transform="translate(-4125.003 -1015.199)" fill="#fff"/>
- </svg>
- </a>
-
- <a class="circle-link" title="CLI" href="https://cli.angular.io/" target="_blank" rel="noopener">
- <svg xmlns="http://www.w3.org/2000/svg" width="21.762" height="23.447" viewBox="0 0 21.762 23.447">
- <title>Angular CLI Logo</title>
- <g id="Group_21" data-name="Group 21" transform="translate(0)">
- <path id="Path_20" data-name="Path 20" d="M2660.313,313.618h0l-10.833,3.9,1.637,14.4,9.2,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-2649.48 -313.618)" fill="#37474f"/>
- <path id="Path_21" data-name="Path 21" d="M2741.883,313.618v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-2731.05 -313.618)" fill="#263238"/>
- <path id="Path_22" data-name="Path 22" d="M2692.293,379.169h11.724V368.618h-11.724Zm11.159-.6h-10.608v-9.345h10.621v9.345Z" transform="translate(-2687.274 -362.17)" fill="#fff"/>
- <path id="Path_23" data-name="Path 23" d="M2709.331,393.688l.4.416,2.265-2.28-2.294-2.294-.4.4,1.893,1.893Z" transform="translate(-2702.289 -380.631)" fill="#fff"/>
- <rect id="Rectangle_12" data-name="Rectangle 12" width="3.517" height="0.469" transform="translate(9.709 13.744)" fill="#fff"/>
- </g>
- </svg>
- </a>
-
- <a class="circle-link" title="Find a Local Meetup" href="https://www.meetup.com/find/?keywords=angular" target="_blank" rel="noopener">
- <svg xmlns="http://www.w3.org/2000/svg" width="24.607" height="23.447" viewBox="0 0 24.607 23.447">
- <title>Meetup Logo</title>
- <path id="logo--mSwarm" d="M21.221,14.95A4.393,4.393,0,0,1,17.6,19.281a4.452,4.452,0,0,1-.8.069c-.09,0-.125.035-.154.117a2.939,2.939,0,0,1-2.506,2.091,2.868,2.868,0,0,1-2.248-.624.168.168,0,0,0-.245-.005,3.926,3.926,0,0,1-2.589.741,4.015,4.015,0,0,1-3.7-3.347,2.7,2.7,0,0,1-.043-.38c0-.106-.042-.146-.143-.166a3.524,3.524,0,0,1-1.516-.69A3.623,3.623,0,0,1,2.23,14.557a3.66,3.66,0,0,1,1.077-3.085.138.138,0,0,0,.026-.2,3.348,3.348,0,0,1-.451-1.821,3.46,3.46,0,0,1,2.749-3.28.44.44,0,0,0,.355-.281,5.072,5.072,0,0,1,3.863-3,5.028,5.028,0,0,1,3.555.666.31.31,0,0,0,.271.03A4.5,4.5,0,0,1,18.3,4.7a4.4,4.4,0,0,1,1.334,2.751,3.658,3.658,0,0,1,.022.706.131.131,0,0,0,.1.157,2.432,2.432,0,0,1,1.574,1.645,2.464,2.464,0,0,1-.7,2.616c-.065.064-.051.1-.014.166A4.321,4.321,0,0,1,21.221,14.95ZM13.4,14.607a2.09,2.09,0,0,0,1.409,1.982,4.7,4.7,0,0,0,1.275.221,1.807,1.807,0,0,0,.9-.151.542.542,0,0,0,.321-.545.558.558,0,0,0-.359-.534,1.2,1.2,0,0,0-.254-.078c-.262-.047-.526-.086-.787-.138a.674.674,0,0,1-.617-.75,3.394,3.394,0,0,1,.218-1.109c.217-.658.509-1.286.79-1.918a15.609,15.609,0,0,0,.745-1.86,1.95,1.95,0,0,0,.06-1.073,1.286,1.286,0,0,0-1.051-1.033,1.977,1.977,0,0,0-1.521.2.339.339,0,0,1-.446-.042c-.1-.092-.2-.189-.307-.284a1.214,1.214,0,0,0-1.643-.061,7.563,7.563,0,0,1-.614.512A.588.588,0,0,1,10.883,8c-.215-.115-.437-.215-.659-.316a2.153,2.153,0,0,0-.695-.248A2.091,2.091,0,0,0,7.541,8.562a9.915,9.915,0,0,0-.405.986c-.559,1.545-1.015,3.123-1.487,4.7a1.528,1.528,0,0,0,.634,1.777,1.755,1.755,0,0,0,1.5.211,1.35,1.35,0,0,0,.824-.858c.543-1.281,1.032-2.584,1.55-3.875.142-.355.28-.712.432-1.064a.548.548,0,0,1,.851-.24.622.622,0,0,1,.185.539,2.161,2.161,0,0,1-.181.621c-.337.852-.68,1.7-1.018,2.552a2.564,2.564,0,0,0-.173.528.624.624,0,0,0,.333.71,1.073,1.073,0,0,0,.814.034,1.22,1.22,0,0,0,.657-.655q.758-1.488,1.511-2.978.35-.687.709-1.37a1.073,1.073,0,0,1,.357-.434.43.43,0,0,1,.463-.016.373.373,0,0,1,.153.387.7.7,0,0,1-.057.236c-.065.157-.127.316-.2.469-.42.883-.846,1.763-1.262,2.648A2.463,2.463,0,0,0,13.4,14.607Zm5.888,6.508a1.09,1.09,0,0,0-2.179.006,1.09,1.09,0,0,0,2.179-.006ZM1.028,12.139a1.038,1.038,0,1,0,.01-2.075,1.038,1.038,0,0,0-.01,2.075ZM13.782.528a1.027,1.027,0,1,0-.011,2.055A1.027,1.027,0,0,0,13.782.528ZM22.21,6.95a.882.882,0,0,0-1.763.011A.882.882,0,0,0,22.21,6.95ZM4.153,4.439a.785.785,0,1,0,.787-.78A.766.766,0,0,0,4.153,4.439Zm8.221,18.22a.676.676,0,1,0-.677.666A.671.671,0,0,0,12.374,22.658ZM22.872,12.2a.674.674,0,0,0-.665.665.656.656,0,0,0,.655.643.634.634,0,0,0,.655-.644A.654.654,0,0,0,22.872,12.2ZM7.171-.123A.546.546,0,0,0,6.613.43a.553.553,0,1,0,1.106,0A.539.539,0,0,0,7.171-.123ZM24.119,9.234a.507.507,0,0,0-.493.488.494.494,0,0,0,.494.494.48.48,0,0,0,.487-.483A.491.491,0,0,0,24.119,9.234Zm-19.454,9.7a.5.5,0,0,0-.488-.488.491.491,0,0,0-.487.5.483.483,0,0,0,.491.479A.49.49,0,0,0,4.665,18.936Z" transform="translate(0 0.123)" fill="#f64060"/>
- </svg>
- </a>
-
- <a class="circle-link" title="Join the Conversation on Discord" href="https://discord.gg/angular" target="_blank" rel="noopener">
- <svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 245 240">
- <title>Discord Logo</title>
- <path d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/>
- <path d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/>
- </svg>
- </a>
- </div>
-
- <!-- Footer -->
- <footer>
- Love Angular?
- <a href="https://github.com/angular/angular" target="_blank" rel="noopener"> Give our repo a star.
- <div class="github-star-badge">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/></svg>
- Star
- </div>
- </a>
- <a href="https://github.com/angular/angular" target="_blank" rel="noopener">
- <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" fill="#1976d2"/><path d="M0 0h24v24H0z" fill="none"/></svg>
- </a>
- </footer>
-
- <svg id="clouds" xmlns="http://www.w3.org/2000/svg" width="2611.084" height="485.677" viewBox="0 0 2611.084 485.677">
- <title>Gray Clouds Background</title>
- <path id="Path_39" data-name="Path 39" d="M2379.709,863.793c10-93-77-171-168-149-52-114-225-105-264,15-75,3-140,59-152,133-30,2.83-66.725,9.829-93.5,26.25-26.771-16.421-63.5-23.42-93.5-26.25-12-74-77-130-152-133-39-120-212-129-264-15-54.084-13.075-106.753,9.173-138.488,48.9-31.734-39.726-84.4-61.974-138.487-48.9-52-114-225-105-264,15a162.027,162.027,0,0,0-103.147,43.044c-30.633-45.365-87.1-72.091-145.206-58.044-52-114-225-105-264,15-75,3-140,59-152,133-53,5-127,23-130,83-2,42,35,72,70,86,49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33,61.112,8.015,113.854-5.72,150.492-29.764a165.62,165.62,0,0,0,110.861-3.236c47,94,178,113,251,33,31.385,4.116,60.563,2.495,86.487-3.311,25.924,5.806,55.1,7.427,86.488,3.311,73,80,204,61,251-33a165.625,165.625,0,0,0,120,0c51,13,108,15,157-5a147.188,147.188,0,0,0,33.5-18.694,147.217,147.217,0,0,0,33.5,18.694c49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33C2446.709,1093.793,2554.709,922.793,2379.709,863.793Z" transform="translate(142.69 -634.312)" fill="#eee"/>
- </svg>
-
-</div>
-
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content above * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-<router-outlet></router-outlet>
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
deleted file mode 100644
index 181680d7..00000000
--- a/client/src/app/app.component.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-import { Store } from '@ngrx/store';
-
-import * as databaseReducer from './metamodel/store/reducers/database.reducer';
-import * as databaseActions from './metamodel/store/actions/database.actions';
-
-@Component({
- selector: 'app-root',
- templateUrl: './app.component.html',
- styleUrls: ['./app.component.scss']
-})
-export class AppComponent implements OnInit {
- title = 'client';
-
- constructor(private store: Store<databaseReducer.State>) {
-
- }
-
- ngOnInit() {
- this.store.dispatch(databaseActions.loadDatabaseList());
- }
-}
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 3cb19d2c..5f1599c8 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -4,7 +4,6 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { HttpClientModule } from '@angular/common/http';
import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { StoreRouterConnectingModule } from '@ngrx/router-store';
@@ -13,13 +12,12 @@ import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { environment } from '../environments/environment';
import { reducers, metaReducers } from './app.reducer';
import { CustomSerializer } from './custom-route-serializer';
+import { CoreModule } from './core/core.module';
import { MetamodelModule } from './metamodel/metamodel.module';
import { AdminModule } from './admin/admin.module';
+import { AppComponent } from './core/containers/app.component';
@NgModule({
- declarations: [
- AppComponent
- ],
imports: [
BrowserModule,
BrowserAnimationsModule,
@@ -45,10 +43,10 @@ import { AdminModule } from './admin/admin.module';
maxAge: 25,
logOnly: environment.production
}),
+ CoreModule,
MetamodelModule,
AdminModule
],
- providers: [],
bootstrap: [AppComponent]
})
export class AppModule { }
diff --git a/client/src/app/auth/auth.action.ts b/client/src/app/auth/auth.action.ts
new file mode 100644
index 00000000..e05a3be9
--- /dev/null
+++ b/client/src/app/auth/auth.action.ts
@@ -0,0 +1,10 @@
+import { createAction, props } from '@ngrx/store';
+
+import { UserProfile } from './user-profile.model';
+
+export const login = createAction('[Auth] Login');
+export const logout = createAction('[Auth] Logout');
+export const authSuccess = createAction('[Auth] Auth Success');
+export const loadUserProfileSuccess = createAction('[Auth] Load User Profile Success', props<{ userProfile: UserProfile }>());
+export const loadUserRoleSuccess = createAction('[Auth] Load User Roles Success', props<{ userRoles: string[] }>());
+export const openEditProfile = createAction('[Auth] Edit Profile');
diff --git a/client/src/app/auth/auth.effects.ts b/client/src/app/auth/auth.effects.ts
new file mode 100644
index 00000000..f00de8c0
--- /dev/null
+++ b/client/src/app/auth/auth.effects.ts
@@ -0,0 +1,69 @@
+import { Injectable } from '@angular/core';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
+import { from } from 'rxjs';
+import { tap, switchMap } from 'rxjs/operators';
+
+import { KeycloakService } from 'keycloak-angular';
+
+import * as authActions from './auth.action';
+import { environment } from 'src/environments/environment';
+
+@Injectable()
+export class AuthEffects {
+ login$ = createEffect(() =>
+ this.actions$.pipe(
+ ofType(authActions.login),
+ tap(_ => {
+ let redirectUri = window.location.origin;
+ if (environment.baseHref !== '/') {
+ redirectUri += environment.baseHref;
+ }
+ redirectUri += environment.ssoLoginRedirectUri;
+ this.keycloak.login({ redirectUri });
+ })
+ ),
+ { dispatch: false }
+ );
+
+ logout$ = createEffect(() =>
+ this.actions$.pipe(
+ ofType(authActions.logout),
+ tap(_ => {
+ let redirectUri = window.location.origin;
+ if (environment.baseHref !== '/') {
+ redirectUri += environment.baseHref;
+ }
+ redirectUri += environment.ssoLogoutRedirectUri;
+ this.keycloak.logout(redirectUri);
+ })
+ ),
+ { dispatch: false }
+ );
+
+ authSuccess$ = createEffect(() =>
+ this.actions$.pipe(
+ ofType(authActions.authSuccess),
+ switchMap(() => from(this.keycloak.loadUserProfile())
+ .pipe(
+ switchMap(userProfile => [
+ authActions.loadUserProfileSuccess({ userProfile }),
+ authActions.loadUserRoleSuccess({ userRoles: this.keycloak.getUserRoles() })
+ ])
+ )
+ )
+ )
+ );
+
+ openEditProfile$ = createEffect(() =>
+ this.actions$.pipe(
+ ofType(authActions.authSuccess),
+ tap(_ => window.open(environment.ssoAuthUrl + '/realms/' + environment.ssoRealm + '/account', '_blank'))
+ ),
+ { dispatch: false }
+ );
+
+ constructor(
+ private actions$: Actions,
+ private keycloak: KeycloakService
+ ) {}
+}
diff --git a/client/src/app/auth/auth.module.spec.ts b/client/src/app/auth/auth.module.spec.ts
new file mode 100644
index 00000000..32064520
--- /dev/null
+++ b/client/src/app/auth/auth.module.spec.ts
@@ -0,0 +1 @@
+import './auth.module';
\ No newline at end of file
diff --git a/client/src/app/auth/auth.module.ts b/client/src/app/auth/auth.module.ts
new file mode 100644
index 00000000..4c649233
--- /dev/null
+++ b/client/src/app/auth/auth.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+
+import { KeycloakAngularModule } from 'keycloak-angular';
+import { StoreModule } from '@ngrx/store';
+import { EffectsModule } from '@ngrx/effects';
+
+import { initializeKeycloakAnis } from './init.keycloak';
+import { authReducer } from './auth.reducer';
+import { AuthEffects } from './auth.effects';
+import { environment } from 'src/environments/environment';
+
+@NgModule({
+ imports: [
+ environment.authenticationEnabled ? KeycloakAngularModule : [],
+ StoreModule.forFeature('auth', authReducer),
+ environment.authenticationEnabled ? EffectsModule.forFeature([ AuthEffects ]): []
+ ],
+ providers: [
+ environment.authenticationEnabled ? initializeKeycloakAnis: []
+ ]
+})
+export class AuthModule { }
diff --git a/client/src/app/auth/auth.reducer.ts b/client/src/app/auth/auth.reducer.ts
new file mode 100644
index 00000000..a6e8e1d9
--- /dev/null
+++ b/client/src/app/auth/auth.reducer.ts
@@ -0,0 +1,36 @@
+import { createReducer, on } from '@ngrx/store';
+
+import * as authActions from './auth.action';
+import { UserProfile } from './user-profile.model';
+
+export interface State {
+ isAuthenticated: boolean;
+ userProfile: UserProfile | null;
+ userRoles: string[];
+}
+
+export const initialState: State = {
+ isAuthenticated: false,
+ userProfile: null,
+ userRoles: []
+};
+
+export const authReducer = createReducer(
+ initialState,
+ on(authActions.authSuccess, state => ({
+ ...state,
+ isAuthenticated: true
+ })),
+ on(authActions.loadUserProfileSuccess, (state, { userProfile }) => ({
+ ...state,
+ userProfile
+ })),
+ on(authActions.loadUserRoleSuccess, (state, { userRoles }) => ({
+ ...state,
+ userRoles
+ }))
+);
+
+export const isAuthenticated = (state: State) => state.isAuthenticated;
+export const getUserProfile = (state: State) => state.userProfile;
+export const getUserRoles = (state: State) => state.userRoles;
diff --git a/client/src/app/auth/auth.selector.ts b/client/src/app/auth/auth.selector.ts
new file mode 100644
index 00000000..2954d0f9
--- /dev/null
+++ b/client/src/app/auth/auth.selector.ts
@@ -0,0 +1,20 @@
+import { createSelector, createFeatureSelector } from '@ngrx/store';
+
+import * as fromAuth from './auth.reducer';
+
+export const selectAuthState = createFeatureSelector<fromAuth.State>('auth');
+
+export const isAuthenticated = createSelector(
+ selectAuthState,
+ fromAuth.isAuthenticated
+);
+
+export const getUserProfile = createSelector(
+ selectAuthState,
+ fromAuth.getUserProfile
+);
+
+export const getUserRoles = createSelector(
+ selectAuthState,
+ fromAuth.getUserRoles
+);
diff --git a/client/src/app/auth/init.keycloak.ts b/client/src/app/auth/init.keycloak.ts
new file mode 100644
index 00000000..8dc2968b
--- /dev/null
+++ b/client/src/app/auth/init.keycloak.ts
@@ -0,0 +1,45 @@
+import { APP_INITIALIZER } from '@angular/core';
+import { from } from 'rxjs';
+
+import { KeycloakService, KeycloakEventType } from 'keycloak-angular';
+import { Store } from '@ngrx/store';
+
+import * as keycloakActions from './auth.action';
+import * as fromKeycloak from './auth.reducer';
+import { environment } from 'src/environments/environment';
+
+function initializeKeycloak(keycloak: KeycloakService, store: Store<{ keycloak: fromKeycloak.State }>) {
+ return async () => {
+ from(keycloak.keycloakEvents$).subscribe(event => {
+ if (event.type === KeycloakEventType.OnAuthSuccess) {
+ store.dispatch(keycloakActions.authSuccess());
+ }
+ })
+
+ let silentCheckSsoRedirectUri = window.location.origin;
+ if (environment.baseHref != '/') {
+ silentCheckSsoRedirectUri += environment.baseHref;
+ }
+ silentCheckSsoRedirectUri += '/assets/silent-check-sso.html';
+
+ return keycloak.init({
+ config: {
+ url: environment.ssoAuthUrl,
+ realm: environment.ssoRealm,
+ clientId: environment.ssoClientId,
+ },
+ initOptions: {
+ onLoad: 'check-sso',
+ silentCheckSsoRedirectUri
+ },
+ loadUserProfileAtStartUp: true
+ });
+ }
+}
+
+export const initializeKeycloakAnis = {
+ provide: APP_INITIALIZER,
+ useFactory: initializeKeycloak,
+ multi: true,
+ deps: [ KeycloakService, Store ],
+};
diff --git a/client/src/app/auth/user-profile.model.ts b/client/src/app/auth/user-profile.model.ts
new file mode 100644
index 00000000..c2addf7e
--- /dev/null
+++ b/client/src/app/auth/user-profile.model.ts
@@ -0,0 +1,11 @@
+export interface UserProfile {
+ id?: string;
+ username?: string;
+ email?: string;
+ firstName?: string;
+ lastName?: string;
+ enabled?: boolean;
+ emailVerified?: boolean;
+ totp?: boolean;
+ createdTimestamp?: number;
+}
diff --git a/client/src/app/core/components/nav.component.html b/client/src/app/core/components/nav.component.html
new file mode 100644
index 00000000..99aeb6c5
--- /dev/null
+++ b/client/src/app/core/components/nav.component.html
@@ -0,0 +1,96 @@
+<nav class="navbar navbar-light bg-light navbar-expand-md fixed-top border-bottom">
+ <!-- Logo -->
+ <a href="{{ baseHref }}" class="navbar-brand">
+ <img src="assets/anis_adminsi.png" alt="CeSAM logo" />
+ </a>
+
+ <!-- Right Navigation -->
+ <div class="collapse navbar-collapse" id="navbarCollapse">
+ <ul class="navbar-nav mr-auto">
+ <li class="nav-item pr-3">
+ <a class="nav-link" routerLink="/instance-list" routerLinkActive="active">
+ <span class="fas fa-home"></span> Instances
+ </a>
+ </li>
+ <li class="nav-item pr-3">
+ <a class="nav-link" routerLink="/survey" routerLinkActive="active">
+ <span class="fas fa-database"></span> Surveys
+ </a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" routerLink="/settings" routerLinkActive="active">
+ <span class="fas fa-wrench"></span> Settings
+ </a>
+ </li>
+ </ul>
+ <span *ngIf="authenticationEnabled()" id="dropdown-menu" dropdown>
+ <button id="button-basic" dropdownToggle type="button" class="btn btn-light" aria-controls="dropdown-basic">
+ <span class="fa-stack theme-color">
+ <span class="fas fa-circle fa-2x"></span>
+ <span class="fas fa-user fa-stack-1x fa-inverse"></span>
+ </span>
+
+ <span class="fas fa-chevron-down text-secondary"></span>
+ </button>
+ <ul id="basic-link-dropdown" *dropdownMenu class="dropdown-menu dropdown-menu-right dropdown-up" role="menu"
+ aria-labelledby="basic-link">
+ <li id="li-email" role="menuitem">
+ <span class="dropdown-item font-italic">{{ userProfile.email }}</span>
+ </li>
+ <li class="divider dropdown-divider"></li>
+ <li role="menuitem">
+ <a class="dropdown-item pointer" (click)="emitOpenEditProfile()">
+ <span class="fas fa-id-card"></span> Edit profile
+ </a>
+ </li>
+ <li class="divider dropdown-divider"></li>
+ <li role="menuitem">
+ <a class="dropdown-item text-danger pointer" (click)="emitLogout()">
+ <span class="fas fa-sign-out-alt fa-fw"></span> Sign Out
+ </a>
+ </li>
+ </ul>
+ </span>
+ </div>
+
+ <!-- Dropdown appearing on mobile only -->
+ <span dropdown>
+ <button id="button-basic" dropdownToggle type="button" class="navbar-toggler" aria-controls="dropdown-basic">
+ <span class="fas fa-bars"></span>
+ </button>
+ <ul id="basic-link-dropdown" *dropdownMenu class="dropdown-menu dropdown-menu-right dropdown-up" role="menu"
+ aria-labelledby="basic-link">
+ <li *ngIf="authenticationEnabled()" role="menuitem">
+ <span class="dropdown-item font-italic">{{ userProfile.email }}</span>
+ </li>
+ <li *ngIf="authenticationEnabled()" class="divider dropdown-divider"></li>
+ <li role="menuitem">
+ <a class="dropdown-item" routerLink="/instance">
+ <span class="fas fa-home fa-fw"></span> Instances
+ </a>
+ </li>
+ <li role="menuitem">
+ <a class="dropdown-item" routerLink="/survey">
+ <span class="fas fa-database fa-fw"></span> Surveys
+ </a>
+ </li>
+ <li role="menuitem">
+ <a class="dropdown-item" routerLink="/settings">
+ <span class="fas fa-wrench fa-fw"></span> Settings
+ </a>
+ </li>
+ <li *ngIf="authenticationEnabled()" class="divider dropdown-divider"></li>
+ <li *ngIf="authenticationEnabled()" role="menuitem">
+ <a class="dropdown-item pointer" (click)="emitOpenEditProfile()">
+ <span class="fas fa-id-card"></span> Edit profile
+ </a>
+ </li>
+ <li *ngIf="authenticationEnabled()" class="divider dropdown-divider"></li>
+ <li *ngIf="authenticationEnabled()" role="menuitem">
+ <a class="dropdown-item pointer text-danger" (click)="logout.emit()">
+ <span class="fas fa-sign-out-alt fa-fw"></span> Sign Out
+ </a>
+ </li>
+ </ul>
+ </span>
+</nav>
diff --git a/client/src/app/core/components/nav.component.ts b/client/src/app/core/components/nav.component.ts
new file mode 100644
index 00000000..b9cb78b4
--- /dev/null
+++ b/client/src/app/core/components/nav.component.ts
@@ -0,0 +1,11 @@
+import { Component, ChangeDetectionStrategy } from '@angular/core';
+
+@Component({
+ selector: 'app-nav',
+ templateUrl: 'nav.component.html',
+ styleUrls: [ 'nav.component.css' ],
+ changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class NavComponent {
+
+}
diff --git a/client/src/app/core/containers/app.component.html b/client/src/app/core/containers/app.component.html
new file mode 100644
index 00000000..109a0eca
--- /dev/null
+++ b/client/src/app/core/containers/app.component.html
@@ -0,0 +1 @@
+<p>TOTO</p>
\ No newline at end of file
diff --git a/client/src/app/app.component.scss b/client/src/app/core/containers/app.component.scss
similarity index 100%
rename from client/src/app/app.component.scss
rename to client/src/app/core/containers/app.component.scss
diff --git a/client/src/app/app.component.spec.ts b/client/src/app/core/containers/app.component.spec.ts
similarity index 100%
rename from client/src/app/app.component.spec.ts
rename to client/src/app/core/containers/app.component.spec.ts
diff --git a/client/src/app/core/containers/app.component.ts b/client/src/app/core/containers/app.component.ts
new file mode 100644
index 00000000..9e7d6005
--- /dev/null
+++ b/client/src/app/core/containers/app.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+import { Store } from '@ngrx/store';
+
+@Component({
+ selector: 'app-root',
+ templateUrl: './app.component.html',
+ styleUrls: ['./app.component.scss']
+})
+export class AppComponent {
+ title = 'client';
+}
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
new file mode 100644
index 00000000..361a13f2
--- /dev/null
+++ b/client/src/app/core/core.module.ts
@@ -0,0 +1,25 @@
+import { NgModule, Optional, SkipSelf } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { AppComponent } from './containers/app.component';
+
+export const COMPONENTS = [
+ AppComponent
+];
+
+@NgModule({
+ imports: [
+ CommonModule
+ ],
+ declarations: COMPONENTS,
+ exports: COMPONENTS
+})
+export class CoreModule {
+ constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
+ if (parentModule) {
+ throw new Error(
+ 'CoreModule is already loaded. Import it in the AppModule only'
+ );
+ }
+ }
+}
\ No newline at end of file
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
new file mode 100644
index 00000000..74ff8218
--- /dev/null
+++ b/client/src/app/shared/shared.module.ts
@@ -0,0 +1,9 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+@NgModule({
+ imports: [
+ CommonModule
+ ]
+})
+export class SharedModule { }
\ No newline at end of file
diff --git a/client/src/environments/environment.ts b/client/src/environments/environment.ts
index b7d6f948..26fad57f 100644
--- a/client/src/environments/environment.ts
+++ b/client/src/environments/environment.ts
@@ -3,8 +3,16 @@
// The list of file replacements can be found in `angular.json`.
export const environment = {
- production: false,
- apiUrl: 'http://localhost:8080'
+ production: false,
+ apiUrl: 'http://localhost:8080',
+ servicesUrl: 'http://localhost:5000',
+ baseHref: '/',
+ authenticationEnabled: false,
+ ssoAuthUrl: 'http://localhost:8180/auth',
+ ssoRealm: 'anis',
+ ssoClientId: 'anis-admin',
+ ssoLoginRedirectUri: '/',
+ ssoLogoutRedirectUri: '/login'
};
/*
diff --git a/client/yarn.lock b/client/yarn.lock
index 6cea09a5..3582b708 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1166,6 +1166,11 @@
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752"
integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==
+"@fortawesome/fontawesome-free@^5.15.3":
+ version "5.15.3"
+ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz#c36ffa64a2a239bf948541a97b6ae8d729e09a9a"
+ integrity sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==
+
"@istanbuljs/schema@^0.1.2":
version "0.1.3"
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
@@ -1903,6 +1908,11 @@ base64-arraybuffer@0.1.4:
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
+base64-js@1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+ integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+
base64-js@^1.3.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -2002,6 +2012,11 @@ boolbase@^1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+bootstrap@4.6:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
+ integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
+
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -4324,6 +4339,11 @@ jest-worker@^27.0.2:
merge-stream "^2.0.0"
supports-color "^8.0.0"
+js-sha256@0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
+ integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
+
js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4487,6 +4507,21 @@ karma@~6.3.0:
ua-parser-js "^0.7.28"
yargs "^16.1.1"
+keycloak-angular@^8.2.0:
+ version "8.2.0"
+ resolved "https://registry.yarnpkg.com/keycloak-angular/-/keycloak-angular-8.2.0.tgz#8c9f3902942fee3abfdae7aa88f155265e7fdba6"
+ integrity sha512-ZOMCiFR+CavRJkjM2TuSK6nTJ1/mCuUXAQDrWKmKkbLNoM77ZSZNhVyk/GYhbyFNdquo+ASraiHyYXbYKFbSvQ==
+ dependencies:
+ tslib "^2.0.0"
+
+keycloak-js@^14.0.0:
+ version "14.0.0"
+ resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-14.0.0.tgz#6d880eb3cd24afef39626f66ca4747d7267eef05"
+ integrity sha512-35olMBg+Fwr1b3hu3BmyYj4PBn2uoDn7OOO0C1f+4axZhaOhvv47zq7nHG8R3g2QZcHFG5SymdEU6obrahEdJQ==
+ dependencies:
+ base64-js "1.3.1"
+ js-sha256 "0.9.0"
+
killable@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -5021,6 +5056,20 @@ neo-async@^2.6.2:
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+ngx-bootstrap@^7.0.0-rc.1:
+ version "7.0.0-rc.1"
+ resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-7.0.0-rc.1.tgz#fc38d7a7c7ae78db3d6c404995da4e85773bfec0"
+ integrity sha512-ZwKzbzO3wp9mDojV5pXi6VhKhPmzIiJoQW5aRleUGGjYwEkzDtdlaAv9NdA6KnCH+WpZBma/pbjPgcisEkfH4w==
+ dependencies:
+ tslib "^2.0.0"
+
+ngx-toastr@^14.0.0:
+ version "14.0.0"
+ resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-14.0.0.tgz#20e4737ef330b892a453768cd98b980558aeb286"
+ integrity sha512-dnDzSY73pF6FvNyxdh6ftfvXvUg6SU7MAT3orPUCzA77t3ZcFslro06zk4NCA2g67RF7dBwM0OJ/y0SN6fdGYw==
+ dependencies:
+ tslib "^2.1.0"
+
nice-try@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
--
GitLab