From 367a3662a9139561208359cb140c324582af634a Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Wed, 3 Dec 2025 01:13:34 +0100 Subject: [PATCH] up --- .gitlab-ci.yml | 262 +++++++++++++++++++++++++---------------- public/asdsad.asdsad | 1 - schema.sql | 45 +++++++ seed.sql | 52 ++++++++ shape3d.code-workspace | 7 -- 5 files changed, 259 insertions(+), 108 deletions(-) delete mode 100644 public/asdsad.asdsad create mode 100755 schema.sql create mode 100755 seed.sql delete mode 100644 shape3d.code-workspace diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 756a7fb..5d80c94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,79 +1,114 @@ stages: - deploy +# ----------------------------------------- +# Globale Variablen +# ----------------------------------------- +variables: + BASE_DIRS: "src public api partials tools" + CONFIG_BASE_DIR: "config" + +# Standard-Image für alle Jobs +default: + image: usbcheck/ci-usbcheck-deploy:latest + # ----------------------------------------- # Deployment auf STAGING # ----------------------------------------- deploy:staging: stage: deploy - image: alpine:3.20 + + variables: + TARGET_PATH: "${FTP_PATH_STAGING}" + CONFIG_ENV_DIR: "config/staging" before_script: - - echo "📡 Installing lftp..." - - apk add --no-cache lftp - - echo "📂 CI Workspace:" - pwd - - echo "host ${FTP_HOST}" - - echo "path ${FTP_PATH_STAGING}" - - echo "user ${FTP_USER}" - - ls -la - - echo "📂 Inhalt von src/:" - - ls -la src/ || echo "⚠️ src/ existiert nicht!" - - echo "📂 Inhalt von public/:" - - ls -la public/ || echo "⚠️ public/ existiert nicht!" - - echo "📂 Inhalt von config/:" - - ls -la config/ || echo "⚠️ config/ existiert nicht!" - - echo "📂 Inhalt von config/staging/:" - - ls -la config/staging/ || echo "⚠️ config/staging/ existiert nicht!" - - script: + - echo "📁 Prüfe & zeige Projektverzeichnisse:" - | - set -e - - # Sicherstellen, dass Basisverzeichnisse existieren - for d in src public config config/staging; do - if [ ! -d "$d" ]; then - echo "❌ Verzeichnis '$d/' fehlt im Repo! Abbruch." - exit 1 + for d in $BASE_DIRS $CONFIG_BASE_DIR $CONFIG_ENV_DIR; do + echo "----------------------------------------" + if [ -d "$d" ]; then + echo "📂 Inhalt von $d/:" + ls -la "$d/" + else + echo "⚠️ Verzeichnis '$d' existiert nicht!" fi done - echo "🚀 Deploy STAGING → ${FTP_HOST}:${FTP_PATH_STAGING}" + script: + - | + echo "📁 Prüfe lokale Basisverzeichnisse..." + MISSING=0 - echo "🔁 Sync src/ → ${FTP_PATH_STAGING}src/" + for d in $BASE_DIRS; do + if [ ! -d "$d" ]; then + echo "❌ Verzeichnis '$d/' fehlt im Repo!" + MISSING=1 + fi + done + + if [ ! -d "$CONFIG_BASE_DIR" ]; then + echo "❌ Basis-Konfig-Verzeichnis '$CONFIG_BASE_DIR/' fehlt!" + MISSING=1 + fi + + if [ ! -d "$CONFIG_ENV_DIR" ]; then + echo "❌ Env-Konfiguration '$CONFIG_ENV_DIR/' fehlt!" + MISSING=1 + fi + + if [ "$MISSING" -ne 0 ]; then + echo "⛔ Abbruch wegen fehlender Verzeichnisse." + exit 1 + fi + + echo "🚀 Deploy ${CI_ENVIRONMENT_NAME} → ${FTP_HOST}:${TARGET_PATH}" + + for d in $BASE_DIRS; do + echo "🔁 Sync ${d}/ → ${TARGET_PATH}${d}/" + lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + mirror -R --delete --exclude .gitkeep ${d}/ ${TARGET_PATH}${d}/; + bye + " || { echo "❌ Upload für Verzeichnis '${d}' fehlgeschlagen."; exit 1; } + done + + echo "🧩 Baue gemischtes Config-Verzeichnis (config/*.php + ${CONFIG_ENV_DIR})..." + rm -rf .ci_config_deploy + mkdir -p .ci_config_deploy + + if [ -d "${CONFIG_BASE_DIR}" ]; then + for f in ${CONFIG_BASE_DIR}/*.php; do + if [ -f "$f" ]; then + echo "➕ Basis-Config-Datei: $f" + cp "$f" .ci_config_deploy/ + fi + done + fi + + if [ -d "${CONFIG_ENV_DIR}" ]; then + echo "➕ Env-Config aus ${CONFIG_ENV_DIR}/" + cp -R ${CONFIG_ENV_DIR}/. .ci_config_deploy/ + fi + + echo "🔁 Sync .ci_config_deploy/ → ${TARGET_PATH}${CONFIG_BASE_DIR}/" lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " set ftp:ssl-force true; set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; - mirror -R --delete --exclude .gitkeep src/ ${FTP_PATH_STAGING}src/; + lcd .ci_config_deploy; + mirror -R --delete --exclude .gitkeep ./ ${TARGET_PATH}${CONFIG_BASE_DIR}/; bye - " + " || { echo "❌ Upload für gemischtes Config-Verzeichnis fehlgeschlagen."; exit 1; } - echo "🔁 Sync public/ → ${FTP_PATH_STAGING}public/" - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " - set ftp:ssl-force true; - set ftp:passive-mode true; - set ftp:ssl-protect-data true; - set ssl:verify-certificate no; - mirror -R --delete --exclude .gitkeep public/ ${FTP_PATH_STAGING}public/; - bye - " - - echo "🔁 Sync config/staging/ (nur Inhalt) → ${FTP_PATH_STAGING}config/" - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " - set ftp:ssl-force true; - set ftp:passive-mode true; - set ftp:ssl-protect-data true; - set ssl:verify-certificate no; - lcd config/staging; - mirror -R --delete --exclude .gitkeep ./ ${FTP_PATH_STAGING}config/; - bye - " - - echo "✅ Deploy STAGING abgeschlossen." + echo "✅ Deploy ${CI_ENVIRONMENT_NAME} abgeschlossen." environment: name: staging @@ -89,71 +124,98 @@ deploy:staging: # ----------------------------------------- deploy:production: stage: deploy - image: alpine:3.20 + + variables: + TARGET_PATH: "${FTP_PATH_PROD}" + CONFIG_ENV_DIR: "config/prod" before_script: - - echo "📡 Installing lftp..." - - apk add --no-cache lftp - - echo "📂 CI Workspace:" - pwd - ls -la - - - echo "📂 Inhalt von src/:" - - ls -la src/ || echo "⚠️ src/ existiert nicht!" - - echo "📂 Inhalt von public/:" - - ls -la public/ || echo "⚠️ public/ existiert nicht!" - - echo "📂 Inhalt von config/:" - - ls -la config/ || echo "⚠️ config/ existiert nicht!" - - echo "📂 Inhalt von config/prod/:" - - ls -la config/prod/ || echo "⚠️ config/prod/ existiert nicht!" - - script: + - echo "📁 Prüfe & zeige Projektverzeichnisse:" - | - set -e - - # Sicherstellen, dass Basisverzeichnisse existieren - for d in src public config config/prod; do - if [ ! -d "$d" ]; then - echo "❌ Verzeichnis '$d/' fehlt im Repo! Abbruch." - exit 1 + for d in $BASE_DIRS $CONFIG_BASE_DIR $CONFIG_ENV_DIR; do + echo "----------------------------------------" + if [ -d "$d" ]; then + echo "📂 Inhalt von $d/:" + ls -la "$d/" + else + echo "⚠️ Verzeichnis '$d' existiert nicht!" fi done - echo "🚀 Deploy PRODUCTION → ${FTP_HOST}:${FTP_PATH_PROD}" + script: + - | + echo "📁 Prüfe lokale Basisverzeichnisse..." + MISSING=0 - echo "🔁 Sync src/ → ${FTP_PATH_PROD}src/" + for d in $BASE_DIRS; do + if [ ! -d "$d" ]; then + echo "❌ Verzeichnis '$d/' fehlt im Repo!" + MISSING=1 + fi + done + + if [ ! -d "$CONFIG_BASE_DIR" ]; then + echo "❌ Basis-Konfig-Verzeichnis '$CONFIG_BASE_DIR/' fehlt!" + MISSING=1 + fi + + if [ ! -d "$CONFIG_ENV_DIR" ]; then + echo "❌ Env-Konfiguration '$CONFIG_ENV_DIR/' fehlt!" + MISSING=1 + fi + + if [ "$MISSING" -ne 0 ]; then + echo "⛔ Abbruch wegen fehlender Verzeichnisse." + exit 1 + fi + + echo "🚀 Deploy ${CI_ENVIRONMENT_NAME} → ${FTP_HOST}:${TARGET_PATH}" + + for d in $BASE_DIRS; do + echo "🔁 Sync ${d}/ → ${TARGET_PATH}${d}/" + lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + mirror -R --delete --exclude .gitkeep ${d}/ ${TARGET_PATH}${d}/; + bye + " || { echo "❌ Upload für Verzeichnis '${d}' fehlgeschlagen."; exit 1; } + done + + echo "🧩 Baue gemischtes Config-Verzeichnis (config/*.php + ${CONFIG_ENV_DIR})..." + rm -rf .ci_config_deploy + mkdir -p .ci_config_deploy + + if [ -d "${CONFIG_BASE_DIR}" ]; then + for f in ${CONFIG_BASE_DIR}/*.php; do + if [ -f "$f" ]; then + echo "➕ Basis-Config-Datei: $f" + cp "$f" .ci_config_deploy/ + fi + done + fi + + if [ -d "${CONFIG_ENV_DIR}" ]; then + echo "➕ Env-Config aus ${CONFIG_ENV_DIR}/" + cp -R ${CONFIG_ENV_DIR}/. .ci_config_deploy/ + fi + + echo "🔁 Sync .ci_config_deploy/ → ${TARGET_PATH}${CONFIG_BASE_DIR}/" lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " set ftp:ssl-force true; set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; - mirror -R --delete --exclude .gitkeep src/ ${FTP_PATH_PROD}src/; + lcd .ci_config_deploy; + mirror -R --delete --exclude .gitkeep ./ ${TARGET_PATH}${CONFIG_BASE_DIR}/; bye - " + " || { echo "❌ Upload für gemischtes Config-Verzeichnis fehlgeschlagen."; exit 1; } - echo "🔁 Sync public/ → ${FTP_PATH_PROD}public/" - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " - set ftp:ssl-force true; - set ftp:passive-mode true; - set ftp:ssl-protect-data true; - set ssl:verify-certificate no; - mirror -R --delete --exclude .gitkeep public/ ${FTP_PATH_PROD}public/; - bye - " - - echo "🔁 Sync config/prod/ (nur Inhalt) → ${FTP_PATH_PROD}config/" - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " - set ftp:ssl-force true; - set ftp:passive-mode true; - set ftp:ssl-protect-data true; - set ssl:verify-certificate no; - lcd config/prod; - mirror -R --delete --exclude .gitkeep ./ ${FTP_PATH_PROD}config/; - bye - " - - echo "✅ Deploy PRODUCTION abgeschlossen." + echo "✅ Deploy ${CI_ENVIRONMENT_NAME} abgeschlossen." environment: name: production @@ -161,4 +223,4 @@ deploy:production: only: - main -# when: manual + # when: manual diff --git a/public/asdsad.asdsad b/public/asdsad.asdsad deleted file mode 100644 index 28d44e9..0000000 --- a/public/asdsad.asdsad +++ /dev/null @@ -1 +0,0 @@ -asdsad \ No newline at end of file diff --git a/schema.sql b/schema.sql new file mode 100755 index 0000000..8cebc77 --- /dev/null +++ b/schema.sql @@ -0,0 +1,45 @@ +-- schema.sql +-- Datenbank-Schema für 3D-Druck Materialdatenbank + +CREATE TABLE materials ( + id INT AUTO_INCREMENT PRIMARY KEY, + code VARCHAR(50) NOT NULL, + name VARCHAR(150) NOT NULL, + short_desc VARCHAR(255) NULL, + properties TEXT NULL, + tg_celsius DECIMAL(5,1) NULL, + nozzle_req VARCHAR(150) NULL, + plate_req VARCHAR(150) NULL, + extra_req VARCHAR(255) NULL, + application TEXT NULL, + kid_safety ENUM('safe','limited','no') DEFAULT 'limited', + emission ENUM('low','medium','high') DEFAULT 'low', + is_active TINYINT(1) DEFAULT 1, + UNIQUE KEY uq_material_code (code) +); + +CREATE TABLE printers ( + id INT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(150) NOT NULL, + brand VARCHAR(100) NULL, + model_code VARCHAR(100) NULL, + max_nozzle_temp INT NULL, + max_bed_temp INT NULL, + chamber TINYINT(1) DEFAULT 0, + build_volume VARCHAR(50) NULL, + notes TEXT NULL, + is_active TINYINT(1) DEFAULT 1 +); + +CREATE TABLE printer_material_support ( + id INT AUTO_INCREMENT PRIMARY KEY, + printer_id INT NOT NULL, + material_id INT NOT NULL, + support_level ENUM('full','partial','with_addon','no') NOT NULL DEFAULT 'no', + partial_reason VARCHAR(255) NULL, + extra_info VARCHAR(255) NULL, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + CONSTRAINT fk_pms_printer FOREIGN KEY (printer_id) REFERENCES printers(id) ON DELETE CASCADE, + CONSTRAINT fk_pms_material FOREIGN KEY (material_id) REFERENCES materials(id) ON DELETE CASCADE, + UNIQUE KEY uq_printer_material (printer_id, material_id) +); diff --git a/seed.sql b/seed.sql new file mode 100755 index 0000000..c8fd01e --- /dev/null +++ b/seed.sql @@ -0,0 +1,52 @@ +-- seed.sql +-- Beispiel-Daten für Materialien, Drucker und Zuordnungen + +INSERT INTO materials +(code, name, short_desc, properties, tg_celsius, nozzle_req, plate_req, extra_req, application, kid_safety, emission) +VALUES +('PLA', 'PLA', 'Biopolymer, leicht druckbar', 'starr; wenig hitze- & UV-beständig', 60, 'Messing', 'PEI / Glas + Klebstift', 'keine', 'Modelle, Deko, Spielzeug', 'safe', 'low'), +('PLA+', 'PLA+', 'zäheres PLA', 'starr; zäher als PLA', 65, 'Messing', 'PEI / Glas', 'keine', 'Haushaltsteile, Deko', 'safe', 'low'), +('PETG', 'PETG', 'zäh, leicht flexibel', 'zäh; chemikalienresistent; mäßig UV-fest', 80, 'Messing', 'PEI / Glas, 60°C+', 'Lüfter 50%', 'Funktionsteile, Halterungen', 'limited', 'low'), +('ABS', 'ABS', 'Technik-Kunststoff', 'hitzefest; neigt zu Warping', 105, 'Messing', 'PEI / ABS-Slurry', 'Gehäuse empfohlen', 'Gehäuseteile, Werkstatt', 'no', 'high'), +('ASA', 'ASA', 'UV-beständig', 'wie ABS aber wetterfest', 105, 'Messing', 'PEI / Klebstift', 'Gehäuse empfohlen', 'Outdoor-Teile', 'no', 'high'), +('TPU95A', 'TPU 95A', 'flexibel, gummiartig', NULL, NULL, 'Messing', 'PEI / Blue Tape', 'langsam drucken', 'Schutzhüllen, Dichtungen', 'limited', 'low'), +('PA', 'PA (Nylon)', 'zäh, abriebfest', 70, 'gehärtet', 'Haftspray / Trockenbox', 'trocken lagern', 'Mechanische Bauteile', 'no', 'high'), +('PA6-CF', 'PA6-CF', 'Nylon mit CF, sehr steif', 70, 'gehärtet / Ruby', 'Haftspray / Trockenbox', 'trocken lagern', 'Robotik, Halterungen', 'no', 'high'), +('PPA-CF', 'PPA-CF', 'Technik-Nylon mit CF', 110, 'gehärtet', 'PEI / Trockenbox', 'Gehäuse + Trockenbox', 'Hochfeste Funktionsteile', 'no', 'high'), +('PC', 'PC (Polycarbonat)', 'sehr fest, hohe Temp.', 145, 'gehärtet', 'PEI / Gehäuse', 'hohe Düsen-/Bett-Temp', 'Transparente/technische Teile', 'no', 'high'), +('Wood-PLA', 'Wood-PLA', 'Holzgefülltes PLA', 60, 'gehärtet', 'PEI / Klebstift', 'keine', 'Deko, Figuren', 'safe', 'low'), +('Metal-PLA', 'Metal-PLA', 'Metallgefülltes PLA', 60, 'gehärtet', 'PEI / Glas', 'keine', 'Deko, Design', 'limited', 'low'); + +INSERT INTO printers +(name, brand, model_code, max_nozzle_temp, max_bed_temp, chamber, build_volume, notes) +VALUES +('Bambu Lab P2S Combo', 'Bambu Lab', 'P2S', 320, 120, 1, '256x256x256', 'Multi-Material; TPU nur eingeschränkt'), +('Creality K2 Pro Combo', 'Creality', 'K2-Pro-Combo', 300, 120, 1, '350x350x350', 'CFS: TPU/BVOH nicht empfohlen'); + +-- Zuweisungen für Bambu Lab P2S Combo +INSERT INTO printer_material_support (printer_id, material_id, support_level) +SELECT p.id, m.id, 'full' +FROM printers p +JOIN materials m ON m.code IN ('PLA','PLA+','PETG','ABS','ASA','PLA-CF','Wood-PLA','Metal-PLA','PA6-CF','PPA-CF') +WHERE p.name = 'Bambu Lab P2S Combo'; + +-- TPU am Bambu nur teilweise +INSERT INTO printer_material_support (printer_id, material_id, support_level, partial_reason) +SELECT p.id, m.id, 'partial', 'nicht über AMS; langsam drucken' +FROM printers p +JOIN materials m ON m.code = 'TPU95A' +WHERE p.name = 'Bambu Lab P2S Combo'; + +-- Zuweisungen für Creality K2 Pro Combo +INSERT INTO printer_material_support (printer_id, material_id, support_level) +SELECT p.id, m.id, 'full' +FROM printers p +JOIN materials m ON m.code IN ('PLA','PLA+','PETG','ABS','ASA','PLA-CF','PA6-CF','PPA-CF') +WHERE p.name = 'Creality K2 Pro Combo'; + +-- TPU am Creality: nicht empfohlen +INSERT INTO printer_material_support (printer_id, material_id, support_level, partial_reason) +SELECT p.id, m.id, 'no', 'CFS nicht TPU-fähig' +FROM printers p +JOIN materials m ON m.code = 'TPU95A' +WHERE p.name = 'Creality K2 Pro Combo'; diff --git a/shape3d.code-workspace b/shape3d.code-workspace deleted file mode 100644 index ef9f5d2..0000000 --- a/shape3d.code-workspace +++ /dev/null @@ -1,7 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ] -} \ No newline at end of file