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

Commit 20502a8

Browse files
committed
email and settings
1 parent 99faa93 commit 20502a8

30 files changed

Lines changed: 1254 additions & 453 deletions

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ This is an Administrator Panel for IdentityServer4. It's available in 2 versions
88

99
# Several break changes
1010

11-
The version ASP.NET Core 3.0 have changed a lot. So before upgrade read differences between light and full version. At the end it's the same project . But splited repo's.
11+
The new version, written in ASP.NET Core 3.0, changed a lot. So before upgrade read differences between light and full version. If have the past version, don't worry. It's the same project at all. But splited repo's.
1212

1313
# Installation
1414

15-
If you know the differences between Light and Full. Check the installation instructions below. If wanna understand, check more here [Presentation](#presentation) version.
15+
If you know the differences between Light and Full. Check the installation instructions below. If wanna understand, check more here at[Presentation](#presentation) section.
1616

1717
## Full Install
1818

1919
Go to this [repo](https://github.com/brunohbrito/JPProject.IdentityServer4.SSO) and follow instructions there.
2020

2121
## Light Install
2222

23-
You will need to create a Client and API resources in you IdentityServer4. At the end of this section there are some shortcuts.
23+
You will need to create a Client and API resources in your IdentityServer4. At the end of this section there are some shortcuts.
2424

2525
1. [Download](https://github.com/brunohbrito/JPProject.IdentityServer4.AdminUI/archive/master.zip)/Clone or [Fork](https://github.com/brunohbrito/JPProject.IdentityServer4.AdminUI/fork) this repository.
2626
2. Open `environment.ts` and change settings for you SSO.
@@ -145,6 +145,7 @@ Api resource configuration
145145
- [Docs](#docs)
146146
- [Contributing](#contributing)
147147
- [Free](#free)
148+
- [3.0.2](#302)
148149
- [3.0.1](#301)
149150
- [v1.4.5](#v145)
150151
- [What comes next?](#what-comes-next)
@@ -252,6 +253,12 @@ We'll love it! Please [Read the docs](https://jp-project.readthedocs.io/en/lates
252253
If you need help building or running your Jp Project platform
253254
There are several ways we can help you out.
254255
256+
## 3.0.2
257+
258+
1. Menu translation
259+
2. Email support for full version
260+
3. Email configuration settings (SMTP / Password) for full version
261+
255262
## 3.0.1
256263
257264
1. ASP.NET Core 3.0 support
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Set-Location ..
2+
docker build -f .\build\continuous-delivery\admin-prod.dockerfile -t bhdebrito/jpproject-admin-ui:prd .
3+
docker push bhdebrito/jpproject-admin-ui:prd
4+

build/image002.jpg

800 Bytes
Loading

src/Frontend/Jp.AdminUI/Translate.json

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/Frontend/Jp.AdminUI/angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"polyfills": "src/polyfills.ts",
2929
"assets": [
3030
"src/assets",
31-
"src/silent-refresh.html",
31+
"src/silent-refresh.html"
3232
],
3333
"styles": [
3434
"src/app/core/preloader/preloader.scss",

src/Frontend/Jp.AdminUI/package-lock.json

Lines changed: 21 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Frontend/Jp.AdminUI/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@
3434
"@angular/platform-browser-dynamic": "^8.1.3",
3535
"@angular/router": "^8.1.3",
3636
"@fortawesome/fontawesome-free": "^5.9.0",
37+
"@kolkov/angular-editor": "^1.0.0-rc.1",
3738
"@ng-bootstrap/ng-bootstrap": "^5.1.0",
3839
"@ngx-translate/core": "^11.0.1",
3940
"@ngx-translate/http-loader": "^4.0.0",
4041
"@swimlane/ngx-datatable": "^15.0.2",
4142
"ag-grid": "^18.1.2",
4243
"ag-grid-angular": "^21.1.0",
44+
"angular-froala-wysiwyg": "^3.0.6",
4345
"angular-oauth2-oidc": "^8.0.2",
4446
"angular-tree-component": "^8.3.0",
4547
"angular2-text-mask": "9.0.0",
@@ -82,7 +84,6 @@
8284
"simple-line-icons": "2.4.1",
8385
"source-sans-pro": "^2.20.2",
8486
"spinkit": "1.2.5",
85-
"summernote": "^0.8.11",
8687
"sweetalert": "2.1.2",
8788
"sweetalert2": "^8.15.1",
8889
"weather-icons": "1.3.2",
Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export class MenuItem {
22
constructor() { }
3-
text: string;
3+
text?: string;
44
heading?: boolean;
55
link?: string; // internal route links
66
elink?: string; // used only for external links
@@ -9,6 +9,7 @@ export class MenuItem {
99
alert?: string;
1010
submenu?: Array<any>;
1111
lightVersion?: boolean;
12+
translate?: string;
1213
}
1314

1415
const Home: MenuItem = {
@@ -17,106 +18,138 @@ const Home: MenuItem = {
1718
icon: "icon-home"
1819
};
1920

21+
const Settings: MenuItem = {
22+
translate: "menu.settings",
23+
link: "/settings",
24+
icon: "icon-cup",
25+
lightVersion: false
26+
};
2027
const Clients: MenuItem = {
21-
text: "Clients",
28+
translate: "general.clients",
2229
link: "/clients",
2330
icon: "fa fa-desktop",
2431
submenu: [
2532
{
2633
text: "List",
34+
translate: "general.list",
2735
link: "/clients"
2836
},
2937
{
3038
text: "Add",
39+
translate: "general.add",
3140
link: "/clients/add"
3241
}
3342
]
3443
};
3544

3645
const IdentityResource: MenuItem = {
37-
text: "Identity Resources",
46+
translate: "general.identity-resource",
3847
link: "/identity-resource",
3948
icon: "far fa-id-card",
4049
submenu: [
4150
{
4251
text: "List",
52+
translate: "general.list",
4353
link: "/identity-resource"
4454
},
4555
{
4656
text: "Add",
57+
translate: "general.add",
4758
link: "/identity-resource/add"
4859
}
4960
]
5061
};
5162

5263
const ApiResource: MenuItem = {
53-
text: "Api Resources",
64+
translate: "general.api-resource",
5465
link: "/api-resource",
5566
icon: "fas fa-cloud",
5667
submenu: [
5768
{
5869
text: "List",
70+
translate: "general.list",
5971
link: "/api-resource"
6072
},
6173
{
6274
text: "Add",
75+
translate: "general.add",
6376
link: "/api-resource/add"
6477
}
6578
]
6679
};
6780

6881
const PersistedGrants: MenuItem = {
69-
text: "Persisted Grants",
82+
translate: "general.persisted-grants",
7083
link: "/persisted-grants",
7184
icon: "fas fa-key"
7285
};
7386

7487
const Users: MenuItem = {
75-
text: "Users",
88+
translate: "menu.users",
7689
link: "/users",
7790
icon: "fas fa-users-cog",
7891
submenu: [
7992
{
8093
text: "List",
94+
translate: "general.list",
8195
link: "/users"
8296
},
8397
{
8498
text: "Add",
99+
translate: "general.add",
85100
link: "/users/add"
86101
}
87102
],
88103
lightVersion: false
89104
};
90105

91106
const Roles: MenuItem = {
92-
text: "Roles",
107+
translate: "menu.roles",
93108
link: "/roles",
94109
icon: "fas fa-user-tag",
95110
submenu: [
96111
{
97112
text: "List",
113+
translate: "general.list",
98114
link: "/roles"
99115
},
100116
{
101117
text: "Add",
118+
translate: "general.add",
102119
link: "/roles/add"
103120
}
104121
],
105122
lightVersion: false
106123
};
107124

125+
const Emails: MenuItem = {
126+
translate: "general.emails",
127+
link: "/emails",
128+
icon: "fas fa-envelope-open-text",
129+
submenu: [
130+
{
131+
translate: "general.edit",
132+
link: "/emails"
133+
}
134+
// ,{
135+
// translate: "menu.email-template",
136+
// link: "/emails/templates"
137+
// }
138+
],
139+
lightVersion: false
140+
};
108141
const headingMain: MenuItem = {
109142
text: "IdentityServer4",
110143
heading: true
111144
};
112145

113146
const headingUsers: MenuItem = {
114-
text: "Users",
147+
translate: "menu.users",
115148
heading: true,
116149
lightVersion: false
117150
};
118151
const headingSettings: MenuItem = {
119-
text: "SSO Settings",
152+
translate: "menu.ssoSettings",
120153
heading: true,
121154
lightVersion: false
122155
};
@@ -131,5 +164,7 @@ export const menu: MenuItem[] = [
131164
headingUsers,
132165
Users,
133166
Roles,
134-
headingSettings
167+
headingSettings,
168+
Emails,
169+
Settings
135170
];

src/Frontend/Jp.AdminUI/src/app/panel/clients/list/clients-list.component.html

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</div>
77

88
<ng-template #loading>
9-
<app-loading *ngIf="clientList == null"></app-loading>
9+
<app-loading></app-loading>
1010
</ng-template>
1111

1212
<div class="card card-default" *ngIf="clientList$ | async as clientList; else loading">
@@ -30,19 +30,15 @@
3030
<tbody>
3131
<tr *ngFor="let client of clientList">
3232
<th>
33-
<a [routerLink]="['/clients', client.clientId, 'edit']" class="btn btn-primary btn-xs"
34-
placement="top" [tooltip]="'general.edit' | translate"><i
35-
class="fa fa-edit"></i></a>
36-
&nbsp;
37-
<button (click)="copy(client.clientId)" class="btn btn-outline-info btn-xs"
38-
placement="top" [tooltip]="'general.copy' | translate"><i
33+
<a [routerLink]="['/clients', client.clientId, 'edit']" class="btn btn-primary btn-xs" placement="top" [tooltip]="'general.edit' | translate"><i
34+
class="fa fa-edit"></i></a> &nbsp;
35+
<button (click)="copy(client.clientId)" class="btn btn-outline-info btn-xs" placement="top" [tooltip]="'general.copy' | translate"><i
3936
class="fa fa-copy"></i></button>
4037
</th>
4138
<td><img *ngIf="client.logoUri" height="33" [src]="client.logoUri" /></td>
4239
<td>{{client.clientName}}</td>
4340
<td>
44-
<button class="btn btn-danger btn-xs" placement="top"
45-
[tooltip]="'general.remove' | translate" (click)="remove(client.clientId)"><i
41+
<button class="btn btn-danger btn-xs" placement="top" [tooltip]="'general.remove' | translate" (click)="remove(client.clientId)"><i
4642
class="fa fa-times"></i></button>
4743
</td>
4844
</tr>

0 commit comments

Comments
 (0)