Merge branch 'develop'

This commit is contained in:
Samuele Locatelli
2021-09-21 18:38:52 +02:00
5 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -60,7 +60,7 @@
string answ = "";
if (CurrItem != null)
{
answ = $"{BaseUrl}&MatrOpr={CurrItem.MatrOpr}&UserAuthKey={CurrItem.AuthKey}";
answ = $"{BaseUrl}MatrOpr={CurrItem.MatrOpr}&UserAuthKey={CurrItem.AuthKey}";
}
return answ;
}
+1 -1
View File
@@ -19,7 +19,7 @@
@foreach (var item in ListRecords)
{
<div class="col-6 my-2 userCard">
<UserCard CurrItem="@item" BaseUrl="@BaseUrl" Environment="@Environment"></UserCard>
<UserCard CurrItem="@item" BaseUrl="@BaseUrlTab" Environment="@Environment"></UserCard>
</div>
}
</div>
+2 -2
View File
@@ -63,9 +63,9 @@ namespace MP.Land.Pages
[Inject]
protected MessageService AppMService { get; set; }
protected string BaseUrl
protected string BaseUrlTab
{
get => Configuration["BaseUrl"];
get => $"{Configuration["BaseUrl"]}{Configuration["QrJumpPath"]}";
}
[Inject]
+1 -1
View File
@@ -8,6 +8,6 @@
}
},
"AllowedHosts": "*",
"BaseUrl": "IIS01",
"BaseUrl": "https://IIS01/",
"Environment": "Steam STAG"
}
+1
View File
@@ -15,6 +15,7 @@
},
"AllowedHosts": "*",
"BaseUrl": "https://localhost:44309/",
"QrJumpPath": "MP/TAB/jumper?",
"Environment": "Steam DEV",
"downloadPath": "C:\\Steamware\\installers\\MP",
"appVers": "stable",