From e3155fad7b1c22399d56f339b4269e4cc0d0d5c5 Mon Sep 17 00:00:00 2001
From: swaggboi <swaggboi@slackware.uk>
Date: Tue, 25 Jun 2024 13:08:13 -0400
Subject: [PATCH] Try this again...

---
 Dockerfile                          |  3 +--
 assets/assetpack.db                 | 12 ------------
 assets/assetpack.def                |  5 -----
 cpanfile                            |  2 --
 lib/PostText.pm                     |  3 ---
 {assets => public}/css/elements.css |  0
 {assets => public}/css/nested.css   |  0
 {assets => public}/css/simple.css   |  0
 templates/layouts/default.html.ep   |  4 +++-
 9 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 assets/assetpack.db
 delete mode 100644 assets/assetpack.def
 rename {assets => public}/css/elements.css (100%)
 rename {assets => public}/css/nested.css (100%)
 rename {assets => public}/css/simple.css (100%)

diff --git a/Dockerfile b/Dockerfile
index 09f4c37..701dab9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,6 @@ FROM docker.io/perl:5.36
 
 # Move it
 WORKDIR /opt
-COPY assets/ ./assets/
 COPY lib/ ./lib/
 COPY migrations/ ./migrations/
 COPY public/ ./public/
@@ -17,7 +16,7 @@ RUN apt-get update
 RUN apt-get -y upgrade
 # Work around for test failing due to headers being lowercase now that
 # cpan.org is on HTTP/2
-RUN cpanm --notest Net::HTTP
+#RUN cpanm --notest Net::HTTP
 RUN cpanm --installdeps .
 
 # Finish setting up the environment
diff --git a/assets/assetpack.db b/assets/assetpack.db
deleted file mode 100644
index 7c32dbc..0000000
--- a/assets/assetpack.db
+++ /dev/null
@@ -1,12 +0,0 @@
-[css-min:css/PostText.css]
-checksum=3698d7bf52
-format=css
-minified=1
-[css-min:https://unpkg.com/98.css]
-checksum=4f089bc53f
-format=css
-minified=1
-[sass:sass/post_text.scss]
-checksum=ecda188939
-format=css
-minified=0
diff --git a/assets/assetpack.def b/assets/assetpack.def
deleted file mode 100644
index e2a5c19..0000000
--- a/assets/assetpack.def
+++ /dev/null
@@ -1,5 +0,0 @@
-! app.css
-< https://unpkg.com/normalize.css@8.0.1/normalize.css
-< css/elements.css
-< css/simple.css
-< css/nested.css
diff --git a/cpanfile b/cpanfile
index 885e6e9..6624df6 100644
--- a/cpanfile
+++ b/cpanfile
@@ -1,11 +1,9 @@
 requires 'Mojolicious';
 requires 'Mojo::Pg';
 requires 'Mojolicious::Plugin::TagHelpers::Pagination';
-requires 'Mojolicious::Plugin::AssetPack';
 requires 'Crypt::Passphrase::Argon2';
 requires 'Date::Format';
 requires 'XML::RSS';
-requires 'CSS::Minifier::XS';
 requires 'Text::Markdown';
 requires 'HTML::Restrict';
 requires 'IO::Socket::SSL';
diff --git a/lib/PostText.pm b/lib/PostText.pm
index 331742b..0ef3393 100644
--- a/lib/PostText.pm
+++ b/lib/PostText.pm
@@ -18,7 +18,6 @@ use PostText::Model::Page;
 sub startup($self) {
     $self->plugin('Config');
     $self->plugin('TagHelpers::Pagination');
-    $self->plugin(AssetPack => {pipes => [qw{Css Combine}]});
 
     # Helpers
     $self->helper(pg => sub ($c) {
@@ -108,8 +107,6 @@ sub startup($self) {
         $self->thread->max_pages($max_thread_pages)
     }
 
-    $self->asset->process;
-
     push @{$self->commands->namespaces}, 'PostText::Command';
 
     # Begin routing
diff --git a/assets/css/elements.css b/public/css/elements.css
similarity index 100%
rename from assets/css/elements.css
rename to public/css/elements.css
diff --git a/assets/css/nested.css b/public/css/nested.css
similarity index 100%
rename from assets/css/nested.css
rename to public/css/nested.css
diff --git a/assets/css/simple.css b/public/css/simple.css
similarity index 100%
rename from assets/css/simple.css
rename to public/css/simple.css
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index 441d527..e162ea1 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -29,7 +29,9 @@
         content="<%= url_for('/images/logo.png')->to_abs %>">
   <meta name="twitter:image:alt"
         content="Post::Text logo; a small nerdy anime girl giving a V sign">
-  <%= asset 'app.css' %>
+  <%= stylesheet '/css/elements.css' %>
+  <%= stylesheet '/css/simple.css'   %>
+  <%= stylesheet '/css/nested.css'   %>
 </head>
 <body>
 <header class="header">