rework dev server: hmr for all courses, per-course targets, root index
- make dev serves all courses on port 1312 with marp live reload - make dev-b/dev-c for single course on 1313/1314 - dev-kill only kills specific ports instead of all marp processes - add generate-root-index.sh for prod build overview page - cleanup function uses exec + trap instead of pid files
This commit is contained in:
@@ -35,8 +35,9 @@ build/ # Generated output (gitignored)
|
|||||||
## Build Commands
|
## Build Commands
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
make dev-b # Dev server 223015b (port 1311)
|
make dev # Marp live server all courses (port 1312, HMR)
|
||||||
make dev-c # Dev server 223015c (port 1312)
|
make dev-b # Marp live server 223015b (port 1313, HMR)
|
||||||
|
make dev-c # Marp live server 223015c (port 1314, HMR)
|
||||||
make build # Build all courses
|
make build # Build all courses
|
||||||
make build-b # Build 223015b only
|
make build-b # Build 223015b only
|
||||||
make build-c # Build 223015c only
|
make build-c # Build 223015c only
|
||||||
|
|||||||
17
Makefile
17
Makefile
@@ -27,7 +27,9 @@ help:
|
|||||||
@echo " 223015c - Internettechnologien"
|
@echo " 223015c - Internettechnologien"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "Development:"
|
@echo "Development:"
|
||||||
@echo " make dev - Start development server (port 3000)"
|
@echo " make dev - Marp live server all courses (port 1312, HMR)"
|
||||||
|
@echo " make dev-b - Marp live server 223015b (port 1313, HMR)"
|
||||||
|
@echo " make dev-c - Marp live server 223015c (port 1314, HMR)"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "Build:"
|
@echo "Build:"
|
||||||
@echo " make build - Build all courses"
|
@echo " make build - Build all courses"
|
||||||
@@ -55,13 +57,20 @@ build/.exists:
|
|||||||
@mkdir -p build/223015b build/223015c
|
@mkdir -p build/223015b build/223015c
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
# Development server
|
# Development server (Marp live server with HMR)
|
||||||
dev:
|
dev:
|
||||||
@./scripts/dev-server.sh
|
@./scripts/dev-server.sh
|
||||||
|
|
||||||
|
dev-b:
|
||||||
|
@./scripts/dev-server.sh 223015b 1313
|
||||||
|
|
||||||
|
dev-c:
|
||||||
|
@./scripts/dev-server.sh 223015c 1314
|
||||||
|
|
||||||
dev-kill:
|
dev-kill:
|
||||||
@-pkill -f "marp-cli.*--server" 2>/dev/null || true
|
@-fuser -k 1312/tcp 2>/dev/null || true
|
||||||
@sleep 0.5
|
@-fuser -k 1313/tcp 2>/dev/null || true
|
||||||
|
@-fuser -k 1314/tcp 2>/dev/null || true
|
||||||
|
|
||||||
# Build functions
|
# Build functions
|
||||||
define build_course
|
define build_course
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# Simplified development server for HdM slides
|
# Development server for HdM slides
|
||||||
# Starts single Marp server for all courses
|
# Usage:
|
||||||
|
# ./dev-server.sh - Marp live server for all courses (port 1312)
|
||||||
|
# ./dev-server.sh 223015b 1313 - Marp live server for single course
|
||||||
|
# ./dev-server.sh 223015c 1314 - Marp live server for single course
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
SLIDES_DIR="slides"
|
SLIDES_DIR="slides"
|
||||||
DEV_PORT=3000
|
COURSE="${1:-}"
|
||||||
|
DEV_PORT="${2:-1312}"
|
||||||
|
|
||||||
# Colors
|
# Colors
|
||||||
GREEN='\033[0;32m'
|
GREEN='\033[0;32m'
|
||||||
@@ -14,40 +18,27 @@ BLUE='\033[0;34m'
|
|||||||
RED='\033[0;31m'
|
RED='\033[0;31m'
|
||||||
NC='\033[0m' # No Color
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
# Cleanup function
|
# Kill existing process on our port only
|
||||||
cleanup() {
|
kill_port() {
|
||||||
echo -e "\n${RED}Shutting down dev server...${NC}"
|
fuser -k "$DEV_PORT/tcp" 2>/dev/null || true
|
||||||
pkill -f "marp-cli.*--server" 2>/dev/null || true
|
sleep 0.5
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Kill existing processes on our port
|
|
||||||
kill_existing() {
|
|
||||||
echo -e "${BLUE}Cleaning up existing processes...${NC}"
|
|
||||||
pkill -9 -f "marp-cli" 2>/dev/null || true
|
|
||||||
fuser -k $DEV_PORT/tcp 2>/dev/null || true
|
|
||||||
sleep 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Main
|
# Main
|
||||||
trap cleanup SIGINT SIGTERM
|
trap 'echo -e "\n${RED}Shutting down...${NC}"; kill 0; exit 0' SIGINT SIGTERM
|
||||||
|
|
||||||
kill_existing
|
kill_port
|
||||||
|
|
||||||
echo -e "${GREEN}Starting development server...${NC}"
|
if [ -n "$COURSE" ]; then
|
||||||
echo ""
|
SERVE_DIR="$SLIDES_DIR/$COURSE"
|
||||||
echo -e " Server: ${BLUE}http://localhost:$DEV_PORT${NC}"
|
echo -e "${GREEN}Marp dev server${NC} · ${BLUE}$COURSE${NC}"
|
||||||
echo -e " Slides: ${BLUE}$SLIDES_DIR/${NC}"
|
else
|
||||||
echo ""
|
SERVE_DIR="$SLIDES_DIR"
|
||||||
echo -e "Available courses:"
|
echo -e "${GREEN}Marp dev server${NC} · ${BLUE}all courses${NC}"
|
||||||
echo -e " 223015b: ${BLUE}http://localhost:$DEV_PORT/223015b/${NC}"
|
fi
|
||||||
echo -e " 223015c: ${BLUE}http://localhost:$DEV_PORT/223015c/${NC}"
|
|
||||||
echo ""
|
echo -e " ${BLUE}http://localhost:$DEV_PORT${NC}"
|
||||||
echo -e "Press ${RED}Ctrl+C${NC} to stop the server"
|
echo -e " ${BLUE}$SERVE_DIR/${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Start single Marp server for all slides
|
PORT=$DEV_PORT exec npx @marp-team/marp-cli --server "$SERVE_DIR/"
|
||||||
PORT=$DEV_PORT npx @marp-team/marp-cli --server "$SLIDES_DIR/"
|
|
||||||
|
|
||||||
# Wait for process to exit
|
|
||||||
wait
|
|
||||||
|
|||||||
158
scripts/generate-root-index.sh
Executable file
158
scripts/generate-root-index.sh
Executable file
@@ -0,0 +1,158 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Generate root index.html for HdM slides overview
|
||||||
|
# Usage: ./generate-root-index.sh
|
||||||
|
|
||||||
|
BUILD_DIR="${1:-build}"
|
||||||
|
|
||||||
|
cat > "$BUILD_DIR/index.html" << 'HEADER'
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="de">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>HdM Vorlesungen</title>
|
||||||
|
<style>
|
||||||
|
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
|
body {
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "SF Pro Display", "Segoe UI", Roboto, sans-serif;
|
||||||
|
max-width: 720px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 3rem 1.5rem;
|
||||||
|
background: #fafafa;
|
||||||
|
color: #1d1d1f;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
h1 {
|
||||||
|
font-size: 2rem;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: -0.02em;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
.subtitle { color: #86868b; font-size: 1rem; }
|
||||||
|
.courses {
|
||||||
|
margin-top: 2rem;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
.course-card {
|
||||||
|
position: relative;
|
||||||
|
background: #fff;
|
||||||
|
border-radius: 12px;
|
||||||
|
box-shadow: 0 1px 3px rgba(0,0,0,0.08);
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr auto auto;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
.course-card:hover {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: 0 4px 12px rgba(0,0,0,0.12);
|
||||||
|
}
|
||||||
|
.course-link {
|
||||||
|
display: block;
|
||||||
|
padding: 1.25rem 1.5rem;
|
||||||
|
text-decoration: none;
|
||||||
|
color: inherit;
|
||||||
|
grid-column: 1;
|
||||||
|
}
|
||||||
|
.course-link::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
border-radius: 12px;
|
||||||
|
}
|
||||||
|
.course-label {
|
||||||
|
font-size: 0.7rem;
|
||||||
|
font-weight: 600;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
}
|
||||||
|
.course-b .course-label { color: #1e5f8a; }
|
||||||
|
.course-c .course-label { color: #d63384; }
|
||||||
|
.course-title {
|
||||||
|
font-size: 1.15rem;
|
||||||
|
font-weight: 500;
|
||||||
|
color: #1d1d1f;
|
||||||
|
margin: 0.25rem 0;
|
||||||
|
}
|
||||||
|
.course-info { font-size: 0.85rem; color: #86868b; }
|
||||||
|
.section-title {
|
||||||
|
font-size: 1rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #86868b;
|
||||||
|
margin-top: 2.5rem;
|
||||||
|
margin-bottom: 0.75rem;
|
||||||
|
}
|
||||||
|
.references {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
footer {
|
||||||
|
margin-top: 2.5rem;
|
||||||
|
padding-top: 1.5rem;
|
||||||
|
border-top: 1px solid #e5e5e7;
|
||||||
|
color: #86868b;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
footer a { color: #1d1d1f; text-decoration: none; }
|
||||||
|
footer a:hover { text-decoration: underline; }
|
||||||
|
.qr-section {
|
||||||
|
margin-top: 2.5rem;
|
||||||
|
padding: 1.5rem;
|
||||||
|
background: #fff;
|
||||||
|
border-radius: 12px;
|
||||||
|
box-shadow: 0 1px 3px rgba(0,0,0,0.08);
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
.qr-code { width: 100%; height: auto; }
|
||||||
|
.qr-url { margin-top: 0.75rem; font-size: 0.85rem; color: #86868b; }
|
||||||
|
@media (max-width: 600px) {
|
||||||
|
.course-card { grid-template-columns: 1fr; }
|
||||||
|
.course-link { padding-bottom: 0.75rem; }
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>HdM Vorlesungen</h1>
|
||||||
|
<p class="subtitle">Sommersemester 2026 · Michael Czechowski</p>
|
||||||
|
<div class="courses">
|
||||||
|
<div class="course-card course-b">
|
||||||
|
<a href="223015b/" class="course-link">
|
||||||
|
<span class="course-label">223015b</span>
|
||||||
|
<div class="course-title">Dateiformate, Schnittstellen, Speichermedien & Distributionswege</div>
|
||||||
|
<span class="course-info">6 Kapitel · Modul "Technik 1"</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div class="course-card course-c">
|
||||||
|
<a href="223015c/" class="course-link">
|
||||||
|
<span class="course-label">223015c</span>
|
||||||
|
<div class="course-title">Grundlagen IT- und Internettechnik</div>
|
||||||
|
<span class="course-info">3 Kapitel · Modul "Technik 1"</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<h2 class="section-title">Referenzen</h2>
|
||||||
|
<div class="references">
|
||||||
|
<div class="course-card">
|
||||||
|
<a href="https://codecrispi.es/" class="course-link">
|
||||||
|
<span class="course-label">Plattform</span>
|
||||||
|
<div class="course-title">Code Crispies</div>
|
||||||
|
<span class="course-info">Selbstlernplattform</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="qr-section">
|
||||||
|
<img src="qr-root.svg" alt="QR Code" class="qr-code">
|
||||||
|
<p class="qr-url">https://librete.ch/hdm/</p>
|
||||||
|
</div>
|
||||||
|
<footer>
|
||||||
|
<a href="mailto:mail@librete.ch">Kontakt</a>
|
||||||
|
</footer>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
HEADER
|
||||||
|
|
||||||
|
echo "Generated $BUILD_DIR/index.html"
|
||||||
Reference in New Issue
Block a user