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

Commit cde5bdd

Browse files
committed
updates for clean prod build
1 parent 043d1b1 commit cde5bdd

File tree

7 files changed

+638
-662
lines changed

7 files changed

+638
-662
lines changed

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ services:
3030
depends_on:
3131
- jpdatabase
3232
environment:
33-
DATABASE_TYPE: "MySql"
34-
CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
33+
DATABASE_TYPE: "SqlServer"
34+
CUSTOMCONNSTR_DATABASE_CONNECTION: "Data Source=tcp:capturadb.database.windows.net,1433;Initial Catalog=homolog_jpproject;User [email protected];Password=8BIaspVxw1vOgSIDKdIn;"
3535
ASPNETCORE_ENVIRONMENT: "Development"
3636
ASPNETCORE_URLS: http://+:5000
3737

@@ -48,8 +48,8 @@ services:
4848
depends_on:
4949
- jpdatabase
5050
environment:
51-
DATABASE_TYPE: "MySql"
52-
CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
51+
DATABASE_TYPE: "SqlServer"
52+
CUSTOMCONNSTR_DATABASE_CONNECTION: "Data Source=tcp:capturadb.database.windows.net,1433;Initial Catalog=homolog_jpproject;User [email protected];Password=8BIaspVxw1vOgSIDKdIn;"
5353
ASPNETCORE_ENVIRONMENT: "Development"
5454
AUTHORITY: "http://jpproject:5000"
5555
ASPNETCORE_URLS: http://+

src/Frontend/Jp.AdminUI/src/app/shared/viewModel/client.model.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ export class Client {
9595
allowedCorsOrigins: string[];
9696
properties: ClientProperty[];
9797
oldClientId: string;
98-
98+
userCodeType: string;
99+
deviceCodeLifetime: number;
100+
99101
public static isValid(client: Client, errors: string[]): boolean {
100102
errors.length = 0;
101103
if (client.allowedGrantTypes == null || client.allowedGrantTypes.length <= 0) {

src/Frontend/Jp.UI.SSO/Dockerfile

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

src/Frontend/Jp.UI.SSO/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public static void Main(string[] args)
3030

3131
var host = CreateWebHostBuilder(args).Build();
3232

33-
// Uncomment this to seed upon startup, alternatively pass in `dotnet run / seed` to seed using CLI
34-
Task.WaitAll(DbMigrationHelpers.EnsureSeedData(host));
33+
//Task.WaitAll(DbMigrationHelpers.EnsureSeedData(host));
3534

3635
host.Run();
3736
}

src/Frontend/Jp.UI.SSO/Views/Shared/_Layout.cshtml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<link rel="apple-touch-icon" sizes="152x152" href="@Url.Content("~/images/apple-icon-152x152.png")">
3333
<link rel="apple-touch-icon" sizes="180x180" href="@Url.Content("~/images/apple-icon-180x180.png")">
3434
<link rel="icon" type="image/png" sizes="192x192" href="@Url.Content("~/images/android-icon-192x192.png")">
35-
<link rel="icon" type="image/png" sizes="32x32" href="@Url.Content("images/favicon-32x32.png")">
36-
<link rel="icon" type="image/png" sizes="96x96" href="@Url.Content("images/favicon-96x96.png")">
37-
<link rel="icon" type="image/png" sizes="16x16" href="@Url.Content("images/favicon-16x16.png")">
38-
<link rel="manifest" href="@Url.Content("images/manifest.json")">
35+
<link rel="icon" type="image/png" sizes="32x32" href="@Url.Content("~/images/favicon-32x32.png")">
36+
<link rel="icon" type="image/png" sizes="96x96" href="@Url.Content("~/images/favicon-96x96.png")">
37+
<link rel="icon" type="image/png" sizes="16x16" href="@Url.Content("~/images/favicon-16x16.png")">
38+
<link rel="manifest" href="@Url.Content("~/images/manifest.json")">
3939
<meta name="msapplication-TileColor" content="#ffffff">
40-
<meta name="msapplication-TileImage" content="@Url.Content("images/ms-icon-144x144.png")">
40+
<meta name="msapplication-TileImage" content="@Url.Content("~/images/ms-icon-144x144.png")">
4141
<meta name="theme-color" content="#ffffff">
4242
<script asp-append-version="true" crossorigin="anonymous" src="~/js/app.insights.js"></script>
4343
</head>

src/Frontend/Jp.UI.SSO/Views/Shared/_LayoutExt.cshtml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<link rel="apple-touch-icon" sizes="152x152" href="@Url.Content("~/images/apple-icon-152x152.png")">
2929
<link rel="apple-touch-icon" sizes="180x180" href="@Url.Content("~/images/apple-icon-180x180.png")">
3030
<link rel="icon" type="image/png" sizes="192x192" href="@Url.Content("~/images/android-icon-192x192.png")">
31-
<link rel="icon" type="image/png" sizes="32x32" href="@Url.Content("images/favicon-32x32.png")">
32-
<link rel="icon" type="image/png" sizes="96x96" href="@Url.Content("images/favicon-96x96.png")">
33-
<link rel="icon" type="image/png" sizes="16x16" href="@Url.Content("images/favicon-16x16.png")">
34-
<link rel="manifest" href="@Url.Content("images/manifest.json")">
31+
<link rel="icon" type="image/png" sizes="32x32" href="@Url.Content("~/images/favicon-32x32.png")">
32+
<link rel="icon" type="image/png" sizes="96x96" href="@Url.Content("~/images/favicon-96x96.png")">
33+
<link rel="icon" type="image/png" sizes="16x16" href="@Url.Content("~/images/favicon-16x16.png")">
34+
<link rel="manifest" href="@Url.Content("~/images/manifest.json")">
3535
<meta name="msapplication-TileColor" content="#ffffff">
36-
<meta name="msapplication-TileImage" content="@Url.Content("images/ms-icon-144x144.png")">
36+
<meta name="msapplication-TileImage" content="@Url.Content("~/images/ms-icon-144x144.png")">
3737
<meta name="theme-color" content="#ffffff">
3838
<link href="@Url.Content("~/css/jp.min.css")" rel="stylesheet">
3939
<script asp-append-version="true" crossorigin="anonymous" src="~/js/app.insights.js"></script>

0 commit comments

Comments
 (0)