O2-Bionics · live-dev999 · Nov 14, 2022 · Nov 14, 2022 · Nov 14, 2022 · Nov 14, 2022
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs b/src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs
@@ -12,15 +12,15 @@ public class VersionController : ControllerBase
     {
         #region Fields
 
-        private readonly IHostingEnvironment _environment;
+        private readonly IWebHostEnvironment _environment;
         private readonly ILogger<VersionController> _logger;
 
         #endregion
 
 
         #region Ctors
 
-        public VersionController(IHostingEnvironment environment, ILogger<VersionController> logger)
+        public VersionController(IWebHostEnvironment environment, ILogger<VersionController> logger)
         {
             _environment = environment;
             _logger = logger;

diff --git a/src/Services/auth/O2NextGen.Auth.Web/Dockerfile b/src/Services/auth/O2NextGen.Auth.Web/Dockerfile
@@ -1,10 +1,24 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:2.2 AS base
+#FROM node as react
+
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:2.2 AS build
+RUN apt-get update
+RUN apt-get install -y curl
+RUN apt-get install -y libpng-dev libjpeg-dev curl libxi6 build-essential libgl1-mesa-glx
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
+RUN apt-get install -y nodejs
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+RUN apt-get update
+RUN apt-get install -y curl
+RUN apt-get install -y libpng-dev libjpeg-dev curl libxi6 build-essential libgl1-mesa-glx
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
+RUN apt-get install -y nodejs
+
 WORKDIR /src
 COPY ["Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj", "Services/auth/O2NextGen.Auth.Web/"]
 RUN dotnet restore "Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj"

diff --git a/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj b/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj
@@ -28,6 +28,8 @@
     <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
+    <PackageReference Include="SkiaSharp" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.QrCode" Version="0.6.0" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Resources\Pages\Account\Register.en.resx">
@@ -76,6 +78,20 @@
     <Compile Remove="Logs\**" />
   </ItemGroup>
 
+   <ItemGroup>
+        <UpToDateCheckBuilt Include="wwwroot/css/site.css" Set="Css" />
+        <UpToDateCheckBuilt Include="postcss.config.js" Set="Css" />
+        <UpToDateCheckBuilt Include="tailwind.config.js" Set="Css" />
+    </ItemGroup>
+
+    <Target Name="NPM install" BeforeTargets="Build">
+	    <Exec Command="npm install" />
+    </Target>
+
+    <Target Name="Tailwind" BeforeTargets="Build">
+        <Exec Command="npm run css:build" />
+    </Target>
+
   <ItemGroup>
     <None Remove="Resources\SharedResource.en" />
     <None Remove="Resources\Resources.ru" />
@@ -88,10 +104,8 @@
     <None Remove="Microsoft.EntityFrameworkCore.InMemory" />
     <None Remove="IdentityServer4" />
     <None Remove="IdentityServer4.AspNetIdentity" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="css\core" />
+    <None Remove="SkiaSharp" />
+    <None Remove="SkiaSharp.QrCode" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Shared/_Layout.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/Shared/_Layout.cshtml
@@ -4,8 +4,9 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"] - O2NextGen.Auth.Web</title>
-    <link rel="stylesheet" href="~/css/styles.css" />
-    <link rel="stylesheet" href="~/build/app.css">
+    @*<link rel="stylesheet" href="~/css/styles.css" />
+    <link rel="stylesheet" href="~/build/app.css">*@
+    <link rel="stylesheet" href="~/css/output.css" />
 </head>
 <body>
     <div class="2xl:container h-screen m-auto">

diff --git a/src/Services/auth/O2NextGen.Auth.Web/Properties/launchSettings.json b/src/Services/auth/O2NextGen.Auth.Web/Properties/launchSettings.json
@@ -17,7 +17,7 @@
     "O2NextGen.Auth.Web": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:59041",
+      "applicationUrl": "https://localhost:9769;http://localhost:55585",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
@@ -24,8 +24,11 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc()
-                .SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
+            services.AddMvc(options =>
+            {
+                options.EnableEndpointRouting = false;
+            })
+                //.SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
                 .AddRazorPagesOptions(options =>
                 {
                     options.Conventions.AuthorizeFolder("/Account");

diff --git a/src/Services/auth/O2NextGen.Auth.Web/css/core/main.css b/src/Services/auth/O2NextGen.Auth.Web/css/core/main.css
diff --git a/src/Services/auth/O2NextGen.Auth.Web/css/tailwind.css b/src/Services/auth/O2NextGen.Auth.Web/css/tailwind.css