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

Commit 642ce97

Browse files
brunobritodevbrunobritodev
authored
Merge pull request #172 from brunohbrito/dev
config files ready
2 parents 6f85e84 + b66a963 commit 642ce97

6 files changed

Lines changed: 76 additions & 45 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ Breaking change: **Argon2 password hashing**. Be careful before update. If you a
271271
2. Argon2 Password Hasher
272272
3. Show version at footer
273273
274-
Check [Changelog.md](https://github.com/brunohbrito/JP-Project/blob/master/CHANGELOG.md) for a complete list of changes.
274+
Check [Changelog.md](https://github.com/brunohbrito/JPProject.IdentityServer4.AdminUI/blob/master/CHANGELOG.md) for a complete list of changes.
275275
276276
# What comes next?
277277

‎build/continuous-delivery/admin-prod.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ COPY ["src/Frontend/Jp.AdminUI/", "/app"]
1515
# rebuild node
1616
RUN npm rebuild node-sass
1717
# generate build
18-
RUN npm run ng build
18+
RUN npm run ng build -- --configuration=production
1919

2020
##################
2121
### production ###

‎db.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
2-
"notifications": [
3-
{ "icon": "text-info fab fa-microsoft", "title": "DevOps", "description": "2019-06 Azure CI/CD ready" },
4-
{ "icon": "text-info fas fa-kiwi-bird", "title": "Session", "description": "2019-05 UI Session improvements" },
5-
{ "icon": "text-warning fab fa-docker", "title": "Docker", "description": "2019-04 Docker Ready" },
6-
{ "icon": "text-info fas fa-code-branch", "title": "NET Core 2.2", "description": "2019-03 Updated to ASP.NET Core 2.2" },
7-
{ "icon": "text-success fas fa-id-card", "title": "ID4", "description": "2019-03 IdentityServer4 2.4 Components" },
8-
{ "icon": "text-danger fas fa-rocket", "title": "Launch", "description": "2018-10 first release" }
9-
]
2+
"notifications": [
3+
{ "icon": "text-info fas fa-layer-group", "title": "Feature", "description": "2019-10 SSO and AdminUI now are separated projects" },
4+
{ "icon": "text-info fas fa-seedling", "title": "NET Core 3.0", "description": "2019-10 Updated to ASP.NET Core 3" },
5+
{ "icon": "text-info fab fa-microsoft", "title": "DevOps", "description": "2019-06 Azure CI/CD ready" },
6+
{ "icon": "text-info fas fa-kiwi-bird", "title": "Session", "description": "2019-05 UI Session improvements" },
7+
{ "icon": "text-warning fab fa-docker", "title": "Docker", "description": "2019-04 Docker Ready" },
8+
{ "icon": "text-info fas fa-code-branch", "title": "NET Core 2.2", "description": "2019-03 Updated to ASP.NET Core 2.2" },
9+
{ "icon": "text-success fas fa-id-card", "title": "ID4", "description": "2019-03 IdentityServer4 2.4 Components" },
10+
{ "icon": "text-danger fas fa-rocket", "title": "Launch", "description": "2018-10 first release" }
11+
]
1012
}

‎environment.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export const environment = {
44
ResourceServer: "http://localhost:5002/",
55
RequireHttps: false,
66
Uri: "http://localhost:4300",
7-
defaultTheme: "E",
7+
defaultTheme: "A",
88
version: "3.0.0"
99
};
1010

‎src/Frontend/Jp.AdminUI/src/environments/environment.prod.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ export const environment = {
44
IssuerUri: "https://sso.jpproject.net",
55
RequireHttps: true,
66
Uri: "https://admin.jpproject.net",
7-
defaultTheme: "E",
7+
defaultTheme: "C",
88
version: "3.0.0"
99
};

‎src/Frontend/Jp.AdminUI/src/index.html‎

Lines changed: 62 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,64 @@
1-
<!doctype html>
2-
<html lang="en">
3-
4-
<head>
5-
<meta charset="utf-8">
6-
<title>Jp Project - IdentityServer4 Admin Panel</title> <!--CONFIG-->
1+
<!doctype html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<title>Jp Project - IdentityServer4 Admin Panel</title>
7+
<!--CONFIG-->
8+
9+
<base href="/">
10+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
11+
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
12+
<link rel="apple-touch-icon" sizes="180x180" href="/assets/img/favicon/apple-touch-icon.png">
13+
<link rel="icon" type="image/png" sizes="32x32" href="/assets/img/favicon/favicon-32x32.png">
14+
<link rel="icon" type="image/png" sizes="16x16" href="/assets/img/favicon/favicon-16x16.png">
15+
<link rel="manifest" href="/assets/img/favicon/site.webmanifest">
16+
<link rel="mask-icon" href="/assets/img/favicon/safari-pinned-tab.svg" color="#5bbad5">
17+
<meta name="msapplication-TileColor" content="#da532c">
18+
<meta name="theme-color" content="#ffffff">
19+
</head>
20+
21+
<body>
22+
<app-root></app-root>
23+
</body>
24+
<script type="text/javascript">
25+
var appInsights = window.appInsights || function(a) {
26+
function b(a) {
27+
c[a] = function() {
28+
var b = arguments;
29+
c.queue.push(function() {
30+
c[a].apply(c, b)
31+
})
32+
}
33+
}
34+
var c = {
35+
config: a
36+
},
37+
d = document,
38+
e = window;
39+
setTimeout(function() {
40+
var b = d.createElement("script");
41+
b.src = a.url || "https://az416426.vo.msecnd.net/scripts/a/ai.0.js", d.getElementsByTagName("script")[0].parentNode.appendChild(b)
42+
});
43+
try {
44+
c.cookie = d.cookie
45+
} catch (a) {}
46+
c.queue = [];
47+
for (var f = ["Event", "Exception", "Metric", "PageView", "Trace", "Dependency"]; f.length;) b("track" + f.pop());
48+
if (b("setAuthenticatedUserContext"), b("clearAuthenticatedUserContext"), b("startTrackEvent"), b("stopTrackEvent"), b("startTrackPage"), b("stopTrackPage"), b("flush"), !a.disableExceptionTracking) {
49+
f = "onerror", b("_" + f);
50+
var g = e[f];
51+
e[f] = function(a, b, d, e, h) {
52+
var i = g && g(a, b, d, e, h);
53+
return !0 !== i && c["_" + f](a, b, d, e, h), i
54+
}
55+
}
56+
return c
57+
}({
58+
instrumentationKey: '58eff4af-ab6a-471e-9d61-a22d8d54e01f'
59+
});
60+
61+
window.appInsights = appInsights, appInsights.queue && 0 === appInsights.queue.length && appInsights.trackPageView();
62+
</script>
763

8-
<base href="/">
9-
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
10-
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
11-
<link rel="apple-touch-icon" sizes="180x180" href="/assets/img/favicon/apple-touch-icon.png">
12-
<link rel="icon" type="image/png" sizes="32x32" href="/assets/img/favicon/favicon-32x32.png">
13-
<link rel="icon" type="image/png" sizes="16x16" href="/assets/img/favicon/favicon-16x16.png">
14-
<link rel="manifest" href="/assets/img/favicon/site.webmanifest">
15-
<link rel="mask-icon" href="/assets/img/favicon/safari-pinned-tab.svg" color="#5bbad5">
16-
<meta name="msapplication-TileColor" content="#da532c">
17-
<meta name="theme-color" content="#ffffff">
18-
</head>
19-
20-
<body>
21-
<app-root></app-root>
22-
</body>
23-
<script type="text/javascript">
24-
25-
var appInsights=window.appInsights||function(a){
26-
function b(a){c[a]=function(){var b=arguments;c.queue.push(function(){c[a].apply(c,b)})}}var c={config:a},d=document,e=window;setTimeout(function(){var b=d.createElement("script");b.src=a.url||"https://az416426.vo.msecnd.net/scripts/a/ai.0.js",d.getElementsByTagName("script")[0].parentNode.appendChild(b)});try{c.cookie=d.cookie}catch(a){}c.queue=[];for(var f=["Event","Exception","Metric","PageView","Trace","Dependency"];f.length;)b("track"+f.pop());if(b("setAuthenticatedUserContext"),b("clearAuthenticatedUserContext"),b("startTrackEvent"),b("stopTrackEvent"),b("startTrackPage"),b("stopTrackPage"),b("flush"),!a.disableExceptionTracking){f="onerror",b("_"+f);var g=e[f];e[f]=function(a,b,d,e,h){var i=g&&g(a,b,d,e,h);return!0!==i&&c["_"+f](a,b,d,e,h),i}}return c
27-
}({
28-
instrumentationKey: '205fabcd-09ee-46f5-bb74-95780fc873da'
29-
});
30-
31-
window.appInsights=appInsights,appInsights.queue&&0===appInsights.queue.length&&appInsights.trackPageView();
32-
33-
</script>
34-
3564
</html>

0 commit comments

Comments
 (0)