Update TGBeta.ps1

TGBeta.ps1

@@ -738,9 +738,12 @@ function GetHtmlContent {
                     </div>
                 </div>
             </div>
-            <!-- tweaks Tab -->
             <div id="tweaksTab" class="tab-content inactive">
                 <h2>Tweaks</h2>
+                <div class="columns-container">
+                    <!-- Column 1 -->
+                    <div class="column" id="tweaksColumn1">
+                        <h3>System Optimizations</h3>
                         <div class="checkbox-group">
                             <label>
                                 <input type="checkbox" id="selectAllTweaksCheckbox" onclick="toggleTweaksCheckboxes(this)">
@@ -750,23 +753,58 @@ function GetHtmlContent {
                                 <input type="checkbox" name="setedgedefaultsearch" id="setedgedefaultsearchCheckbox">
                                 Set Edge Default Search Engine
                             </label>
+                            <label>
+                                <input type="checkbox" name="setWindowsPerformance" id="setWindowsPerformanceCheckbox">
+                                Optimize Windows Performance
+                            </label>
+                            <label>
+                                <input type="checkbox" name="stopUnnecessaryServices" id="stopUnnecessaryServicesCheckbox">
+                                Stop Unnecessary Services
+                            </label>
+                        </div>
+                    </div>
+
+                    <!-- Column 2 -->
+                    <div class="column" id="tweaksColumn2">
+                        <h3>Additional Tweaks</h3>
+                        <div class="checkbox-group">
                             <label>
                                 <input type="checkbox" name="disableAnimations" id="disableAnimationsCheckbox">
                                 Disable Animations
                             </label>
                             <label>
                                 <input type="checkbox" name="optimizePerformance" id="optimizePerformanceCheckbox">
-                        Optimize Performance
+                                Optimize Application Performance
                             </label>
                             <label>
                                 <input type="checkbox" name="increaseFontSize" id="increaseFontSizeCheckbox">
                                 Increase Font Size
                             </label>
                         </div>
+                    </div>
+
+                    <!-- Column 3 -->
+                    <div class="column" id="tweaksColumn3">
+                        <h3>Miscellaneous</h3>
+                        <div class="checkbox-group">
+                            <label>
+                                <input type="checkbox" name="enableDarkMode" id="enableDarkModeCheckbox">
+                                Enable Dark Mode
+                            </label>
+                            <label>
+                                <input type="checkbox" name="clearTempFiles" id="clearTempFilesCheckbox">
+                                Clear Temporary Files
+                            </label>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Apply Tweaks Button -->
                 <div class="button-group">
-                     <button class="install-button" onclick="triggerTweaks()">Tweaks</button>
+                    <button class="install-button" onclick="triggerTweaks()">Apply Tweaks</button>
                 </div>
             </div>
+
             <!-- Shared Exit Button -->
             <div class="button-group">
                 <button class="exit-button" onclick="endSession()">Exit</button>
@@ -923,13 +961,55 @@ function GetHtmlContent {
         });
 
         function triggerTweaks() {
-            const setedgedefaultsearch = document.querySelector('input[name="setedgedefaultsearch"]');
+            // Gather all selected tweaks
+            const selectedTweaks = [];
+            document.querySelectorAll('#tweaksTab input[type="checkbox"]').forEach(checkbox => {
+                if (checkbox.checked) {
+                    selectedTweaks.push(checkbox.name); // Use 'name' as the identifier
+                }
+            });
+
+            if (selectedTweaks.length === 0) {
+                appendLog("No tweaks selected. Please select at least one tweak.", "red");
+                return;
+            }
+
+            // Send selected tweaks to the backend
+            fetch('/runTweaks', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({ tweaks: selectedTweaks })
+            })
+                .then(response => {
+                    if (!response.ok) {
+                        throw new Error(`Failed to apply tweaks: ${response.statusText}`);
+                    }
+                    return response.json();
+                })
+                .then(data => {
+                    // Log successes and errors
+                    if (data.Success && data.Success.length > 0) {
+                        data.Success.forEach(tweak => appendLog(`Successfully applied: ${tweak}`, "green"));
+                    }
+                    if (data.Errors && data.Errors.length > 0) {
+                        data.Errors.forEach(error => appendLog(`Error: ${error}`, "red"));
+                    }
+                })
+                .catch(error => {
+                    appendLog(`Unexpected error: ${error.message}`, "red");
+                });
+        }
+
+        function appendLog(message, color = "white") {
+            const log = document.createElement('p');
+            log.style.color = color;
+            log.textContent = message;
+            document.getElementById('logArea').appendChild(log);
+        }
 
 
-            if (setedgedefaultsearch.checked) {
-                fetch('/setedgedefaultsearch', { method: 'GET' })
-            }
-        }
 
 
         function toggleDattoRMMOptions() {
@@ -1641,46 +1721,63 @@ try {
                             return
                         }
 
-                        # Step 3: Run Selected Tweaks
+                        # Step 3: Define Lookup Table for Tweaks
+                        $tweakActions = @{
+                            "setWindowsPerformanceCheckbox" = { .\Set-WindowsPerformance.ps1 }
+                            "stopUnnecessaryServicesCheckbox" = { .\Stop-UnnecessaryServices.ps1 }
+                            "setedgedefaultsearchCheckbox" = { Set-EdgeDefaultSearchEngine }
+                            "disableAnimationsCheckbox" = { Disable-Animations }
+                            "optimizePerformanceCheckbox" = { Optimize-Performance }
+                            "increaseFontSizeCheckbox" = { Increase-FontSize }
+                            "enableDarkModeCheckbox" = { Enable-DarkMode }
+                            "clearTempFilesCheckbox" = { Clear-TempFiles }
+                        }
+
+                        # Step 4: Process Each Selected Tweak
+                        $tweaksProcessed = @()
+                        $errors = @()
                         foreach ($tweak in $tweaks) {
-                            switch ($tweak) {
+                            if ($tweakActions[$tweak]) {
-                                "enableDarkModeCheckbox" {
+                                try {
-                                    Write-LogHybrid -Message "Running tweak: Set Edge Default Search Engine" -Level "Info"
+                                    # Execute the tweak function or script
-                                    Set-EdgeDefaultSearchEngine
+                                    $tweakActions[$tweak].Invoke()
+                                    Write-LogHybrid -Message "Tweak '$tweak' applied successfully." -Level "Info"
+                                    $tweaksProcessed += $tweak
+                                } catch {
+                                    # Log and collect errors for this tweak
+                                    $errorMessage = "Failed to apply tweak '$tweak': $($_.Exception.Message)"
+                                    Write-LogHybrid -Message $errorMessage -Level "Error"
+                                    $errors += $errorMessage
                                 }
-                                "disableAnimationsCheckbox" {
+                            } else {
-                                    Write-LogHybrid -Message "Running tweak: Disable Animations" -Level "Info"
+                                # Handle unknown tweaks
-                                    #Disable-Animations
-                                }
-                                "optimizePerformanceCheckbox" {
-                                    Write-LogHybrid -Message "Running tweak: Optimize Performance" -Level "Info"
-                                    #Optimize-Performance
-                                }
-                                "increaseFontSizeCheckbox" {
-                                    Write-LogHybrid -Message "Running tweak: Increase Font Size" -Level "Info"
-                                    #Increase-FontSize
-                                }
-                                default {
                                 Write-LogHybrid -Message "Unknown tweak: $tweak" -Level "Warning"
-                                }
+                                $errors += "Unknown tweak: $tweak"
                             }
                         }
 
-                        # Step 4: Return Success Response
+                        # Step 5: Return Summary of Results
-                        $responseString = "Selected tweaks executed successfully."
+                        $responseData = @{
+                            Success = $tweaksProcessed
+                            Errors = $errors
+                        }
+                        $responseString = $responseData | ConvertTo-Json -Depth 2
                         $response.StatusCode = 200
                     } catch {
+                        # Handle General Errors
                         $responseString = "Error processing tweaks: $($_.Exception.Message)"
+                        Write-LogHybrid -Message $responseString -Level "Error"
                         $response.StatusCode = 500
                     }
 
-                    # Send the Response
+                    # Step 6: Send Response
                     $buffer = [System.Text.Encoding]::UTF8.GetBytes($responseString)
-                    $response.ContentType = "text/plain"
+                    $response.ContentType = "application/json"
                     $response.ContentLength64 = $buffer.Length
                     $response.OutputStream.Write($buffer, 0, $buffer.Length)
                     $response.OutputStream.Close()
                 } else {
+                    # Handle Unsupported HTTP Methods
                     $responseString = "Method not allowed. Use POST."
                     $response.StatusCode = 405
                     $buffer = [System.Text.Encoding]::UTF8.GetBytes($responseString)
@@ -1690,6 +1787,7 @@ try {
             }
 
 
+
             # ----------------------------------------------------------------
             # 4) NEW ROUTE: /getLogs
             #   Returns $Global:LogCache as JSON for the polling function