From 0623c8a20881ea5d707101641a1cb8252f7fde5f Mon Sep 17 00:00:00 2001
From: Serghei Cebotari <serghei@cebotari.ru>
Date: Fri, 2 Feb 2024 14:30:47 +0300
Subject: Use external js

---
 Dockerfile                  |  3 ---
 MyDarling.csproj            |  5 ++++-
 Pages/Shared/_Layout.cshtml | 19 ++++++++++++-------
 libman.json                 | 18 ------------------
 4 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 libman.json

diff --git a/Dockerfile b/Dockerfile
index d643703..4b57ffb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
 WORKDIR /source
 
 COPY . .
-RUN dotnet restore && \
-    dotnet tool restore && \
-    dotnet libman restore
 RUN dotnet publish --property:OutputPath=/app
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
diff --git a/MyDarling.csproj b/MyDarling.csproj
index 3179cb5..60ee12c 100644
--- a/MyDarling.csproj
+++ b/MyDarling.csproj
@@ -15,7 +15,10 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
     <PackageReference Include="SkiaSharp" Version="2.88.7" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />    
+    <None Include="wwwroot\**">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/Pages/Shared/_Layout.cshtml b/Pages/Shared/_Layout.cshtml
index 789b9d5..e308e85 100644
--- a/Pages/Shared/_Layout.cshtml
+++ b/Pages/Shared/_Layout.cshtml
@@ -20,15 +20,22 @@
 
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />
     <link rel="shortcut icon" type="image/png" href="/favicon.png" />
-    <script src="/lib/font-awesome/js/all.js"></script>
-    <link href="/lib/fancyapps-ui/fancybox.css" rel="stylesheet" />
-    <link href="/css/styles.css" rel="stylesheet" />
 
+    <!-- Bootstrap -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Fancybox -->
+    <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@@fancyapps/fancybox@@3.5.7/dist/jquery.fancybox.min.js"></script>
+    <link href="https://cdn.jsdelivr.net/npm/@@fancyapps/fancybox@@3.5.7/dist/jquery.fancybox.min.css" rel="stylesheet">
+    <!-- Fonts -->
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link
-        href="https://fonts.googleapis.com/css2?family=Noto+Sans&family=Noto+Sans+Mono&family=Nunito&display=swap"
+    <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&family=Noto+Sans+Mono&family=Nunito&display=swap"
         rel="stylesheet">
+    <!-- Styles -->
+    <link href="/css/styles.css" rel="stylesheet" />
+    <!-- Font Awesome -->
+    <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js"></script>
     <!-- Yandex.Metrika counter -->
     <script type="text/javascript">
         (function (m, e, t, r, i, k, a) {
@@ -56,8 +63,6 @@
     <footer class="footer bg-black small text-center text-white-50">
         <div class="container px-4 px-lg-5">My Darling Underwear &copy; 2023</div>
     </footer>
-    <script src="/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
-    <script src="/lib/fancyapps-ui/fancybox.umd.js"></script>
     <script src="/js/scripts.js"></script>
 </body>
 
diff --git a/libman.json b/libman.json
deleted file mode 100644
index 7ba7b9a..0000000
--- a/libman.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.0",
-  "defaultProvider": "cdnjs",
-  "libraries": [
-    {
-      "library": "fancyapps-ui@4.0.31",
-      "destination": "wwwroot\\lib\\fancyapps-ui"
-    },
-    {
-      "library": "bootstrap@5.1.3",
-      "destination": "wwwroot\\lib\\bootstrap"
-    },
-    {
-      "library": "font-awesome@6.3.0",
-      "destination": "wwwroot\\lib\\font-awesome"
-    }
-  ]
-}
\ No newline at end of file
-- 
cgit v1.2.3