Simplify the build process a bit

.dockerignore

@@ -3,3 +3,4 @@ Dockerfile
 docker-compose.yml
 flake.nix
 flake.lock
+static/style.css

.gitignore

@@ -15,7 +15,7 @@ cabal.sandbox.config
 *.dump-hi
 .direnv/
 .envrc
+static/style.css
 dist-newstyle/
 result/
 logs/
-Lunch at Chalmers_files/

Dockerfile

@@ -1,18 +1,25 @@
-FROM haskell:9.6.6 as BIN
-WORKDIR /app/user
-COPY *.cabal ./
+from haskell:9.6.6 as bin
+workdir /app/user
+copy *.cabal ./
 
-RUN cabal v2-update && \
+run cabal v2-update && \
     cabal v2-build --dependencies-only
 
-COPY . .
-RUN cabal v2-install --install-method copy --installdir . --overwrite-policy=always
+copy . .
 
-FROM debian:12.5-slim
-RUN apt-get update && apt-get install --no-install-recommends -y ca-certificates \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-COPY --from=BIN /app/user/mat-chalmers /bin/mat-chalmers
-ENV LANG C.UTF-8
-CMD /bin/mat-chalmers
-EXPOSE 5007
+run curl -sLO https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 && \
+    mv tailwindcss-linux-x64 tailwindcss && \
+    chmod +x tailwindcss && \
+    ./tailwindcss --content src/View.hs --output static/style.css --minify
+
+run cabal v2-install --install-method copy --installdir . --overwrite-policy=always
+
+
+from debian:12.5-slim
+run apt-get update && apt-get install --no-install-recommends -y ca-certificates \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+copy --from=bin /app/user/mat-chalmers /bin/mat-chalmers
+env LANG C.UTF-8
+cmd /bin/mat-chalmers
+expose 5007

README.md

@@ -36,10 +36,10 @@ cachix use pingu    # Probably more up to date as of 5/6-24
 
 ### Updating the view?
 Currently, the css framework used is [TailwindCSS](https://tailwindcss.com).
-To generate the css file, visit the website, wait until menus have loaded, and then save the html to `Lunch at Chalmers.html`.
-Then use [Tailwinds cli](https://tailwindcss.com/blog/standalone-cli) program to generate the new css by running `tailwindcss --content Lunch\ at\ Chalmers.html --output static/style.css --minify`.
+To generate css, you can use the [Tailwinds cli](https://tailwindcss.com/blog/standalone-cli) program to generate the new css by running `tailwindcss --content src/View.hs --output static/style.css --minify`.
 
-Worth noting is that the css is embedded in the binary, and changes to it aren't well captured by cabal, so `cabal clean && cabal run` or `docker compose up --build` might be needed to see the updated styling.
+Worth noting is that the css is embedded in the binary, and changes to it aren't well captured by cabal, so `cabal clean && cabal run`.
+When running `docker compose up --build`, the css file will be generated by it self.
 
 ## Credits
 

mat-chalmers.cabal

@@ -11,11 +11,6 @@ Tested-With: GHC ==9.6.6
 data-files:
            static/style.css
            static/icon.png
-           static/fonts/AnonymousPro-Bold.ttf
-           static/fonts/AnonymousPro-BoldItalic.ttf
-           static/fonts/AnonymousPro-Italic.ttf
-           static/fonts/AnonymousPro-Regular.ttf
-           static/fonts/OFL.txt
 
 library
   default-language: GHC2021