Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit 51d7b05

Browse files
brunobritodevbrunobritodev
committed
aoeu
1 parent 41a7ec7 commit 51d7b05

10 files changed

Lines changed: 6055 additions & 83 deletions

File tree

‎src/Backend/Jp.UserManagement/Configuration/ConfigurePolicy.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using AutoMapper;
6-
using Jp.Application.AutoMapper;
7-
using Microsoft.AspNetCore.Authorization;
1+
using Microsoft.AspNetCore.Authorization;
82
using Microsoft.Extensions.DependencyInjection;
93

104
namespace Jp.Management.Configuration

‎src/Backend/Jp.UserManagement/jpProject_sso_log.txt‎

Lines changed: 1874 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ export class SettingsService {
3030
this.app = {
3131
name: "Jp Project - IS4Admin",
3232
description: "IdentityServer4 Admin Panel",
33-
year: ((new Date()).getFullYear())
33+
year: ((new Date()).getFullYear()),
34+
version: "1.0.0"
3435
};
3536

3637
// Layout Settings

‎src/Frontend/Jp.AdminUI/src/app/shared/layout/footer/footer.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<span>&copy; {{settings.app.year}} - {{ settings.app.name }}</span>
1+
<span>&copy; {{settings.app.year}} - {{ settings.app.name }} - version {{ settings.app.version }}</span>

‎src/Frontend/Jp.AdminUI/src/app/shared/layout/header/header.component.h.html‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,12 @@
3737
<!-- End Navbar Menu-->
3838
<!-- START Right Navbar-->
3939
<ul class="navbar-nav flex-row">
40-
<!-- START lock screen-->
41-
<li class="nav-item">
42-
<a class="nav-link" title="Lock screen" [routerLink]="'/lock'">
43-
<em class="icon-lock"></em>
44-
</a>
45-
</li>
46-
<!-- END lock screen-->
47-
<!-- Search icon-->
48-
<li class="nav-item">
40+
<!-- Search icon - Disabled by now, maybe in future -->
41+
<!-- <li class="nav-item">
4942
<a class="nav-link" (click)="openNavSearch($event)">
5043
<em class="icon-magnifier"></em>
5144
</a>
52-
</li>
45+
</li> -->
5346
<!-- Fullscreen (only desktops)-->
5447
<li class="nav-item d-none d-md-block">
5548
<a class="nav-link" #fsbutton (click)="toggleFullScreen($event)">

‎src/Frontend/Jp.AdminUI/src/app/shared/layout/header/header.component.html‎

Lines changed: 5 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,16 @@
3232
</a>
3333
</li>
3434
<!-- END User avatar toggle-->
35-
<!-- START lock screen-->
36-
<li class="nav-item d-none d-md-block">
37-
<a class="nav-link" title="Lock screen" [routerLink]="'/lock'">
38-
<em class="icon-lock"></em>
39-
</a>
40-
</li>
41-
<!-- END lock screen-->
4235
</ul>
4336
<!-- END Left navbar-->
4437
<!-- START Right Navbar-->
4538
<ul class="navbar-nav flex-row">
46-
<!-- Search icon-->
47-
<li class="nav-item" placement="bottom" tooltip="Search">
39+
<!-- Search icon - Disabled by now, maybe in future -->
40+
<!-- <li class="nav-item" placement="bottom" tooltip="Search">
4841
<a class="nav-link" (click)="openNavSearch($event)">
4942
<em class="icon-magnifier"></em>
5043
</a>
51-
</li>
44+
</li> -->
5245
<!-- Fullscreen (only desktops)-->
5346
<li class="nav-item d-none d-md-block" placement="bottom" tooltip="Fullscreen">
5447
<a class="nav-link" #fsbutton (click)="toggleFullScreen($event)">
@@ -59,60 +52,10 @@
5952
<li class="nav-item dropdown dropdown-list" placement="bottom" tooltip="Notifications" dropdown>
6053
<a class="nav-link dropdown-toggle dropdown-toggle-nocaret" dropdownToggle>
6154
<em class="icon-bell"></em>
62-
<span class="badge badge-danger">11</span>
55+
<span class="badge badge-danger">1</span>
6356
</a>
6457
<!-- START Dropdown menu-->
65-
<div *dropdownMenu class="dropdown-menu dropdown-menu-right animated flipInX">
66-
<div class="dropdown-item">
67-
<!-- START list group-->
68-
<div class="list-group">
69-
<!-- list item-->
70-
<div class="list-group-item list-group-item-action">
71-
<div class="media">
72-
<div class="align-self-start mr-2">
73-
<em class="fa fa-twitter fa-2x text-info"></em>
74-
</div>
75-
<div class="media-body">
76-
<p class="m-0">New followers</p>
77-
<p class="m-0 text-muted text-sm">1 new follower</p>
78-
</div>
79-
</div>
80-
</div>
81-
<!-- list item-->
82-
<div class="list-group-item list-group-item-action">
83-
<div class="media">
84-
<div class="align-self-start mr-2">
85-
<em class="fa fa-envelope fa-2x text-warning"></em>
86-
</div>
87-
<div class="media-body">
88-
<p class="m-0">New e-mails</p>
89-
<p class="m-0 text-muted text-sm">You have 10 new emails</p>
90-
</div>
91-
</div>
92-
</div>
93-
<!-- list item-->
94-
<div class="list-group-item list-group-item-action">
95-
<div class="media">
96-
<div class="align-self-start mr-2">
97-
<em class="fa fa-tasks fa-2x text-success"></em>
98-
</div>
99-
<div class="media-body">
100-
<p class="m-0">Pending Tasks</p>
101-
<p class="m-0 text-muted text-sm">11 pending task</p>
102-
</div>
103-
</div>
104-
</div>
105-
<!-- last list item-->
106-
<div class="list-group-item list-group-item-action">
107-
<span class="d-flex align-items-center">
108-
<span class="text-sm">More notifications</span>
109-
<span class="badge badge-danger ml-auto">14</span>
110-
</span>
111-
</div>
112-
</div>
113-
<!-- END list group-->
114-
</div>
115-
</div>
58+
<app-notifications></app-notifications>
11659
<!-- END Dropdown menu-->
11760
</li>
11861
<!-- END Alert menu-->

‎src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<div *dropdownMenu class="dropdown-menu dropdown-menu-right animated flipInX">
2+
<div class="dropdown-item">
3+
<!-- START list group-->
4+
<div class="list-group">
5+
<!-- list item-->
6+
<div class="list-group-item list-group-item-action">
7+
<div class="media">
8+
<div class="align-self-start mr-2">
9+
<em class="fas fa-rocket fa-2x text-info"></em>
10+
</div>
11+
<div class="media-body">
12+
<p class="m-0">Launch</p>
13+
<p class="m-0 text-muted text-sm">1 new follower</p>
14+
</div>
15+
</div>
16+
</div>
17+
<!-- last list item-->
18+
<div class="list-group-item list-group-item-action">
19+
<span class="d-flex align-items-center">
20+
<a class="text-sm" href="https://github.com/brunohbrito/JP-Project">More notifications</a>
21+
<span class="badge badge-info ml-auto"><i class="fas fa-info"></i></span>
22+
</span>
23+
</div>
24+
</div>
25+
<!-- END list group-->
26+
</div>
27+
</div>

‎src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-notifications',
5+
templateUrl: './notifications.component.html',
6+
encapsulation: ViewEncapsulation.Emulated
7+
})
8+
export class NotificationsComponent implements OnInit {
9+
10+
11+
constructor() { }
12+
13+
ngOnInit() { }
14+
}

‎src/Frontend/Jp.AdminUI/src/app/shared/layout/layout.module.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { UserblockService } from "./sidebar/userblock/userblock.service";
1010
import { FooterComponent } from "./footer/footer.component";
1111

1212
import { SharedModule } from "../shared.module";
13+
import { NotificationsComponent } from "./header/notifications/notifications.component";
1314

1415
@NgModule({
1516
imports: [
@@ -25,7 +26,8 @@ import { SharedModule } from "../shared.module";
2526
HeaderComponent,
2627
NavsearchComponent,
2728
OffsidebarComponent,
28-
FooterComponent
29+
FooterComponent,
30+
NotificationsComponent
2931
],
3032
exports: [
3133
LayoutComponent,
@@ -34,7 +36,8 @@ import { SharedModule } from "../shared.module";
3436
HeaderComponent,
3537
NavsearchComponent,
3638
OffsidebarComponent,
37-
FooterComponent
39+
FooterComponent,
40+
NotificationsComponent
3841
]
3942
})
4043
export class LayoutModule { }

0 commit comments

Comments
 (0)