From a3769f507527c75511a72366ccef6c39208f5fc1 Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Thu, 22 Jan 2026 00:44:18 +0100 Subject: [PATCH] asdadsasdasd --- .gitlab-ci.yml | 262 +++++++++++++++++++++++++---------------- config/stagingdemo.txt | 1 + schema.sql | 45 +++++++ 3 files changed, 208 insertions(+), 100 deletions(-) create mode 100755 config/stagingdemo.txt create mode 100755 schema.sql 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/config/stagingdemo.txt b/config/stagingdemo.txt new file mode 100755 index 0000000..11f1b23 --- /dev/null +++ b/config/stagingdemo.txt @@ -0,0 +1 @@ +Demo mΓ€nn \ 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) +);