diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..f470cc7
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,285 @@
+
+# Created by https://www.gitignore.io/api/csharp
+
+### Csharp ###
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+PetShopProj/buildhelp/
+PetShopProj/Help/*.HxT
+PetShopProj/Help/*.HxC
+PetShopProj/Help/*.hhc
+PetShopProj/Help/*.hhk
+PetShopProj/Help/*.hhp
+PetShopProj/Help/Html2
+PetShopProj/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/
+tools/Cake.CoreCLR
+.vscode
+tools
+.dotnet
+Dockerfile
+
+# .env file contains default environment variables for docker
+.env
+.git/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a1184e3
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0 as build-env
+WORKDIR /app
+COPY . .
+RUN dotnet restore
+RUN dotnet publish -c Release -o /app/out
+
+FROM mcr.microsoft.com/dotnet/aspnet:6.0
+WORKDIR /app
+COPY --from=build-env /app/out .
+EXPOSE 80
+EXPOSE 433
+ENTRYPOINT ["dotnet", "PetShopProj.dll"]
\ No newline at end of file
diff --git a/PetShopProj.csproj b/PetShopProj.csproj
index a092c5b..f120a17 100644
--- a/PetShopProj.csproj
+++ b/PetShopProj.csproj
@@ -4,6 +4,7 @@
net6.0
enable
enable
+
diff --git a/PetShopProj.sln b/PetShopProj.sln
index 9ea2b66..47a770f 100644
--- a/PetShopProj.sln
+++ b/PetShopProj.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.3.32929.385
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PetShopProj", "PetShopProj.csproj", "{1E0C46F0-F547-4C88-B39E-BC8E002A4FA0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PetShopProj.Tests", "..\PetShopProj.Tests\PetShopProj.Tests.csproj", "{F19177C5-9D5B-4C1C-9833-FE3BD1571C8E}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
{1E0C46F0-F547-4C88-B39E-BC8E002A4FA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E0C46F0-F547-4C88-B39E-BC8E002A4FA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E0C46F0-F547-4C88-B39E-BC8E002A4FA0}.Release|Any CPU.Build.0 = Release|Any CPU
- {F19177C5-9D5B-4C1C-9833-FE3BD1571C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F19177C5-9D5B-4C1C-9833-FE3BD1571C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F19177C5-9D5B-4C1C-9833-FE3BD1571C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F19177C5-9D5B-4C1C-9833-FE3BD1571C8E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Program.cs b/Program.cs
index e6e564d..4e4cd28 100644
--- a/Program.cs
+++ b/Program.cs
@@ -6,6 +6,10 @@
using Serilog;
var builder = WebApplication.CreateBuilder(args);
+builder.WebHost.UseKestrel()
+ .UseContentRoot(Directory.GetCurrentDirectory())
+ .UseIISIntegration();
+ /*.UseUrls("http://localhost:8080/");*/
builder.Services.AddTransient();
builder.Host.UseSerilog((ctx, lc) => lc.ReadFrom.Configuration(ctx.Configuration));
string connectionString = builder.Configuration["ConnectionStrings:DefaultConnection"];
diff --git a/Properties/ServiceDependencies/PetShopArad - Web Deploy/profile.arm.json b/Properties/ServiceDependencies/PetShopArad - Web Deploy/profile.arm.json
new file mode 100644
index 0000000..c3d41ee
--- /dev/null
+++ b/Properties/ServiceDependencies/PetShopArad - Web Deploy/profile.arm.json
@@ -0,0 +1,113 @@
+{
+ "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "metadata": {
+ "_dependencyType": "compute.appService.windows"
+ },
+ "parameters": {
+ "resourceGroupName": {
+ "type": "string",
+ "defaultValue": "PetShopAradResourceGroup",
+ "metadata": {
+ "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking."
+ }
+ },
+ "resourceGroupLocation": {
+ "type": "string",
+ "defaultValue": "centralus",
+ "metadata": {
+ "description": "Location of the resource group. Resource groups could have different location than resources, however by default we use API versions from latest hybrid profile which support all locations for resource types we support."
+ }
+ },
+ "resourceName": {
+ "type": "string",
+ "defaultValue": "PetShopArad",
+ "metadata": {
+ "description": "Name of the main resource to be created by this template."
+ }
+ },
+ "resourceLocation": {
+ "type": "string",
+ "defaultValue": "[parameters('resourceGroupLocation')]",
+ "metadata": {
+ "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there."
+ }
+ }
+ },
+ "variables": {
+ "appServicePlan_name": "[concat('Plan', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
+ "appServicePlan_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Web/serverFarms/', variables('appServicePlan_name'))]"
+ },
+ "resources": [
+ {
+ "type": "Microsoft.Resources/resourceGroups",
+ "name": "[parameters('resourceGroupName')]",
+ "location": "[parameters('resourceGroupLocation')]",
+ "apiVersion": "2019-10-01"
+ },
+ {
+ "type": "Microsoft.Resources/deployments",
+ "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
+ "resourceGroup": "[parameters('resourceGroupName')]",
+ "apiVersion": "2019-10-01",
+ "dependsOn": [
+ "[parameters('resourceGroupName')]"
+ ],
+ "properties": {
+ "mode": "Incremental",
+ "template": {
+ "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+ "contentVersion": "1.0.0.0",
+ "resources": [
+ {
+ "location": "[parameters('resourceLocation')]",
+ "name": "[parameters('resourceName')]",
+ "type": "Microsoft.Web/sites",
+ "apiVersion": "2015-08-01",
+ "tags": {
+ "[concat('hidden-related:', variables('appServicePlan_ResourceId'))]": "empty"
+ },
+ "dependsOn": [
+ "[variables('appServicePlan_ResourceId')]"
+ ],
+ "kind": "app",
+ "properties": {
+ "name": "[parameters('resourceName')]",
+ "kind": "app",
+ "httpsOnly": true,
+ "reserved": false,
+ "serverFarmId": "[variables('appServicePlan_ResourceId')]",
+ "siteConfig": {
+ "metadata": [
+ {
+ "name": "CURRENT_STACK",
+ "value": "dotnetcore"
+ }
+ ]
+ }
+ },
+ "identity": {
+ "type": "SystemAssigned"
+ }
+ },
+ {
+ "location": "[parameters('resourceLocation')]",
+ "name": "[variables('appServicePlan_name')]",
+ "type": "Microsoft.Web/serverFarms",
+ "apiVersion": "2015-08-01",
+ "sku": {
+ "name": "S1",
+ "tier": "Standard",
+ "family": "S",
+ "size": "S1"
+ },
+ "properties": {
+ "name": "[variables('appServicePlan_name')]"
+ }
+ }
+ ]
+ }
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/appsettings.json b/appsettings.json
index 7c8c6be..71de6a2 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -1,6 +1,7 @@
{
+ "AllowedHosts": "*",
"ConnectionStrings": {
- "DefaultConnection": "Data Source=(localdb)\\mssqllocaldb;Initial Catalog=_WHATEVERXXX;Integrated Security=True"
+ "DefaultConnection": "Server=tcp:localhost,1433;Initial Catalog=PetShop;Persist Security Info=False;User ID=sa;Password=Abc12345!;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;"
},
"Logging": {
"LogLevel": {
@@ -8,7 +9,6 @@
"Microsoft.AspNetCore": "Warning"
}
},
- "AllowedHosts": "*",
"Serilog": {
"MinimumLevel": {
"Default": "Warning"
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..b32f44e
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '3.3'
+
+services:
+ db:
+ image: bloodshop/petshopdb:1.0
+ restart: always
+
+ app:
+ depends_on:
+ - db
+ image: bloodshop/petshopapp:1.0
+ ports:
+ - "3000:80"
+ restart: always
\ No newline at end of file
diff --git a/log.txt b/log.txt
index 393ec78..736ce02 100644
--- a/log.txt
+++ b/log.txt
@@ -715,3 +715,13 @@ System.InvalidOperationException: Unable to resolve service for type 'PetShopPro
2022-11-28 18:59:17.466 +02:00 [WRN] Failed to determine the https port for redirect.
2022-11-28 19:01:02.411 +02:00 [WRN] Failed to determine the https port for redirect.
2022-11-28 19:07:32.139 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-13 12:40:47.663 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-13 14:38:35.562 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-13 15:03:13.670 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-13 16:58:50.117 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-25 11:17:09.208 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-25 12:13:43.491 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-25 12:56:45.799 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-25 13:37:59.484 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-25 13:50:32.561 +02:00 [WRN] Failed to determine the https port for redirect.
+2022-12-25 15:13:01.124 +02:00 [WRN] Failed to determine the https port for redirect.
diff --git a/wwwroot/js/calls-center.js b/wwwroot/js/calls-center.js
index 9de4222..9bc863a 100644
--- a/wwwroot/js/calls-center.js
+++ b/wwwroot/js/calls-center.js
@@ -8,9 +8,7 @@ $(() => {
var connection = new signalR.HubConnectionBuilder().withUrl("/callcenter").build();
connection.start()
- .then(() => {
- connection.invoke("JoinCallCenters");
- })
+ .then(() => connection.invoke("JoinCallCenters"))
.catch(err => console.error(err.toString()));
connection.on("NewCallReceivedAsync", () => LoadCallsData());
@@ -19,7 +17,6 @@ $(() => {
function LoadCallsData() {
var tr = '';
-
$.ajax({
url: '/Calls/GetCalls',
method: 'GET',