should be good to publish new docker images

m-GDEV · Dec 3, 2024 · 6202a39 · 6202a39
1 parent 0058a2f
commit 6202a39
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -179,8 +179,9 @@ See the [open projects](https://github.com/m-GDEV/WardrobeManager/projects) for
 
 1. Clone the repository: `git clone https://github.com/m-GDEV/WardrobeManager`
 2. Open solution in IDE of your choice
-3. Run both projects with 'dotnet watch' launch profile
-4. Profit
+3. Make sure you have npm and nodejs installed and that they are in your PATH
+4. Run both projects with 'dotnet watch' launch profile
+5. Profit
 
 Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
 

diff --git a/WardrobeManager.Presentation/Layout/MainLayout.razor b/WardrobeManager.Presentation/Layout/MainLayout.razor
@@ -5,17 +5,20 @@
 <div class="h-full  text-base-content body-text transition-all duration-300">
     <ErrorBoundary @ref="errorBoundary">
         <ChildContent>
-            <div class="h-[10%]">
-                <NavMenu/>
+
+            <div class="hidden sm:block h-full">
+                <div class="h-[10%]">
+                    <NavMenu/>
+                </div>
+                <div class="h-[90%]">
+                    @Body
+                </div>
             </div>
-            <div class="h-[90%]">
-                @Body
+            <div class="sm:hidden flex flex-col items-center justify-center h-full">
+                <h1 class="heading-text text-primary">Mobile Version In Development!</h1>
+                <p class="subtitle-text text-accent">Please check back later</p>
             </div>
-        @*
-            <div class="h-[7%]">
-                <FooterMenu/>
-            </div>
-            *@
+
         </ChildContent>
         <ErrorContent Context="ex">
             @{

diff --git a/WardrobeManager.Presentation/WardrobeManager.Presentation.csproj b/WardrobeManager.Presentation/WardrobeManager.Presentation.csproj
@@ -19,5 +19,11 @@
   <ItemGroup>
     <ProjectReference Include="..\WardrobeManager.Shared\WardrobeManager.Shared.csproj" />
   </ItemGroup>
+
+  <!-- Build tailwindcss -->
+  <Target Name="BuildTailwind" BeforeTargets="Build">
+    <Exec Command="npm install" />
+    <Exec Command="npm run build" />
+  </Target>
 
 </Project>
diff --git a/WardrobeManager.Presentation/package.json b/WardrobeManager.Presentation/package.json
@@ -1,4 +1,9 @@
 {
+  "scripts": {
+    "build": "tailwindcss -i ./tailwind.css -o ./wwwroot/css/tailwind.css --minify",
+    "watch": "tailwindcss -i ./tailwind.css -o ./wwwroot/css/tailwind.css --watch"
+  },
+
   "devDependencies": {
     "daisyui": "^4.12.14",
     "tailwindcss": "^3.4.15"

diff --git a/WardrobeManager.Presentation/wwwroot/css/daisyUI.css b/WardrobeManager.Presentation/wwwroot/css/daisyUI.css
diff --git a/WardrobeManager.Presentation/wwwroot/css/tailwind.css b/WardrobeManager.Presentation/wwwroot/css/tailwind.css
@@ -2880,10 +2880,6 @@ html {
   height: 4rem;
 }
 
-.h-\[7\%\] {
-  height: 7%;
-}
-
 .h-\[80\%\] {
   height: 80%;
 }
@@ -3377,6 +3373,10 @@ html {
   font-size: 10rem;
 }
 
+.text-\[33rem\] {
+  font-size: 33rem;
+}
+
 .text-lg {
   font-size: 1.125rem;
   line-height: 1.75rem;
@@ -3480,6 +3480,11 @@ html {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
+.hover\:bg-black:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(0 0 0 / var(--tw-bg-opacity, 1));
+}
+
 .hover\:bg-primary:hover {
   --tw-bg-opacity: 1;
   background-color: var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity, 1)));
@@ -3490,6 +3495,21 @@ html {
   background-color: var(--fallback-pc,oklch(var(--pc)/var(--tw-bg-opacity, 1)));
 }
 
+.hover\:bg-red-500:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(239 68 68 / var(--tw-bg-opacity, 1));
+}
+
+@media (min-width: 640px) {
+  .sm\:block {
+    display: block;
+  }
+
+  .sm\:hidden {
+    display: none;
+  }
+}
+
 @media (min-width: 1024px) {
   .lg\:flex {
     display: flex;

diff --git a/WardrobeManager.Presentation/wwwroot/css/tailwind.js b/WardrobeManager.Presentation/wwwroot/css/tailwind.js
diff --git a/WardrobeManager.Presentation/wwwroot/index.html b/WardrobeManager.Presentation/wwwroot/index.html
@@ -14,7 +14,7 @@
 <!--    <script src="https://cdn.tailwindcss.com?plugins=typography"></script>-->
     <!--    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/full.min.css" rel="stylesheet" type="text/css" />-->
 
-    <link href="/css/tailwind.css" rel="stylesheet">
+    <link href="./css/tailwind.css" rel="stylesheet" type="text/css">
     <link href="./css/custom.css" rel="stylesheet" type="text/css" />
 
     <script defer src="https://cdn.jsdelivr.net/npm/[email protected]/index.js"></script>

diff --git a/docker/WardrobeManager.Presentation/Dockerfile b/docker/WardrobeManager.Presentation/Dockerfile
@@ -9,6 +9,11 @@ COPY  ./WardrobeManager.Presentation /src/WardrobeManager.Presentation/
 
 # Publish phase
 FROM build AS publish
+
+# Takes a while and installs a lot of deps but its ok because this not the final stage
+RUN apt update
+RUN apt install nodejs npm -y
+
 ARG BUILD_CONFIGURATION=Release
 RUN dotnet publish "./WardrobeManager.Presentation/WardrobeManager.Presentation.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false