create project data theme injection

ChristianHohlfeld · ChristianHohlfeld · commit 30225672b301 · 2024-10-24T23:35:30.000+02:00
diff --git a/projects/example/index.html b/projects/example/index.html
@@ -9,7 +9,7 @@
     <link href="https://cdn.jsdelivr.net/npm/daisyui@4.12.12/dist/full.min.css" rel="stylesheet" />
     <script src="https://cdn.tailwindcss.com"></script>
 </head>
-<body class="flex flex-col min-h-screen">
+<body class="flex flex-col min-h-screen" data-theme="default">
 
     <div>
         <div id="sidebar_default" data-state="closed" class="bg-neutral w-64 h-full fixed top-0 left-0 flex flex-col justify-between transform -translate-x-full md:translate-x-0 transition-transform duration-300 ease-in-out z-10">
diff --git a/projects/example/run_generate.sh b/projects/example/run_generate.sh
@@ -18,7 +18,10 @@ find_project_root() {
     return 1  # Return error if no root found
 }
 
-# Find the project root directory
+# Get the current directory where the script is executed
+current_dir=$(pwd)
+
+# Find the project root directory (if needed for other purposes)
 project_root=$(find_project_root "$(dirname "${BASH_SOURCE[0]}")")
 
 # Check if the project root was found
@@ -30,14 +33,20 @@ fi
 # Append the scripts directory to the root path
 scripts_dir="$project_root/scripts"
 
-# Print the final scripts directory for verification
-echo "Scripts directory path: $scripts_dir"
-
 # Check if the generate_site.sh script exists in the scripts directory
 if [[ ! -f "$scripts_dir/generate_site.sh" ]]; then
     echo "Error: generate_site.sh not found in $scripts_dir"
     exit 1
 fi
 
-# Run the generate_site.sh script
-"$scripts_dir/generate_site.sh"
+# Check if a theme was provided as an argument, default to empty string if none
+if [[ -n "$1" ]]; then
+    theme="$1"
+    echo "Theme '$theme' will be used."
+else
+    theme="default"
+    echo "No theme provided, proceeding with default theme."
+fi
+
+# Run the generate_site.sh script and pass the current directory and theme as parameters
+"$scripts_dir/generate_site.sh" "$current_dir" "$theme"
diff --git a/public/index.html b/public/index.html
@@ -9,7 +9,7 @@
     <link href="https://cdn.jsdelivr.net/npm/daisyui@4.12.12/dist/full.min.css" rel="stylesheet" />
     <script src="https://cdn.tailwindcss.com"></script>
 </head>
-<body class="flex flex-col min-h-screen">
+<body class="flex flex-col min-h-screen" data-theme="default">
 
     <div>
         <div id="sidebar_default" data-state="closed" class="bg-neutral w-64 h-full fixed top-0 left-0 flex flex-col justify-between transform -translate-x-full md:translate-x-0 transition-transform duration-300 ease-in-out z-10">
diff --git a/run_create_project.sh b/run_create_project.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Find the project root
+# Function to find the project root
 find_project_root() {
     local dir="$(cd "${1:-$(pwd)}" && pwd)"  # Convert to absolute path
     local root_files=("README.md" "LICENSE" "CONTRIBUTE.md" "CNAME")
@@ -81,6 +81,10 @@ else
     exit 1
 fi
 
+# Replace the data-theme attribute in the template with the selected theme
+sed -i "s/data-theme=\"\"/data-theme=\"$theme\"/" "$target_dir/template_default.html"
+echo "Applied theme '$theme' to template_default.html."
+
 # Copy all components from the components directory to the target project directory
 if [[ -d "$components_dir" ]]; then
     cp "$components_dir"/* "$target_dir/"
@@ -117,15 +121,10 @@ else
     echo "Error: run_serve.sh not found in '$scripts_dir'."
 fi
 
-# Insert the selected theme into the template_default.html file
-template_file="$target_dir/template_default.html"
-if [[ -f "$template_file" ]]; then
-    # Replace the data-theme attribute with the selected theme
-    sed -i "s/data-theme=\"\"/data-theme=\"$theme\"/g" "$template_file"
-    echo "Applied theme '$theme' to template_default.html."
-else
-    echo "Error: template_default.html not found in '$target_dir'."
-    exit 1
-fi
+# Apply the theme (this is a placeholder, you can customize how to handle theme selection)
+echo "Setting theme to '$theme' in project..."
+
+# Run the project generate script with the theme
+cd "$target_dir" && ./run_generate.sh "$theme"
 
 echo "Project setup complete with theme '$theme' in directory '$base_dir/$project_name'."
diff --git a/scripts/generate_site.sh b/scripts/generate_site.sh
@@ -7,37 +7,35 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"  # Assuming the project root is one level up from scripts
 
-# Define the template and output files
-TEMPLATE_FILE="template_default.html"
-OUTPUT_FILE="index.html"  # Output file set to index.html
+# Get the project directory passed as an argument, default to current directory if not provided
+PROJECT_DIR="${1:-$(pwd)}"
+
+# Define the template and output files within the project directory
+TEMPLATE_FILE="$PROJECT_DIR/template_default.html"
+OUTPUT_FILE="$PROJECT_DIR/index.html"  # Output file set to index.html
 
 # Default theme if not provided (optional)
-THEME_NAME=""
+THEME_NAME="$2"
 
 # Check if a theme name was passed as an argument
-if [[ ! -z "$1" ]]; then
-    THEME_NAME="$1"
+if [[ ! -z "$THEME_NAME" ]]; then
     echo "Using theme: $THEME_NAME"
 else
-    echo "No theme provided, proceeding without data-theme attribute."
+    THEME_NAME="default"
+    echo "No theme provided, proceeding with default theme."
 fi
 
-# Check if the template file exists
+# Check if the template file exists in the project directory
 if [[ ! -f "$TEMPLATE_FILE" ]]; then
-    echo "Error: Template file '$TEMPLATE_FILE' not found. Use './run_add.sh template_default.html' to add the default template file."
+    echo "Error: Template file '$TEMPLATE_FILE' not found in project directory. Use './run_add.sh template_default.html' to add the default template file."
     exit 1
 fi
 
-# Prompt for the page title if a theme is provided
-if [[ ! -z "$THEME_NAME" ]]; then
-    read -p "Enter the title for your page (leave empty to use default): " PAGE_TITLE
-fi
-
-# Function to ensure required components exist
+# Function to ensure required components exist in the project directory
 ensure_components() {
     local missing=()
     for component in sidebar_default content_default footer_default; do
-        local component_file="./${component}.html"
+        local component_file="$PROJECT_DIR/${component}.html"
         if [[ ! -f "$component_file" ]]; then
             missing+=("$component")
         fi
@@ -53,7 +51,7 @@ ensure_components() {
     fi
 }
 
-# Ensure all required components are present
+# Ensure all required components are present in the project directory
 ensure_components
 
 # Create or overwrite the output file
@@ -72,48 +70,26 @@ while IFS= read -r line || [[ -n "$line" ]]; do
 
     # Replace the <body> tag with the data-theme attribute if a theme is specified
     if [[ "$line" =~ \<body ]]; then
-        if [[ ! -z "$THEME_NAME" ]]; then
-            echo "Adding data-theme attribute with theme: $THEME_NAME"
-            line="<body class=\"flex flex-col min-h-screen\" data-theme=\"$THEME_NAME\">"
-        else
-            line="<body class=\"flex flex-col min-h-screen\">"
-        fi
+        echo "Adding data-theme attribute with theme: $THEME_NAME"
+        line="<body class=\"flex flex-col min-h-screen\" data-theme=\"$THEME_NAME\">"
     fi
 
-    # Use regex to find all placeholders in the format {{component_name}}
+    # Process components
     while [[ "$line" =~ \{\{([a-zA-Z0-9_]+)\}\} ]]; do
         COMPONENT_ID="${BASH_REMATCH[1]}"
-        COMPONENT_FILE="${COMPONENT_ID}.html"
+        COMPONENT_FILE="$PROJECT_DIR/${COMPONENT_ID}.html"
 
-        # Check if the component file exists
         if [[ -f "$COMPONENT_FILE" ]]; then
-            echo "Processing component: $COMPONENT_ID"
             COMPONENT_CONTENT=$(<"$COMPONENT_FILE")
-
-            # Safely escape special characters like &
             COMPONENT_CONTENT=$(echo "$COMPONENT_CONTENT" | sed 's/&/\\&/g')
-
-            # Replace the placeholder with the component content
             line="${line/\{\{$COMPONENT_ID\}\}/$COMPONENT_CONTENT}"
-            echo "Replaced {{${COMPONENT_ID}}} successfully."
         else
-            echo "Warning: Component file '$COMPONENT_ID.html' not found in '$components_dir/default/'. Leaving placeholder unchanged."
-            missing_components+=("$COMPONENT_ID")
-            # Optionally, keep the placeholder or replace it with an empty string
-            line="${line/\{\{$COMPONENT_ID\}\}/{{${COMPONENT_ID}}}}"
+            line="${line/\{\{$COMPONENT_ID\}\}/}"
         fi
     done
 
     # Write the processed line to the output file
     echo "$line" >> "$OUTPUT_FILE"
 done < "$TEMPLATE_FILE"
 
-# Check for any missing components
-if [[ ${#missing_components[@]} -gt 0 ]]; then
-    echo "The following components were not found and left unchanged:"
-    for missing in "${missing_components[@]}"; do
-        echo "- {{${missing}}}"
-    done
-fi
-
 echo "Template processing complete. Check '$OUTPUT_FILE'."
diff --git a/scripts/run_generate.sh b/scripts/run_generate.sh
@@ -18,7 +18,10 @@ find_project_root() {
     return 1  # Return error if no root found
 }
 
-# Find the project root directory
+# Get the current directory where the script is executed
+current_dir=$(pwd)
+
+# Find the project root directory (if needed for other purposes)
 project_root=$(find_project_root "$(dirname "${BASH_SOURCE[0]}")")
 
 # Check if the project root was found
@@ -30,14 +33,20 @@ fi
 # Append the scripts directory to the root path
 scripts_dir="$project_root/scripts"
 
-# Print the final scripts directory for verification
-echo "Scripts directory path: $scripts_dir"
-
 # Check if the generate_site.sh script exists in the scripts directory
 if [[ ! -f "$scripts_dir/generate_site.sh" ]]; then
     echo "Error: generate_site.sh not found in $scripts_dir"
     exit 1
 fi
 
-# Run the generate_site.sh script
-"$scripts_dir/generate_site.sh"
+# Check if a theme was provided as an argument, default to empty string if none
+if [[ -n "$1" ]]; then
+    theme="$1"
+    echo "Theme '$theme' will be used."
+else
+    theme="default"
+    echo "No theme provided, proceeding with default theme."
+fi
+
+# Run the generate_site.sh script and pass the current directory and theme as parameters
+"$scripts_dir/generate_site.sh" "$current_dir" "$theme"
