From 1ceb063d14eb80fd1484b3375c83f80b225acf9d Mon Sep 17 00:00:00 2001 From: "Amir.H Khademi" Date: Fri, 27 Sep 2024 15:11:03 +0330 Subject: [PATCH] chore ( UpdatePackages ) --- .../AppSettings/appsettings.Development.json | 2 +- DocuMed.Api/Dockerfile | 4 +- DocuMed.Api/DocuMed.Api.csproj | 56 ++-- DocuMed.Api/Program.cs | 1 - DocuMed.Api/Properties/launchSettings.json | 3 +- DocuMed.Api/Views/Home/Index.cshtml | 30 +-- DocuMed.Common/DocuMed.Common.csproj | 2 +- DocuMed.Common/Extensions/StringExtensions.cs | 7 +- DocuMed.Core/CoreServices/AccountService.cs | 6 +- DocuMed.Core/DocuMed.Core.csproj | 4 +- DocuMed.Domain/DocuMed.Domain.csproj | 4 +- .../DocuMed.Infrastructure.csproj | 2 +- DocuMed.PWA/DocuMed.PWA.csproj | 16 +- DocuMed.PWA/package-lock.json | 135 +++++----- DocuMed.PWA/package.json | 6 +- DocuMed.PWA/wwwroot/css/app.min.css | 41 +-- DocuMed.PWA/wwwroot/css/app.output.css | 247 +++++++++--------- DocuMed.Repository/DocuMed.Repository.csproj | 14 +- 18 files changed, 307 insertions(+), 273 deletions(-) diff --git a/DocuMed.Api/AppSettings/appsettings.Development.json b/DocuMed.Api/AppSettings/appsettings.Development.json index a1781b1..d8e8e62 100644 --- a/DocuMed.Api/AppSettings/appsettings.Development.json +++ b/DocuMed.Api/AppSettings/appsettings.Development.json @@ -2,7 +2,7 @@ "ConnectionStrings": { "PostgresServer": "User ID=postgres;Password=root;Host=localhost;Port=5432;Database=iGarsonDB;", "PostgresCompose": "Host=postgres_image;Username=brizcouser;Password=brizco;Database=BrizCoDB;", - "Postgres": "Host=pg-0,pg-1;Username=igarsonAgent;Password=xHTpBf4wC+bBeNg2pL6Ga7VEWKFJx7VPEUpqxwPFfOc2YYTVwFQuHfsiqoVeT9+6;Database=DocuMedDB;Load Balance Hosts=true;Target Session Attributes=primary;Application Name=iGLS" + "Postgres": "Host=pg-0;Username=postgres;Password=xHTpBf4wC+bBeNg2pL6Ga7VEWKFJx7VPEUpqxwPFfOc2YYTVwFQuHfsiqoVeT9+6;Database=DocuMedDB;" }, "Logging": { "LogLevel": { diff --git a/DocuMed.Api/Dockerfile b/DocuMed.Api/Dockerfile index e3b4132..fc690f4 100644 --- a/DocuMed.Api/Dockerfile +++ b/DocuMed.Api/Dockerfile @@ -1,10 +1,10 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["DocuMed.Api/DocuMed.Api.csproj", "DocuMed.Api/"] RUN dotnet restore "DocuMed.Api/DocuMed.Api.csproj" diff --git a/DocuMed.Api/DocuMed.Api.csproj b/DocuMed.Api/DocuMed.Api.csproj index d46a320..2cbd197 100644 --- a/DocuMed.Api/DocuMed.Api.csproj +++ b/DocuMed.Api/DocuMed.Api.csproj @@ -11,44 +11,44 @@ - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + - - + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/DocuMed.Api/Program.cs b/DocuMed.Api/Program.cs index 92eaf1a..e1870af 100644 --- a/DocuMed.Api/Program.cs +++ b/DocuMed.Api/Program.cs @@ -19,7 +19,6 @@ var configuration = builder.Configuration; var siteSetting = configuration.GetSection(nameof(SiteSettings)).Get(); builder.Services.Configure(configuration.GetSection(nameof(SiteSettings))); -// Add services to the container. builder.Services.AddControllers(); diff --git a/DocuMed.Api/Properties/launchSettings.json b/DocuMed.Api/Properties/launchSettings.json index 4aa8988..d544ef5 100644 --- a/DocuMed.Api/Properties/launchSettings.json +++ b/DocuMed.Api/Properties/launchSettings.json @@ -13,7 +13,6 @@ "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, - "launchUrl": "", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } @@ -26,7 +25,7 @@ "ASPNETCORE_URLS": "http://+:80" }, "publishAllPorts": true, - "DockerfileRunArguments": " --network=mother -p 32770:80" + "DockerfileRunArguments": " --network=mother -p 32780:80" } }, "$schema": "https://json.schemastore.org/launchsettings.json", diff --git a/DocuMed.Api/Views/Home/Index.cshtml b/DocuMed.Api/Views/Home/Index.cshtml index 84da229..c5144c1 100644 --- a/DocuMed.Api/Views/Home/Index.cshtml +++ b/DocuMed.Api/Views/Home/Index.cshtml @@ -8,7 +8,7 @@ - iGarson API + DocuMed API @@ -33,8 +33,8 @@ -
-
+