Update docker-image.yml

set admin-panel

.github/workflows/docker-image.yml

@@ -36,7 +36,6 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: |
-            yaflay/yaflay.ru
             ghcr.io/${{ github.repository }}
       
       - name: Build and push Docker images

.gitignore

@@ -360,4 +360,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+/appsettings.json

Controllers/HomeController.cs

@@ -11,26 +11,25 @@ namespace yaflay.ru.Новая_папка
     {
         // GET: HomeController
 
+        
         private async Task<string?> getUrlFromGit(string baseUrl)
         {
             try
             {
                 HttpClient client = new();
-                HttpResponseMessage getter = await client.GetAsync("https://raw.githubusercontent.com/YaFlay/yaflay.ru/master/redirect_uris.json");
-                JsonNodeOptions jsonNodeOptions = new ();
-                JsonDocumentOptions jsonDocumentOptions = new()
+                HttpResponseMessage getter = await client.GetAsync("https://raw.githubusercontent.com/yawaflua/yaflay.ru/master/redirect_uris.json");
+                JsonDocumentOptions jsonDocumentOptions = new ()
                 {
                     AllowTrailingCommas = true
                 };
                 JsonNode? allFile = JsonNode.Parse(await getter.Content.ReadAsStringAsync(),
-                                                 nodeOptions: jsonNodeOptions,
                                                  documentOptions: jsonDocumentOptions);
                 ;
                 return (string?)allFile[baseUrl];
             }
             catch (Exception except)
             {
-                await Console.Out.WriteLineAsync(except.ToString());
+                await Console.Out.WriteLineAsync(except.Message.ToString());
                 return null;
             }
         }
@@ -40,7 +39,6 @@ namespace yaflay.ru.Новая_папка
         {
             
             string? url = await getUrlFromGit(uri);
-            await Console.Out.WriteLineAsync($"New connected user: {HttpContext.Connection.RemoteIpAddress}");
             if (url != null) 
             {
                 return Redirect(url);

Pages/Index.cshtml

@@ -1,7 +1,7 @@
 @page
 @model IndexModel
 @{
-    ViewData["Title"] = "YaFlay";
+    ViewData["Title"] = "yawaflua";
 }
 
 <h3 align="left" class="readme" >README.md</h3>  
@@ -9,5 +9,6 @@
 @{
     string Github_readme = Startup.client.GetStringAsync("https://raw.githubusercontent.com/yawaflua/yawaflua/main/README.md").Result;
     <div class="text"> @Html.Raw(Github_readme) </div>
+    
 }
 

Pages/Shared/_Layout.cshtml

@@ -4,33 +4,34 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" href="~/favicon.ico" />
-    <title>@ViewData["Title"] - yaflay.ru</title>
+    <title>@ViewData["Title"] - @Context.Request.Host.Host</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
     <link type="application/json+oembed" href="~/json/oembed.json" />
-    <meta property="og:title" content="YaFlay ReadMe" />
+    <!--<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">-->
+    <meta property="og:title" content="yawaflua readme" />
     <meta property="og:type" content="rich" />
-    <meta property="og:url" content="https://yaflay.ru/" />
+    <meta property="og:url" content="@Context.Request.Host.Host" />
     <meta property="og:image" content="https://user-images.githubusercontent.com/5713670/87202985-820dcb80-c2b6-11ea-9f56-7ec461c497c3.gif" />
     <meta property="og:description"
-          content="Here you can check info about YaFlay: social networks, programming languages that he knows and his projects." />
+          content="Here you can check info about yawaflua: social networks, programming languages that he knows and his projects." />
     <meta property="og:locale" content="en_US" />
-    <meta property="og:site_name" content="yaflay.ru" />
+    <meta property="og:site_name" content="yawaflua.ru" />
 </head>
 <body>
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light border-bottom box-shadow mb-3" style="background-color: #2c2c2c;">
             <div class="container">
-                <a class="navbar-brand" style="color: cornflowerblue" asp-area="" asp-page="/Index">
-                    <img src="https://cdn.discordapp.com/avatars/945317832290336798/fcd69146cf424ca9b6e507bba67386ab.gif" width="50" height="50" style="border-radius: 10px; margin-right: 10%">
-                    yaflay.ru
-                </a>
+                
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
                 <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
+                        <a class="nav-link " style="color: cornflowerblue;" asp-area="" asp-page="/Index">
+                            @Context.Request.Host.Host
+                        </a>
                         <li class="nav-item">
                             <a class="nav-link text-white" asp-area="" asp-page="/Index">Home</a>
                         </li>
@@ -38,23 +39,45 @@
                             <a class="nav-link text-white" asp-area="" asp-page="/Privacy">Privacy</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-white" href="https://storespw.ru">StoreSPw</a>
+                            <a class="nav-link text-white" href="https://storespw.ru/">StoreSPw</a>
                         </li>
                     </ul>
                 </div>
             </div>
         </nav>
     </header>
+    <div class="migratePushUp">
+        @{
+
+            if (!Context.Request.Host.Host.StartsWith("yawaflua.ru"))
+            {
+            <div aria-live="polite" aria-atomic="true" style="margin-right: 3vh;">
+                    <div class="toast bg-dark right-1vm absolute fixed" style="bottom: 0; display:block;">
+                    <div class="toast-header bg-dark" >
+                        <strong class="mr-auto left-1vm absolute">@Context.Request.Host.Host</strong>
+                        <small class="absolute right-1vm">Now</small>
+                    </div>
+                    <div class="toast-body text-muted">
+                        This site is outdated. Use <a href="https://yawaflua.ru">new site</a>
+                    </div>
+                </div>
+            </div>
+            }
+        }
+    </div>
     <div class="container">
         <main role="main" class="pb-3">
             @RenderBody()
         </main>
     </div>
 
-    <footer class="border-top footer text-muted">
-        <div class="container">
-            &copy; 2023 - yaflay.ru - <a asp-area="" asp-page="/Privacy">Privacy</a>
+    <footer class="border-top footer text-muted margin-2-vm">
+        <div class="container margin-2-vm">
+            &copy; 2023 - @Context.Request.Host.Host - <a asp-area="" asp-page="/Privacy">Privacy</a>
         </div>
+        <p class="flex-row margin-2-vm container-md">
+            сrafted by <a href="https://yawaflua.ru/gh" class="underline dashed decoration-purple text-white hover:decoration-wavy">yawaflua</a>
+        </p>
     </footer>
 
     <script src="~/lib/jquery/dist/jquery.min.js"></script>

appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

wwwroot/css/site.css

@@ -9,6 +9,10 @@ html {
 .readme{
     font-family: 'Anonymous Pro';
 }
+.stats {
+    width: 60vmax;
+    max-width: 1000px;
+}
 body {
     background: #2c2c2c;
     color: white;
@@ -29,7 +33,18 @@ nav {
     font-size: 16px;
   }
 }
-
+.absolute {
+    position: absolute;
+}
+.fixed {
+    position:fixed;
+}
+.right-1vm {
+    right: 1vmax;
+}
+.left-1vm {
+    left: 1vmax;
+}
 html {
   position: relative;
   min-height: 100%;
@@ -43,6 +58,21 @@ div .text {
     border: solid white;
     border-width: 4px;
 }
+.margin-2-vm {
+    margin: 2vmax;
+}
+.underline{
+    text-decoration-line: underline;
+}
+.hover\:decoration-wavy:hover {
+    text-decoration-style: wavy
+}
+.dashed {
+    text-decoration-style: dashed;
+}
+.decoration-purple{
+    text-decoration-color: purple;
+}
 p {
     margin-right: 5vh;
     margin-left: 5vh;

wwwroot/json/oembed.json

@@ -2,9 +2,9 @@
   "embeds": [
     {
       "type": "rich",
-      "url": "yaflay.ru",
-      "title": "YaFlay ReadMe",
-      "description": "Here you can get info about YaFlay: social networks, programming languages that he knows and his projects.",
+      "url": "yawaflua.ru",
+      "title": "ReadAbout yawaflua",
+      "description": "Here you can get info about yawaflua: social networks, programming languages that he knows and his projects.",
       "thumbnail": {
         "url": "https://user-images.githubusercontent.com/5713670/87202985-820dcb80-c2b6-11ea-9f56-7ec461c497c3.gif",
         "proxy_url": "https://user-images.githubusercontent.com/5713670/87202985-820dcb80-c2b6-11ea-9f56-7ec461c497c3.gif",