simpler and more integrated build with extended Makefile without weir… (#321)

* simpler and more integrated build with extended Makefile without weird cli run.py

* simplify the toml file

* fixed renamed script

* install uv

* also install python

Author: peter-sk

.github/workflows/documentation.yml

@@ -34,10 +34,7 @@ jobs:
 
       - name: Prepare landing page
         if: github.event_name == 'push'
-        run: |
-          mkdir -p site
-          touch site/.nojekyll
-          cp -rv landing/* site/
+        run: make build-site
 
       - name: Deploy to GitHub Pages
         if: github.event_name == 'push'

Makefile

@@ -0,0 +1,40 @@
+all: prepare-build build-docs build-site
+
+prepare-build:
+	@echo "--- 🛠️ Preparing build ---"
+	@echo "This will install the dependencies"
+	@if [ "$(shell which uv)" = "" ]; then \
+		curl -LsSf https://astral.sh/uv/install.sh | sh; \
+			echo "Installed uv."; \
+		else \
+			echo "Updating uv..."; \
+			uv self update; \
+	fi
+	uv python install 3.12
+	uv sync --all-extras --python 3.12
+
+build-docs:
+	@echo "--- 📚 Building docs ---"
+	@echo "Builds the docs and puts them in the 'site' folder"
+	@echo "You might need to also update the table with the desc. stats you can do this by running 'make update-table-in-docs'"
+	uv run mkdocs build
+
+view-docs:
+	@echo "--- 👀 Viewing docs ---"
+	uv run mkdocs serve
+
+build-css:
+	@echo "--- 🎨 Building CSS ---"
+	@echo "Builds the CSS and puts it in the 'landing' folder"
+	scripts/landing.sh
+
+build-site: build-css
+	@echo "--- 🏗️ Building site ---"
+	@echo "Builds the site and puts it in the 'site' folder"
+	mkdir -p site
+	touch site/.nojekyll
+	cp -rv landing/* site/
+
+start-backend:
+	@echo "--- 🚀 Starting backend ---"
+	scripts/dfm-backend

dfm_backend/app.conf.py

@@ -1,5 +1,5 @@
 import os
-STATIC_FOLDER = os.getenv('STATIC_FOLDER', os.path.join(os.getcwd(), 'landing'))
+STATIC_FOLDER = os.getenv('STATIC_FOLDER', os.path.join(os.getcwd(), 'site'))
 DATA_FOLDER = os.getenv('DATA_FOLDER', os.path.join(os.getcwd(), 'data'))
 NEWS_FILE = os.getenv('NEWS_FILE', os.path.join(DATA_FOLDER, 'news.jsonl'))
 ADMIN_PASSWORD = os.getenv('ADMIN_PASSWORD', 'changeme')

dfm_backend/cli.py

@@ -34,13 +34,10 @@
     --container-3xl: 48rem;
     --container-4xl: 56rem;
     --container-6xl: 72rem;
-    --container-7xl: 80rem;
     --text-xs: 0.75rem;
     --text-xs--line-height: calc(1 / 0.75);
     --text-sm: 0.875rem;
     --text-sm--line-height: calc(1.25 / 0.875);
-    --text-base: 1rem;
-    --text-base--line-height: calc(1.5 / 1);
     --text-lg: 1.125rem;
     --text-lg--line-height: calc(1.75 / 1.125);
     --text-xl: 1.25rem;
@@ -51,22 +48,14 @@
     --text-3xl--line-height: calc(2.25 / 1.875);
     --text-4xl: 2.25rem;
     --text-4xl--line-height: calc(2.5 / 2.25);
-    --text-5xl: 3rem;
-    --text-5xl--line-height: 1;
     --text-6xl: 3.75rem;
     --text-6xl--line-height: 1;
     --font-weight-medium: 500;
     --font-weight-semibold: 600;
     --font-weight-bold: 700;
-    --tracking-tight: -0.025em;
-    --leading-tight: 1.25;
-    --radius-sm: 0.25rem;
     --radius-md: 0.375rem;
     --radius-lg: 0.5rem;
     --radius-xl: 0.75rem;
-    --ease-in: cubic-bezier(0.4, 0, 1, 1);
-    --ease-out: cubic-bezier(0, 0, 0.2, 1);
-    --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1);
     --blur-sm: 8px;
     --default-transition-duration: 150ms;
     --default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
@@ -389,12 +378,12 @@
   .list-disc {
     list-style-type: disc;
   }
+  .grid-cols-1 {
+    grid-template-columns: repeat(1, minmax(0, 1fr));
+  }
   .grid-cols-2 {
     grid-template-columns: repeat(2, minmax(0, 1fr));
   }
-  .grid-cols-3 {
-    grid-template-columns: repeat(3, minmax(0, 1fr));
-  }
   .flex-col {
     flex-direction: column;
   }
@@ -924,6 +913,11 @@
       outline-style: none;
     }
   }
+  .sm\:grid-cols-2 {
+    @media (width >= 40rem) {
+      grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+  }
   .md\:mt-0 {
     @media (width >= 48rem) {
       margin-top: calc(var(--spacing) * 0);
@@ -969,6 +963,11 @@
       grid-template-columns: repeat(3, minmax(0, 1fr));
     }
   }
+  .md\:grid-cols-4 {
+    @media (width >= 48rem) {
+      grid-template-columns: repeat(4, minmax(0, 1fr));
+    }
+  }
   .md\:flex-row {
     @media (width >= 48rem) {
       flex-direction: row;

landing/css/index.css

@@ -128,12 +128,12 @@ <h4 class="text-xl font-semibold mb-4 text-dfmTeal">Collaborating Institutions</
         </div>
         <!-- Bottom Content: Why Danish Models + Feature Grid -->
         <div>
-            <div class="grid grid-cols-3 gap-4 mt-8">
-                <!--div class="bg-gray-100 p-4 rounded-lg">
+            <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-4 gap-4 mt-8">
+                <div class="bg-gray-100 p-4 rounded-lg">
                     <i class="fas fa-language text-3xl mb-2 text-dfmBlue"></i>
                     <h4 class="font-bold">Language Specific</h4>
-                    <p>Optimized for Danish language nuances</p>
-                </div-->
+                    <p>Optimized for Danish language, cultural, and knowlege</p>
+                </div>
                 <div class="bg-gray-100 p-4 rounded-lg">
                     <i class="fas fa-lock-open text-3xl mb-2 text-dfmBlue"></i>
                     <h4 class="font-bold">Open Source</h4>

landing/landing.html

@@ -13,12 +13,13 @@ dependencies = [
     "flask-limiter==3.12",
     "flask-mail==0.10.0",
     "gunicorn==23.0.0",
+    "uv==0.7.6",
 ]
 license = "MIT"
 license-files = ["LICENSE"]
 
-[project.scripts]
-dfm-backend = "dfm_backend.cli:run"
-
 [tool.setuptools]
 packages = ["dfm_backend"]
+
+[tool.setuptools.data-files]
+bin = ["scripts/dfm-backend"]

makefile

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+export GUNICORN_CONF=$(python -c $'import pathlib as p\nimport dfm_backend as d\nprint(p.Path(d.__file__).resolve().parent / "gunicorn.conf.py")')
+gunicorn "dfm_backend:create_app()" -c $GUNICORN_CONF $@