edit readme to push to pr

.github/workflows/docker-build.yml

@@ -1,52 +0,0 @@
-name: Reusable Docker Build Logic
-
-on:
-  workflow_call:
-    inputs:
-      platform: { required: true, type: string }
-      suffix: { required: true, type: string }
-      runner: { required: true, type: string }
-    secrets:
-      token: { required: true }
-
-jobs:
-  build:
-    runs-on: ${{ inputs.runner }}
-    permissions: { contents: read, packages: write }
-    steps:
-      - { name: Checkout repository, uses: actions/checkout@v4 }
-
-      - name: "Prepare repository name in lowercase"
-        id: repo
-        run: echo "name=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - { name: Set up QEMU, uses: docker/setup-qemu-action@v3 }
-      - { name: Set up Docker Buildx, uses: docker/setup-buildx-action@v3 }
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.token }}
-
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/${{ steps.repo.outputs.name }}
-          tags: |
-            type=ref,event=branch,suffix=${{ inputs.suffix }}
-            type=ref,event=tag,suffix=${{ inputs.suffix }}
-            type=raw,value=latest,suffix=${{ inputs.suffix }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: ${{ inputs.platform }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/docker-publish.yml

@@ -1,69 +1,27 @@
-name: Build and Publish Multi-Platform Docker Image
+name: Docker
 
 on:
   push:
-    branches: ["main", "develop"]
+    branches: ["main", "legacy", "feature/*"]
     tags: ["*"]
+  pull_request:
+    branches: ["main"]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build-amd64:
+  build:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Prepare repository name in lowercase
-        id: repo
-        run: echo "name=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/${{ steps.repo.outputs.name }}
-          tags: |
-            type=ref,event=branch,suffix=-amd64
-            type=ref,event=tag,suffix=-amd64
-            type=raw,value=latest,suffix=-amd64,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-
-      - name: Build and push AMD64 Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-  build-arm64:
-    runs-on: ubuntu-22.04-arm
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Prepare repository name in lowercase
-        id: repo
-        run: echo "name=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -73,68 +31,27 @@ jobs:
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata
+      - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
-            ghcr.io/${{ steps.repo.outputs.name }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=ref,event=branch,suffix=-arm64
-            type=ref,event=tag,suffix=-arm64
-            type=raw,value=latest,suffix=-arm64,enable=${{ startsWith(github.ref, 'refs/tags/') }}
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
 
-      - name: Build and push ARM64 Docker image
+      - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/arm64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-  manifest:
-    needs: [build-amd64, build-arm64]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Prepare repository name in lowercase
-        id: repo
-        run: echo "name=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata for final manifest
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/${{ steps.repo.outputs.name }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-
-      - name: Create and push manifest list
-        run: |
-          echo "${{ steps.meta.outputs.tags }}" | while read -r tag; do
-            if [ -z "$tag" ]; then continue; fi
-            echo "Creating manifest for ${tag}"
-            docker buildx imagetools create --tag "${tag}" \
-              "${tag}-amd64" \
-              "${tag}-arm64"
-          done

.gitignore

@@ -13,6 +13,4 @@ node_modules
 .cursorignore
 .idea
 tsconfig.tsbuildinfo
-docker-compose.test.yml
-/data
-claude.md
+docker-compose.test.yml

CONTRIBUTING.md

@@ -1,37 +0,0 @@
-# How to contribute
-
-Hi, it's amazing having a community willing to push new feature to the app, and I am VERY open to contributors pushing their idea, it's what makes open source amazing.
-
-That said for the sake of sanity let's all follow the same structure:
-
-- When creating a new branch, do off from the develop branch, this will always be ahead of main and it's what gets released
-- When creating a pull request, direct it back into develop, I'll then review it and merge it. Your code will end up in the next release that way and we all avoid conflicts!
-- Please bear with on reviews, it may take a bit of time for me to go through it all on top of life/work/hobbies :)
-
-## Some best practices
-
-### Code Quality
-
-- Follow the existing code style and structure
-- Keep files modular and under 250-300 (split into smaller components if needed) lines unless it's a major server action, these can get intense I know 
-- Avoid code duplication - reuse existing functions and UI components, don't hardcode html when a component already exists (e.g. <button> vs <Button>)
-- All imports should be at the top of the file unless it's for specific server actions
-- Avoid using `any` 
-- Don't hardcode colors! Use the theme variables to make sure light/dark mode keep working well
-- Make sure the UI is consistent with the current one, look for spacing issues, consistent spacing really makes a difference
-
-### Pull Requests
-
-- Keep PRs focused on a single feature or fix
-- Update documentation if your changes affect user-facing features
-- Test your changes locally before submitting
-
-### Getting Started
-
-1. Fork the repository
-2. Create a feature branch from `develop`
-3. Make your changes
-4. Test thoroughly
-5. Submit a pull request to `develop`
-
-Thank you for contributing! <3

Dockerfile

@@ -5,15 +5,6 @@ RUN apt-get update && apt-get install -y \
     curl \
     iputils-ping \
     util-linux \
-    ca-certificates \
-    gnupg \
-    lsb-release \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
-    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
-    && apt-get update \
-    && apt-get install -y docker-ce-cli \
     && rm -rf /var/lib/apt/lists/*
 
 FROM base AS deps

README.md

@@ -2,59 +2,27 @@
   <img src="public/heading.png" width="400px">
 </p>
 
-## Table of Contents
+# ATTENTION BREAKING UPDATE!!
 
-- [Features](#features)
-- [Quick Start](#quick-start)
-  - [Using Docker (Recommended)](#using-docker-recommended)
-  - [API](#api)
-  - [Single Sign-On (SSO) with OIDC](#single-sign-on-sso-with-oidc)
-  - [Localization](#localization)
-  - [Local Development](#local-development)
-  - [Environment Variables](howto/ENV_VARIABLES.md)
-- [Authentication](#authentication)
-- [Usage](#usage)
-  - [Viewing System Information](#viewing-system-information)
-  - [Managing Cron Jobs](#managing-cron-jobs)
-  - [Job Execution Logging](#job-execution-logging)
-  - [Managing Scripts](#managing-scripts)
-- [Technologies Used](#technologies-used)
-- [Contributing](#contributing)
-- [License](#license)
-
----
+> The latest `main` branch has completely changed the way this app used to run.
+> The main reason being trying to address some security concerns and make the whole application work
+> across multiple platform without too much trouble.
+>
+> If you came here due to this change trying to figure out why your app stopped working you have two options:
+>
+> 1 - Update your `docker-compose.yml` with the new one provided within this readme (or just copy [docker-compose.yml](docker-compose.yml))
+>
+> 2 - Keep your `docker-compose.yml` file as it is and use the legacy tag in the image `image: ghcr.io/fccview/cronmaster:legacy`. However bear in mind this will not be supported going forward, any issue regarding the legacy tag will be ignored and I will only support the main branch. Feel free to fork that specific branch in case you want to work on it yourself :)
 
 ## Features
 
 - **Modern UI**: Beautiful, responsive interface with dark/light mode.
-- **System Information**: Display uptime, memory, network, CPU, and GPU info.
+- **System Information**: Display hostname, IP address, uptime, memory, network and CPU info.
 - **Cron Job Management**: View, create, and delete cron jobs with comments.
 - **Script management**: View, create, and delete bash scripts on the go to use within your cron jobs.
-- **Job Execution Logging**: Optional logging for cronjobs with automatic cleanup, capturing stdout, stderr, exit codes, and timestamps.
-- **Live Updates (SSE)**: Real-time job status updates and live log streaming for long-running jobs (when logging is enabled).
-- **Smart Job Execution**: Jobs with logging run in background with live updates, jobs without logging run synchronously with 5-minute timeout.
-- **Authentication**: Secure password-based and/or OIDC (SSO) authentication with proper session management.
-- **REST API**: Full REST API with optional API key authentication for external integrations.
 - **Docker Support**: Runs entirely from a Docker container.
 - **Easy Setup**: Quick presets for common cron schedules.
 
-<br />
-
----
-
-<p align="center">
-  <a href="http://discord.gg/invite/mMuk2WzVZu">
-    <img width="40" src="public/repo-images/discord_icon.webp">
-  </a>
-  <br />
-  <i>Join the discord server for more info</i>
-  <br />
-</p>
-
----
-
-<br />
-
 ## Before we start
 
 Hey there! 👋 Just a friendly heads-up: I'm a big believer in open source and love sharing my work with the community. Everything you find in my GitHub repos is and always will be 100% free. If someone tries to sell you a "premium" version of any of my projects while claiming to be me, please know that this is not legitimate. 🚫
@@ -68,72 +36,72 @@ If you find my projects helpful and want to fuel my late-night coding sessions w
 </p>
 
 <div align="center">
-  <img width="500px" src="screenshots/home.png">
-  <img width="500px" src="screenshots/live-running.png" />
+  <img width="500px" src="screenshots/jobs-view.png">
+  <img width="500px" src="screenshots/scripts-view.png" />
 </div>
 
-<a id="quick-start"></a>
-
 ## Quick Start
 
-<a id="using-docker-recommended"></a>
-
 ### Using Docker (Recommended)
 
-1. Create a `docker-compose.yml` file with this minimal configuration:
+1. Create a `docker-compose.yml` file with this content:
 
-```yaml
-# For all configuration options, see howto/DOCKER.md
+```bash
 services:
-  cronmaster:
+  cronjob-manager:
     image: ghcr.io/fccview/cronmaster:latest
     container_name: cronmaster
     user: "root"
     ports:
+      # Feel free to change port, 3000 is very common so I like to map it to something else
       - "40123:3000"
     environment:
       - NODE_ENV=production
       - DOCKER=true
+
+      # --- MAP HOST PROJECT DIRECTORY, THIS IS MANDATORY FOR SCRIPTS TO WORK
+      - HOST_PROJECT_DIR=/path/to/cronmaster/directory
       - NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL=30000
+
+      # --- PASSWORD PROTECTION
+      # Uncomment to enable password protection (replace "very_strong_password" with your own)
       - AUTH_PASSWORD=very_strong_password
+
+      # --- CRONTAB USERS
+      # This is used to read the crontabs for the specific user.
+      # replace root with your user - find it with: ls -asl /var/spool/cron/crontabs/
+      # For multiple users, use comma-separated values: HOST_CRONTAB_USER=root,user1,user2
       - HOST_CRONTAB_USER=root
+
+      # --- !! IMPORTANT !!DOCKER EXEC USER
+      # If you do not specify this user to be a valid user on your system,
+      # any cronjob containing a docker command will fail. IDEALLY you should not be running
+      # docker commands as root, so this is only a fallback. ONLY ONE USER IS ALLOWED.
+      - DOCKER_EXEC_USER=fccview
     volumes:
+      # --- MOUNT DOCKER SOCKET
+      # Mount Docker socket to execute commands on host
       - /var/run/docker.sock:/var/run/docker.sock
+
+      # --- MOUNT DATA
+      # These are needed if you want to keep your data on the host machine and not wihin the docker volume.
+      # DO NOT change the location of ./scripts as all cronjobs that use custom scripts created via the app
+      # will target this folder (thanks to the HOST_PROJECT_DIR variable set above)
       - ./scripts:/app/scripts
       - ./data:/app/data
       - ./snippets:/app/snippets
+
+    # --- USE HOST PID NAMESPACE FOR HOST COMMAND EXECUTION
+    # --- RUN IN PRIVILEGED MODE FOR NSENTER ACCESS
     pid: "host"
     privileged: true
     restart: always
     init: true
+
+    # --- DEFAULT PLATFORM IS SET TO AMD64, UNCOMMENT TO USE ARM64.
+    #platform: linux/arm64
 ```
 
-📖 **For all available configuration options, see [`howto/DOCKER.md`](howto/DOCKER.md)**
-
-<a id="api"></a>
-
-## API
-
-`cr*nmaster` includes a REST API for programmatic access to your cron jobs and system information. This is perfect for integrations.
-
-📖 **For the complete API documentation, see [howto/API.md](howto/API.md)**
-
-<a id="single-sign-on-sso-with-oidc"></a>
-
-## Single Sign-On (SSO) with OIDC
-
-`cr*nmaster` supports any OIDC provider (Authentik, Auth0, Keycloak, Okta, Google, EntraID, etc.)
-
-📖 **For the complete SSO documentation, see [howto/SSO.md](howto/SSO.md)**
-
-<a id="localization"></a>
-
-## Localization
-
-`cr*nmaster` officially support [some languages](app/_translations) and allows you to create your custom translations locally on your own machine.
-
-📖 **For the complete Translations documentation, see [howto/TRANSLATIONS.md](howto/TRANSLATIONS.md)**
-
 ### ARM64 Support
 
 The application supports both AMD64 and ARM64 architectures:
@@ -158,8 +126,6 @@ docker compose up --build
 
 **Note**: The Docker implementation uses direct file access to read and write crontab files, ensuring real-time synchronization with the host system's cron jobs. This approach bypasses the traditional `crontab` command limitations in containerized environments
 
-<a id="local-development"></a>
-
 ### Local Development
 
 1. Install dependencies:
@@ -176,70 +142,39 @@ yarn dev
 
 3. Open your browser and navigate to `http://localhost:3000`
 
-<a id="environment-variables"></a>
-
 ### Environment Variables
 
-📖 **For the complete environment variables reference, see [`howto/ENV_VARIABLES.md`](howto/ENV_VARIABLES.md)**
+The following environment variables can be configured:
 
-This includes all configuration options for:
+| Variable                            | Default | Description                                                                                 |
+| ----------------------------------- | ------- | ------------------------------------------------------------------------------------------- |
+| `NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL` | `30000` | Clock update interval in milliseconds (30 seconds)                                          |
+| `HOST_PROJECT_DIR`                  | `N/A`   | Mandatory variable to make sure cron runs on the right path.                                |
+| `DOCKER`                            | `false` | ONLY set this to true if you are runnign the app via docker, in the docker-compose.yml file |
+| `HOST_CRONTAB_USER`                 | `root`  | Comma separated list of users that run cronjobs on your host machine                        |
+| `AUTH_PASSWORD`                     | `N/A`   | If you set a password the application will be password protected with basic next-auth       |
+| `DOCKER_EXEC_USER`                  | `N/A`   | If you don't set this user you won't be able to run docker commands as root                 |
 
-- Core application settings
-- Docker configuration
-- UI customization
-- Logging settings
-- Authentication (password, SSO/OIDC, API keys)
-- Development and debugging options
+**Example**: To change the clock update interval to 60 seconds:
+
+```bash
+NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL=60000 docker-compose up
+```
+
+**Example**: Your `docker-compose.yml` file or repository are in `~/homelab/cronmaster/`
+
+```bash
+HOST_PROJECT_DIR=/home/<your_user_here>/homelab/cronmaster
+```
 
 ### Important Notes for Docker
 
 - Root user is required for cron operations and direct file access. There is no way around this, if you don't feel comfortable in running it as root feel free to run the app locally with `yarn install`, `yarn build` and `yarn start`
+- `HOST_PROJECT_DIR` is required in order for the scripts created within the app to run properly
 - The `DOCKER=true` environment variable enables direct file access mode for crontab operations. This is REQUIRED when running the application in docker mode.
-- The Docker socket and data volume mounts are required for proper functionality
-
-**Important Note on Root Commands**: When running commands as `root` within Cronmaster, ensure that these commands also function correctly as `root` on your host machine. If a command works as `root` on your host but fails within Cronmaster, please open an issue with detailed information.
-
-<a id="authentication"></a>
-
-## Authentication
-
-Cr\*nMaster supports multiple authentication methods to secure your instance:
-
-### Password Authentication
-
-Set a password to protect access to your Cronmaster instance:
-
-```yaml
-environment:
-  - AUTH_PASSWORD=your_secure_password
-```
-
-Users will be prompted to enter this password before accessing the application.
-
-### SSO Authentication (OIDC)
-
-Cr\*nMaster supports SSO via OIDC (OpenID Connect), compatible with providers like:
-
-- Authentik
-- Auth0
-- Keycloak
-- Okta
-- Google
-- Entra ID (Azure AD)
-- And many more!
-
-You can enable **both** password and SSO authentication simultaneously:
-
-The login page will display both options, allowing users to choose their preferred method.
-
-**For detailed setup instructions, see **[howto/SSO.md](howto/SSO.md)**
-
-<a id="usage"></a>
 
 ## Usage
 
-<a id="viewing-system-information"></a>
-
 ### Viewing System Information
 
 The application automatically detects your operating system and displays:
@@ -249,8 +184,6 @@ The application automatically detects your operating system and displays:
 - CPU Information
 - GPU Information (if supported)
 
-<a id="managing-cron-jobs"></a>
-
 ### Managing Cron Jobs
 
 1. **View Existing Jobs**: All current cron jobs are displayed with their schedules and commands
@@ -259,13 +192,6 @@ The application automatically detects your operating system and displays:
 4. **Add Comments**: Include descriptions for your cron jobs
 5. **Delete Jobs**: Remove unwanted cron jobs with the delete button
 6. **Clone Jobs**: Clone jobs to quickly edit the command in case it's similar
-7. **Enable Logging**: Optionally enable execution logging for any cronjob to capture detailed execution information
-
-<a id="job-execution-logging"></a>
-
-### Job Execution Logging
-
-📖 **For complete logging documentation, see [howto/LOGS.md](howto/LOGS.md)**
 
 ### Cron Schedule Format
 
@@ -277,8 +203,6 @@ The application uses standard cron format: `* * * * *`
 - Fourth field: Month (1-12)
 - Fifth field: Day of week (0-7, where 0 and 7 are Sunday)
 
-<a id="managing-scripts"></a>
-
 ### Managing Scripts
 
 1. **View Existing Scripts**: All current user created scripts are displayed with their name and descriptions
@@ -287,6 +211,23 @@ The application uses standard cron format: `* * * * *`
 4. **Delete Scripts**: Remove unwanted scripts (this won't delete the cronjob, you will need to manually remove these yourself)
 5. **Clone Scripts**: Clone scripts to quickly edit them in case they are similar to one another.
 
+## Technologies Used
+
+- **Next.js 14**: React framework with App Router
+- **TypeScript**: Type-safe JavaScript
+- **Tailwind CSS**: Utility-first CSS framework
+- **Lucide React**: Beautiful icons
+- **next-themes**: Dark/light mode support
+- **Docker**: Containerization
+
+## Contributing
+
+1. Fork the repository
+2. Create a feature branch
+3. Make your changes
+4. Add tests if applicable
+5. Submit a pull request
+
 ## Community shouts
 
 I would like to thank the following members for raising issues and help test/debug them!
@@ -323,20 +264,10 @@ I would like to thank the following members for raising issues and help test/deb
       <td align="center" valign="top" width="20%">
         <a href="https://github.com/cerede2000"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/38144752?v=4&size=100"><br />cerede2000</a>
       </td>
-      <td align="center" valign="top" width="20%">
-        <a href="https://github.com/Navino16"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/22234867?v=4&size=100"><br />Navino16</a>
-      </td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="20%">
-        <a href="https://github.com/ShadowTox"><img width="100" height="100" src="https://avatars.githubusercontent.com/u/558536?v=4&size=100"><br />ShadowTox</a>
-      </td>
     </tr>
   </tbody>
 </table>
 
-<a id="license"></a>
-
 ## License
 
 This project is licensed under the MIT License.

app/_components/BashEditor.tsx

@@ -0,0 +1,137 @@
+"use client";
+
+import { useEffect, useRef, useState } from "react";
+import { EditorView } from "@codemirror/view";
+import { EditorState } from "@codemirror/state";
+import { javascript } from "@codemirror/lang-javascript";
+import { oneDark } from "@codemirror/theme-one-dark";
+import { Button } from "./ui/Button";
+import { Terminal, Copy, Check } from "lucide-react";
+
+interface BashEditorProps {
+  value: string;
+  onChange: (value: string) => void;
+  placeholder?: string;
+  className?: string;
+  label?: string;
+}
+
+export const BashEditor = ({
+  value,
+  onChange,
+  placeholder = "#!/bin/bash\n# Your bash script here\necho 'Hello World'",
+  className = "",
+  label = "Bash Script",
+}: BashEditorProps) => {
+  const [copied, setCopied] = useState(false);
+  const editorRef = useRef<HTMLDivElement>(null);
+  const editorViewRef = useRef<EditorView | null>(null);
+
+  useEffect(() => {
+    if (!editorRef.current) return;
+
+    const bashLanguage = javascript({
+      typescript: false,
+      jsx: false,
+    });
+
+    const state = EditorState.create({
+      doc: value || placeholder,
+      extensions: [
+        bashLanguage,
+        oneDark,
+        EditorView.updateListener.of((update: any) => {
+          if (update.docChanged) {
+            onChange(update.state.doc.toString());
+          }
+        }),
+        EditorView.theme({
+          "&": {
+            fontSize: "14px",
+            fontFamily:
+              'ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace',
+            height: "100%",
+            maxHeight: "100%",
+          },
+          ".cm-content": {
+            padding: "12px",
+            minHeight: "200px",
+          },
+          ".cm-line": {
+            lineHeight: "1.4",
+          },
+          ".cm-scroller": {
+            fontFamily:
+              'ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace',
+            height: "100%",
+            maxHeight: "100%",
+          },
+        }),
+      ],
+    });
+
+    const view = new EditorView({
+      state,
+      parent: editorRef.current,
+    });
+
+    editorViewRef.current = view;
+
+    return () => {
+      view.destroy();
+    };
+  }, []);
+
+  useEffect(() => {
+    if (editorViewRef.current) {
+      const currentValue = editorViewRef.current.state.doc.toString();
+      if (currentValue !== value) {
+        editorViewRef.current.dispatch({
+          changes: {
+            from: 0,
+            to: editorViewRef.current.state.doc.length,
+            insert: value,
+          },
+        });
+      }
+    }
+  }, [value]);
+
+  const handleCopy = async () => {
+    if (editorViewRef.current) {
+      const text = editorViewRef.current.state.doc.toString();
+      await navigator.clipboard.writeText(text);
+      setCopied(true);
+      setTimeout(() => setCopied(false), 2000);
+    }
+  };
+
+  return (
+    <div className={className}>
+      {label && (
+        <div className="flex items-center justify-between mb-2">
+          <div className="flex items-center gap-2">
+            <Terminal className="h-4 w-4 text-cyan-500" />
+            <span className="text-sm font-medium">{label}</span>
+          </div>
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={handleCopy}
+            className="btn-outline h-7 px-2"
+          >
+            {copied ? (
+              <Check className="h-3 w-3 mr-1" />
+            ) : (
+              <Copy className="h-3 w-3 mr-1" />
+            )}
+            {copied ? "Copied!" : "Copy"}
+          </Button>
+        </div>
+      )}
+      <div className="border border-border overflow-hidden h-full">
+        <div ref={editorRef} className="h-full rounded-lg" />
+      </div>
+    </div>
+  );
+}

app/_components/BashSnippetHelper.tsx

@@ -1,42 +1,40 @@
 "use client";
 
 import { useState, useEffect } from "react";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
+import { Button } from "./ui/Button";
+import { Input } from "./ui/Input";
 import {
-  MagnifyingGlassIcon,
-  FileTextIcon,
+  Search,
+  FileText,
   FolderOpen,
-  CodeIcon,
-  GearIcon,
+  Code,
+  Settings,
   Database,
-  CopyIcon,
-  CheckIcon,
-} from "@phosphor-icons/react";
+  Copy,
+  Check,
+} from "lucide-react";
 import {
   fetchSnippets,
   fetchSnippetCategories,
   searchSnippets,
   type BashSnippet,
-} from "@/app/_server/actions/snippets";
+} from "../_server/actions/snippets";
 
 interface BashSnippetHelperProps {
   onInsertSnippet: (snippet: string) => void;
 }
 
 const categoryIcons = {
-  "File Operations": FileTextIcon,
-  Loops: CodeIcon,
-  Conditionals: CodeIcon,
-  "System Operations": GearIcon,
+  "File Operations": FileText,
+  Loops: Code,
+  Conditionals: Code,
+  "System Operations": Settings,
   "Database Operations": Database,
-  "UserIcon Examples": FolderOpen,
-  "Custom Scripts": CodeIcon,
+  "User Examples": FolderOpen,
+  "Custom Scripts": Code,
 };
 
-export const BashSnippetHelper = ({
-  onInsertSnippet,
-}: BashSnippetHelperProps) => {
+export const BashSnippetHelper = ({ onInsertSnippet }: BashSnippetHelperProps) => {
   const [searchQuery, setSearchQuery] = useState("");
   const [selectedCategory, setSelectedCategory] = useState<string | null>(null);
   const [copiedId, setCopiedId] = useState<string | null>(null);
@@ -109,7 +107,7 @@ export const BashSnippetHelper = ({
     return (
       <div className="space-y-3">
         <div className="text-center py-8">
-          <CodeIcon className="h-8 w-8 text-muted-foreground mx-auto mb-2 animate-spin" />
+          <Code className="h-8 w-8 text-muted-foreground mx-auto mb-2 animate-spin" />
           <p className="text-sm text-muted-foreground">Loading snippets...</p>
         </div>
       </div>
@@ -119,17 +117,17 @@ export const BashSnippetHelper = ({
   return (
     <div className="space-y-3">
       <div className="relative">
-        <MagnifyingGlassIcon className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+        <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
         <Input
           value={searchQuery}
           onChange={(e) => setSearchQuery(e.target.value)}
-          placeholder="MagnifyingGlassIcon bash snippets..."
+          placeholder="Search bash snippets..."
           className="pl-9"
         />
       </div>
 
       {!searchQuery && (
-        <div className="overflow-x-auto tui-scrollbar">
+        <div className="overflow-x-auto">
           <div className="flex gap-1 pb-2 min-w-max">
             <Button
               type="button"
@@ -142,7 +140,7 @@ export const BashSnippetHelper = ({
             </Button>
             {categories.map((category) => {
               const Icon =
-                categoryIcons[category as keyof typeof categoryIcons] || CodeIcon;
+                categoryIcons[category as keyof typeof categoryIcons] || Code;
               return (
                 <Button
                   key={category}
@@ -163,15 +161,15 @@ export const BashSnippetHelper = ({
         </div>
       )}
 
-      <div className="space-y-2 overflow-y-auto !pr-0 tui-scrollbar">
+      <div className="space-y-2 overflow-y-auto custom-scrollbar">
         {filteredSnippets.map((snippet) => {
           const Icon =
             categoryIcons[snippet.category as keyof typeof categoryIcons] ||
-            CodeIcon;
+            Code;
           return (
             <div
               key={snippet.id}
-              className="bg-muted/30 rounded-lg border border-border p-3 hover:bg-accent/30 transition-colors"
+              className="bg-muted/30 rounded-lg border border-border/50 p-3 hover:bg-accent/30 transition-colors"
             >
               <div className="flex-1 min-w-0">
                 <div className="flex items-center gap-2 mb-1">
@@ -181,7 +179,7 @@ export const BashSnippetHelper = ({
                   </h4>
                   {snippet.source === "user" && (
                     <span className="inline-block px-1.5 py-0.5 text-xs bg-green-100 text-green-700 rounded border border-green-200">
-                      UserIcon
+                      User
                     </span>
                   )}
                 </div>
@@ -212,9 +210,9 @@ export const BashSnippetHelper = ({
                     className="h-6 w-8 p-0 text-xs"
                   >
                     {copiedId === snippet.id ? (
-                      <CheckIcon className="h-3 w-3" />
+                      <Check className="h-3 w-3" />
                     ) : (
-                      <CopyIcon className="h-3 w-3" />
+                      <Copy className="h-3 w-3" />
                     )}
                   </Button>
                   <Button
@@ -234,7 +232,7 @@ export const BashSnippetHelper = ({
 
         {filteredSnippets.length === 0 && (
           <div className="text-center py-8">
-            <CodeIcon className="h-8 w-8 text-muted-foreground mx-auto mb-2" />
+            <Code className="h-8 w-8 text-muted-foreground mx-auto mb-2" />
             <p className="text-sm text-muted-foreground">
               {searchQuery
                 ? `No snippets found for "${searchQuery}"`
@@ -245,4 +243,4 @@ export const BashSnippetHelper = ({
       </div>
     </div>
   );
-};
+}

app/_components/CronExpressionHelper.tsx

@@ -5,20 +5,19 @@ import {
   parseCronExpression,
   cronPatterns,
   type CronExplanation,
-} from "@/app/_utils/parser-utils";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
+} from "../_utils/cronParser";
+import { Button } from "./ui/Button";
+import { Input } from "./ui/Input";
 import {
-  ClockIcon,
-  InfoIcon,
-  CheckCircleIcon,
-  WarningCircleIcon,
+  Clock,
+  Info,
+  CheckCircle,
+  AlertCircle,
   Calendar,
-  CaretDownIcon,
-  CaretUpIcon,
-  MagnifyingGlassIcon,
-} from "@phosphor-icons/react";
-import { useLocale } from "next-intl";
+  ChevronDown,
+  ChevronUp,
+  Search,
+} from "lucide-react";
 
 interface CronExpressionHelperProps {
   value: string;
@@ -35,7 +34,6 @@ export const CronExpressionHelper = ({
   className = "",
   showPatterns = true,
 }: CronExpressionHelperProps) => {
-  const locale = useLocale();
   const [explanation, setExplanation] = useState<CronExplanation | null>(null);
   const [showPatternsPanel, setShowPatternsPanel] = useState(false);
   const [debouncedValue, setDebouncedValue] = useState(value);
@@ -51,7 +49,7 @@ export const CronExpressionHelper = ({
 
   useEffect(() => {
     if (debouncedValue) {
-      const result = parseCronExpression(debouncedValue, locale);
+      const result = parseCronExpression(debouncedValue);
       setExplanation(result);
     } else {
       setExplanation(null);
@@ -87,20 +85,20 @@ export const CronExpressionHelper = ({
         />
         <div className="absolute right-3 top-1/2 -translate-y-1/2">
           {explanation?.isValid ? (
-            <CheckCircleIcon className="h-4 w-4 text-status-success" />
+            <CheckCircle className="h-4 w-4 text-green-500" />
           ) : value ? (
-            <WarningCircleIcon className="h-4 w-4 text-status-error" />
+            <AlertCircle className="h-4 w-4 text-red-500" />
           ) : (
-            <ClockIcon className="h-4 w-4 text-muted-foreground" />
+            <Clock className="h-4 w-4 text-muted-foreground" />
           )}
         </div>
       </div>
 
       {explanation && (
-        <div className="bg-background2 p-2 ascii-border terminal-font">
+        <div className="bg-muted/30 rounded p-2 border border-border/30">
           <div className="space-y-1">
             <div className="flex items-start gap-2">
-              <InfoIcon className="h-3 w-3 text-primary mt-0.5 flex-shrink-0" />
+              <Info className="h-3 w-3 text-primary mt-0.5 flex-shrink-0" />
               <div className="flex-1">
                 <p className="text-xs italic text-muted-foreground">
                   {explanation.isValid
@@ -108,7 +106,7 @@ export const CronExpressionHelper = ({
                     : "Invalid Expression"}
                 </p>
                 {explanation.error && (
-                  <p className="text-xs text-status-error mt-0.5">
+                  <p className="text-xs text-red-600 dark:text-red-400 mt-0.5">
                     {explanation.error}
                   </p>
                 )}
@@ -117,7 +115,7 @@ export const CronExpressionHelper = ({
 
             {explanation.isValid && explanation.nextRuns.length > 0 && (
               <div className="flex items-start gap-2">
-                <Calendar className="h-3 w-3 text-status-info mt-0.5 flex-shrink-0" />
+                <Calendar className="h-3 w-3 text-blue-500 mt-0.5 flex-shrink-0" />
                 <div className="flex-1">
                   <p className="text-xs text-muted-foreground mb-1">
                     Next executions:
@@ -137,7 +135,7 @@ export const CronExpressionHelper = ({
       )}
 
       {showPatterns && (
-        <div className="bg-background0 ascii-border terminal-font">
+        <div className="bg-muted/30 rounded-lg border border-border/50">
           <button
             type="button"
             onClick={(e) => {
@@ -145,33 +143,33 @@ export const CronExpressionHelper = ({
               e.stopPropagation();
               setShowPatternsPanel(!showPatternsPanel);
             }}
-            className="w-full text-left p-3 hover:bg-background0 transition-colors"
+            className="w-full text-left p-3 hover:bg-accent/30 transition-colors rounded-t-lg"
           >
             <div className="flex items-center justify-between">
               <span className="text-sm font-medium">Quick Patterns</span>
               <div className="p-1">
                 {showPatternsPanel ? (
-                  <CaretUpIcon className="h-4 w-4" />
+                  <ChevronUp className="h-4 w-4" />
                 ) : (
-                  <CaretDownIcon className="h-4 w-4" />
+                  <ChevronDown className="h-4 w-4" />
                 )}
               </div>
             </div>
           </button>
 
           {showPatternsPanel && (
-            <div className="p-3 border-t border-border">
+            <div className="p-3 border-t border-border/50">
               <div className="relative mb-3">
-                <MagnifyingGlassIcon className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+                <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
                 <Input
                   value={patternSearch}
                   onChange={(e) => setPatternSearch(e.target.value)}
-                  placeholder="MagnifyingGlassIcon patterns..."
+                  placeholder="Search patterns..."
                   className="pl-9"
                 />
               </div>
 
-              <div className="space-y-3 max-h-64 overflow-y-auto tui-scrollbar">
+              <div className="space-y-3 max-h-64 overflow-y-auto custom-scrollbar">
                 {filteredPatterns.map((category) => (
                   <div key={category.category} className="space-y-2">
                     <h4 className="font-medium text-foreground text-sm">

app/_components/FeatureComponents/Cronjobs/CronJobList.tsx

@@ -1,433 +0,0 @@
-"use client";
-
-import {
-  Card,
-  CardContent,
-  CardHeader,
-  CardTitle,
-} from "@/app/_components/GlobalComponents/Cards/Card";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Switch } from "@/app/_components/GlobalComponents/UIElements/Switch";
-import {
-  ClockIcon,
-  PlusIcon,
-  Archive,
-  CaretDownIcon,
-  CodeIcon,
-  ChatTextIcon,
-  GearIcon,
-  CircleNotchIcon,
-  FunnelIcon,
-} from "@phosphor-icons/react";
-import { CronJob } from "@/app/_utils/cronjob-utils";
-import { Script } from "@/app/_utils/scripts-utils";
-import { UserFilter } from "@/app/_components/FeatureComponents/User/UserFilter";
-
-import { useCronJobState } from "@/app/_hooks/useCronJobState";
-import { CronJobItem } from "@/app/_components/FeatureComponents/Cronjobs/Parts/CronJobItem";
-import { MinimalCronJobItem } from "@/app/_components/FeatureComponents/Cronjobs/Parts/MinimalCronJobItem";
-import { CronJobEmptyState } from "@/app/_components/FeatureComponents/Cronjobs/Parts/CronJobEmptyState";
-import { CronJobListModals } from "@/app/_components/FeatureComponents/Modals/CronJobListsModals";
-import { LogsModal } from "@/app/_components/FeatureComponents/Modals/LogsModal";
-import { LiveLogModal } from "@/app/_components/FeatureComponents/Modals/LiveLogModal";
-import { RestoreBackupModal } from "@/app/_components/FeatureComponents/Modals/RestoreBackupModal";
-import { FiltersModal } from "@/app/_components/FeatureComponents/Modals/FiltersModal";
-import { useTranslations } from "next-intl";
-import { useSSEContext } from "@/app/_contexts/SSEContext";
-import { useEffect, useState } from "react";
-import { useRouter } from "next/navigation";
-import {
-  fetchBackupFiles,
-  restoreCronJob,
-  deleteBackup,
-  backupAllCronJobs,
-  restoreAllCronJobs,
-} from "@/app/_server/actions/cronjobs";
-import { showToast } from "@/app/_components/GlobalComponents/UIElements/Toast";
-
-interface CronJobListProps {
-  cronJobs: CronJob[];
-  scripts: Script[];
-}
-
-export const CronJobList = ({ cronJobs, scripts }: CronJobListProps) => {
-  const t = useTranslations();
-  const router = useRouter();
-  const { subscribe } = useSSEContext();
-  const [isBackupModalOpen, setIsBackupModalOpen] = useState(false);
-  const [backupFiles, setBackupFiles] = useState<
-    Array<{
-      filename: string;
-      job: CronJob;
-      backedUpAt: string;
-    }>
-  >([]);
-  const [scheduleDisplayMode, setScheduleDisplayMode] = useState<
-    "cron" | "human" | "both"
-  >("both");
-  const [loadedSettings, setLoadedSettings] = useState<boolean>(false);
-  const [isFiltersModalOpen, setIsFiltersModalOpen] = useState(false);
-  const [minimalMode, setMinimalMode] = useState(false);
-  const [isClient, setIsClient] = useState(false);
-
-  useEffect(() => {
-    setIsClient(true);
-
-    try {
-      const savedScheduleMode = localStorage.getItem(
-        "cronjob-schedule-display-mode"
-      );
-      if (
-        savedScheduleMode === "cron" ||
-        savedScheduleMode === "human" ||
-        savedScheduleMode === "both"
-      ) {
-        setScheduleDisplayMode(savedScheduleMode);
-      }
-
-      const savedMinimalMode = localStorage.getItem("cronjob-minimal-mode");
-      if (savedMinimalMode === "true") {
-        setMinimalMode(true);
-      }
-
-      setLoadedSettings(true);
-    } catch (error) {
-      console.warn("Failed to load settings from localStorage:", error);
-    }
-  }, []);
-
-  useEffect(() => {
-    const unsubscribe = subscribe((event) => {
-      if (event.type === "job-completed" || event.type === "job-failed") {
-        router.refresh();
-      }
-    });
-
-    return unsubscribe;
-  }, [subscribe, router]);
-
-  useEffect(() => {
-    if (!isClient) return;
-
-    try {
-      localStorage.setItem(
-        "cronjob-schedule-display-mode",
-        scheduleDisplayMode
-      );
-    } catch (error) {
-      console.warn(
-        "Failed to save schedule display mode to localStorage:",
-        error
-      );
-    }
-  }, [scheduleDisplayMode, isClient]);
-
-  useEffect(() => {
-    if (!isClient) return;
-
-    try {
-      localStorage.setItem("cronjob-minimal-mode", minimalMode.toString());
-    } catch (error) {
-      console.warn("Failed to save minimal mode to localStorage:", error);
-    }
-  }, [minimalMode, isClient]);
-
-  const loadBackupFiles = async () => {
-    const backups = await fetchBackupFiles();
-    setBackupFiles(backups);
-  };
-
-  const handleRestore = async (filename: string) => {
-    const result = await restoreCronJob(filename);
-    if (result.success) {
-      showToast("success", t("cronjobs.restoreJobSuccess"));
-      router.refresh();
-      loadBackupFiles();
-    } else {
-      showToast("error", t("cronjobs.restoreJobFailed"), result.message);
-    }
-  };
-
-  const handleRestoreAll = async () => {
-    const result = await restoreAllCronJobs();
-    if (result.success) {
-      showToast("success", result.message);
-      router.refresh();
-      setIsBackupModalOpen(false);
-    } else {
-      showToast("error", "Failed to restore all jobs", result.message);
-    }
-  };
-
-  const handleBackupAll = async () => {
-    const result = await backupAllCronJobs();
-    if (result.success) {
-      showToast("success", result.message);
-      loadBackupFiles();
-    } else {
-      showToast("error", t("cronjobs.backupAllFailed"), result.message);
-    }
-  };
-
-  const handleDeleteBackup = async (filename: string) => {
-    const result = await deleteBackup(filename);
-    if (result.success) {
-      showToast("success", t("cronjobs.backupDeleted"));
-      loadBackupFiles();
-    } else {
-      showToast("error", "Failed to delete backup", result.message);
-    }
-  };
-
-  const {
-    deletingId,
-    runningJobId,
-    selectedUser,
-    setSelectedUser,
-    jobErrors,
-    errorModalOpen,
-    setErrorModalOpen,
-    selectedError,
-    setSelectedError,
-    isLogsModalOpen,
-    setIsLogsModalOpen,
-    jobForLogs,
-    isLiveLogModalOpen,
-    setIsLiveLogModalOpen,
-    liveLogRunId,
-    liveLogJobId,
-    liveLogJobComment,
-    filteredJobs,
-    isNewCronModalOpen,
-    setIsNewCronModalOpen,
-    isEditModalOpen,
-    setIsEditModalOpen,
-    isDeleteModalOpen,
-    setIsDeleteModalOpen,
-    isCloneModalOpen,
-    setIsCloneModalOpen,
-    jobToDelete,
-    jobToClone,
-    isCloning,
-    editForm,
-    setEditForm,
-    newCronForm,
-    setNewCronForm,
-    handleErrorClickLocal,
-    refreshJobErrorsLocal,
-    handleDeleteLocal,
-    handleCloneLocal,
-    handlePauseLocal,
-    handleResumeLocal,
-    handleRunLocal,
-    handleToggleLoggingLocal,
-    handleViewLogs,
-    confirmDelete,
-    confirmClone,
-    handleEdit,
-    handleEditSubmitLocal,
-    handleNewCronSubmitLocal,
-    handleBackupLocal,
-  } = useCronJobState({ cronJobs, scripts });
-
-  return (
-    <>
-      <Card className="glass-card">
-        <CardHeader>
-          <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
-            <div className="flex items-center gap-3">
-              <div className="p-2 bg-primary/10 rounded-lg">
-                <ClockIcon className="h-5 w-5 text-primary" />
-              </div>
-              <div>
-                <CardTitle className="text-xl brand-gradient">
-                  {t("cronjobs.scheduledTasks")}
-                </CardTitle>
-                <p className="text-sm text-muted-foreground">
-                  {t("cronjobs.nOfNJObs", {
-                    filtered: filteredJobs.length,
-                    total: cronJobs.length,
-                  })}{" "}
-                  {selectedUser &&
-                    t("cronjobs.forUser", { user: selectedUser })}
-                </p>
-              </div>
-            </div>
-            <div className="flex gap-2 w-full justify-between sm:w-auto">
-              <div className="flex gap-2">
-                <Button
-                  onClick={() => setIsFiltersModalOpen(true)}
-                  variant="outline"
-                  className="btn-outline"
-                  title={t("cronjobs.filters")}
-                >
-                  <FunnelIcon className="h-4 w-4" />
-                </Button>
-                <Button
-                  onClick={() => setIsBackupModalOpen(true)}
-                  variant="outline"
-                  className="btn-outline"
-                  title={t("cronjobs.backups")}
-                >
-                  <Archive className="h-4 w-4" />
-                </Button>
-              </div>
-              <Button
-                onClick={() => setIsNewCronModalOpen(true)}
-                className="btn-primary glow-primary"
-              >
-                <PlusIcon className="h-4 w-4 mr-2" />
-                {t("cronjobs.newTask")}
-              </Button>
-            </div>
-          </div>
-        </CardHeader>
-        <CardContent>
-          <div className="mb-4 flex items-center justify-between">
-            <div className="flex items-center gap-3">
-              <label
-                className="text-sm font-medium text-foreground cursor-pointer"
-                onClick={() => setMinimalMode(!minimalMode)}
-              >
-                {t("cronjobs.minimalMode")}
-              </label>
-              <Switch checked={minimalMode} onCheckedChange={setMinimalMode} />
-            </div>
-          </div>
-
-          {filteredJobs.length === 0 ? (
-            <CronJobEmptyState
-              selectedUser={selectedUser}
-              onNewTaskClick={() => setIsNewCronModalOpen(true)}
-            />
-          ) : (
-            <div className="space-y-4 max-h-[55vh] min-h-[55vh] overflow-y-auto tui-scrollbar">
-              {loadedSettings ? (
-                filteredJobs.map((job) =>
-                  minimalMode ? (
-                    <MinimalCronJobItem
-                      key={job.id}
-                      job={job}
-                      errors={jobErrors[job.id] || []}
-                      runningJobId={runningJobId}
-                      deletingId={deletingId}
-                      scheduleDisplayMode={scheduleDisplayMode}
-                      onRun={handleRunLocal}
-                      onEdit={handleEdit}
-                      onClone={confirmClone}
-                      onResume={handleResumeLocal}
-                      onPause={handlePauseLocal}
-                      onToggleLogging={handleToggleLoggingLocal}
-                      onViewLogs={handleViewLogs}
-                      onDelete={confirmDelete}
-                      onBackup={handleBackupLocal}
-                      onErrorClick={handleErrorClickLocal}
-                    />
-                  ) : (
-                    <CronJobItem
-                      key={job.id}
-                      job={job}
-                      errors={jobErrors[job.id] || []}
-                      runningJobId={runningJobId}
-                      deletingId={deletingId}
-                      scheduleDisplayMode={scheduleDisplayMode}
-                      onRun={handleRunLocal}
-                      onEdit={handleEdit}
-                      onClone={confirmClone}
-                      onResume={handleResumeLocal}
-                      onPause={handlePauseLocal}
-                      onToggleLogging={handleToggleLoggingLocal}
-                      onViewLogs={handleViewLogs}
-                      onDelete={confirmDelete}
-                      onBackup={handleBackupLocal}
-                      onErrorClick={handleErrorClickLocal}
-                      onErrorDismiss={refreshJobErrorsLocal}
-                    />
-                  )
-                )
-              ) : (
-                <div className="flex items-center justify-center h-full min-h-[55vh]">
-                  <CircleNotchIcon className="h-8 w-8 animate-spin text-primary" />
-                </div>
-              )}
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      <CronJobListModals
-        cronJobs={cronJobs}
-        scripts={scripts}
-        isNewCronModalOpen={isNewCronModalOpen}
-        onNewCronModalClose={() => setIsNewCronModalOpen(false)}
-        onNewCronSubmit={handleNewCronSubmitLocal}
-        newCronForm={newCronForm}
-        onNewCronFormChange={(updates) =>
-          setNewCronForm((prev) => ({ ...prev, ...updates }))
-        }
-        isEditModalOpen={isEditModalOpen}
-        onEditModalClose={() => setIsEditModalOpen(false)}
-        onEditSubmit={handleEditSubmitLocal}
-        editForm={editForm}
-        onEditFormChange={(updates) =>
-          setEditForm((prev) => ({ ...prev, ...updates }))
-        }
-        isDeleteModalOpen={isDeleteModalOpen}
-        onDeleteModalClose={() => setIsDeleteModalOpen(false)}
-        onDeleteConfirm={() =>
-          jobToDelete ? handleDeleteLocal(jobToDelete.id) : undefined
-        }
-        jobToDelete={jobToDelete}
-        isCloneModalOpen={isCloneModalOpen}
-        onCloneModalClose={() => setIsCloneModalOpen(false)}
-        onCloneConfirm={handleCloneLocal}
-        jobToClone={jobToClone}
-        isCloning={isCloning}
-        isErrorModalOpen={errorModalOpen}
-        onErrorModalClose={() => {
-          setErrorModalOpen(false);
-          setSelectedError(null);
-        }}
-        selectedError={selectedError}
-      />
-
-      {jobForLogs && (
-        <LogsModal
-          isOpen={isLogsModalOpen}
-          onClose={() => setIsLogsModalOpen(false)}
-          jobId={jobForLogs.id}
-          jobComment={jobForLogs.comment}
-          preSelectedLog={jobForLogs.logError?.lastFailedLog}
-        />
-      )}
-
-      <LiveLogModal
-        isOpen={isLiveLogModalOpen}
-        onClose={() => setIsLiveLogModalOpen(false)}
-        runId={liveLogRunId}
-        jobId={liveLogJobId}
-        jobComment={liveLogJobComment}
-      />
-
-      <RestoreBackupModal
-        isOpen={isBackupModalOpen}
-        onClose={() => setIsBackupModalOpen(false)}
-        backups={backupFiles}
-        onRestore={handleRestore}
-        onRestoreAll={handleRestoreAll}
-        onBackupAll={handleBackupAll}
-        onDelete={handleDeleteBackup}
-        onRefresh={loadBackupFiles}
-      />
-
-      <FiltersModal
-        isOpen={isFiltersModalOpen}
-        onClose={() => setIsFiltersModalOpen(false)}
-        selectedUser={selectedUser}
-        onUserChange={setSelectedUser}
-        scheduleDisplayMode={scheduleDisplayMode}
-        onScheduleDisplayModeChange={setScheduleDisplayMode}
-      />
-    </>
-  );
-};

app/_components/FeatureComponents/Cronjobs/Parts/CronJobEmptyState.tsx

@@ -1,40 +0,0 @@
-"use client";
-
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { ClockIcon, PlusIcon } from "@phosphor-icons/react";
-
-interface CronJobEmptyStateProps {
-    selectedUser: string | null;
-    onNewTaskClick: () => void;
-}
-
-export const CronJobEmptyState = ({
-    selectedUser,
-    onNewTaskClick,
-}: CronJobEmptyStateProps) => {
-    return (
-        <div className="text-center py-16">
-            <div className="mx-auto w-20 h-20 bg-gradient-to-br from-primary/20 to-blue-500/20 rounded-full flex items-center justify-center mb-6">
-                <ClockIcon className="h-10 w-10 text-primary" />
-            </div>
-            <h3 className="text-xl font-semibold mb-3 brand-gradient">
-                {selectedUser
-                    ? `No tasks for user ${selectedUser}`
-                    : "No scheduled tasks yet"}
-            </h3>
-            <p className="text-muted-foreground mb-6 max-w-md mx-auto">
-                {selectedUser
-                    ? `No scheduled tasks found for user ${selectedUser}. Try selecting a different user or create a new task.`
-                    : "Create your first scheduled task to automate your system operations and boost productivity."}
-            </p>
-            <Button
-                onClick={onNewTaskClick}
-                className="btn-primary glow-primary"
-                size="lg"
-            >
-                <PlusIcon className="h-5 w-5 mr-2" />
-                Create Your First Task
-            </Button>
-        </div>
-    );
-};

app/_components/FeatureComponents/Cronjobs/Parts/CronJobItem.tsx

@@ -1,380 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { DropdownMenu } from "@/app/_components/GlobalComponents/UIElements/DropdownMenu";
-import {
-  TrashIcon,
-  PencilSimpleIcon,
-  FilesIcon,
-  UserIcon,
-  PlayIcon,
-  PauseIcon,
-  CodeIcon,
-  InfoIcon,
-  FileArrowDownIcon,
-  FileXIcon,
-  FileTextIcon,
-  WarningCircleIcon,
-  CheckCircleIcon,
-  WarningIcon,
-  DownloadIcon,
-  HashIcon,
-  CheckIcon,
-} from "@phosphor-icons/react";
-import { CronJob } from "@/app/_utils/cronjob-utils";
-import { JobError } from "@/app/_utils/error-utils";
-import { ErrorBadge } from "@/app/_components/GlobalComponents/Badges/ErrorBadge";
-import {
-  parseCronExpression,
-  type CronExplanation,
-} from "@/app/_utils/parser-utils";
-import { unwrapCommand } from "@/app/_utils/wrapper-utils-client";
-import { useLocale } from "next-intl";
-import { useTranslations } from "next-intl";
-import { copyToClipboard } from "@/app/_utils/global-utils";
-
-interface CronJobItemProps {
-  job: CronJob;
-  errors: JobError[];
-  runningJobId: string | null;
-  deletingId: string | null;
-  scheduleDisplayMode: "cron" | "human" | "both";
-  onRun: (id: string) => void;
-  onEdit: (job: CronJob) => void;
-  onClone: (job: CronJob) => void;
-  onResume: (id: string) => void;
-  onPause: (id: string) => void;
-  onDelete: (job: CronJob) => void;
-  onToggleLogging: (id: string) => void;
-  onViewLogs: (job: CronJob) => void;
-  onBackup: (id: string) => void;
-  onErrorClick: (error: JobError) => void;
-  onErrorDismiss: () => void;
-}
-
-export const CronJobItem = ({
-  job,
-  errors,
-  runningJobId,
-  deletingId,
-  scheduleDisplayMode,
-  onRun,
-  onEdit,
-  onClone,
-  onResume,
-  onPause,
-  onDelete,
-  onToggleLogging,
-  onViewLogs,
-  onBackup,
-  onErrorClick,
-  onErrorDismiss,
-}: CronJobItemProps) => {
-  const [cronExplanation, setCronExplanation] =
-    useState<CronExplanation | null>(null);
-  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
-  const [showCopyConfirmation, setShowCopyConfirmation] = useState(false);
-  const locale = useLocale();
-  const t = useTranslations();
-  const displayCommand = unwrapCommand(job.command);
-  const [commandCopied, setCommandCopied] = useState<string | null>(null);
-
-  useEffect(() => {
-    if (job.schedule) {
-      const explanation = parseCronExpression(job.schedule, locale);
-      setCronExplanation(explanation);
-    } else {
-      setCronExplanation(null);
-    }
-  }, [job.schedule]);
-
-  const dropdownMenuItems = [
-    {
-      label: t("cronjobs.editCronJob"),
-      icon: <PencilSimpleIcon className="h-3 w-3" />,
-      onClick: () => onEdit(job),
-    },
-    {
-      label: job.logsEnabled
-        ? t("cronjobs.disableLogging")
-        : t("cronjobs.enableLogging"),
-      icon: job.logsEnabled ? (
-        <FileXIcon className="h-3 w-3" />
-      ) : (
-        <FileArrowDownIcon className="h-3 w-3" />
-      ),
-      onClick: () => onToggleLogging(job.id),
-    },
-    ...(job.logsEnabled
-      ? [
-        {
-          label: t("cronjobs.viewLogs"),
-          icon: <FileTextIcon className="h-3 w-3" />,
-          onClick: () => onViewLogs(job),
-        },
-      ]
-      : []),
-    {
-      label: job.paused
-        ? t("cronjobs.resumeCronJob")
-        : t("cronjobs.pauseCronJob"),
-      icon: job.paused ? (
-        <PlayIcon className="h-3 w-3" />
-      ) : (
-        <PauseIcon className="h-3 w-3" />
-      ),
-      onClick: () => (job.paused ? onResume(job.id) : onPause(job.id)),
-    },
-    {
-      label: t("cronjobs.cloneCronJob"),
-      icon: <FilesIcon className="h-3 w-3" />,
-      onClick: () => onClone(job),
-    },
-    {
-      label: t("cronjobs.backupJob"),
-      icon: <DownloadIcon className="h-3 w-3" />,
-      onClick: () => onBackup(job.id),
-    },
-    {
-      label: t("cronjobs.deleteCronJob"),
-      icon: <TrashIcon className="h-3 w-3" />,
-      onClick: () => onDelete(job),
-      variant: "destructive" as const,
-      disabled: deletingId === job.id,
-    },
-  ];
-
-  return (
-    <div
-      key={job.id}
-      className={`tui-card p-4 terminal-font transition-colors ${isDropdownOpen ? "relative z-10" : ""
-        }`}
-    >
-      <div className="flex flex-col sm:flex-row sm:items-start gap-4">
-        <div className="flex-1 min-w-0">
-          <div className="flex items-center gap-3 mb-2">
-            {(scheduleDisplayMode === "cron" ||
-              scheduleDisplayMode === "both") && (
-                <code className="text-sm bg-background0 text-status-warning px-2 py-1 terminal-font ascii-border">
-                  {job.schedule}
-                </code>
-              )}
-            {scheduleDisplayMode === "human" && cronExplanation?.isValid && (
-              <div className="flex items-start gap-1.5 ascii-border bg-background2 px-2 py-0.5">
-                <InfoIcon className="h-3 w-3 mt-0.5 flex-shrink-0" />
-                <p className="text-sm italic">
-                  {cronExplanation.humanReadable}
-                </p>
-              </div>
-            )}
-            <div className="flex-1 min-w-0">
-              <div className="flex items-center gap-2 min-w-0 w-full">
-                {commandCopied === job.id && (
-                  <CheckIcon className="h-3 w-3 text-status-success" />
-                )}
-                <pre
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    copyToClipboard(unwrapCommand(job.command));
-                    setCommandCopied(job.id);
-                    setTimeout(() => setCommandCopied(null), 3000);
-                  }}
-                  className="w-full cursor-pointer overflow-x-auto text-sm font-medium terminal-font bg-background1 px-2 py-1 ascii-border hide-scrollbar"
-                >
-                  {unwrapCommand(displayCommand)}
-                </pre>
-              </div>
-            </div>
-          </div>
-
-          <div className="flex items-center gap-2 pb-2 pt-4">
-            {scheduleDisplayMode === "both" && cronExplanation?.isValid && (
-              <div className="flex items-start gap-1.5 ascii-border bg-background2 px-2 py-0.5">
-                <InfoIcon className="h-3 w-3 mt-0.5 flex-shrink-0" />
-                <p className="text-xs italic">
-                  {cronExplanation.humanReadable}
-                </p>
-              </div>
-            )}
-
-            {job.comment && (
-              <p
-                className="text-xs italic truncate"
-                title={job.comment}
-              >
-                {job.comment}
-              </p>
-            )}
-          </div>
-
-          <div className="flex flex-wrap items-center gap-2 py-3">
-            <div className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border cursor-pointer hover:bg-background2 transition-colors relative terminal-font">
-              <UserIcon className="h-3 w-3" />
-              <span>{job.user}</span>
-            </div>
-
-            <div
-              className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border cursor-pointer hover:bg-background2 transition-colors relative terminal-font"
-              title="Click to copy Job UUID"
-              onClick={async () => {
-                const success = await copyToClipboard(job.id);
-                if (success) {
-                  setShowCopyConfirmation(true);
-                  setTimeout(() => setShowCopyConfirmation(false), 3000);
-                }
-              }}
-            >
-              {showCopyConfirmation ? (
-                <CheckIcon className="h-3 w-3 text-status-success" />
-              ) : (
-                <HashIcon className="h-3 w-3" />
-              )}
-              <span className="font-mono">{job.id}</span>
-            </div>
-
-            {job.paused && (
-              <span className="text-xs bg-background2 px-2 py-0.5 ascii-border terminal-font">
-                <span className="text-status-warning">{t("cronjobs.paused")}</span>
-              </span>
-            )}
-
-            {job.logsEnabled && (
-              <span className="text-xs bg-background0 px-2 py-0.5 ascii-border terminal-font">
-                <span className="text-status-info">{t("cronjobs.logged")}</span>
-              </span>
-            )}
-
-            {job.logsEnabled && job.logError?.hasError && (
-              <button
-                onClick={(e) => {
-                  e.stopPropagation();
-                  onViewLogs(job);
-                }}
-                className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border hover:bg-background1 transition-colors cursor-pointer terminal-font"
-                title="Latest execution failed - Click to view error log"
-              >
-                <WarningCircleIcon className="h-3 w-3 text-status-error" />
-                <span className="text-status-error">
-                  {t("cronjobs.failed", {
-                    exitCode: job.logError?.exitCode?.toString() ?? "",
-                  })}
-                </span>
-              </button>
-            )}
-
-            {job.logsEnabled &&
-              !job.logError?.hasError &&
-              job.logError?.hasHistoricalFailures && (
-                <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    onViewLogs(job);
-                  }}
-                  className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border hover:bg-background1 transition-colors cursor-pointer terminal-font"
-                  title="Latest execution succeeded, but has historical failures - Click to view logs"
-                >
-                  <CheckCircleIcon className="h-3 w-3 text-status-success" />
-                  <span className="text-status-warning">{t("cronjobs.healthy")}</span>
-                  <WarningIcon className="h-3 w-3 text-status-warning" />
-                </button>
-              )}
-
-            {job.logsEnabled &&
-              !job.logError?.hasError &&
-              !job.logError?.hasHistoricalFailures &&
-              job.logError?.latestExitCode === 0 && (
-                <div className="flex items-center gap-1 text-xs bg-background0 px-2 py-0.5 ascii-border terminal-font">
-                  <CheckCircleIcon className="h-3 w-3 text-status-success" />
-                  <span className="text-status-success">{t("cronjobs.healthy")}</span>
-                </div>
-              )}
-
-            {!job.logsEnabled && (
-              <ErrorBadge
-                errors={errors}
-                onErrorClick={onErrorClick}
-                onErrorDismiss={onErrorDismiss}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className="flex items-center gap-2 justify-between sm:justify-end">
-          <div className="flex items-center gap-2 flex-shrink-0">
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={() => onRun(job.id)}
-              disabled={runningJobId === job.id || job.paused}
-              className="btn-outline h-8 px-3"
-              title={t("cronjobs.runCronManually")}
-              aria-label={t("cronjobs.runCronManually")}
-            >
-              {runningJobId === job.id ? (
-                <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
-              ) : (
-                <CodeIcon className="h-3 w-3" />
-              )}
-            </Button>
-
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={() => {
-                if (job.paused) {
-                  onResume(job.id);
-                } else {
-                  onPause(job.id);
-                }
-              }}
-              className="btn-outline h-8 px-3"
-              title={t("cronjobs.pauseCronJob")}
-              aria-label={t("cronjobs.pauseCronJob")}
-            >
-              {job.paused ? (
-                <PlayIcon className="h-3 w-3" />
-              ) : (
-                <PauseIcon className="h-3 w-3" />
-              )}
-            </Button>
-
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={() => {
-                if (job.logsEnabled) {
-                  onViewLogs(job);
-                } else {
-                  onToggleLogging(job.id);
-                }
-              }}
-              className="btn-outline h-8 px-3"
-              title={
-                job.logsEnabled
-                  ? t("cronjobs.viewLogs")
-                  : t("cronjobs.enableLogging")
-              }
-              aria-label={
-                job.logsEnabled
-                  ? t("cronjobs.viewLogs")
-                  : t("cronjobs.enableLogging")
-              }
-            >
-              {job.logsEnabled ? (
-                <FileTextIcon className="h-3 w-3" />
-              ) : (
-                <FileArrowDownIcon className="h-3 w-3" />
-              )}
-            </Button>
-          </div>
-
-          <DropdownMenu
-            items={dropdownMenuItems}
-            onOpenChange={setIsDropdownOpen}
-          />
-        </div>
-      </div>
-    </div>
-  );
-};

app/_components/FeatureComponents/Cronjobs/Parts/MinimalCronJobItem.tsx

@@ -1,310 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { DropdownMenu } from "@/app/_components/GlobalComponents/UIElements/DropdownMenu";
-import {
-  TrashIcon,
-  PencilSimpleIcon,
-  FilesIcon,
-  PlayIcon,
-  PauseIcon,
-  CodeIcon,
-  InfoIcon,
-  DownloadIcon,
-  CheckIcon,
-  FileXIcon,
-  FileTextIcon,
-  FileArrowDownIcon,
-} from "@phosphor-icons/react";
-import { CronJob } from "@/app/_utils/cronjob-utils";
-import { JobError } from "@/app/_utils/error-utils";
-import {
-  parseCronExpression,
-  type CronExplanation,
-} from "@/app/_utils/parser-utils";
-import { unwrapCommand } from "@/app/_utils/wrapper-utils-client";
-import { useLocale } from "next-intl";
-import { useTranslations } from "next-intl";
-import { copyToClipboard } from "@/app/_utils/global-utils";
-
-interface MinimalCronJobItemProps {
-  job: CronJob;
-  errors: JobError[];
-  runningJobId: string | null;
-  deletingId: string | null;
-  scheduleDisplayMode: "cron" | "human" | "both";
-  onRun: (id: string) => void;
-  onEdit: (job: CronJob) => void;
-  onClone: (job: CronJob) => void;
-  onResume: (id: string) => void;
-  onPause: (id: string) => void;
-  onDelete: (job: CronJob) => void;
-  onToggleLogging: (id: string) => void;
-  onViewLogs: (job: CronJob) => void;
-  onBackup: (id: string) => void;
-  onErrorClick: (error: JobError) => void;
-}
-
-export const MinimalCronJobItem = ({
-  job,
-  errors,
-  runningJobId,
-  deletingId,
-  scheduleDisplayMode,
-  onRun,
-  onEdit,
-  onClone,
-  onResume,
-  onPause,
-  onDelete,
-  onToggleLogging,
-  onViewLogs,
-  onBackup,
-  onErrorClick,
-}: MinimalCronJobItemProps) => {
-  const [cronExplanation, setCronExplanation] =
-    useState<CronExplanation | null>(null);
-  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
-  const [commandCopied, setCommandCopied] = useState<string | null>(null);
-  const locale = useLocale();
-  const t = useTranslations();
-  const displayCommand = unwrapCommand(job.command);
-
-  useEffect(() => {
-    if (job.schedule) {
-      const explanation = parseCronExpression(job.schedule, locale);
-      setCronExplanation(explanation);
-    } else {
-      setCronExplanation(null);
-    }
-  }, [job.schedule]);
-
-  const dropdownMenuItems = [
-    {
-      label: t("cronjobs.editCronJob"),
-      icon: <PencilSimpleIcon className="h-3 w-3" />,
-      onClick: () => onEdit(job),
-    },
-    {
-      label: job.logsEnabled
-        ? t("cronjobs.disableLogging")
-        : t("cronjobs.enableLogging"),
-      icon: job.logsEnabled ? (
-        <FileXIcon className="h-3 w-3" />
-      ) : (
-        <CodeIcon className="h-3 w-3" />
-      ),
-      onClick: () => onToggleLogging(job.id),
-    },
-    ...(job.logsEnabled
-      ? [
-        {
-          label: t("cronjobs.viewLogs"),
-          icon: <CodeIcon className="h-3 w-3" />,
-          onClick: () => onViewLogs(job),
-        },
-      ]
-      : []),
-    {
-      label: job.paused
-        ? t("cronjobs.resumeCronJob")
-        : t("cronjobs.pauseCronJob"),
-      icon: job.paused ? (
-        <PlayIcon className="h-3 w-3" />
-      ) : (
-        <PauseIcon className="h-3 w-3" />
-      ),
-      onClick: () => (job.paused ? onResume(job.id) : onPause(job.id)),
-    },
-    {
-      label: t("cronjobs.cloneCronJob"),
-      icon: <FilesIcon className="h-3 w-3" />,
-      onClick: () => onClone(job),
-    },
-    {
-      label: t("cronjobs.backupJob"),
-      icon: <DownloadIcon className="h-3 w-3" />,
-      onClick: () => onBackup(job.id),
-    },
-    {
-      label: t("cronjobs.deleteCronJob"),
-      icon: <TrashIcon className="h-3 w-3" />,
-      onClick: () => onDelete(job),
-      variant: "destructive" as const,
-      disabled: deletingId === job.id,
-    },
-  ];
-
-  return (
-    <div
-      key={job.id}
-      className={`tui-card p-3 terminal-font transition-colors ${isDropdownOpen ? "relative z-10" : ""
-        }`}
-    >
-      <div className="flex items-center gap-3">
-        <div className="flex items-center gap-1 flex-shrink-0">
-          {scheduleDisplayMode === "cron" && (
-            <code className="text-xs bg-background0 text-status-warning px-1.5 py-0.5 terminal-font ascii-border">
-              {job.schedule}
-            </code>
-          )}
-          {scheduleDisplayMode === "human" && cronExplanation?.isValid && (
-            <div className="flex items-center gap-1 ascii-border bg-background2 px-1.5 py-0.5">
-              <InfoIcon className="h-3 w-3 flex-shrink-0" />
-              <span className="text-xs italic truncate max-w-32">
-                {cronExplanation.humanReadable}
-              </span>
-            </div>
-          )}
-          {scheduleDisplayMode === "both" && (
-            <div className="flex items-center gap-1">
-              <code className="text-xs bg-background0 text-status-warning px-1 py-0.5 terminal-font ascii-border">
-                {job.schedule}
-              </code>
-              {cronExplanation?.isValid && (
-                <div
-                  className="flex items-center gap-1 ascii-border bg-background0 px-1 py-0.5 cursor-help"
-                  title={cronExplanation.humanReadable}
-                >
-                  <InfoIcon className="h-2.5 w-2.5 flex-shrink-0" />
-                </div>
-              )}
-            </div>
-          )}
-        </div>
-
-        <div className="flex-1 min-w-0">
-          <div className="flex items-center gap-2">
-            {commandCopied === job.id && (
-              <CheckIcon className="h-3 w-3 text-status-success flex-shrink-0" />
-            )}
-            <pre
-              onClick={(e) => {
-                e.stopPropagation();
-                copyToClipboard(unwrapCommand(job.command));
-                setCommandCopied(job.id);
-                setTimeout(() => setCommandCopied(null), 3000);
-              }}
-              className="flex-1 cursor-pointer overflow-hidden text-sm font-medium terminal-font bg-background1 px-2 py-1 ascii-border truncate"
-              title={unwrapCommand(job.command)}
-            >
-              {unwrapCommand(displayCommand)}
-            </pre>
-          </div>
-        </div>
-
-        <div className="flex items-center gap-1 flex-shrink-0">
-          {job.logsEnabled && (
-            <div
-              className="w-2 h-2 bg-status-info ascii-border"
-              title={t("cronjobs.logged")}
-            />
-          )}
-          {job.paused && (
-            <div
-              className="w-2 h-2 bg-status-warning ascii-border"
-              title={t("cronjobs.paused")}
-            />
-          )}
-          {!job.logError?.hasError && job.logsEnabled && (
-            <div
-              className="w-2 h-2 bg-status-success ascii-border"
-              title={t("cronjobs.healthy")}
-            />
-          )}
-          {job.logsEnabled && job.logError?.hasError && (
-            <div
-              className="w-2 h-2 bg-status-error ascii-border cursor-pointer"
-              title="Latest execution failed - Click to view error log"
-              onClick={(e) => {
-                e.stopPropagation();
-                onViewLogs(job);
-              }}
-            />
-          )}
-          {!job.logsEnabled && errors.length > 0 && (
-            <div
-              className="w-2 h-2 bg-status-warning ascii-border cursor-pointer"
-              title={`${errors.length} error(s)`}
-              onClick={(e) => onErrorClick(errors[0])}
-            />
-          )}
-        </div>
-
-        <div className="flex items-center gap-2 flex-shrink-0">
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => onRun(job.id)}
-            disabled={runningJobId === job.id || job.paused}
-            className="btn-outline h-8 px-3"
-            title={t("cronjobs.runCronManually")}
-            aria-label={t("cronjobs.runCronManually")}
-          >
-            {runningJobId === job.id ? (
-              <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
-            ) : (
-              <CodeIcon className="h-3 w-3" />
-            )}
-          </Button>
-
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => {
-              if (job.paused) {
-                onResume(job.id);
-              } else {
-                onPause(job.id);
-              }
-            }}
-            className="btn-outline h-8 px-3"
-            title={t("cronjobs.pauseCronJob")}
-            aria-label={t("cronjobs.pauseCronJob")}
-          >
-            {job.paused ? (
-              <PlayIcon className="h-3 w-3" />
-            ) : (
-              <PauseIcon className="h-3 w-3" />
-            )}
-          </Button>
-
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => {
-              if (job.logsEnabled) {
-                onViewLogs(job);
-              } else {
-                onToggleLogging(job.id);
-              }
-            }}
-            className="btn-outline h-8 px-3"
-            title={
-              job.logsEnabled
-                ? t("cronjobs.viewLogs")
-                : t("cronjobs.enableLogging")
-            }
-            aria-label={
-              job.logsEnabled
-                ? t("cronjobs.viewLogs")
-                : t("cronjobs.enableLogging")
-            }
-          >
-            {job.logsEnabled ? (
-              <FileTextIcon className="h-3 w-3" />
-            ) : (
-              <FileArrowDownIcon className="h-3 w-3" />
-            )}
-          </Button>
-
-          <DropdownMenu
-            items={dropdownMenuItems}
-            onOpenChange={setIsDropdownOpen}
-          />
-        </div>
-      </div>
-    </div>
-  );
-};

app/_components/FeatureComponents/Layout/TabbedInterface.tsx

@@ -1,67 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { CronJobList } from "@/app/_components/FeatureComponents/Cronjobs/CronJobList";
-import { ScriptsManager } from "@/app/_components/FeatureComponents/Scripts/ScriptsManager";
-import { CronJob } from "@/app/_utils/cronjob-utils";
-import { Script } from "@/app/_utils/scripts-utils";
-import { ClockIcon, FileTextIcon } from "@phosphor-icons/react";
-import { useTranslations } from "next-intl";
-
-interface TabbedInterfaceProps {
-  cronJobs: CronJob[];
-  scripts: Script[];
-}
-
-export const TabbedInterface = ({
-  cronJobs,
-  scripts,
-}: TabbedInterfaceProps) => {
-  const [activeTab, setActiveTab] = useState<"cronjobs" | "scripts">(
-    "cronjobs"
-  );
-  const t = useTranslations();
-
-  return (
-    <div className="space-y-6">
-      <div className="tui-card p-1 terminal-font">
-        <div className="flex gap-2">
-          <button
-            onClick={() => setActiveTab("cronjobs")}
-            className={`flex items-center gap-2 px-4 py-2 text-sm font-medium flex-1 justify-center terminal-font ${activeTab === "cronjobs"
-              ? "bg-background0 ascii-border"
-              : "hover:ascii-border"
-              }`}
-          >
-            <ClockIcon className="h-4 w-4" />
-            {t("cronjobs.cronJobs")}
-            <span className="ml-1 text-xs bg-background2 px-2 py-0.5 ascii-border font-medium">
-              {cronJobs.length}
-            </span>
-          </button>
-          <button
-            onClick={() => setActiveTab("scripts")}
-            className={`flex items-center gap-2 px-4 py-2 text-sm font-medium flex-1 justify-center terminal-font ${activeTab === "scripts"
-              ? "bg-background0 ascii-border"
-              : "hover:ascii-border"
-              }`}
-          >
-            <FileTextIcon className="h-4 w-4" />
-            {t("scripts.scripts")}
-            <span className="ml-1 text-xs bg-background2 px-2 py-0.5 ascii-border font-medium">
-              {scripts.length}
-            </span>
-          </button>
-        </div>
-      </div>
-
-      <div className="min-h-[60vh]">
-        {activeTab === "cronjobs" ? (
-          <CronJobList cronJobs={cronJobs} scripts={scripts} />
-        ) : (
-          <ScriptsManager scripts={scripts} />
-        )}
-      </div>
-    </div>
-  );
-};

app/_components/FeatureComponents/LoginForm/LoginForm.tsx

@@ -1,215 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
-import { useTranslations } from "next-intl";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
-import {
-  Card,
-  CardHeader,
-  CardTitle,
-  CardDescription,
-  CardContent,
-} from "@/app/_components/GlobalComponents/Cards/Card";
-import { LockIcon, EyeIcon, EyeSlashIcon, ShieldIcon, WarningIcon, CircleNotchIcon } from "@phosphor-icons/react";
-
-interface LoginFormProps {
-  hasPassword?: boolean;
-  hasOIDC?: boolean;
-  oidcAutoRedirect?: boolean;
-  version?: string;
-}
-
-export const LoginForm = ({
-  hasPassword = false,
-  hasOIDC = false,
-  oidcAutoRedirect = false,
-  version,
-}: LoginFormProps) => {
-  const [password, setPassword] = useState("");
-  const [showPassword, setShowPassword] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-  const [error, setError] = useState("");
-  const [isRedirecting, setIsRedirecting] = useState(false);
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const t = useTranslations();
-
-  useEffect(() => {
-    const errorParam = searchParams.get("error");
-
-    if (errorParam) {
-      setError(decodeURIComponent(errorParam));
-      return;
-    }
-
-    if (oidcAutoRedirect && !hasPassword && hasOIDC) {
-      setIsRedirecting(true);
-      window.location.href = "/api/oidc/login";
-    }
-  }, [oidcAutoRedirect, hasPassword, hasOIDC, searchParams]);
-
-  const handlePasswordSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    setIsLoading(true);
-    setError("");
-
-    try {
-      const response = await fetch("/api/auth/login", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ password }),
-      });
-
-      const result = await response.json();
-
-      if (result.success) {
-        router.push("/");
-      } else {
-        setError(result.message || t("login.loginFailed"));
-      }
-    } catch (error) {
-      setError(t("login.genericError"));
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const handleOIDCLogin = () => {
-    setIsLoading(true);
-    window.location.href = "/api/oidc/login";
-  };
-
-  if (isRedirecting) {
-    return (
-      <Card className="w-full max-w-md shadow-xl">
-        <CardContent className="pt-6">
-          <div className="flex flex-col items-center justify-center py-8 space-y-4">
-            <CircleNotchIcon className="w-12 h-12 text-primary animate-spin" />
-            <div className="text-center">
-              <p className="text-lg font-medium">{t("login.redirectingToOIDC")}</p>
-              <p className="text-sm text-muted-foreground mt-1">
-                {t("login.pleaseWait")}
-              </p>
-            </div>
-          </div>
-        </CardContent>
-      </Card>
-    );
-  }
-
-  return (
-    <Card className="w-full max-w-md shadow-xl">
-      <CardHeader className="text-center">
-        <div className="mx-auto w-16 h-16 bg-primary/10 rounded-full flex items-center justify-center mb-4">
-          <LockIcon className="w-8 h-8 text-primary" />
-        </div>
-        <CardTitle>{t("login.welcomeTitle")}</CardTitle>
-        <CardDescription>
-          {hasPassword && hasOIDC
-            ? t("login.signInWithPasswordOrSSO")
-            : hasOIDC
-              ? t("login.signInWithSSO")
-              : t("login.enterPasswordToContinue")}
-        </CardDescription>
-      </CardHeader>
-
-      <CardContent>
-        {!hasPassword && !hasOIDC && (
-          <div className="mb-4 p-3 bg-amber-500/10 border border-amber-500/20 rounded-md">
-            <div className="flex items-start space-x-2">
-              <WarningIcon className="w-4 h-4 text-amber-500 mt-0.5 flex-shrink-0" />
-              <div className="text-sm text-amber-700 dark:text-amber-400">
-                <div className="font-medium">
-                  {t("login.authenticationNotConfigured")}
-                </div>
-                <div className="mt-1">{t("login.noAuthMethodsEnabled")}</div>
-              </div>
-            </div>
-          </div>
-        )}
-
-        <div className="space-y-4">
-          {hasPassword && (
-            <form onSubmit={handlePasswordSubmit} className="space-y-4">
-              <div className="relative">
-                <Input
-                  type={showPassword ? "text" : "password"}
-                  value={password}
-                  onChange={(e) => setPassword(e.target.value)}
-                  placeholder={t("login.enterPassword")}
-                  className="pr-10"
-                  required
-                  disabled={isLoading}
-                />
-                <button
-                  type="button"
-                  onClick={() => setShowPassword(!showPassword)}
-                  className="absolute right-3 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground transition-colors"
-                  disabled={isLoading}
-                >
-                  {showPassword ? (
-                    <EyeSlashIcon className="w-4 h-4" />
-                  ) : (
-                    <EyeIcon className="w-4 h-4" />
-                  )}
-                </button>
-              </div>
-
-              <Button
-                type="submit"
-                className="w-full"
-                disabled={isLoading || !password.trim()}
-              >
-                {isLoading ? t("login.signingIn") : t("login.signIn")}
-              </Button>
-            </form>
-          )}
-
-          {hasPassword && hasOIDC && (
-            <div className="relative">
-              <div className="absolute inset-0 flex items-center">
-                <span className="w-full border-t" />
-              </div>
-              <div className="relative flex justify-center text-xs uppercase">
-                <span className="bg-background0 px-2 text-muted-foreground">
-                  {t("login.orContinueWith")}
-                </span>
-              </div>
-            </div>
-          )}
-
-          {hasOIDC && (
-            <Button
-              type="button"
-              variant="outline"
-              className="w-full"
-              onClick={handleOIDCLogin}
-              disabled={isLoading}
-            >
-              <ShieldIcon className="w-4 h-4 mr-2" />
-              {isLoading ? t("login.redirecting") : t("login.signInWithSSO")}
-            </Button>
-          )}
-
-          {error && (
-            <div className="text-sm text-red-500 bg-red-500/10 border border-red-500/20 rounded-md p-3">
-              {error}
-            </div>
-          )}
-        </div>
-
-        {version && (
-          <div className="mt-6 pt-4 border-t border-border">
-            <div className="text-center text-xs text-muted-foreground">
-              Cr*nMaster {t("common.version", { version })}
-            </div>
-          </div>
-        )}
-      </CardContent>
-    </Card>
-  );
-};

app/_components/FeatureComponents/LoginForm/LogoutButton.tsx

@@ -1,42 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { useRouter } from "next/navigation";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { SignOutIcon } from "@phosphor-icons/react";
-
-export const LogoutButton = () => {
-  const [isLoading, setIsLoading] = useState(false);
-  const router = useRouter();
-
-  const handleLogout = async () => {
-    setIsLoading(true);
-    try {
-      const response = await fetch("/api/auth/logout", {
-        method: "POST",
-      });
-
-      if (response.ok) {
-        router.push("/login");
-        router.refresh();
-      }
-    } catch (error) {
-      console.error("Logout error:", error);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return (
-    <Button
-      variant="ghost"
-      size="icon"
-      onClick={handleLogout}
-      disabled={isLoading}
-      title="Logout"
-    >
-      <SignOutIcon className="h-[1.2rem] w-[1.2rem]" />
-      <span className="sr-only">Logout</span>
-    </Button>
-  );
-};

app/_components/FeatureComponents/Modals/CronJobListsModals.tsx

@@ -1,121 +0,0 @@
-"use client";
-
-import { CreateTaskModal } from "@/app/_components/FeatureComponents/Modals/CreateTaskModal";
-import { EditTaskModal } from "@/app/_components/FeatureComponents/Modals/EditTaskModal";
-import { DeleteTaskModal } from "@/app/_components/FeatureComponents/Modals/DeleteTaskModal";
-import { CloneTaskModal } from "@/app/_components/FeatureComponents/Modals/CloneTaskModal";
-import { ErrorDetailsModal } from "@/app/_components/FeatureComponents/Modals/ErrorDetailsModal";
-import { CronJob } from "@/app/_utils/cronjob-utils";
-import { Script } from "@/app/_utils/scripts-utils";
-import { JobError } from "@/app/_utils/error-utils";
-
-interface CronJobListModalsProps {
-    cronJobs: CronJob[];
-    scripts: Script[];
-
-    isNewCronModalOpen: boolean;
-    onNewCronModalClose: () => void;
-    onNewCronSubmit: (e: React.FormEvent) => Promise<void>;
-    newCronForm: any;
-    onNewCronFormChange: (updates: any) => void;
-
-    isEditModalOpen: boolean;
-    onEditModalClose: () => void;
-    onEditSubmit: (e: React.FormEvent) => Promise<void>;
-    editForm: any;
-    onEditFormChange: (updates: any) => void;
-
-    isDeleteModalOpen: boolean;
-    onDeleteModalClose: () => void;
-    onDeleteConfirm: () => void;
-    jobToDelete: CronJob | null;
-
-    isCloneModalOpen: boolean;
-    onCloneModalClose: () => void;
-    onCloneConfirm: (newComment: string) => Promise<void>;
-    jobToClone: CronJob | null;
-    isCloning: boolean;
-
-    isErrorModalOpen: boolean;
-    onErrorModalClose: () => void;
-    selectedError: JobError | null;
-}
-
-export const CronJobListModals = ({
-    scripts,
-    isNewCronModalOpen,
-    onNewCronModalClose,
-    onNewCronSubmit,
-    newCronForm,
-    onNewCronFormChange,
-    isEditModalOpen,
-    onEditModalClose,
-    onEditSubmit,
-    editForm,
-    onEditFormChange,
-    isDeleteModalOpen,
-    onDeleteModalClose,
-    onDeleteConfirm,
-    jobToDelete,
-    isCloneModalOpen,
-    onCloneModalClose,
-    onCloneConfirm,
-    jobToClone,
-    isCloning,
-    isErrorModalOpen,
-    onErrorModalClose,
-    selectedError,
-}: CronJobListModalsProps) => {
-    return (
-        <>
-            <CreateTaskModal
-                isOpen={isNewCronModalOpen}
-                onClose={onNewCronModalClose}
-                onSubmit={onNewCronSubmit}
-                scripts={scripts}
-                form={newCronForm}
-                onFormChange={onNewCronFormChange}
-            />
-
-            <EditTaskModal
-                isOpen={isEditModalOpen}
-                onClose={onEditModalClose}
-                onSubmit={onEditSubmit}
-                form={editForm}
-                onFormChange={onEditFormChange}
-            />
-
-            <DeleteTaskModal
-                isOpen={isDeleteModalOpen}
-                onClose={onDeleteModalClose}
-                onConfirm={onDeleteConfirm}
-                job={jobToDelete}
-            />
-
-            <CloneTaskModal
-                cronJob={jobToClone}
-                isOpen={isCloneModalOpen}
-                onClose={onCloneModalClose}
-                onConfirm={onCloneConfirm}
-                isCloning={isCloning}
-            />
-
-            {isErrorModalOpen && selectedError && (
-                <ErrorDetailsModal
-                    isOpen={isErrorModalOpen}
-                    onClose={onErrorModalClose}
-                    error={{
-                        title: selectedError.title,
-                        message: selectedError.message,
-                        details: selectedError.details,
-                        command: selectedError.command,
-                        output: selectedError.output,
-                        stderr: selectedError.stderr,
-                        timestamp: selectedError.timestamp,
-                        jobId: selectedError.jobId,
-                    }}
-                />
-            )}
-        </>
-    );
-};

app/_components/FeatureComponents/Modals/FiltersModal.tsx

@@ -1,155 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { CaretDownIcon, CodeIcon, ChatTextIcon } from "@phosphor-icons/react";
-import { UserFilter } from "@/app/_components/FeatureComponents/User/UserFilter";
-import { useTranslations } from "next-intl";
-
-interface FiltersModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  selectedUser: string | null;
-  onUserChange: (user: string | null) => void;
-  scheduleDisplayMode: "cron" | "human" | "both";
-  onScheduleDisplayModeChange: (mode: "cron" | "human" | "both") => void;
-}
-
-export const FiltersModal = ({
-  isOpen,
-  onClose,
-  selectedUser,
-  onUserChange,
-  scheduleDisplayMode,
-  onScheduleDisplayModeChange,
-}: FiltersModalProps) => {
-  const t = useTranslations();
-  const [localScheduleMode, setLocalScheduleMode] =
-    useState(scheduleDisplayMode);
-  const [isScheduleDropdownOpen, setIsScheduleDropdownOpen] = useState(false);
-
-  useEffect(() => {
-    setLocalScheduleMode(scheduleDisplayMode);
-  }, [scheduleDisplayMode]);
-
-  const handleSave = () => {
-    onScheduleDisplayModeChange(localScheduleMode);
-    onClose();
-  };
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onClose}
-      title={t("cronjobs.filtersAndDisplay")}
-      size="md"
-    >
-      <div className="space-y-6">
-        <div className="space-y-4 min-h-[200px]">
-          <div>
-            <label className="text-sm font-medium text-foreground mb-2 block">
-              {t("cronjobs.filterByUser")}
-            </label>
-            <UserFilter
-              selectedUser={selectedUser}
-              onUserChange={onUserChange}
-              className="w-full"
-            />
-          </div>
-
-          <div>
-            <label className="text-sm font-medium text-foreground mb-2 block">
-              {t("cronjobs.scheduleDisplay")}
-            </label>
-            <div className="relative">
-              <Button
-                variant="outline"
-                onClick={() =>
-                  setIsScheduleDropdownOpen(!isScheduleDropdownOpen)
-                }
-                className="btn-outline w-full justify-between"
-              >
-                <div className="flex items-center">
-                  {localScheduleMode === "cron" && (
-                    <CodeIcon className="h-4 w-4 mr-2" />
-                  )}
-                  {localScheduleMode === "human" && (
-                    <ChatTextIcon className="h-4 w-4 mr-2" />
-                  )}
-                  {localScheduleMode === "both" && (
-                    <>
-                      <CodeIcon className="h-4 w-4 mr-1" />
-                      <ChatTextIcon className="h-4 w-4 mr-2" />
-                    </>
-                  )}
-                  <span>
-                    {localScheduleMode === "cron" && t("cronjobs.cronSyntax")}
-                    {localScheduleMode === "human" &&
-                      t("cronjobs.humanReadable")}
-                    {localScheduleMode === "both" && t("cronjobs.both")}
-                  </span>
-                </div>
-                <CaretDownIcon className="h-4 w-4 ml-2" />
-              </Button>
-
-              {isScheduleDropdownOpen && (
-                <div className="absolute top-full left-0 right-0 mt-1 bg-background0 border border-border rounded-md shadow-lg z-50 min-w-[140px]">
-                  <button
-                    onClick={() => {
-                      setLocalScheduleMode("cron");
-                      setIsScheduleDropdownOpen(false);
-                    }}
-                    className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors flex items-center gap-2 ${localScheduleMode === "cron"
-                      ? "bg-accent text-accent-foreground"
-                      : ""
-                      }`}
-                  >
-                    <CodeIcon className="h-3 w-3" />
-                    {t("cronjobs.cronSyntax")}
-                  </button>
-                  <button
-                    onClick={() => {
-                      setLocalScheduleMode("human");
-                      setIsScheduleDropdownOpen(false);
-                    }}
-                    className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors flex items-center gap-2 ${localScheduleMode === "human"
-                      ? "bg-accent text-accent-foreground"
-                      : ""
-                      }`}
-                  >
-                    <ChatTextIcon className="h-3 w-3" />
-                    {t("cronjobs.humanReadable")}
-                  </button>
-                  <button
-                    onClick={() => {
-                      setLocalScheduleMode("both");
-                      setIsScheduleDropdownOpen(false);
-                    }}
-                    className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors flex items-center gap-2 ${localScheduleMode === "both"
-                      ? "bg-accent text-accent-foreground"
-                      : ""
-                      }`}
-                  >
-                    <CodeIcon className="h-3 w-3" />
-                    <ChatTextIcon className="h-3 w-3" />
-                    {t("cronjobs.both")}
-                  </button>
-                </div>
-              )}
-            </div>
-          </div>
-        </div>
-
-        <div className="flex justify-end gap-2 pt-4">
-          <Button variant="outline" onClick={onClose}>
-            {t("common.cancel")}
-          </Button>
-          <Button className="btn-primary" onClick={handleSave}>
-            {t("cronjobs.applyFilters")}
-          </Button>
-        </div>
-      </div>
-    </Modal>
-  );
-};

app/_components/FeatureComponents/Modals/LiveLogModal.tsx

@@ -1,366 +0,0 @@
-"use client";
-
-import { useState, useEffect, useRef, useCallback } from "react";
-import { CircleNotchIcon, CheckCircleIcon, XCircleIcon, WarningIcon, ArrowsInIcon, ArrowsOutIcon } from "@phosphor-icons/react";
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { useSSEContext } from "@/app/_contexts/SSEContext";
-import { SSEEvent } from "@/app/_utils/sse-events";
-import { usePageVisibility } from "@/app/_hooks/usePageVisibility";
-import { useTranslations } from "next-intl";
-
-interface LiveLogModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  runId: string;
-  jobId: string;
-  jobComment?: string;
-}
-
-const MAX_LINES_FULL_RENDER = 10000;
-const TAIL_LINES = 5000;
-
-export const LiveLogModal = ({
-  isOpen,
-  onClose,
-  runId,
-  jobId,
-  jobComment,
-}: LiveLogModalProps) => {
-  const t = useTranslations();
-  const [logContent, setLogContent] = useState<string>("");
-  const [status, setStatus] = useState<"running" | "completed" | "failed">(
-    "running"
-  );
-  const [exitCode, setExitCode] = useState<number | null>(null);
-  const [tailMode, setTailMode] = useState<boolean>(false);
-  const [showSizeWarning, setShowSizeWarning] = useState<boolean>(false);
-  const logEndRef = useRef<HTMLDivElement>(null);
-  const { subscribe } = useSSEContext();
-  const isPageVisible = usePageVisibility();
-  const lastOffsetRef = useRef<number>(0);
-  const abortControllerRef = useRef<AbortController | null>(null);
-  const [fileSize, setFileSize] = useState<number>(0);
-  const [lineCount, setLineCount] = useState<number>(0);
-  const [maxLines, setMaxLines] = useState<number>(500);
-  const [totalLines, setTotalLines] = useState<number>(0);
-  const [truncated, setTruncated] = useState<boolean>(false);
-  const [showFullLog, setShowFullLog] = useState<boolean>(false);
-  const [isJobComplete, setIsJobComplete] = useState<boolean>(false);
-
-  useEffect(() => {
-    if (isOpen) {
-      lastOffsetRef.current = 0;
-      setLogContent("");
-      setTailMode(false);
-      setShowSizeWarning(false);
-      setFileSize(0);
-      setLineCount(0);
-      setShowFullLog(false);
-      setIsJobComplete(false);
-    }
-  }, [isOpen, runId]);
-
-  useEffect(() => {
-    if (isOpen && runId && !isJobComplete) {
-      lastOffsetRef.current = 0;
-      setLogContent("");
-      fetchLogs();
-    }
-  }, [maxLines]);
-
-  const fetchLogs = useCallback(async () => {
-    if (abortControllerRef.current) {
-      abortControllerRef.current.abort();
-    }
-
-    const abortController = new AbortController();
-    abortControllerRef.current = abortController;
-
-    try {
-      const url = `/api/logs/stream?runId=${runId}&offset=${lastOffsetRef.current}&maxLines=${maxLines}`;
-      const response = await fetch(url, {
-        signal: abortController.signal,
-      });
-      const data = await response.json();
-
-      if (data.fileSize !== undefined) {
-        lastOffsetRef.current = data.fileSize;
-        setFileSize(data.fileSize);
-
-        if (data.fileSize > 10 * 1024 * 1024) {
-          setShowSizeWarning(true);
-        }
-      }
-
-      if (data.totalLines !== undefined) {
-        setTotalLines(data.totalLines);
-      }
-      setLineCount(data.displayedLines || 0);
-
-      if (data.truncated !== undefined) {
-        setTruncated(data.truncated);
-      }
-
-      if (lastOffsetRef.current === 0 && data.content) {
-        setLogContent(data.content);
-
-        if (data.truncated) {
-          setTailMode(true);
-        }
-      } else if (data.newContent) {
-        setLogContent((prev) => {
-          const combined = prev + data.newContent;
-          const lines = combined.split("\n");
-
-          if (lines.length > maxLines) {
-            return lines.slice(-maxLines).join("\n");
-          }
-
-          return combined;
-        });
-      }
-
-      const jobStatus = data.status || "running";
-      setStatus(jobStatus);
-
-      if (jobStatus === "completed" || jobStatus === "failed") {
-        setIsJobComplete(true);
-      }
-
-      if (data.exitCode !== undefined) {
-        setExitCode(data.exitCode);
-      }
-    } catch (error: any) {
-      if (error.name !== "AbortError") {
-        console.error("Failed to fetch logs:", error);
-      }
-    }
-  }, [runId, maxLines]);
-
-  useEffect(() => {
-    if (!isOpen || !runId || !isPageVisible) return;
-
-    fetchLogs();
-
-    let interval: NodeJS.Timeout | null = null;
-    if (isPageVisible && !isJobComplete) {
-      interval = setInterval(fetchLogs, 3000);
-    }
-
-    return () => {
-      if (interval) {
-        clearInterval(interval);
-      }
-      if (abortControllerRef.current) {
-        abortControllerRef.current.abort();
-      }
-    };
-  }, [isOpen, runId, isPageVisible, fetchLogs, isJobComplete]);
-
-  useEffect(() => {
-    if (!isOpen) return;
-
-    const unsubscribe = subscribe((event: SSEEvent) => {
-      if (event.type === "job-completed" && event.data.runId === runId) {
-        setStatus("completed");
-        setExitCode(event.data.exitCode);
-
-        fetch(`/api/logs/stream?runId=${runId}&offset=0`)
-          .then((res) => res.json())
-          .then((data) => {
-            if (data.content) {
-              const lines = data.content.split("\n");
-              setLineCount(lines.length);
-              if (tailMode && lines.length > TAIL_LINES) {
-                setLogContent(lines.slice(-TAIL_LINES).join("\n"));
-              } else {
-                setLogContent(data.content);
-              }
-            }
-          });
-      } else if (event.type === "job-failed" && event.data.runId === runId) {
-        setStatus("failed");
-        setExitCode(event.data.exitCode);
-
-        fetch(`/api/logs/stream?runId=${runId}&offset=0`)
-          .then((res) => res.json())
-          .then((data) => {
-            if (data.content) {
-              const lines = data.content.split("\n");
-              setLineCount(lines.length);
-              if (tailMode && lines.length > TAIL_LINES) {
-                setLogContent(lines.slice(-TAIL_LINES).join("\n"));
-              } else {
-                setLogContent(data.content);
-              }
-            }
-          });
-      }
-    });
-
-    return unsubscribe;
-  }, [isOpen, runId, subscribe, tailMode]);
-
-  useEffect(() => {
-    if (logEndRef.current) {
-      logEndRef.current.scrollIntoView({ behavior: "instant" });
-    }
-  }, [logContent]);
-
-  const toggleTailMode = () => {
-    setTailMode(!tailMode);
-    if (!tailMode) {
-      const lines = logContent.split("\n");
-      if (lines.length > TAIL_LINES) {
-        setLogContent(lines.slice(-TAIL_LINES).join("\n"));
-      }
-    }
-  };
-
-  const formatFileSize = (bytes: number): string => {
-    if (bytes < 1024) return `${bytes} B`;
-    if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
-  };
-
-  const titleWithStatus = (
-    <div className="flex items-center gap-3">
-      <span>{t("cronjobs.liveJobExecution")}{jobComment && `: ${jobComment}`}</span>
-      {status === "running" && (
-        <span className="flex items-center gap-1 text-sm text-status-info">
-          <CircleNotchIcon className="w-4 h-4 animate-spin" />
-          {t("cronjobs.running")}
-        </span>
-      )}
-      {status === "completed" && (
-        <span className="flex items-center gap-1 text-sm text-status-success">
-          <CheckCircleIcon className="w-4 h-4" />
-          {t("cronjobs.completed", { exitCode: exitCode ?? 0 })}
-        </span>
-      )}
-      {status === "failed" && (
-        <span className="flex items-center gap-1 text-sm text-status-error">
-          <XCircleIcon className="w-4 h-4" />
-          {t("cronjobs.jobFailed", { exitCode: exitCode ?? 1 })}
-        </span>
-      )}
-    </div>
-  );
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onClose}
-      title={titleWithStatus as any}
-      size="xl"
-      preventCloseOnClickOutside={status === "running"}
-    >
-      <div className="space-y-4">
-        <div className="flex items-center justify-between gap-4">
-          <div className="flex items-center gap-3">
-            {!showFullLog ? (
-              <>
-                <label htmlFor="maxLines" className="text-sm text-muted-foreground">
-                  {t("cronjobs.showLast")}
-                </label>
-                <select
-                  id="maxLines"
-                  value={maxLines}
-                  onChange={(e) => setMaxLines(parseInt(e.target.value, 10))}
-                  className="bg-background0 border border-border rounded px-2 py-1 text-sm"
-                >
-                  <option value="100">{t("cronjobs.nLines", { count: "100" })}</option>
-                  <option value="500">{t("cronjobs.nLines", { count: "500" })}</option>
-                  <option value="1000">{t("cronjobs.nLines", { count: "1,000" })}</option>
-                  <option value="2000">{t("cronjobs.nLines", { count: "2,000" })}</option>
-                  <option value="5000">{t("cronjobs.nLines", { count: "5,000" })}</option>
-                </select>
-                {truncated && (
-                  <Button
-                    type="button"
-                    variant="outline"
-                    size="sm"
-                    onClick={() => {
-                      setShowFullLog(true);
-                      setMaxLines(50000);
-                    }}
-                    className="text-xs"
-                  >
-                    {totalLines > 0
-                      ? t("cronjobs.viewFullLog", { totalLines: totalLines.toLocaleString() })
-                      : t("cronjobs.viewFullLogNoCount")}
-                  </Button>
-                )}
-              </>
-            ) : (
-              <div className="flex items-center gap-2">
-                <span className="text-sm text-muted-foreground">
-                  {totalLines > 0
-                    ? t("cronjobs.viewingFullLog", { totalLines: totalLines.toLocaleString() })
-                    : t("cronjobs.viewingFullLogNoCount")}
-                </span>
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  onClick={() => {
-                    setShowFullLog(false);
-                    setMaxLines(500);
-                  }}
-                  className="text-xs"
-                >
-                  {t("cronjobs.backToWindowedView")}
-                </Button>
-              </div>
-            )}
-          </div>
-          {truncated && !showFullLog && (
-            <div className="text-sm text-status-warning flex items-center gap-1 terminal-font">
-              <WarningIcon className="h-4 w-4" />
-              {t("cronjobs.showingLastOf", {
-                lineCount: lineCount.toLocaleString(),
-                totalLines: totalLines.toLocaleString()
-              })}
-            </div>
-          )}
-        </div>
-
-        {showSizeWarning && (
-          <div className="bg-background2 ascii-border p-3 flex items-start gap-3 terminal-font">
-            <WarningIcon className="h-4 w-4 text-status-warning mt-0.5 flex-shrink-0" />
-            <div className="flex-1 min-w-0">
-              <p className="text-sm text-foreground">
-                <span className="font-medium">{t("cronjobs.largeLogFileDetected")}</span> ({formatFileSize(fileSize)})
-                {tailMode && ` - ${t("cronjobs.tailModeEnabled", { tailLines: TAIL_LINES.toLocaleString() })}`}
-              </p>
-            </div>
-            <Button
-              type="button"
-              variant="ghost"
-              size="sm"
-              onClick={toggleTailMode}
-              className="text-status-warning hover:text-status-warning hover:bg-background2 h-auto py-1 px-2 text-xs"
-              title={tailMode ? t("cronjobs.showAllLines") : t("cronjobs.enableTailMode")}
-            >
-              {tailMode ? <ArrowsOutIcon className="h-3 w-3" /> : <ArrowsInIcon className="h-3 w-3" />}
-            </Button>
-          </div>
-        )}
-
-        <div className="bg-black/90 dark:bg-black/60 p-4 max-h-[60vh] overflow-auto terminal-font ascii-border">
-          <pre className="text-xs font-mono text-status-success whitespace-pre-wrap break-words">
-            {logContent || t("cronjobs.waitingForJobToStart")}
-            <div ref={logEndRef} />
-          </pre>
-        </div>
-
-        <div className="flex justify-between items-center text-xs text-muted-foreground">
-          <span>
-            {t("cronjobs.runIdJobId", { runId, jobId })}
-          </span>
-        </div>
-      </div>
-    </Modal>
-  );
-};

app/_components/FeatureComponents/Modals/LogsModal.tsx

@@ -1,298 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { FileTextIcon, TrashIcon, EyeIcon, XIcon, ArrowsClockwiseIcon, WarningCircleIcon, CheckCircleIcon } from "@phosphor-icons/react";
-import { useTranslations } from "next-intl";
-import {
-  getJobLogs,
-  getLogContent,
-  deleteLogFile,
-  deleteAllJobLogs,
-  getJobLogStats,
-} from "@/app/_server/actions/logs";
-
-interface LogEntry {
-  filename: string;
-  timestamp: string;
-  fullPath: string;
-  size: number;
-  dateCreated: Date;
-  exitCode?: number;
-  hasError?: boolean;
-}
-
-interface LogsModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  jobId: string;
-  jobComment?: string;
-  preSelectedLog?: string;
-}
-
-export const LogsModal = ({
-  isOpen,
-  onClose,
-  jobId,
-  jobComment,
-  preSelectedLog,
-}: LogsModalProps) => {
-  const t = useTranslations();
-  const [logs, setLogs] = useState<LogEntry[]>([]);
-  const [selectedLog, setSelectedLog] = useState<string | null>(null);
-  const [logContent, setLogContent] = useState<string>("");
-  const [isLoadingLogs, setIsLoadingLogs] = useState(false);
-  const [isLoadingContent, setIsLoadingContent] = useState(false);
-  const [stats, setStats] = useState<{
-    count: number;
-    totalSize: number;
-    totalSizeMB: number;
-  } | null>(null);
-
-  const loadLogs = async () => {
-    setIsLoadingLogs(true);
-    try {
-      const [logsData, statsData] = await Promise.all([
-        getJobLogs(jobId, false, true),
-        getJobLogStats(jobId),
-      ]);
-
-      setLogs(logsData);
-      setStats(statsData);
-    } catch (error) {
-      console.error("Error loading logs:", error);
-    } finally {
-      setIsLoadingLogs(false);
-    }
-  };
-
-  useEffect(() => {
-    if (isOpen) {
-      loadLogs().then(() => {
-        if (preSelectedLog) {
-          handleViewLog(preSelectedLog);
-        }
-      });
-      if (!preSelectedLog) {
-        setSelectedLog(null);
-        setLogContent("");
-      }
-    }
-  }, [isOpen, jobId, preSelectedLog]);
-
-  const handleViewLog = async (filename: string) => {
-    setIsLoadingContent(true);
-    setSelectedLog(filename);
-    try {
-      const content = await getLogContent(jobId, filename);
-      setLogContent(content);
-    } catch (error) {
-      console.error("Error loading log content:", error);
-      setLogContent("Error loading log content");
-    } finally {
-      setIsLoadingContent(false);
-    }
-  };
-
-  const handleDeleteLog = async (filename: string) => {
-    if (!confirm(t("cronjobs.confirmDeleteLog"))) return;
-
-    try {
-      const result = await deleteLogFile(jobId, filename);
-      if (result.success) {
-        await loadLogs();
-        if (selectedLog === filename) {
-          setSelectedLog(null);
-          setLogContent("");
-        }
-      } else {
-        alert(result.message);
-      }
-    } catch (error) {
-      console.error("Error deleting log:", error);
-      alert("Error deleting log file");
-    }
-  };
-
-  const handleDeleteAllLogs = async () => {
-    if (!confirm(t("cronjobs.confirmDeleteAllLogs"))) return;
-
-    try {
-      const result = await deleteAllJobLogs(jobId);
-      if (result.success) {
-        await loadLogs();
-        setSelectedLog(null);
-        setLogContent("");
-      } else {
-        alert(result.message);
-      }
-    } catch (error) {
-      console.error("Error deleting all logs:", error);
-      alert("Error deleting all logs");
-    }
-  };
-
-  const formatFileSize = (bytes: number): string => {
-    if (bytes < 1024) return `${bytes} B`;
-    if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(2)} KB`;
-    return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
-  };
-
-  const formatTimestamp = (timestamp: string): string => {
-    const [datePart, timePart] = timestamp.split("_");
-    const [year, month, day] = datePart.split("-");
-    const [hour, minute, second] = timePart.split("-");
-    const date = new Date(
-      parseInt(year),
-      parseInt(month) - 1,
-      parseInt(day),
-      parseInt(hour),
-      parseInt(minute),
-      parseInt(second)
-    );
-    return date.toLocaleString();
-  };
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose} title={t("cronjobs.viewLogs")} size="xl">
-      <div className="flex flex-col h-[600px]">
-        <div className="flex items-center justify-between mb-4 pb-4 border-b border-border">
-          <div>
-            <h3 className="font-semibold text-lg">{jobComment || jobId}</h3>
-            {stats && (
-              <p className="text-sm text-muted-foreground">
-                {stats.count} {t("cronjobs.logs")} • {stats.totalSizeMB} MB
-              </p>
-            )}
-          </div>
-          <div className="flex gap-2">
-            <Button
-              onClick={loadLogs}
-              disabled={isLoadingLogs}
-              className="btn-primary glow-primary"
-              size="sm"
-            >
-              <ArrowsClockwiseIcon
-                className={`w-4 h-4 mr-2 ${isLoadingLogs ? "animate-spin" : ""
-                  }`}
-              />
-              {t("common.refresh")}
-            </Button>
-            {logs.length > 0 && (
-              <Button
-                onClick={handleDeleteAllLogs}
-                className="btn-destructive glow-primary"
-                size="sm"
-              >
-                <TrashIcon className="w-4 h-4 mr-2" />
-                {t("cronjobs.deleteAll")}
-              </Button>
-            )}
-          </div>
-        </div>
-
-        <div className="flex-1 flex gap-4 overflow-hidden">
-          <div className="w-1/3 flex flex-col border-r border-border pr-4 overflow-hidden">
-            <h4 className="font-semibold mb-2">{t("cronjobs.logFiles")}</h4>
-            <div className="flex-1 overflow-y-auto space-y-2">
-              {isLoadingLogs ? (
-                <div className="text-center py-8 text-muted-foreground">
-                  {t("common.loading")}...
-                </div>
-              ) : logs.length === 0 ? (
-                <div className="text-center py-8 text-muted-foreground">
-                  {t("cronjobs.noLogsFound")}
-                </div>
-              ) : (
-                logs.map((log) => (
-                  <div
-                    key={log.filename}
-                    className={`p-3 ascii-border cursor-pointer transition-colors terminal-font ${selectedLog === log.filename
-                      ? "border-primary bg-background2"
-                      : log.hasError
-                        ? "border-red-600 hover:border-red-600"
-                        : "ascii-border hover:border-primary"
-                      }`}
-                    onClick={() => handleViewLog(log.filename)}
-                  >
-                    <div className="flex items-start justify-between gap-2">
-                      <div className="flex-1 min-w-0">
-                        <div className="flex items-center gap-2 mb-1">
-                          {log.hasError ? (
-                            <WarningCircleIcon className="w-4 h-4 flex-shrink-0 text-status-error" />
-                          ) : log.exitCode === 0 ? (
-                            <CheckCircleIcon className="w-4 h-4 flex-shrink-0 text-status-success" />
-                          ) : (
-                            <FileTextIcon className="w-4 h-4 flex-shrink-0" />
-                          )}
-                          <span className="text-sm font-medium truncate">
-                            {formatTimestamp(log.timestamp)}
-                          </span>
-                        </div>
-                        <div className="flex items-center gap-2">
-                          <p className="text-xs text-muted-foreground">
-                            {formatFileSize(log.size)}
-                          </p>
-                          {log.exitCode !== undefined && (
-                            <span
-                              className={`text-xs px-1.5 py-0.5 ${log.hasError
-                                ? "bg-background2 text-status-error"
-                                : "bg-background2 text-status-success"
-                                }`}
-                            >
-                              Exit: {log.exitCode}
-                            </span>
-                          )}
-                        </div>
-                      </div>
-                      <Button
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          handleDeleteLog(log.filename);
-                        }}
-                        className="btn-destructive glow-primary p-1 h-auto"
-                        size="sm"
-                      >
-                        <TrashIcon className="w-3 h-3" />
-                      </Button>
-                    </div>
-                  </div>
-                ))
-              )}
-            </div>
-          </div>
-
-          <div className="flex-1 flex flex-col overflow-hidden">
-            <h4 className="font-semibold mb-2">{t("cronjobs.logContent")}</h4>
-            <div className="flex-1 overflow-hidden">
-              {isLoadingContent ? (
-                <div className="h-full flex items-center justify-center text-muted-foreground">
-                  {t("common.loading")}...
-                </div>
-              ) : selectedLog ? (
-                <pre className="h-full overflow-auto bg-background2 p-4 ascii-border text-xs font-mono whitespace-pre-wrap terminal-font">
-                  {logContent}
-                </pre>
-              ) : (
-                <div className="h-full flex items-center justify-center text-muted-foreground">
-                  <div className="text-center">
-                    <EyeIcon className="w-12 h-12 mx-auto mb-2 opacity-50" />
-                    <p>{t("cronjobs.selectLogToView")}</p>
-                  </div>
-                </div>
-              )}
-            </div>
-          </div>
-        </div>
-
-        <div className="mt-4 pt-4 border-t border-border flex justify-end">
-          <Button onClick={onClose} className="btn-primary glow-primary">
-            <XIcon className="w-4 h-4 mr-2" />
-            {t("common.close")}
-          </Button>
-        </div>
-      </div>
-    </Modal>
-  );
-};

app/_components/FeatureComponents/Modals/RestoreBackupModal.tsx

@@ -1,218 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import {
-  UploadIcon,
-  TrashIcon,
-  CalendarIcon,
-  UserIcon,
-  DownloadIcon,
-  ArrowsClockwiseIcon,
-  CheckIcon,
-} from "@phosphor-icons/react";
-import { useTranslations } from "next-intl";
-import { CronJob } from "@/app/_utils/cronjob-utils";
-import { unwrapCommand } from "@/app/_utils/wrapper-utils-client";
-import { copyToClipboard } from "@/app/_utils/global-utils";
-
-interface BackupFile {
-  filename: string;
-  job: CronJob;
-  backedUpAt: string;
-}
-
-interface RestoreBackupModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  backups: BackupFile[];
-  onRestore: (filename: string) => void;
-  onRestoreAll: () => void;
-  onBackupAll: () => void;
-  onDelete: (filename: string) => void;
-  onRefresh: () => void;
-}
-
-export const RestoreBackupModal = ({
-  isOpen,
-  onClose,
-  backups,
-  onRestore,
-  onRestoreAll,
-  onBackupAll,
-  onDelete,
-  onRefresh,
-}: RestoreBackupModalProps) => {
-  const t = useTranslations();
-  const [deletingFilename, setDeletingFilename] = useState<string | null>(null);
-  const [commandCopied, setCommandCopied] = useState<string | null>(null);
-
-  useEffect(() => {
-    if (isOpen) {
-      onRefresh();
-    }
-  }, [isOpen]);
-
-  const handleRestoreAll = () => {
-    if (window.confirm(t("cronjobs.confirmRestoreAll"))) {
-      onRestoreAll();
-    }
-  };
-
-  const handleDelete = async (filename: string) => {
-    if (window.confirm(t("cronjobs.confirmDeleteBackup"))) {
-      setDeletingFilename(filename);
-      await onDelete(filename);
-      setDeletingFilename(null);
-      onRefresh();
-    }
-  };
-
-  const formatDate = (dateString: string) => {
-    try {
-      const date = new Date(dateString);
-      return date.toLocaleString();
-    } catch {
-      return dateString;
-    }
-  };
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onClose}
-      title={t("cronjobs.backups")}
-      size="xl"
-    >
-      <div className="space-y-4">
-        <div className="flex gap-2">
-          <Button
-            variant="outline"
-            onClick={onBackupAll}
-            className="btn-outline flex-1"
-          >
-            <DownloadIcon className="h-4 w-4 mr-2" />
-            {t("cronjobs.backupAll")}
-          </Button>
-          {backups.length > 0 && (
-            <Button
-              variant="outline"
-              onClick={handleRestoreAll}
-              className="btn-primary flex-1"
-            >
-              <UploadIcon className="h-4 w-4 mr-2" />
-              {t("cronjobs.restoreAll")}
-            </Button>
-          )}
-          <Button
-            variant="outline"
-            onClick={onRefresh}
-            className="btn-outline"
-            title={t("common.refresh")}
-          >
-            <ArrowsClockwiseIcon className="h-4 w-4" />
-          </Button>
-        </div>
-
-        {backups.length === 0 ? (
-          <div className="text-center py-8 text-muted-foreground">
-            <p>{t("cronjobs.noBackupsFound")}</p>
-          </div>
-        ) : (
-          <div className="space-y-3 max-h-[500px] overflow-y-auto tui-scrollbar">
-            {backups.map((backup) => (
-              <div
-                key={backup.filename}
-                className="tui-card p-3 terminal-font"
-              >
-                <div className="flex items-center gap-3">
-                  <div className="flex-shrink-0">
-                    <code className="text-xs bg-background0 text-status-warning px-1.5 py-0.5 terminal-font ascii-border">
-                      {backup.job.schedule}
-                    </code>
-                  </div>
-
-                  <div className="flex-1 min-w-0">
-                    <div className="flex items-center gap-2">
-                      {commandCopied === backup.filename && (
-                        <CheckIcon className="h-3 w-3 text-status-success flex-shrink-0" />
-                      )}
-                      <pre
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          copyToClipboard(unwrapCommand(backup.job.command));
-                          setCommandCopied(backup.filename);
-                          setTimeout(() => setCommandCopied(null), 3000);
-                        }}
-                        className="flex-1 cursor-pointer overflow-hidden text-sm font-medium terminal-font bg-background1 px-2 py-1 ascii-border truncate"
-                        title={unwrapCommand(backup.job.command)}
-                      >
-                        {unwrapCommand(backup.job.command)}
-                      </pre>
-                    </div>
-                  </div>
-
-                  <div className="flex items-center gap-3 text-xs text-muted-foreground flex-shrink-0">
-                    <div className="flex items-center gap-1">
-                      <UserIcon className="h-3 w-3" />
-                      <span>{backup.job.user}</span>
-                    </div>
-                    <div className="flex items-center gap-1">
-                      <CalendarIcon className="h-3 w-3" />
-                      <span>{formatDate(backup.backedUpAt)}</span>
-                    </div>
-                  </div>
-
-                  <div className="flex items-center gap-2 flex-shrink-0">
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      onClick={() => {
-                        onRestore(backup.filename);
-                        onClose();
-                      }}
-                      className="btn-outline h-8 px-3"
-                      title={t("cronjobs.restoreThisBackup")}
-                    >
-                      <UploadIcon className="h-3 w-3" />
-                    </Button>
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      onClick={() => handleDelete(backup.filename)}
-                      disabled={deletingFilename === backup.filename}
-                      className="btn-destructive h-8 px-3"
-                      title={t("cronjobs.deleteBackup")}
-                    >
-                      {deletingFilename === backup.filename ? (
-                        <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
-                      ) : (
-                        <TrashIcon className="h-3 w-3" />
-                      )}
-                    </Button>
-                  </div>
-                </div>
-
-                {backup.job.comment && (
-                  <p className="text-xs text-muted-foreground italic mt-2">
-                    {backup.job.comment}
-                  </p>
-                )}
-              </div>
-            ))}
-          </div>
-        )}
-
-        <div className="flex justify-between gap-2 pt-4 border-t border-border">
-          <p className="text-sm text-muted-foreground">
-            {t("cronjobs.availableBackups")}: {backups.length}
-          </p>
-          <Button variant="outline" onClick={onClose} className="btn-outline">
-            {t("common.close")}
-          </Button>
-        </div>
-      </div>
-    </Modal>
-  );
-};

app/_components/FeatureComponents/Scripts/BashEditor.tsx

@@ -1,251 +0,0 @@
-"use client";
-
-import { useEffect, useRef, useState } from "react";
-import { EditorView, keymap } from "@codemirror/view";
-import { EditorState, Transaction } from "@codemirror/state";
-import { shell } from "@codemirror/legacy-modes/mode/shell";
-import { StreamLanguage } from "@codemirror/language";
-import { catppuccinMocha, catppuccinLatte } from './catppuccin-theme';
-import { useTheme } from 'next-themes';
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { TerminalIcon, CopyIcon, CheckIcon } from "@phosphor-icons/react";
-
-interface BashEditorProps {
-  value: string;
-  onChange: (value: string) => void;
-  placeholder?: string;
-  className?: string;
-  label?: string;
-}
-
-export const BashEditor = ({
-  value,
-  onChange,
-  placeholder = "#!/bin/bash\n# Your bash script here\necho 'Hello World'",
-  className = "",
-  label,
-}: BashEditorProps) => {
-  const [copied, setCopied] = useState(false);
-  const editorRef = useRef<HTMLDivElement>(null);
-  const editorViewRef = useRef<EditorView | null>(null);
-  const { theme } = useTheme();
-
-  const insertFourSpaces = ({
-    state,
-    dispatch,
-  }: {
-    state: EditorState;
-    dispatch: (tr: Transaction) => void;
-  }) => {
-    if (state.selection.ranges.some((range) => !range.empty)) {
-      const changes = state.selection.ranges
-        .map((range) => {
-          const fromLine = state.doc.lineAt(range.from).number;
-          const toLine = state.doc.lineAt(range.to).number;
-          const changes = [];
-          for (let line = fromLine; line <= toLine; line++) {
-            const lineObj = state.doc.line(line);
-            changes.push({ from: lineObj.from, insert: "    " });
-          }
-          return changes;
-        })
-        .flat();
-      dispatch(state.update({ changes }));
-    } else {
-      dispatch(state.update(state.replaceSelection("    ")));
-    }
-    return true;
-  };
-
-  const removeFourSpaces = ({
-    state,
-    dispatch,
-  }: {
-    state: EditorState;
-    dispatch: (tr: Transaction) => void;
-  }) => {
-    if (state.selection.ranges.some((range) => !range.empty)) {
-      const changes = state.selection.ranges
-        .map((range) => {
-          const fromLine = state.doc.lineAt(range.from).number;
-          const toLine = state.doc.lineAt(range.to).number;
-          const changes = [];
-          for (let line = fromLine; line <= toLine; line++) {
-            const lineObj = state.doc.line(line);
-            const indent = lineObj.text.match(/^    /);
-            if (indent) {
-              changes.push({ from: lineObj.from, to: lineObj.from + 4 });
-            }
-          }
-          return changes;
-        })
-        .flat();
-      dispatch(state.update({ changes }));
-    } else {
-      const cursor = state.selection.main.head;
-      const line = state.doc.lineAt(cursor);
-      const beforeCursor = line.text.slice(0, cursor - line.from);
-      const spacesToRemove = beforeCursor.match(/ {1,4}$/);
-      if (spacesToRemove) {
-        const removeCount = spacesToRemove[0].length;
-        dispatch(
-          state.update({
-            changes: { from: cursor - removeCount, to: cursor },
-          })
-        );
-      }
-    }
-    return true;
-  };
-
-  useEffect(() => {
-    if (!editorRef.current) return;
-
-    const isDark = theme === 'catppuccin-mocha';
-    const bashLanguage = StreamLanguage.define(shell);
-
-    const getThemeColors = () => {
-      const root = document.documentElement;
-      const style = getComputedStyle(root);
-
-      return {
-        background: style.getPropertyValue('--base').trim() || (isDark ? '#1e1e2e' : '#eff1f5'),
-        foreground: style.getPropertyValue('--text').trim() || (isDark ? '#cdd6f4' : '#4c4f69'),
-        border: style.getPropertyValue('--box-border-color').trim() || (isDark ? '#313244' : '#9ca0b0'),
-        surface: style.getPropertyValue('--surface0').trim() || (isDark ? '#313244' : '#ccd0da'),
-      };
-    };
-
-    const colors = getThemeColors();
-
-    const customTheme = EditorView.theme({
-      "&": {
-        backgroundColor: colors.background,
-        color: colors.foreground,
-        border: `1px solid ${colors.border}`,
-        borderRadius: '0',
-      },
-      ".cm-content": {
-        caretColor: colors.foreground,
-        padding: '12px'
-      },
-      ".cm-gutters": {
-        backgroundColor: colors.surface,
-        color: colors.foreground,
-        borderRight: `1px solid ${colors.border}`,
-        opacity: '0.6',
-      },
-      ".cm-activeLineGutter": {
-        backgroundColor: colors.surface,
-        opacity: '1',
-      },
-      ".cm-scroller": {
-        fontFamily: 'JetBrains Mono, Fira CodeIcon, monospace',
-      },
-    }, { dark: isDark });
-
-    const state = EditorState.create({
-      doc: value || placeholder,
-      extensions: [
-        bashLanguage,
-        customTheme,
-        keymap.of([
-          { key: "Tab", run: insertFourSpaces },
-          { key: "Shift-Tab", run: removeFourSpaces },
-        ]),
-        EditorView.updateListener.of((update: any) => {
-          if (update.docChanged) {
-            onChange(update.state.doc.toString());
-          }
-        }),
-        EditorView.theme({
-          "&": {
-            fontSize: "14px",
-            fontFamily:
-              'JetBrains Mono, Fira CodeIcon, ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace',
-            height: "100%",
-            maxHeight: "100%",
-          },
-          ".cm-content": {
-            padding: "12px",
-            minHeight: "200px",
-          },
-          ".cm-line": {
-            lineHeight: "1.4",
-          },
-          ".cm-scroller": {
-            fontFamily:
-              'JetBrains Mono, Fira CodeIcon, ui-monospace, SFMono-Regular, "SF Mono", Consolas, "Liberation Mono", Menlo, monospace',
-            height: "100%",
-            maxHeight: "100%",
-          },
-        }),
-      ],
-    });
-
-    const view = new EditorView({
-      state,
-      parent: editorRef.current,
-    });
-
-    editorViewRef.current = view;
-
-    return () => {
-      view.destroy();
-    };
-  }, [theme]);
-
-  useEffect(() => {
-    if (editorViewRef.current) {
-      const currentValue = editorViewRef.current.state.doc.toString();
-      if (currentValue !== value) {
-        editorViewRef.current.dispatch({
-          changes: {
-            from: 0,
-            to: editorViewRef.current.state.doc.length,
-            insert: value,
-          },
-        });
-      }
-    }
-  }, [value]);
-
-  const handleCopy = async () => {
-    if (editorViewRef.current) {
-      const text = editorViewRef.current.state.doc.toString();
-      await navigator.clipboard.writeText(text);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2000);
-    }
-  };
-
-  return (
-    <div className={className}>
-      {label && (
-        <div className="flex items-center justify-between mb-2">
-          <div className="flex items-center gap-2">
-            <TerminalIcon className="h-4 w-4" />
-            <span className="text-sm font-medium">{label}</span>
-          </div>
-          <Button
-            type="button"
-            variant="outline"
-            size="sm"
-            onClick={handleCopy}
-            className="btn-outline h-7 px-2"
-          >
-            {copied ? (
-              <CheckIcon className="h-3 w-3 mr-1" />
-            ) : (
-              <CopyIcon className="h-3 w-3 mr-1" />
-            )}
-            {copied ? "Copied!" : "CopyIcon"}
-          </Button>
-        </div>
-      )}
-      <div className="overflow-hidden h-full">
-        <div ref={editorRef} className="h-full" />
-      </div>
-    </div>
-  );
-};

app/_components/FeatureComponents/Scripts/catppuccin-theme.ts

@@ -1,36 +0,0 @@
-import { Extension } from '@codemirror/state';
-import { EditorView } from '@codemirror/view';
-
-export const catppuccinMocha: Extension = EditorView.theme({
-  '&': {
-    backgroundColor: '#1e1e2e',
-    color: '#cdd6f4',
-    fontSize: '14px',
-    fontFamily: 'JetBrains Mono, monospace',
-    border: '1px solid #45475a',
-    borderRadius: '0',
-  },
-  '.cm-content': { caretColor: '#f5e0dc', padding: '12px' },
-  '.cm-gutters': {
-    backgroundColor: '#181825',
-    color: '#6c7086',
-    borderRight: '1px solid #45475a',
-  },
-}, { dark: true });
-
-export const catppuccinLatte: Extension = EditorView.theme({
-  '&': {
-    backgroundColor: '#eff1f5',
-    color: '#4c4f69',
-    fontSize: '14px',
-    fontFamily: 'JetBrains Mono, monospace',
-    border: '1px solid #9ca0b0',
-    borderRadius: '0',
-  },
-  '.cm-content': { caretColor: '#dc8a78', padding: '12px' },
-  '.cm-gutters': {
-    backgroundColor: '#e6e9ef',
-    color: '#8c8fa1',
-    borderRight: '1px solid #9ca0b0',
-  },
-}, { dark: false });

app/_components/FeatureComponents/System/WrapperScriptWarning.tsx

@@ -1,69 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { useTranslations } from "next-intl";
-import { WarningIcon, XIcon } from "@phosphor-icons/react";
-
-export const WrapperScriptWarning = () => {
-  const [isVisible, setIsVisible] = useState(false);
-  const [isLoading, setIsLoading] = useState(true);
-  const t = useTranslations();
-
-  useEffect(() => {
-    const dismissed = localStorage.getItem("wrapper-warning-dismissed");
-    if (dismissed === "true") {
-      setIsLoading(false);
-      return;
-    }
-
-    checkWrapperScriptModification();
-  }, []);
-
-  const checkWrapperScriptModification = async () => {
-    try {
-      const response = await fetch("/api/system/wrapper-check");
-      if (response.ok) {
-        const data = await response.json();
-        setIsVisible(data.modified);
-      }
-    } catch (error) {
-      console.error("Failed to check wrapper script:", error);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const dismissWarning = () => {
-    setIsVisible(false);
-    localStorage.setItem("wrapper-warning-dismissed", "true");
-  };
-
-  if (isLoading || !isVisible) {
-    return null;
-  }
-
-  return (
-    <div className="bg-amber-500/10 border border-amber-500/20 rounded-lg p-4 mb-4">
-      <div className="flex items-start justify-between">
-        <div className="flex items-start space-x-3">
-          <WarningIcon className="w-5 h-5 text-amber-500 mt-0.5 flex-shrink-0" />
-          <div className="flex-1">
-            <h3 className="text-sm font-medium text-amber-800 dark:text-amber-400">
-              {t("warnings.wrapperScriptModified")}
-            </h3>
-            <p className="text-sm text-amber-700 dark:text-amber-500 mt-1">
-              {t("warnings.wrapperScriptModifiedDescription")}
-            </p>
-          </div>
-        </div>
-        <button
-          onClick={dismissWarning}
-          className="text-amber-600 dark:text-amber-400 hover:text-amber-800 dark:hover:text-amber-300 transition-colors ml-4"
-          aria-label="Dismiss warning"
-        >
-          <XIcon className="w-4 h-4" />
-        </button>
-      </div>
-    </div>
-  );
-};

app/_components/FeatureComponents/Theme/ThemeToggle.tsx

@@ -1,26 +0,0 @@
-'use client'
-
-import { useTheme } from 'next-themes';
-import { useEffect, useState } from 'react';
-
-export const ThemeToggle = () => {
-  const [mounted, setMounted] = useState(false);
-  const { theme, setTheme } = useTheme();
-
-  useEffect(() => {
-    setMounted(true);
-  }, []);
-
-  if (!mounted) return null;
-
-  const isDark = theme === 'dark';
-
-  return (
-    <button
-      onClick={() => setTheme(isDark ? 'light' : 'dark')}
-      className="px-3 py-2 ascii-border terminal-font text-sm bg-background0"
-    >
-      {isDark ? 'LIGHT' : 'DARK'}
-    </button>
-  );
-};

app/_components/GlobalComponents/Cards/Card.tsx

@@ -1,43 +0,0 @@
-import { HTMLAttributes, forwardRef } from 'react';
-
-export const Card = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
-  ({ className = '', ...props }, ref) => (
-    <div ref={ref} className={`tui-card ${className}`} {...props} />
-  )
-);
-Card.displayName = 'Card';
-
-export const CardHeader = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
-  ({ className = '', ...props }, ref) => (
-    <div ref={ref} className={`p-4 border-b border-foreground1 ${className}`} {...props} />
-  )
-);
-CardHeader.displayName = 'CardHeader';
-
-export const CardTitle = forwardRef<HTMLHeadingElement, HTMLAttributes<HTMLHeadingElement>>(
-  ({ className = '', ...props }, ref) => (
-    <h3 ref={ref} className={`terminal-font font-bold uppercase ${className}`} {...props} />
-  )
-);
-CardTitle.displayName = 'CardTitle';
-
-export const CardDescription = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLParagraphElement>>(
-  ({ className = '', ...props }, ref) => (
-    <p ref={ref} className={`terminal-font text-sm ${className}`} {...props} />
-  )
-);
-CardDescription.displayName = 'CardDescription';
-
-export const CardContent = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
-  ({ className = '', ...props }, ref) => (
-    <div ref={ref} className={`p-4 ${className}`} {...props} />
-  )
-);
-CardContent.displayName = 'CardContent';
-
-export const CardFooter = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
-  ({ className = '', ...props }, ref) => (
-    <div ref={ref} className={`flex items-center p-4 border-t border-foreground1 ${className}`} {...props} />
-  )
-);
-CardFooter.displayName = 'CardFooter';

app/_components/GlobalComponents/FormElements/Input.tsx

@@ -1,17 +0,0 @@
-import { InputHTMLAttributes, forwardRef } from 'react';
-
-export interface InputProps extends InputHTMLAttributes<HTMLInputElement> {}
-
-export const Input = forwardRef<HTMLInputElement, InputProps>(
-  ({ className = '', ...props }, ref) => {
-    return (
-      <input
-        className={`terminal-font ascii-border px-3 py-2 bg-background0 w-full ${className}`}
-        ref={ref}
-        {...props}
-      />
-    );
-  }
-);
-
-Input.displayName = 'Input';

app/_components/GlobalComponents/Logo/Logo.tsx

@@ -1,46 +0,0 @@
-"use client";
-
-import { AsteriskIcon, TerminalIcon } from "@phosphor-icons/react";
-
-interface LogoProps {
-    size?: number;
-    showGlow?: boolean;
-}
-
-export const Logo = ({ size = 48, showGlow = false }: LogoProps) => {
-    const iconSize = size * 0.8;
-    const asteriskSize = size * 0.4;
-    const asteriskOffset = size * 0.08;
-
-    return (
-        <div
-            className="relative flex items-center justify-center flex-shrink-0"
-            style={{ width: size, height: size }}
-        >
-            {showGlow && (
-                <div
-                    className="absolute inset-0 bg-gradient-to-br from-primary/20 via-primary/10 to-transparent blur-xl"
-                    style={{ width: size, height: size }}
-                />
-            )}
-
-            <div className="relative z-10 flex items-center justify-center w-full h-full">
-                <TerminalIcon
-                    className="text-primary drop-shadow-[0_0_10px_rgba(var(--primary-rgb),0.4)]"
-                    weight="duotone"
-                    style={{ width: iconSize, height: iconSize }}
-                />
-                <AsteriskIcon
-                    className="text-primary absolute drop-shadow-[0_0_8px_rgba(var(--primary-rgb),0.6)]"
-                    weight="bold"
-                    style={{
-                        width: asteriskSize,
-                        height: asteriskSize,
-                        top: -asteriskOffset,
-                        right: -asteriskOffset
-                    }}
-                />
-            </div>
-        </div>
-    );
-};

app/_components/GlobalComponents/UIElements/Button.tsx

@@ -1,38 +0,0 @@
-import { ButtonHTMLAttributes, forwardRef } from 'react';
-
-export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
-  variant?: 'default' | 'destructive' | 'outline' | 'secondary' | 'ghost' | 'link';
-  size?: 'default' | 'sm' | 'lg' | 'icon';
-}
-
-export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className = '', variant = 'default', size = 'default', children, ...props }, ref) => {
-    const baseClasses = 'terminal-font ascii-border px-4 py-2 cursor-pointer inline-flex items-center justify-center disabled:opacity-50 disabled:cursor-not-allowed';
-    const variantClasses = {
-      default: 'bg-background1 hover:bg-background2',
-      destructive: 'bg-status-error text-white hover:bg-status-error',
-      outline: 'bg-background0 hover:bg-background1',
-      secondary: 'bg-background2 hover:bg-background1',
-      ghost: 'border-0 bg-transparent hover:bg-background1',
-      link: 'border-0 underline bg-transparent',
-    };
-    const sizeClasses = {
-      default: '',
-      sm: 'px-2 py-1 text-sm',
-      lg: 'px-6 py-3',
-      icon: 'p-2',
-    };
-
-    return (
-      <button
-        className={`${baseClasses} ${variantClasses[variant]} ${sizeClasses[size]} ${className}`}
-        ref={ref}
-        {...props}
-      >
-        {children}
-      </button>
-    );
-  }
-);
-
-Button.displayName = 'Button';

app/_components/GlobalComponents/UIElements/DropdownMenu.tsx

@@ -1,128 +0,0 @@
-"use client";
-
-import { useState, useRef, useEffect, ReactNode } from "react";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { DotsThreeVerticalIcon } from "@phosphor-icons/react";
-
-const DROPDOWN_HEIGHT = 200;
-
-interface DropdownMenuItem {
-  label: string;
-  icon?: ReactNode;
-  onClick: () => void;
-  disabled?: boolean;
-  variant?: "default" | "destructive";
-}
-
-interface DropdownMenuProps {
-  items: DropdownMenuItem[];
-  triggerLabel?: string;
-  triggerIcon?: ReactNode;
-  triggerClassName?: string;
-  onOpenChange?: (isOpen: boolean) => void;
-}
-
-export const DropdownMenu = ({
-  items,
-  triggerLabel,
-  triggerIcon = <DotsThreeVerticalIcon className="h-3 w-3" />,
-  triggerClassName = "btn-outline h-8 px-3",
-  onOpenChange,
-}: DropdownMenuProps) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const [positionAbove, setPositionAbove] = useState(false);
-  const dropdownRef = useRef<HTMLDivElement>(null);
-  const triggerRef = useRef<HTMLButtonElement>(null);
-
-  const handleOpenChange = (open: boolean) => {
-    if (open && triggerRef.current) {
-      const rect = triggerRef.current.getBoundingClientRect();
-      const viewportHeight = window.innerHeight;
-      const spaceBelow = viewportHeight - rect.bottom;
-      const spaceAbove = rect.top;
-
-      setPositionAbove(spaceBelow < DROPDOWN_HEIGHT && spaceAbove > spaceBelow);
-    }
-    setIsOpen(open);
-    onOpenChange?.(open);
-  };
-
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (
-        dropdownRef.current &&
-        !dropdownRef.current.contains(event.target as Node)
-      ) {
-        handleOpenChange(false);
-      }
-    };
-
-    const handleEscape = (event: KeyboardEvent) => {
-      if (event.key === "Escape") {
-        handleOpenChange(false);
-      }
-    };
-
-    if (isOpen) {
-      document.addEventListener("mousedown", handleClickOutside);
-      document.addEventListener("keydown", handleEscape);
-    }
-
-    return () => {
-      document.removeEventListener("mousedown", handleClickOutside);
-      document.removeEventListener("keydown", handleEscape);
-    };
-  }, [isOpen]);
-
-  const handleItemClick = (item: DropdownMenuItem) => {
-    if (!item.disabled) {
-      item.onClick();
-      handleOpenChange(false);
-    }
-  };
-
-  return (
-    <div className="relative inline-block" ref={dropdownRef}>
-      <Button
-        ref={triggerRef}
-        variant="outline"
-        size="sm"
-        onClick={() => handleOpenChange(!isOpen)}
-        className={triggerClassName}
-        aria-label={triggerLabel || "Open menu"}
-        title={triggerLabel || "Open menu"}
-      >
-        {triggerIcon}
-        {triggerLabel && <span className="ml-2">{triggerLabel}</span>}
-      </Button>
-
-      {isOpen && (
-        <div
-          className={`absolute right-0 w-56 ascii-border bg-background0 shadow-lg z-[9999] overflow-hidden terminal-font ${positionAbove ? "bottom-full mb-2" : "top-full mt-2"
-            }`}
-        >
-          <div className="py-1">
-            {items.map((item, index) => (
-              <button
-                key={index}
-                onClick={() => handleItemClick(item)}
-                disabled={item.disabled}
-                className={`w-full flex items-center gap-3 px-4 py-2 text-sm transition-colors ${item.disabled
-                  ? "opacity-50 cursor-not-allowed"
-                  : item.variant === "destructive"
-                    ? "text-status-error hover:bg-background1"
-                    : "hover:bg-background1"
-                  }`}
-              >
-                {item.icon && (
-                  <span className="flex-shrink-0">{item.icon}</span>
-                )}
-                <span className="flex-1 text-left">{item.label}</span>
-              </button>
-            ))}
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};

app/_components/GlobalComponents/UIElements/Modal.tsx

@@ -1,75 +0,0 @@
-"use client";
-
-import { useEffect, useRef } from "react";
-import { XIcon } from "@phosphor-icons/react";
-import { Button } from "./Button";
-
-interface ModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  title: string;
-  children: React.ReactNode;
-  size?: "sm" | "md" | "lg" | "xl" | "2xl" | "3xl";
-  showCloseButton?: boolean;
-  preventCloseOnClickOutside?: boolean;
-  className?: string;
-}
-
-export const Modal = ({
-  isOpen,
-  onClose,
-  title,
-  children,
-  size = "md",
-  showCloseButton = true,
-  preventCloseOnClickOutside = false,
-  className = "",
-}: ModalProps) => {
-  const dialogRef = useRef<HTMLDialogElement>(null);
-
-  useEffect(() => {
-    const dialog = dialogRef.current;
-    if (!dialog) return;
-
-    if (isOpen) {
-      dialog.showModal();
-      document.body.style.overflow = "hidden";
-    } else {
-      dialog.close();
-      document.body.style.overflow = "unset";
-    }
-  }, [isOpen]);
-
-  const sizeClasses = {
-    sm: "w-[600px]",
-    md: "w-[800px]",
-    lg: "w-[1000px]",
-    xl: "w-[1200px]",
-    "2xl": "w-[1400px]",
-    "3xl": "w-[90vw]",
-  };
-
-  return (
-    <dialog
-      ref={dialogRef}
-      className={`ascii-border terminal-font bg-background0 ${sizeClasses[size]} max-w-[95vw] ${className}`}
-      onClick={(e) => {
-        if (e.target === dialogRef.current && !preventCloseOnClickOutside) {
-          onClose();
-        }
-      }}
-    >
-      <div className="ascii-border border-t-0 border-l-0 border-r-0 p-4 flex justify-between items-center bg-background0">
-        <h2 className="terminal-font font-bold uppercase">{title}</h2>
-        {showCloseButton && (
-          <Button variant="ghost" size="icon" onClick={onClose}>
-            <XIcon className="h-4 w-4" />
-          </Button>
-        )}
-      </div>
-      <div className="p-4 max-h-[70vh] overflow-y-auto tui-scrollbar bg-background0">
-        {children}
-      </div>
-    </dialog>
-  );
-};

app/_components/GlobalComponents/UIElements/Switch.tsx

@@ -1,22 +0,0 @@
-"use client";
-
-interface SwitchProps {
-  checked: boolean;
-  onCheckedChange: (checked: boolean) => void;
-  className?: string;
-  disabled?: boolean;
-}
-
-export const Switch = ({ checked, onCheckedChange, className = "", disabled = false }: SwitchProps) => {
-  return (
-    <label className={className}>
-      <input
-        type="checkbox"
-        checked={checked}
-        onChange={(e) => onCheckedChange(e.target.checked)}
-        disabled={disabled}
-        className="terminal-font"
-      />
-    </label>
-  );
-};

app/_components/ScriptsManager.tsx

@@ -1,18 +1,19 @@
 "use client";
 
-import { useState, useEffect } from "react";
-import { Card, CardContent, CardHeader, CardTitle } from "@/app/_components/GlobalComponents/Cards/Card";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
+import { useState } from "react";
+import { Card, CardContent, CardHeader, CardTitle } from "./ui/Card";
+import { Button } from "./ui/Button";
 import {
-  FileTextIcon,
-  PlusIcon,
-  PencilSimpleIcon,
-  TrashIcon,
-  CopyIcon,
-  CheckCircleIcon,
-  FilesIcon,
-} from "@phosphor-icons/react";
-import { Script } from "@/app/_utils/scripts-utils";
+  FileText,
+  Plus,
+  Edit,
+  Trash2,
+  Copy,
+  Copy as CopyIcon,
+  CheckCircle,
+  Files,
+} from "lucide-react";
+import { type Script } from "@/app/_server/actions/scripts";
 import {
   createScript,
   updateScript,
@@ -20,19 +21,16 @@ import {
   cloneScript,
   getScriptContent,
 } from "@/app/_server/actions/scripts";
-import { CreateScriptModal } from "@/app/_components/FeatureComponents/Modals/CreateScriptModal";
-import { EditScriptModal } from "@/app/_components/FeatureComponents/Modals/EditScriptModal";
-import { DeleteScriptModal } from "@/app/_components/FeatureComponents/Modals/DeleteScriptModal";
-import { CloneScriptModal } from "@/app/_components/FeatureComponents/Modals/CloneScriptModal";
-import { showToast } from "@/app/_components/GlobalComponents/UIElements/Toast";
-import { useTranslations } from "next-intl";
+import { CreateScriptModal } from "./modals/CreateScriptModal";
+import { EditScriptModal } from "./modals/EditScriptModal";
+import { DeleteScriptModal } from "./modals/DeleteScriptModal";
+import { CloneScriptModal } from "./modals/CloneScriptModal";
+import { showToast } from "./ui/Toast";
 
 interface ScriptsManagerProps {
   scripts: Script[];
 }
 
-const DRAFT_STORAGE_KEY = "cronjob_script_draft";
-
 export const ScriptsManager = ({
   scripts: initialScripts,
 }: ScriptsManagerProps) => {
@@ -45,15 +43,12 @@ export const ScriptsManager = ({
   const [copiedId, setCopiedId] = useState<string | null>(null);
   const [isDeleting, setIsDeleting] = useState(false);
   const [isCloning, setIsCloning] = useState(false);
-  const t = useTranslations();
 
-  const defaultFormValues = {
+  const [createForm, setCreateForm] = useState({
     name: "",
     description: "",
     content: "#!/bin/bash\n# Your script here\necho 'Hello World'",
-  };
-
-  const [createForm, setCreateForm] = useState(defaultFormValues);
+  });
 
   const [editForm, setEditForm] = useState({
     name: "",
@@ -61,37 +56,6 @@ export const ScriptsManager = ({
     content: "",
   });
 
-  useEffect(() => {
-    try {
-      const savedDraft = localStorage.getItem(DRAFT_STORAGE_KEY);
-      if (savedDraft) {
-        const parsedDraft = JSON.parse(savedDraft);
-        setCreateForm(parsedDraft);
-      }
-    } catch (error) {
-      console.error("Failed to load draft from localStorage:", error);
-    }
-  }, []);
-
-  useEffect(() => {
-    try {
-      localStorage.setItem(DRAFT_STORAGE_KEY, JSON.stringify(createForm));
-    } catch (error) {
-      console.error("Failed to save draft to localStorage:", error);
-    }
-  }, [createForm]);
-
-  const isDraft =
-    createForm.name.trim() !== "" ||
-    createForm.description.trim() !== "" ||
-    createForm.content !== defaultFormValues.content;
-
-  const handleClearDraft = () => {
-    setCreateForm(defaultFormValues);
-    localStorage.removeItem(DRAFT_STORAGE_KEY);
-    showToast("success", t("scripts.draftCleared"));
-  };
-
   const refreshScripts = async () => {
     try {
       const { fetchScripts } = await import("@/app/_server/actions/scripts");
@@ -112,8 +76,6 @@ export const ScriptsManager = ({
     if (result.success) {
       await refreshScripts();
       setIsCreateModalOpen(false);
-      setCreateForm(defaultFormValues);
-      localStorage.removeItem(DRAFT_STORAGE_KEY);
       showToast("success", "Script created successfully");
     } else {
       showToast("error", "Failed to create script", result.message);
@@ -206,15 +168,15 @@ export const ScriptsManager = ({
         <CardHeader>
           <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
             <div className="flex items-center gap-3">
-              <div className="p-2 bg-background2 ascii-border">
-                <FileTextIcon className="h-5 w-5 text-primary" />
+              <div className="p-2 bg-primary/10 rounded-lg">
+                <FileText className="h-5 w-5 text-primary" />
               </div>
               <div>
                 <CardTitle className="text-xl brand-gradient">
-                  {t("scripts.scriptsLibrary")}
+                  Scripts Library
                 </CardTitle>
                 <p className="text-sm text-muted-foreground">
-                  {t("scripts.nOfNSavedScripts", { count: scripts.length })}
+                  {scripts.length} saved script{scripts.length !== 1 ? "s" : ""}
                 </p>
               </div>
             </div>
@@ -222,30 +184,30 @@ export const ScriptsManager = ({
               onClick={() => setIsCreateModalOpen(true)}
               className="btn-primary glow-primary"
             >
-              <PlusIcon className="h-4 w-4 mr-2" />
-              {t("scripts.newScript")}
+              <Plus className="h-4 w-4 mr-2" />
+              New Script
             </Button>
           </div>
         </CardHeader>
         <CardContent>
           {scripts.length === 0 ? (
-            <div className="text-center py-16 terminal-font">
-              <div className="mx-auto w-20 h-20 bg-background2 ascii-border flex items-center justify-center mb-6">
-                <FileTextIcon className="h-10 w-10 text-primary" />
+            <div className="text-center py-16">
+              <div className="mx-auto w-20 h-20 bg-gradient-to-br from-primary/20 to-blue-500/20 rounded-full flex items-center justify-center mb-6">
+                <FileText className="h-10 w-10 text-primary" />
               </div>
               <h3 className="text-xl font-semibold mb-3 brand-gradient">
-                {t("scripts.noScriptsYet")}
+                No scripts yet
               </h3>
               <p className="text-muted-foreground mb-6 max-w-md mx-auto">
-                {t("scripts.createReusableBashScripts")}
+                Create reusable bash scripts to use in your scheduled tasks.
               </p>
               <Button
                 onClick={() => setIsCreateModalOpen(true)}
                 className="btn-primary glow-primary"
                 size="lg"
               >
-                <PlusIcon className="h-5 w-5 mr-2" />
-                {t("scripts.createYourFirstScript")}
+                <Plus className="h-5 w-5 mr-2" />
+                Create Your First Script
               </Button>
             </div>
           ) : (
@@ -253,7 +215,7 @@ export const ScriptsManager = ({
               {scripts.map((script) => (
                 <div
                   key={script.id}
-                  className="glass-card p-4 ascii-border hover:bg-accent/30 transition-colors terminal-font"
+                  className="glass-card p-4 border border-border/50 rounded-lg hover:bg-accent/30 transition-colors"
                 >
                   <div className="flex items-start justify-between gap-4">
                     <div className="flex-1 min-w-0">
@@ -271,7 +233,7 @@ export const ScriptsManager = ({
                         </p>
                       )}
                       <div className="text-xs text-muted-foreground">
-                        {t("scripts.file")}: {script.filename}
+                        File: {script.filename}
                       </div>
                     </div>
 
@@ -281,11 +243,11 @@ export const ScriptsManager = ({
                         size="sm"
                         onClick={() => handleCopy(script)}
                         className="btn-outline h-8 px-3"
-                        title="CopyIcon script content to clipboard"
-                        aria-label="CopyIcon script content to clipboard"
+                        title="Copy script content to clipboard"
+                        aria-label="Copy script content to clipboard"
                       >
                         {copiedId === script.id ? (
-                          <CheckCircleIcon className="h-3 w-3 text-status-success" />
+                          <CheckCircle className="h-3 w-3 text-green-500" />
                         ) : (
                           <CopyIcon className="h-3 w-3" />
                         )}
@@ -301,7 +263,7 @@ export const ScriptsManager = ({
                         title="Clone script"
                         aria-label="Clone script"
                       >
-                        <FilesIcon className="h-3 w-3" />
+                        <Files className="h-3 w-3" />
                       </Button>
                       <Button
                         variant="outline"
@@ -319,10 +281,10 @@ export const ScriptsManager = ({
                           setIsEditModalOpen(true);
                         }}
                         className="btn-outline h-8 px-3"
-                        title="PencilSimpleIcon script"
-                        aria-label="PencilSimpleIcon script"
+                        title="Edit script"
+                        aria-label="Edit script"
                       >
-                        <PencilSimpleIcon className="h-3 w-3" />
+                        <Edit className="h-3 w-3" />
                       </Button>
                       <Button
                         variant="destructive"
@@ -335,7 +297,7 @@ export const ScriptsManager = ({
                         title="Delete script"
                         aria-label="Delete script"
                       >
-                        <TrashIcon className="h-3 w-3" />
+                        <Trash2 className="h-3 w-3" />
                       </Button>
                     </div>
                   </div>
@@ -354,8 +316,6 @@ export const ScriptsManager = ({
         onFormChange={(updates) =>
           setCreateForm((prev) => ({ ...prev, ...updates }))
         }
-        isDraft={isDraft}
-        onClearDraft={handleClearDraft}
       />
 
       <EditScriptModal

app/_components/SystemInfo.tsx

@@ -1,10 +1,16 @@
 "use client";
 
-import { MetricCard } from "@/app/_components/GlobalComponents/Cards/MetricCard";
-import { SystemStatus } from "@/app/_components/FeatureComponents/System/SystemStatus";
-import { PerformanceSummary } from "@/app/_components/FeatureComponents/System/PerformanceSummary";
-import { Sidebar } from "@/app/_components/FeatureComponents/Layout/Sidebar";
-import { ClockIcon, HardDriveIcon, CpuIcon, MonitorIcon, WifiHighIcon } from "@phosphor-icons/react";
+import { MetricCard } from "./ui/MetricCard";
+import { SystemStatus } from "./ui/SystemStatus";
+import { PerformanceSummary } from "./ui/PerformanceSummary";
+import { Sidebar } from "./ui/Sidebar";
+import {
+  Clock,
+  HardDrive,
+  Cpu,
+  Monitor,
+  Wifi,
+} from "lucide-react";
 
 interface SystemInfoType {
   hostname: string;
@@ -48,11 +54,7 @@ interface SystemInfoType {
     details: string;
   };
 }
-import { useState, useEffect, useRef } from "react";
-import { useTranslations } from "next-intl";
-import { useSSEContext } from "@/app/_contexts/SSEContext";
-import { SSEEvent } from "@/app/_utils/sse-events";
-import { usePageVisibility } from "@/app/_hooks/usePageVisibility";
+import { useState, useEffect } from "react";
 
 interface SystemInfoCardProps {
   systemInfo: SystemInfoType;
@@ -65,102 +67,55 @@ export const SystemInfoCard = ({
   const [systemInfo, setSystemInfo] =
     useState<SystemInfoType>(initialSystemInfo);
   const [isUpdating, setIsUpdating] = useState(false);
-  const [isDisabled, setIsDisabled] = useState(false);
-  const t = useTranslations();
-  const { subscribe } = useSSEContext();
-  const isPageVisible = usePageVisibility();
 
-  const abortControllerRef = useRef<AbortController | null>(null);
+
 
   const updateSystemInfo = async () => {
-    if (isDisabled) {
-      return;
-    }
-
-    if (abortControllerRef.current) {
-      abortControllerRef.current.abort();
-    }
-
-    const abortController = new AbortController();
-    abortControllerRef.current = abortController;
-
     try {
       setIsUpdating(true);
-      const response = await fetch("/api/system-stats", {
-        signal: abortController.signal,
-      });
+      const response = await fetch('/api/system-stats');
       if (!response.ok) {
-        throw new Error("Failed to fetch system stats");
+        throw new Error('Failed to fetch system stats');
       }
       const freshData = await response.json();
-      if (freshData === null) {
-        setIsDisabled(true);
-        return;
-      }
       setSystemInfo(freshData);
-    } catch (error: any) {
-      if (error.name !== "AbortError") {
-        console.error("Failed to update system info:", error);
-      }
+    } catch (error) {
+      console.error("Failed to update system info:", error);
     } finally {
-      if (!abortControllerRef.current?.signal.aborted) {
-        setIsUpdating(false);
-      }
+      setIsUpdating(false);
     }
   };
 
-  useEffect(() => {
-    const unsubscribe = subscribe((event: SSEEvent) => {
-      if (event.type === "system-stats" && event.data !== null) {
-        setSystemInfo(event.data);
-      }
-    });
-
-    return unsubscribe;
-  }, [subscribe]);
-
   useEffect(() => {
     const updateTime = () => {
       setCurrentTime(new Date().toLocaleTimeString());
     };
 
     updateTime();
-
-    if (isPageVisible) {
-      updateSystemInfo();
-    }
+    updateSystemInfo();
 
     const updateInterval = parseInt(
       process.env.NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL || "30000"
     );
 
     let mounted = true;
-    let timeoutId: NodeJS.Timeout | null = null;
 
     const doUpdate = () => {
-      if (!mounted || !isPageVisible || isDisabled) return;
+      if (!mounted) return;
       updateTime();
       updateSystemInfo().finally(() => {
-        if (mounted && isPageVisible && !isDisabled) {
-          timeoutId = setTimeout(doUpdate, updateInterval);
+        if (mounted) {
+          setTimeout(doUpdate, updateInterval);
         }
       });
     };
 
-    if (isPageVisible && !isDisabled) {
-      timeoutId = setTimeout(doUpdate, updateInterval);
-    }
+    setTimeout(doUpdate, updateInterval);
 
     return () => {
       mounted = false;
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
-      if (abortControllerRef.current) {
-        abortControllerRef.current.abort();
-      }
     };
-  }, [isPageVisible, isDisabled]);
+  }, []);
 
   const quickStats = {
     cpu: systemInfo.cpu.usage,
@@ -170,77 +125,78 @@ export const SystemInfoCard = ({
 
   const basicInfoItems = [
     {
-      icon: ClockIcon,
-      label: t("sidebar.uptime"),
+      icon: Clock,
+      label: "Uptime",
       value: systemInfo.uptime,
+      color: "text-orange-500",
     },
   ];
 
   const performanceItems = [
     {
-      icon: HardDriveIcon,
-      label: t("sidebar.memory"),
+      icon: HardDrive,
+      label: "Memory",
       value: `${systemInfo.memory.used} / ${systemInfo.memory.total}`,
       detail: `${systemInfo.memory.free} free`,
       status: systemInfo.memory.status,
+      color: "text-cyan-500",
       showProgress: true,
       progressValue: systemInfo.memory.usage,
     },
     {
-      icon: CpuIcon,
-      label: t("sidebar.cpu"),
+      icon: Cpu,
+      label: "CPU",
       value: systemInfo.cpu.model,
       detail: `${systemInfo.cpu.cores} cores`,
       status: systemInfo.cpu.status,
+      color: "text-pink-500",
       showProgress: true,
       progressValue: systemInfo.cpu.usage,
     },
     {
-      icon: MonitorIcon,
-      label: t("sidebar.gpu"),
+      icon: Monitor,
+      label: "GPU",
       value: systemInfo.gpu.model,
       detail: systemInfo.gpu.memory
         ? `${systemInfo.gpu.memory} VRAM`
         : systemInfo.gpu.status,
       status: systemInfo.gpu.status,
+      color: "text-indigo-500",
     },
-    ...(systemInfo.network
-      ? [
-        {
-          icon: WifiHighIcon,
-          label: t("sidebar.network"),
-          value: `${systemInfo.network.latency}ms`,
-          detail: `${systemInfo.network.latency}ms latency • ${systemInfo.network.speed}`,
-          status: systemInfo.network.status,
-        },
-      ]
-      : []),
+    ...(systemInfo.network ? [{
+      icon: Wifi,
+      label: "Network",
+      value: `${systemInfo.network.latency}ms`,
+      detail: `${systemInfo.network.latency}ms latency • ${systemInfo.network.speed}`,
+      status: systemInfo.network.status,
+      color: "text-teal-500",
+    }] : []),
   ];
 
   const performanceMetrics = [
     {
-      label: t("sidebar.cpuUsage"),
+      label: "CPU Usage",
       value: `${systemInfo.cpu.usage}%`,
       status: systemInfo.cpu.status,
     },
     {
-      label: t("sidebar.memoryUsage"),
+      label: "Memory Usage",
       value: `${systemInfo.memory.usage}%`,
       status: systemInfo.memory.status,
     },
-    ...(systemInfo.network
-      ? [
-        {
-          label: t("sidebar.networkLatency"),
-          value: `${systemInfo.network.latency}ms`,
-          status: systemInfo.network.status,
-        },
-      ]
-      : []),
+    ...(systemInfo.network ? [{
+      label: "Network Latency",
+      value: `${systemInfo.network.latency}ms`,
+      status: systemInfo.network.status,
+    }] : []),
   ];
 
   return (
-    <Sidebar defaultCollapsed={false} quickStats={quickStats}>
+    <Sidebar
+      title="System Overview"
+      defaultCollapsed={false}
+      quickStats={quickStats}
+    >
       <SystemStatus
         status={systemInfo.systemStatus.overall}
         details={systemInfo.systemStatus.details}
@@ -250,7 +206,7 @@ export const SystemInfoCard = ({
 
       <div>
         <h3 className="text-xs font-semibold text-foreground mb-2 uppercase tracking-wide">
-          {t("sidebar.systemInformation")}
+          System Information
         </h3>
         <div className="space-y-2">
           {basicInfoItems.map((item) => (
@@ -259,6 +215,7 @@ export const SystemInfoCard = ({
               icon={item.icon}
               label={item.label}
               value={item.value}
+              color={item.color}
               variant="basic"
             />
           ))}
@@ -267,9 +224,9 @@ export const SystemInfoCard = ({
 
       <div>
         <h3 className="text-xs font-semibold text-foreground mb-2 uppercase tracking-wide">
-          {t("sidebar.performanceMetrics")}
+          Performance Metrics
         </h3>
-        <div className="space-y-4">
+        <div className="space-y-2">
           {performanceItems.map((item) => (
             <MetricCard
               key={item.label}
@@ -278,6 +235,7 @@ export const SystemInfoCard = ({
               value={item.value}
               detail={item.detail}
               status={item.status}
+              color={item.color}
               variant="performance"
               showProgress={item.showProgress}
               progressValue={item.progressValue}
@@ -289,16 +247,16 @@ export const SystemInfoCard = ({
       <PerformanceSummary metrics={performanceMetrics} />
 
       <div className="text-xs text-muted-foreground text-center p-2 bg-muted/20 rounded-lg">
-        {t("sidebar.statsUpdateEvery")}{" "}
+        💡 Stats update every{" "}
         {Math.round(
           parseInt(process.env.NEXT_PUBLIC_CLOCK_UPDATE_INTERVAL || "30000") /
           1000
         )}
-        s • {t("sidebar.networkSpeedEstimatedFromLatency")}
+        s • Network speed estimated from latency
         {isUpdating && (
-          <span className="ml-2 animate-pulse">{t("sidebar.updating")}...</span>
+          <span className="ml-2 animate-pulse">🔄 Updating...</span>
         )}
       </div>
     </Sidebar>
   );
-};
+}

app/_components/TabbedInterface.tsx

@@ -0,0 +1,67 @@
+"use client";
+
+import { useState } from "react";
+import { CronJobList } from "./features/Cronjobs/CronJobList";
+import { ScriptsManager } from "./ScriptsManager";
+import { CronJob } from "@/app/_utils/system";
+import { type Script } from "@/app/_server/actions/scripts";
+import { Clock, FileText } from "lucide-react";
+
+interface TabbedInterfaceProps {
+  cronJobs: CronJob[];
+  scripts: Script[];
+}
+
+export const TabbedInterface = ({
+  cronJobs,
+  scripts,
+}: TabbedInterfaceProps) => {
+  const [activeTab, setActiveTab] = useState<"cronjobs" | "scripts">(
+    "cronjobs"
+  );
+
+  return (
+    <div className="space-y-6">
+      <div className="bg-background/80 backdrop-blur-md border border-border/50 rounded-lg p-1 glass-card">
+        <div className="flex">
+          <button
+            onClick={() => setActiveTab("cronjobs")}
+            className={`flex items-center gap-2 px-4 py-2 text-sm font-medium transition-all duration-200 rounded-md flex-1 justify-center ${
+              activeTab === "cronjobs"
+                ? "bg-primary/10 text-primary shadow-sm border border-primary/20"
+                : "text-muted-foreground hover:text-foreground hover:bg-muted/50"
+            }`}
+          >
+            <Clock className="h-4 w-4" />
+            Cron Jobs
+            <span className="ml-1 text-xs bg-primary/20 text-primary px-2 py-0.5 rounded-full font-medium">
+              {cronJobs.length}
+            </span>
+          </button>
+          <button
+            onClick={() => setActiveTab("scripts")}
+            className={`flex items-center gap-2 px-4 py-2 text-sm font-medium transition-all duration-200 rounded-md flex-1 justify-center ${
+              activeTab === "scripts"
+                ? "bg-primary/10 text-primary shadow-sm border border-primary/20"
+                : "text-muted-foreground hover:text-foreground hover:bg-muted/50"
+            }`}
+          >
+            <FileText className="h-4 w-4" />
+            Scripts
+            <span className="ml-1 text-xs bg-primary/20 text-primary px-2 py-0.5 rounded-full font-medium">
+              {scripts.length}
+            </span>
+          </button>
+        </div>
+      </div>
+
+      <div className="min-h-[400px]">
+        {activeTab === "cronjobs" ? (
+          <CronJobList cronJobs={cronJobs} scripts={scripts} />
+        ) : (
+          <ScriptsManager scripts={scripts} />
+        )}
+      </div>
+    </div>
+  );
+};

app/_components/features/Cronjobs/CronJobList.tsx

@@ -0,0 +1,514 @@
+"use client";
+
+import { Card, CardContent, CardHeader, CardTitle } from "../../ui/Card";
+import { Button } from "../../ui/Button";
+import {
+  Trash2,
+  Clock,
+  Edit,
+  Plus,
+  Files,
+  User,
+  Play,
+  Pause,
+  Code,
+} from "lucide-react";
+import { CronJob } from "@/app/_utils/system";
+import {
+  removeCronJob,
+  editCronJob,
+  createCronJob,
+  cloneCronJob,
+  pauseCronJobAction,
+  resumeCronJobAction,
+  runCronJob,
+} from "@/app/_server/actions/cronjobs";
+import { useState, useMemo, useEffect } from "react";
+import { CreateTaskModal } from "../../modals/CreateTaskModal";
+import { EditTaskModal } from "../../modals/EditTaskModal";
+import { DeleteTaskModal } from "../../modals/DeleteTaskModal";
+import { CloneTaskModal } from "../../modals/CloneTaskModal";
+import { UserFilter } from "../../ui/UserFilter";
+import { ErrorBadge } from "../../ui/ErrorBadge";
+import { ErrorDetailsModal } from "../../modals/ErrorDetailsModal";
+import { type Script } from "@/app/_server/actions/scripts";
+import { showToast } from "../../ui/Toast";
+import {
+  getJobErrorsByJobId,
+  setJobError,
+  JobError,
+} from "@/app/_utils/errorState";
+import {
+  handleErrorClick,
+  refreshJobErrors,
+  handleDelete,
+  handleClone,
+  handlePause,
+  handleResume,
+  handleRun,
+  handleEditSubmit,
+  handleNewCronSubmit,
+} from "./helpers";
+
+interface CronJobListProps {
+  cronJobs: CronJob[];
+  scripts: Script[];
+}
+
+export const CronJobList = ({ cronJobs, scripts }: CronJobListProps) => {
+  const [deletingId, setDeletingId] = useState<string | null>(null);
+  const [editingJob, setEditingJob] = useState<CronJob | null>(null);
+  const [isEditModalOpen, setIsEditModalOpen] = useState(false);
+  const [isNewCronModalOpen, setIsNewCronModalOpen] = useState(false);
+  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+  const [isCloneModalOpen, setIsCloneModalOpen] = useState(false);
+  const [jobToDelete, setJobToDelete] = useState<CronJob | null>(null);
+  const [jobToClone, setJobToClone] = useState<CronJob | null>(null);
+  const [isCloning, setIsCloning] = useState(false);
+  const [runningJobId, setRunningJobId] = useState<string | null>(null);
+  const [selectedUser, setSelectedUser] = useState<string | null>(null);
+  const [jobErrors, setJobErrors] = useState<Record<string, JobError[]>>({});
+  const [errorModalOpen, setErrorModalOpen] = useState(false);
+  const [selectedError, setSelectedError] = useState<JobError | null>(null);
+
+  useEffect(() => {
+    const savedUser = localStorage.getItem("selectedCronUser");
+    if (savedUser) {
+      setSelectedUser(savedUser);
+    }
+  }, []);
+
+  useEffect(() => {
+    if (selectedUser) {
+      localStorage.setItem("selectedCronUser", selectedUser);
+    } else {
+      localStorage.removeItem("selectedCronUser");
+    }
+  }, [selectedUser]);
+
+  const [editForm, setEditForm] = useState({
+    schedule: "",
+    command: "",
+    comment: "",
+  });
+  const [newCronForm, setNewCronForm] = useState({
+    schedule: "",
+    command: "",
+    comment: "",
+    selectedScriptId: null as string | null,
+    user: "",
+  });
+
+  const filteredJobs = useMemo(() => {
+    if (!selectedUser) return cronJobs;
+    return cronJobs.filter((job) => job.user === selectedUser);
+  }, [cronJobs, selectedUser]);
+
+  useEffect(() => {
+    const errors: Record<string, JobError[]> = {};
+    filteredJobs.forEach((job) => {
+      errors[job.id] = getJobErrorsByJobId(job.id);
+    });
+    setJobErrors(errors);
+  }, [filteredJobs]);
+
+  const handleErrorClickLocal = (error: JobError) => {
+    handleErrorClick(error, setSelectedError, setErrorModalOpen);
+  };
+
+  const refreshJobErrorsLocal = () => {
+    const errors: Record<string, JobError[]> = {};
+    filteredJobs.forEach((job) => {
+      errors[job.id] = getJobErrorsByJobId(job.id);
+    });
+    setJobErrors(errors);
+  };
+
+  const handleDeleteLocal = async (id: string) => {
+    await handleDelete(id, {
+      setDeletingId,
+      setIsDeleteModalOpen,
+      setJobToDelete,
+      setIsCloneModalOpen,
+      setJobToClone,
+      setIsCloning,
+      setIsEditModalOpen,
+      setEditingJob,
+      setIsNewCronModalOpen,
+      setNewCronForm,
+      setRunningJobId,
+      refreshJobErrors: refreshJobErrorsLocal,
+      jobToClone,
+      editingJob,
+      editForm,
+      newCronForm,
+    });
+  };
+
+  const handleCloneLocal = async (newComment: string) => {
+    await handleClone(newComment, {
+      setDeletingId,
+      setIsDeleteModalOpen,
+      setJobToDelete,
+      setIsCloneModalOpen,
+      setJobToClone,
+      setIsCloning,
+      setIsEditModalOpen,
+      setEditingJob,
+      setIsNewCronModalOpen,
+      setNewCronForm,
+      setRunningJobId,
+      refreshJobErrors: refreshJobErrorsLocal,
+      jobToClone,
+      editingJob,
+      editForm,
+      newCronForm,
+    });
+  };
+
+  const handlePauseLocal = async (id: string) => {
+    await handlePause(id);
+  };
+
+  const handleResumeLocal = async (id: string) => {
+    await handleResume(id);
+  };
+
+  const handleRunLocal = async (id: string) => {
+    await handleRun(id, {
+      setDeletingId,
+      setIsDeleteModalOpen,
+      setJobToDelete,
+      setIsCloneModalOpen,
+      setJobToClone,
+      setIsCloning,
+      setIsEditModalOpen,
+      setEditingJob,
+      setIsNewCronModalOpen,
+      setNewCronForm,
+      setRunningJobId,
+      refreshJobErrors: refreshJobErrorsLocal,
+      jobToClone,
+      editingJob,
+      editForm,
+      newCronForm,
+    });
+  };
+
+  const confirmDelete = (job: CronJob) => {
+    setJobToDelete(job);
+    setIsDeleteModalOpen(true);
+  };
+
+  const confirmClone = (job: CronJob) => {
+    setJobToClone(job);
+    setIsCloneModalOpen(true);
+  };
+
+  const handleEdit = (job: CronJob) => {
+    setEditingJob(job);
+    setEditForm({
+      schedule: job.schedule,
+      command: job.command,
+      comment: job.comment || "",
+    });
+    setIsEditModalOpen(true);
+  };
+
+  const handleEditSubmitLocal = async (e: React.FormEvent) => {
+    await handleEditSubmit(e, {
+      setDeletingId,
+      setIsDeleteModalOpen,
+      setJobToDelete,
+      setIsCloneModalOpen,
+      setJobToClone,
+      setIsCloning,
+      setIsEditModalOpen,
+      setEditingJob,
+      setIsNewCronModalOpen,
+      setNewCronForm,
+      setRunningJobId,
+      refreshJobErrors: refreshJobErrorsLocal,
+      jobToClone,
+      editingJob,
+      editForm,
+      newCronForm,
+    });
+  };
+
+  const handleNewCronSubmitLocal = async (e: React.FormEvent) => {
+    await handleNewCronSubmit(e, {
+      setDeletingId,
+      setIsDeleteModalOpen,
+      setJobToDelete,
+      setIsCloneModalOpen,
+      setJobToClone,
+      setIsCloning,
+      setIsEditModalOpen,
+      setEditingJob,
+      setIsNewCronModalOpen,
+      setNewCronForm,
+      setRunningJobId,
+      refreshJobErrors: refreshJobErrorsLocal,
+      jobToClone,
+      editingJob,
+      editForm,
+      newCronForm,
+    });
+  };
+
+  return (
+    <>
+      <Card className="glass-card">
+        <CardHeader>
+          <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
+            <div className="flex items-center gap-3">
+              <div className="p-2 bg-primary/10 rounded-lg">
+                <Clock className="h-5 w-5 text-primary" />
+              </div>
+              <div>
+                <CardTitle className="text-xl brand-gradient">
+                  Scheduled Tasks
+                </CardTitle>
+                <p className="text-sm text-muted-foreground">
+                  {filteredJobs.length} of {cronJobs.length} scheduled job
+                  {filteredJobs.length !== 1 ? "s" : ""}
+                  {selectedUser && ` for ${selectedUser}`}
+                </p>
+              </div>
+            </div>
+            <Button
+              onClick={() => setIsNewCronModalOpen(true)}
+              className="btn-primary glow-primary"
+            >
+              <Plus className="h-4 w-4 mr-2" />
+              New Task
+            </Button>
+          </div>
+        </CardHeader>
+        <CardContent>
+          <div className="mb-4">
+            <UserFilter
+              selectedUser={selectedUser}
+              onUserChange={setSelectedUser}
+              className="w-full sm:w-64"
+            />
+          </div>
+
+          {filteredJobs.length === 0 ? (
+            <div className="text-center py-16">
+              <div className="mx-auto w-20 h-20 bg-gradient-to-br from-primary/20 to-blue-500/20 rounded-full flex items-center justify-center mb-6">
+                <Clock className="h-10 w-10 text-primary" />
+              </div>
+              <h3 className="text-xl font-semibold mb-3 brand-gradient">
+                {selectedUser
+                  ? `No tasks for user ${selectedUser}`
+                  : "No scheduled tasks yet"}
+              </h3>
+              <p className="text-muted-foreground mb-6 max-w-md mx-auto">
+                {selectedUser
+                  ? `No scheduled tasks found for user ${selectedUser}. Try selecting a different user or create a new task.`
+                  : "Create your first scheduled task to automate your system operations and boost productivity."}
+              </p>
+              <Button
+                onClick={() => setIsNewCronModalOpen(true)}
+                className="btn-primary glow-primary"
+                size="lg"
+              >
+                <Plus className="h-5 w-5 mr-2" />
+                Create Your First Task
+              </Button>
+            </div>
+          ) : (
+            <div className="space-y-3">
+              {filteredJobs.map((job) => (
+                <div
+                  key={job.id}
+                  className="glass-card p-4 border border-border/50 rounded-lg hover:bg-accent/30 transition-colors"
+                >
+                  <div className="flex flex-col sm:flex-row sm:items-start gap-4">
+                    <div className="flex-1 min-w-0 order-2 lg:order-1">
+                      <div className="flex items-center gap-3 mb-2">
+                        <code className="text-sm bg-purple-500/10 text-purple-600 dark:text-purple-400 px-2 py-1 rounded font-mono border border-purple-500/20">
+                          {job.schedule}
+                        </code>
+                        <div className="flex-1 min-w-0">
+                          <pre
+                            className="text-sm font-medium text-foreground truncate bg-muted/30 px-2 py-1 rounded border border-border/30"
+                            title={job.command}
+                          >
+                            {job.command}
+                          </pre>
+                        </div>
+                      </div>
+
+                      <div className="flex items-center gap-2 mb-1">
+                        <div className="flex items-center gap-1 text-xs text-muted-foreground">
+                          <User className="h-3 w-3" />
+                          <span>{job.user}</span>
+                        </div>
+                        {job.paused && (
+                          <span className="text-xs bg-yellow-500/10 text-yellow-600 dark:text-yellow-400 px-2 py-0.5 rounded border border-yellow-500/20">
+                            Paused
+                          </span>
+                        )}
+                        <ErrorBadge
+                          errors={jobErrors[job.id] || []}
+                          onErrorClick={handleErrorClickLocal}
+                          onErrorDismiss={refreshJobErrorsLocal}
+                        />
+                      </div>
+
+                      {job.comment && (
+                        <p
+                          className="text-xs text-muted-foreground italic truncate"
+                          title={job.comment}
+                        >
+                          {job.comment}
+                        </p>
+                      )}
+                    </div>
+
+                    <div className="flex items-center gap-2 flex-shrink-0 order-1 lg:order-2">
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={() => handleRunLocal(job.id)}
+                        disabled={runningJobId === job.id || job.paused}
+                        className="btn-outline h-8 px-3"
+                        title="Run cron job manually"
+                        aria-label="Run cron job manually"
+                      >
+                        {runningJobId === job.id ? (
+                          <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
+                        ) : (
+                          <Code className="h-3 w-3" />
+                        )}
+                      </Button>
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={() => handleEdit(job)}
+                        className="btn-outline h-8 px-3"
+                        title="Edit cron job"
+                        aria-label="Edit cron job"
+                      >
+                        <Edit className="h-3 w-3" />
+                      </Button>
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={() => confirmClone(job)}
+                        className="btn-outline h-8 px-3"
+                        title="Clone cron job"
+                        aria-label="Clone cron job"
+                      >
+                        <Files className="h-3 w-3" />
+                      </Button>
+                      {job.paused ? (
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={() => handleResumeLocal(job.id)}
+                          className="btn-outline h-8 px-3"
+                          title="Resume cron job"
+                          aria-label="Resume cron job"
+                        >
+                          <Play className="h-3 w-3" />
+                        </Button>
+                      ) : (
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={() => handlePauseLocal(job.id)}
+                          className="btn-outline h-8 px-3"
+                          title="Pause cron job"
+                          aria-label="Pause cron job"
+                        >
+                          <Pause className="h-3 w-3" />
+                        </Button>
+                      )}
+                      <Button
+                        variant="destructive"
+                        size="sm"
+                        onClick={() => confirmDelete(job)}
+                        disabled={deletingId === job.id}
+                        className="btn-destructive h-8 px-3"
+                        title="Delete cron job"
+                        aria-label="Delete cron job"
+                      >
+                        {deletingId === job.id ? (
+                          <div className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
+                        ) : (
+                          <Trash2 className="h-3 w-3" />
+                        )}
+                      </Button>
+                    </div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </CardContent>
+      </Card>
+
+      <CreateTaskModal
+        isOpen={isNewCronModalOpen}
+        onClose={() => setIsNewCronModalOpen(false)}
+        onSubmit={handleNewCronSubmitLocal}
+        scripts={scripts}
+        form={newCronForm}
+        onFormChange={(updates) =>
+          setNewCronForm((prev) => ({ ...prev, ...updates }))
+        }
+      />
+
+      <EditTaskModal
+        isOpen={isEditModalOpen}
+        onClose={() => setIsEditModalOpen(false)}
+        onSubmit={handleEditSubmitLocal}
+        form={editForm}
+        onFormChange={(updates) =>
+          setEditForm((prev) => ({ ...prev, ...updates }))
+        }
+      />
+
+      <DeleteTaskModal
+        isOpen={isDeleteModalOpen}
+        onClose={() => setIsDeleteModalOpen(false)}
+        onConfirm={() =>
+          jobToDelete ? handleDeleteLocal(jobToDelete.id) : undefined
+        }
+        job={jobToDelete}
+      />
+
+      <CloneTaskModal
+        cronJob={jobToClone}
+        isOpen={isCloneModalOpen}
+        onClose={() => setIsCloneModalOpen(false)}
+        onConfirm={handleCloneLocal}
+        isCloning={isCloning}
+      />
+
+      {errorModalOpen && selectedError && (
+        <ErrorDetailsModal
+          isOpen={errorModalOpen}
+          onClose={() => {
+            setErrorModalOpen(false);
+            setSelectedError(null);
+          }}
+          error={{
+            title: selectedError.title,
+            message: selectedError.message,
+            details: selectedError.details,
+            command: selectedError.command,
+            output: selectedError.output,
+            stderr: selectedError.stderr,
+            timestamp: selectedError.timestamp,
+            jobId: selectedError.jobId,
+          }}
+        />
+      )}
+    </>
+  );
+};

app/_components/features/Cronjobs/helpers/index.tsx

@@ -1,5 +1,5 @@
-import { JobError, setJobError } from "@/app/_utils/error-utils";
-import { showToast } from "@/app/_components/GlobalComponents/UIElements/Toast";
+import { JobError, setJobError } from "@/app/_utils/errorState";
+import { showToast } from "@/app/_components/ui/Toast";
 import {
   removeCronJob,
   editCronJob,
@@ -8,10 +8,8 @@ import {
   pauseCronJobAction,
   resumeCronJobAction,
   runCronJob,
-  toggleCronJobLogging,
-  backupCronJob,
 } from "@/app/_server/actions/cronjobs";
-import { CronJob } from "@/app/_utils/cronjob-utils";
+import { CronJob } from "@/app/_utils/system";
 
 interface HandlerProps {
   setDeletingId: (id: string | null) => void;
@@ -26,17 +24,12 @@ interface HandlerProps {
   setNewCronForm: (form: any) => void;
   setRunningJobId: (id: string | null) => void;
   refreshJobErrors: () => void;
-  setIsLiveLogModalOpen?: (open: boolean) => void;
-  setLiveLogRunId?: (runId: string) => void;
-  setLiveLogJobId?: (jobId: string) => void;
-  setLiveLogJobComment?: (comment: string) => void;
   jobToClone: CronJob | null;
   editingJob: CronJob | null;
   editForm: {
     schedule: string;
     command: string;
     comment: string;
-    logsEnabled: boolean;
   };
   newCronForm: {
     schedule: string;
@@ -44,7 +37,6 @@ interface HandlerProps {
     comment: string;
     selectedScriptId: string | null;
     user: string;
-    logsEnabled: boolean;
   };
 }
 
@@ -69,7 +61,7 @@ export const refreshJobErrors = (
   setJobErrors(errors);
 };
 
-export const handleDelete = async (job: CronJob, props: HandlerProps) => {
+export const handleDelete = async (id: string, props: HandlerProps) => {
   const {
     setDeletingId,
     setIsDeleteModalOpen,
@@ -77,25 +69,19 @@ export const handleDelete = async (job: CronJob, props: HandlerProps) => {
     refreshJobErrors,
   } = props;
 
-  setDeletingId(job.id);
+  setDeletingId(id);
   try {
-    const result = await removeCronJob({
-      id: job.id,
-      schedule: job.schedule,
-      command: job.command,
-      comment: job.comment,
-      user: job.user,
-    });
+    const result = await removeCronJob(id);
     if (result.success) {
       showToast("success", "Cron job deleted successfully");
     } else {
-      const errorId = `delete-${job.id}-${Date.now()}`;
+      const errorId = `delete-${id}-${Date.now()}`;
       const jobError: JobError = {
         id: errorId,
         title: "Failed to delete cron job",
         message: result.message,
         timestamp: new Date().toISOString(),
-        jobId: job.id,
+        jobId: id,
       };
       setJobError(jobError);
       refreshJobErrors();
@@ -113,14 +99,14 @@ export const handleDelete = async (job: CronJob, props: HandlerProps) => {
       );
     }
   } catch (error: any) {
-    const errorId = `delete-${job.id}-${Date.now()}`;
+    const errorId = `delete-${id}-${Date.now()}`;
     const jobError: JobError = {
       id: errorId,
       title: "Failed to delete cron job",
       message: error.message || "Please try again later.",
       details: error.stack,
       timestamp: new Date().toISOString(),
-      jobId: job.id,
+      jobId: id,
     };
     setJobError(jobError);
     showToast(
@@ -164,15 +150,9 @@ export const handleClone = async (newComment: string, props: HandlerProps) => {
   }
 };
 
-export const handlePause = async (job: any) => {
+export const handlePause = async (id: string) => {
   try {
-    const result = await pauseCronJobAction({
-      id: job.id,
-      schedule: job.schedule,
-      command: job.command,
-      comment: job.comment,
-      user: job.user,
-    });
+    const result = await pauseCronJobAction(id);
     if (result.success) {
       showToast("success", "Cron job paused successfully");
     } else {
@@ -183,36 +163,9 @@ export const handlePause = async (job: any) => {
   }
 };
 
-export const handleToggleLogging = async (job: any) => {
+export const handleResume = async (id: string) => {
   try {
-    const result = await toggleCronJobLogging({
-      id: job.id,
-      schedule: job.schedule,
-      command: job.command,
-      comment: job.comment,
-      user: job.user,
-      logsEnabled: job.logsEnabled,
-    });
-    if (result.success) {
-      showToast("success", result.message);
-    } else {
-      showToast("error", "Failed to toggle logging", result.message);
-    }
-  } catch (error: any) {
-    console.error("Error toggling logging:", error);
-    showToast("error", "Error toggling logging", error.message);
-  }
-};
-
-export const handleResume = async (job: any) => {
-  try {
-    const result = await resumeCronJobAction({
-      id: job.id,
-      schedule: job.schedule,
-      command: job.command,
-      comment: job.comment,
-      user: job.user,
-    });
+    const result = await resumeCronJobAction(id);
     if (result.success) {
       showToast("success", "Cron job resumed successfully");
     } else {
@@ -223,32 +176,14 @@ export const handleResume = async (job: any) => {
   }
 };
 
-export const handleRun = async (id: string, props: HandlerProps, job: CronJob) => {
-  const {
-    setRunningJobId,
-    refreshJobErrors,
-    setIsLiveLogModalOpen,
-    setLiveLogRunId,
-    setLiveLogJobId,
-    setLiveLogJobComment,
-  } = props;
+export const handleRun = async (id: string, props: HandlerProps) => {
+  const { setRunningJobId, refreshJobErrors } = props;
 
   setRunningJobId(id);
   try {
     const result = await runCronJob(id);
     if (result.success) {
-      if (result.mode === "async" && result.runId) {
-        if (setIsLiveLogModalOpen && setLiveLogRunId && setLiveLogJobId) {
-          setLiveLogRunId(result.runId);
-          setLiveLogJobId(id);
-          if (setLiveLogJobComment) {
-            setLiveLogJobComment(job.comment || "");
-          }
-          setIsLiveLogModalOpen(true);
-        }
-      } else {
-        showToast("success", "Cron job executed successfully");
-      }
+      showToast("success", "Cron job executed successfully");
     } else {
       const errorId = `run-${id}-${Date.now()}`;
       const jobError: JobError = {
@@ -326,7 +261,6 @@ export const handleEditSubmit = async (
     formData.append("schedule", editForm.schedule);
     formData.append("command", editForm.command);
     formData.append("comment", editForm.comment);
-    formData.append("logsEnabled", editForm.logsEnabled.toString());
 
     const result = await editCronJob(formData);
     if (result.success) {
@@ -401,7 +335,6 @@ export const handleNewCronSubmit = async (
     formData.append("command", newCronForm.command);
     formData.append("comment", newCronForm.comment);
     formData.append("user", newCronForm.user);
-    formData.append("logsEnabled", newCronForm.logsEnabled.toString());
     if (newCronForm.selectedScriptId) {
       formData.append("selectedScriptId", newCronForm.selectedScriptId);
     }
@@ -415,7 +348,6 @@ export const handleNewCronSubmit = async (
         comment: "",
         selectedScriptId: null,
         user: "",
-        logsEnabled: false,
       });
       showToast("success", "Cron job created successfully");
     } else {
@@ -425,17 +357,3 @@ export const handleNewCronSubmit = async (
     showToast("error", "Failed to create cron job", "Please try again later.");
   }
 };
-
-export const handleBackup = async (job: any) => {
-  try {
-    const result = await backupCronJob(job);
-    if (result.success) {
-      showToast("success", "Job backed up successfully");
-    } else {
-      showToast("error", "Failed to backup job", result.message);
-    }
-  } catch (error: any) {
-    console.error("Error backing up job:", error);
-    showToast("error", "Error backing up job", error.message);
-  }
-};

app/_components/features/LoginForm/LoginForm.tsx

@@ -0,0 +1,99 @@
+"use client";
+
+import { useState } from "react";
+import { useRouter } from "next/navigation";
+import { Button } from "../../ui/Button";
+import { Input } from "../../ui/Input";
+import { Card, CardHeader, CardTitle, CardDescription, CardContent } from "../../ui/Card";
+import { Lock, Eye, EyeOff } from "lucide-react";
+
+
+export const LoginForm = () => {
+  const [password, setPassword] = useState("");
+  const [showPassword, setShowPassword] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState("");
+  const router = useRouter();
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    setIsLoading(true);
+    setError("");
+
+    try {
+      const response = await fetch("/api/auth/login", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ password }),
+      });
+
+      const result = await response.json();
+
+      if (result.success) {
+        router.push("/");
+      } else {
+        setError(result.message || "Login failed");
+      }
+    } catch (error) {
+      setError("An error occurred. Please try again.");
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <Card className="w-full max-w-md shadow-xl">
+      <CardHeader className="text-center">
+        <div className="mx-auto w-16 h-16 bg-primary/10 rounded-full flex items-center justify-center mb-4">
+          <Lock className="w-8 h-8 text-primary" />
+        </div>
+        <CardTitle>Welcome to Cr*nMaster</CardTitle>
+        <CardDescription>Enter your password to continue</CardDescription>
+      </CardHeader>
+
+      <CardContent>
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div className="relative">
+            <Input
+              type={showPassword ? "text" : "password"}
+              value={password}
+              onChange={(e) => setPassword(e.target.value)}
+              placeholder="Enter password"
+              className="pr-10"
+              required
+              disabled={isLoading}
+            />
+            <button
+              type="button"
+              onClick={() => setShowPassword(!showPassword)}
+              className="absolute right-3 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground transition-colors"
+              disabled={isLoading}
+            >
+              {showPassword ? (
+                <EyeOff className="w-4 h-4" />
+              ) : (
+                <Eye className="w-4 h-4" />
+              )}
+            </button>
+          </div>
+
+          {error && (
+            <div className="text-sm text-red-500 bg-red-500/10 border border-red-500/20 rounded-md p-3">
+              {error}
+            </div>
+          )}
+
+          <Button
+            type="submit"
+            className="w-full"
+            disabled={isLoading || !password.trim()}
+          >
+            {isLoading ? "Signing in..." : "Sign In"}
+          </Button>
+        </form>
+      </CardContent>
+    </Card>
+  );
+};

app/_components/modals/CloneScriptModal.tsx

@@ -1,11 +1,11 @@
 "use client";
 
 import { useState } from "react";
-import { CopyIcon } from "@phosphor-icons/react";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
-import { Script } from "@/app/_utils/scripts-utils";
+import { Copy } from "lucide-react";
+import { Button } from "../ui/Button";
+import { Modal } from "../ui/Modal";
+import { Input } from "../ui/Input";
+import { type Script } from "@/app/_server/actions/scripts";
 
 interface CloneScriptModalProps {
   script: Script | null;
@@ -89,7 +89,7 @@ export const CloneScriptModal = ({
               </>
             ) : (
               <>
-                <CopyIcon className="h-4 w-4 mr-2" />
+                <Copy className="h-4 w-4 mr-2" />
                 Clone Script
               </>
             )}

app/_components/modals/CloneTaskModal.tsx

@@ -1,11 +1,11 @@
 "use client";
 
 import { useState } from "react";
-import { CopyIcon } from "@phosphor-icons/react";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
-import { type CronJob } from "@/app/_utils/cronjob-utils";
+import { Copy } from "lucide-react";
+import { Button } from "../ui/Button";
+import { Modal } from "../ui/Modal";
+import { Input } from "../ui/Input";
+import { type CronJob } from "@/app/_utils/system";
 
 interface CloneTaskModalProps {
   cronJob: CronJob | null;
@@ -89,7 +89,7 @@ export const CloneTaskModal = ({
               </>
             ) : (
               <>
-                <CopyIcon className="h-4 w-4 mr-2" />
+                <Copy className="h-4 w-4 mr-2" />
                 Clone Cron Job
               </>
             )}

app/_components/modals/CreateScriptModal.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import { PlusIcon } from "@phosphor-icons/react";
-import { ScriptModal } from "@/app/_components/FeatureComponents/Modals/ScriptModal";
+import { Plus } from "lucide-react";
+import { ScriptModal } from "./ScriptModal";
 
 interface CreateScriptModalProps {
   isOpen: boolean;
@@ -15,8 +15,6 @@ interface CreateScriptModalProps {
     content: string;
   };
   onFormChange: (updates: Partial<CreateScriptModalProps["form"]>) => void;
-  isDraft?: boolean;
-  onClearDraft?: () => void;
 }
 
 export const CreateScriptModal = ({
@@ -25,8 +23,6 @@ export const CreateScriptModal = ({
   onSubmit,
   form,
   onFormChange,
-  isDraft,
-  onClearDraft,
 }: CreateScriptModalProps) => {
   return (
     <ScriptModal
@@ -35,11 +31,9 @@ export const CreateScriptModal = ({
       onSubmit={onSubmit}
       title="Create New Script"
       submitButtonText="Create Script"
-      submitButtonIcon={<PlusIcon className="h-4 w-4 mr-2" />}
+      submitButtonIcon={<Plus className="h-4 w-4 mr-2" />}
       form={form}
       onFormChange={onFormChange}
-      isDraft={isDraft}
-      onClearDraft={onClearDraft}
     />
   );
 }

app/_components/modals/CreateTaskModal.tsx

@@ -1,16 +1,15 @@
 "use client";
 
 import { useState, useEffect } from "react";
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
-import { CronExpressionHelper } from "@/app/_components/FeatureComponents/Scripts/CronExpressionHelper";
-import { SelectScriptModal } from "@/app/_components/FeatureComponents/Modals/SelectScriptModal";
-import { UserSwitcher } from "@/app/_components/FeatureComponents/User/UserSwitcher";
-import { PlusIcon, TerminalIcon, FileTextIcon, XIcon, FileArrowDownIcon } from "@phosphor-icons/react";
+import { Modal } from "../ui/Modal";
+import { Button } from "../ui/Button";
+import { Input } from "../ui/Input";
+import { CronExpressionHelper } from "../CronExpressionHelper";
+import { SelectScriptModal } from "./SelectScriptModal";
+import { UserSwitcher } from "../ui/UserSwitcher";
+import { Plus, Terminal, FileText, X } from "lucide-react";
 import { getScriptContent } from "@/app/_server/actions/scripts";
-import { getHostScriptPath } from "@/app/_server/actions/scripts";
-import { useTranslations } from "next-intl";
+import { getHostScriptPath } from "@/app/_utils/scripts";
 
 interface Script {
   id: string;
@@ -31,7 +30,6 @@ interface CreateTaskModalProps {
     comment: string;
     selectedScriptId: string | null;
     user: string;
-    logsEnabled: boolean;
   };
   onFormChange: (updates: Partial<CreateTaskModalProps["form"]>) => void;
 }
@@ -48,7 +46,6 @@ export const CreateTaskModal = ({
     useState<string>("");
   const [isSelectScriptModalOpen, setIsSelectScriptModalOpen] = useState(false);
   const selectedScript = scripts.find((s) => s.id === form.selectedScriptId);
-  const t = useTranslations();
 
   useEffect(() => {
     const loadScriptContent = async () => {
@@ -64,10 +61,9 @@ export const CreateTaskModal = ({
   }, [selectedScript]);
 
   const handleScriptSelect = async (script: Script) => {
-    const scriptPath = await getHostScriptPath(script.filename);
     onFormChange({
       selectedScriptId: script.id,
-      command: scriptPath,
+      command: await getHostScriptPath(script.filename),
     });
   };
 
@@ -90,23 +86,23 @@ export const CreateTaskModal = ({
       <Modal
         isOpen={isOpen}
         onClose={onClose}
-        title={t("cronjobs.createNewScheduledTask")}
+        title="Create New Scheduled Task"
         size="lg"
       >
         <form onSubmit={onSubmit} className="space-y-4">
           <div>
             <label className="block text-sm font-medium text-foreground mb-1">
-              {t("common.user")}
+              User
             </label>
             <UserSwitcher
               selectedUser={form.user}
-              onUserChange={(user: string) => onFormChange({ user })}
+              onUserChange={(user) => onFormChange({ user })}
             />
           </div>
 
           <div>
             <label className="block text-sm font-medium text-foreground mb-1">
-              {t("cronjobs.schedule")}
+              Schedule
             </label>
             <CronExpressionHelper
               value={form.schedule}
@@ -118,26 +114,22 @@ export const CreateTaskModal = ({
 
           <div>
             <label className="block text-sm font-medium text-foreground mb-2">
-              {t("cronjobs.taskType")}
+              Task Type
             </label>
             <div className="grid grid-cols-2 gap-3">
               <button
                 type="button"
                 onClick={handleCustomCommand}
-                className={`p-4 rounded-lg transition-all ${!form.selectedScriptId
-                  ? "border-border border-2"
-                  : "border-border border"
+                className={`p-4 rounded-lg border-2 transition-all ${!form.selectedScriptId
+                    ? "border-primary bg-primary/5 text-primary"
+                    : "border-border bg-muted/30 text-muted-foreground hover:border-border/60"
                   }`}
               >
                 <div className="flex items-center gap-3">
-                  <TerminalIcon className="h-5 w-5" />
+                  <Terminal className="h-5 w-5" />
                   <div className="text-left">
-                    <div className="font-medium">
-                      {t("cronjobs.customCommand")}
-                    </div>
-                    <div className="text-xs opacity-70">
-                      {t("cronjobs.singleCommand")}
-                    </div>
+                    <div className="font-medium">Custom Command</div>
+                    <div className="text-xs opacity-70">Single command</div>
                   </div>
                 </div>
               </button>
@@ -145,19 +137,17 @@ export const CreateTaskModal = ({
               <button
                 type="button"
                 onClick={() => setIsSelectScriptModalOpen(true)}
-                className={`p-4 rounded-lg transition-all ${form.selectedScriptId
-                  ? "border-border border-2"
-                  : "border-border border"
+                className={`p-4 rounded-lg border-2 transition-all ${form.selectedScriptId
+                    ? "border-primary bg-primary/5 text-primary"
+                    : "border-border bg-muted/30 text-muted-foreground hover:border-border/60"
                   }`}
               >
                 <div className="flex items-center gap-3">
-                  <FileTextIcon className="h-5 w-5" />
+                  <FileText className="h-5 w-5" />
                   <div className="text-left">
-                    <div className="font-medium">
-                      {t("scripts.savedScript")}
-                    </div>
+                    <div className="font-medium">Saved Script</div>
                     <div className="text-xs opacity-70">
-                      {t("scripts.selectFromLibrary")}
+                      Select from library
                     </div>
                   </div>
                 </div>
@@ -170,7 +160,7 @@ export const CreateTaskModal = ({
               <div className="flex items-start justify-between">
                 <div className="flex-1">
                   <div className="flex items-center gap-2 mb-1">
-                    <FileTextIcon className="h-4 w-4 text-primary" />
+                    <FileText className="h-4 w-4 text-primary" />
                     <h4 className="font-medium text-foreground">
                       {selectedScript.name}
                     </h4>
@@ -178,7 +168,7 @@ export const CreateTaskModal = ({
                   <p className="text-sm text-muted-foreground mb-2">
                     {selectedScript.description}
                   </p>
-                  <div className="bg-muted/30 p-2 rounded border border-border">
+                  <div className="bg-muted/30 p-2 rounded border border-border/30">
                     <code className="text-xs font-mono text-foreground break-all">
                       {form.command}
                     </code>
@@ -192,7 +182,7 @@ export const CreateTaskModal = ({
                     onClick={() => setIsSelectScriptModalOpen(true)}
                     className="h-8 px-2 text-xs"
                   >
-                    {t("common.change")}
+                    Change
                   </Button>
                   <Button
                     type="button"
@@ -201,7 +191,7 @@ export const CreateTaskModal = ({
                     onClick={handleClearScript}
                     className="h-8 w-8 p-0 text-muted-foreground hover:text-foreground"
                   >
-                    <XIcon className="h-4 w-4" />
+                    <X className="h-4 w-4" />
                   </Button>
                 </div>
               </div>
@@ -211,7 +201,7 @@ export const CreateTaskModal = ({
           {!form.selectedScriptId && !selectedScript && (
             <div>
               <label className="block text-sm font-medium text-foreground mb-1">
-                {t("cronjobs.command")}
+                Command
               </label>
               <div className="relative">
                 <textarea
@@ -222,17 +212,18 @@ export const CreateTaskModal = ({
                       ? "/app/scripts/script_name.sh"
                       : "/usr/bin/command"
                   }
-                  className="w-full h-24 p-2 border border-border rounded bg-background0 text-foreground font-mono text-sm resize-none focus:outline-none focus:ring-1 focus:ring-primary/20"
+                  className="w-full h-24 p-2 border border-border rounded bg-background text-foreground font-mono text-sm resize-none focus:outline-none focus:ring-1 focus:ring-primary/20"
                   required
                   readOnly={!!form.selectedScriptId}
                 />
                 <div className="absolute right-3 top-2">
-                  <TerminalIcon className="h-4 w-4 text-muted-foreground" />
+                  <Terminal className="h-4 w-4 text-muted-foreground" />
                 </div>
               </div>
               {form.selectedScriptId && (
                 <p className="text-xs text-muted-foreground mt-1">
-                  {t("scripts.scriptPathReadOnly")}
+                  Script path is read-only. Edit the script in the Scripts
+                  Library.
                 </p>
               )}
             </div>
@@ -240,57 +231,29 @@ export const CreateTaskModal = ({
 
           <div>
             <label className="block text-sm font-medium text-foreground mb-1">
-              {t("common.description")}
-              <span className="text-muted-foreground">
-                ({t("common.optional")})
-              </span>
+              Description{" "}
+              <span className="text-muted-foreground">(Optional)</span>
             </label>
             <Input
               value={form.comment}
               onChange={(e) => onFormChange({ comment: e.target.value })}
-              placeholder={t("cronjobs.whatDoesThisTaskDo")}
-              className="bg-muted/30 border-border focus:border-primary/50"
+              placeholder="What does this task do?"
+              className="bg-muted/30 border-border/50 focus:border-primary/50"
             />
           </div>
 
-          <div className="border border-border bg-muted/10 rounded-lg p-4">
-            <div className="flex items-start gap-3">
-              <input
-                type="checkbox"
-                id="logsEnabled"
-                checked={form.logsEnabled}
-                onChange={(e) =>
-                  onFormChange({ logsEnabled: e.target.checked })
-                }
-                className="mt-1 h-4 w-4 rounded border-border text-primary focus:ring-primary/20 cursor-pointer"
-              />
-              <div className="flex-1">
-                <label
-                  htmlFor="logsEnabled"
-                  className="flex items-center gap-2 text-sm font-medium text-foreground cursor-pointer"
-                >
-                  <FileArrowDownIcon className="h-4 w-4 text-primary" />
-                  {t("cronjobs.enableLogging")}
-                </label>
-                <p className="text-xs text-muted-foreground mt-1">
-                  {t("cronjobs.loggingDescription")}
-                </p>
-              </div>
-            </div>
-          </div>
-
-          <div className="flex justify-end gap-2 pt-3 border-t border-border">
+          <div className="flex justify-end gap-2 pt-3 border-t border-border/50">
             <Button
               type="button"
               variant="outline"
               onClick={onClose}
               className="btn-outline"
             >
-              {t("common.cancel")}
+              Cancel
             </Button>
             <Button type="submit" className="btn-primary glow-primary">
-              <PlusIcon className="h-4 w-4 mr-2" />
-              {t("cronjobs.createTask")}
+              <Plus className="h-4 w-4 mr-2" />
+              Create Task
             </Button>
           </div>
         </form>
@@ -305,4 +268,4 @@ export const CreateTaskModal = ({
       />
     </>
   );
-};
+}

app/_components/modals/DeleteScriptModal.tsx

@@ -1,9 +1,9 @@
 "use client";
 
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { FileTextIcon, WarningCircleIcon, TrashIcon } from "@phosphor-icons/react";
-import { Script } from "@/app/_utils/scripts-utils";
+import { Modal } from "../ui/Modal";
+import { Button } from "../ui/Button";
+import { FileText, AlertCircle, Trash2 } from "lucide-react";
+import { type Script } from "@/app/_server/actions/scripts";
 
 interface DeleteScriptModalProps {
   script: Script | null;
@@ -25,10 +25,10 @@ export const DeleteScriptModal = ({
   return (
     <Modal isOpen={isOpen} onClose={onClose} title="Delete Script" size="sm">
       <div className="space-y-3">
-        <div className="bg-muted/30 rounded p-2 border border-border">
+        <div className="bg-muted/30 rounded p-2 border border-border/50">
           <div className="space-y-1">
             <div className="flex items-center gap-2">
-              <FileTextIcon className="h-3 w-3 text-muted-foreground" />
+              <FileText className="h-3 w-3 text-muted-foreground" />
               <span className="text-xs font-medium text-foreground">
                 {script.name}
               </span>
@@ -36,7 +36,7 @@ export const DeleteScriptModal = ({
 
             {script.description && (
               <div className="flex items-start gap-2">
-                <FileTextIcon className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
+                <FileText className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
                 <p className="text-xs text-muted-foreground break-words italic">
                   {script.description}
                 </p>
@@ -44,8 +44,8 @@ export const DeleteScriptModal = ({
             )}
 
             <div className="flex items-start gap-2">
-              <FileTextIcon className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
-              <code className="text-xs font-mono bg-muted/30 px-1 py-0.5 rounded border border-border">
+              <FileText className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
+              <code className="text-xs font-mono bg-muted/30 px-1 py-0.5 rounded border border-border/30">
                 {script.filename}
               </code>
             </div>
@@ -54,7 +54,7 @@ export const DeleteScriptModal = ({
 
         <div className="bg-destructive/5 border border-destructive/20 rounded p-2">
           <div className="flex items-start gap-2">
-            <WarningCircleIcon className="h-4 w-4 text-destructive mt-0.5 flex-shrink-0" />
+            <AlertCircle className="h-4 w-4 text-destructive mt-0.5 flex-shrink-0" />
             <div>
               <p className="text-xs font-medium text-destructive mb-0.5">
                 This action cannot be undone
@@ -66,7 +66,7 @@ export const DeleteScriptModal = ({
           </div>
         </div>
 
-        <div className="flex justify-end gap-2 pt-2 border-t border-border">
+        <div className="flex justify-end gap-2 pt-2 border-t border-border/50">
           <Button
             variant="outline"
             onClick={onClose}
@@ -88,7 +88,7 @@ export const DeleteScriptModal = ({
               </>
             ) : (
               <>
-                <TrashIcon className="h-4 w-4 mr-2" />
+                <Trash2 className="h-4 w-4 mr-2" />
                 Delete Script
               </>
             )}

app/_components/modals/DeleteTaskModal.tsx

@@ -1,15 +1,15 @@
 "use client";
 
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
+import { Modal } from "../ui/Modal";
+import { Button } from "../ui/Button";
 import {
   Calendar,
-  TerminalIcon,
-  ChatTextIcon,
-  WarningCircleIcon,
-  TrashIcon,
-} from "@phosphor-icons/react";
-import { CronJob } from "@/app/_utils/cronjob-utils";
+  Terminal,
+  MessageSquare,
+  AlertCircle,
+  Trash2,
+} from "lucide-react";
+import { CronJob } from "@/app/_utils/system";
 
 interface DeleteTaskModalProps {
   isOpen: boolean;
@@ -34,7 +34,7 @@ export const DeleteTaskModal = ({
       size="sm"
     >
       <div className="space-y-3">
-        <div className="bg-muted/30 rounded p-2 border border-border">
+        <div className="bg-muted/30 rounded p-2 border border-border/50">
           <div className="space-y-1">
             <div className="flex items-center gap-2">
               <Calendar className="h-3 w-3 text-muted-foreground" />
@@ -44,15 +44,15 @@ export const DeleteTaskModal = ({
             </div>
 
             <div className="flex items-start gap-2">
-              <TerminalIcon className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
-              <pre className="max-w-full overflow-x-auto text-xs font-medium text-foreground break-words bg-muted/30 px-1 py-0.5 rounded border border-border flex-1 hide-scrollbar">
+              <Terminal className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
+              <pre className="text-xs font-medium text-foreground break-words bg-muted/30 px-1 py-0.5 rounded border border-border/30 flex-1">
                 {job.command}
               </pre>
             </div>
 
             {job.comment && (
               <div className="flex items-start gap-2">
-                <ChatTextIcon className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
+                <MessageSquare className="h-3 w-3 text-muted-foreground mt-0.5 flex-shrink-0" />
                 <p className="text-xs text-muted-foreground break-words italic">
                   {job.comment}
                 </p>
@@ -63,7 +63,7 @@ export const DeleteTaskModal = ({
 
         <div className="bg-destructive/5 border border-destructive/20 rounded p-2">
           <div className="flex items-start gap-2">
-            <WarningCircleIcon className="h-4 w-4 text-destructive mt-0.5 flex-shrink-0" />
+            <AlertCircle className="h-4 w-4 text-destructive mt-0.5 flex-shrink-0" />
             <div>
               <p className="text-xs font-medium text-destructive mb-0.5">
                 This action cannot be undone
@@ -75,7 +75,7 @@ export const DeleteTaskModal = ({
           </div>
         </div>
 
-        <div className="flex justify-end gap-2 pt-2 border-t border-border">
+        <div className="flex justify-end gap-2 pt-2 border-t border-border/50">
           <Button variant="outline" onClick={onClose} className="btn-outline">
             Cancel
           </Button>
@@ -84,11 +84,11 @@ export const DeleteTaskModal = ({
             onClick={onConfirm}
             className="btn-destructive"
           >
-            <TrashIcon className="h-4 w-4 mr-2" />
+            <Trash2 className="h-4 w-4 mr-2" />
             Delete Task
           </Button>
         </div>
       </div>
     </Modal>
   );
-};
+}

app/_components/modals/EditScriptModal.tsx

@@ -1,8 +1,8 @@
 "use client";
 
-import { PencilSimpleIcon } from "@phosphor-icons/react";
-import { Script } from "@/app/_utils/scripts-utils";
-import { ScriptModal } from "@/app/_components/FeatureComponents/Modals/ScriptModal";
+import { Edit } from "lucide-react";
+import { type Script } from "@/app/_server/actions/scripts";
+import { ScriptModal } from "./ScriptModal";
 
 interface EditScriptModalProps {
   isOpen: boolean;
@@ -34,9 +34,9 @@ export const EditScriptModal = ({
       isOpen={isOpen}
       onClose={onClose}
       onSubmit={onSubmit}
-      title="PencilSimpleIcon Script"
+      title="Edit Script"
       submitButtonText="Update Script"
-      submitButtonIcon={<PencilSimpleIcon className="h-4 w-4 mr-2" />}
+      submitButtonIcon={<Edit className="h-4 w-4 mr-2" />}
       form={form}
       onFormChange={onFormChange}
       additionalFormData={{ id: script.id }}

app/_components/modals/EditTaskModal.tsx

@@ -1,11 +1,10 @@
 "use client";
 
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
-import { CronExpressionHelper } from "@/app/_components/FeatureComponents/Scripts/CronExpressionHelper";
-import { PencilSimpleIcon, TerminalIcon, FileArrowDownIcon } from "@phosphor-icons/react";
-import { useTranslations } from "next-intl";
+import { Modal } from "../ui/Modal";
+import { Button } from "../ui/Button";
+import { Input } from "../ui/Input";
+import { CronExpressionHelper } from "../CronExpressionHelper";
+import { Edit, Terminal } from "lucide-react";
 
 interface EditTaskModalProps {
   isOpen: boolean;
@@ -15,7 +14,6 @@ interface EditTaskModalProps {
     schedule: string;
     command: string;
     comment: string;
-    logsEnabled: boolean;
   };
   onFormChange: (updates: Partial<EditTaskModalProps["form"]>) => void;
 }
@@ -27,13 +25,11 @@ export const EditTaskModal = ({
   form,
   onFormChange,
 }: EditTaskModalProps) => {
-  const t = useTranslations();
-
   return (
     <Modal
       isOpen={isOpen}
       onClose={onClose}
-      title={t("cronjobs.editScheduledTask")}
+      title="Edit Scheduled Task"
       size="xl"
     >
       <form onSubmit={onSubmit} className="space-y-4">
@@ -59,11 +55,11 @@ export const EditTaskModal = ({
                 value={form.command}
                 onChange={(e) => onFormChange({ command: e.target.value })}
                 placeholder="/usr/bin/command"
-                className="font-mono bg-muted/30 border-border focus:border-primary/50"
+                className="font-mono bg-muted/30 border-border/50 focus:border-primary/50"
                 required
               />
               <div className="absolute right-3 top-1/2 -translate-y-1/2">
-                <TerminalIcon className="h-4 w-4 text-muted-foreground" />
+                <Terminal className="h-4 w-4 text-muted-foreground" />
               </div>
             </div>
           </div>
@@ -71,44 +67,18 @@ export const EditTaskModal = ({
 
         <div>
           <label className="block text-sm font-medium text-foreground mb-1">
-            {t("common.description")}{" "}
-            <span className="text-muted-foreground">
-              ({t("common.optional")})
-            </span>
+            Description{" "}
+            <span className="text-muted-foreground">(Optional)</span>
           </label>
           <Input
             value={form.comment}
             onChange={(e) => onFormChange({ comment: e.target.value })}
-            placeholder={t("cronjobs.whatDoesThisTaskDo")}
-            className="bg-muted/30 border-border focus:border-primary/50"
+            placeholder="What does this task do?"
+            className="bg-muted/30 border-border/50 focus:border-primary/50"
           />
         </div>
 
-        <div className="border border-border bg-muted/10 rounded-lg p-4">
-          <div className="flex items-start gap-3">
-            <input
-              type="checkbox"
-              id="logsEnabled"
-              checked={form.logsEnabled}
-              onChange={(e) => onFormChange({ logsEnabled: e.target.checked })}
-              className="mt-1 h-4 w-4 rounded border-border text-primary focus:ring-primary/20 cursor-pointer"
-            />
-            <div className="flex-1">
-              <label
-                htmlFor="logsEnabled"
-                className="flex items-center gap-2 text-sm font-medium text-foreground cursor-pointer"
-              >
-                <FileArrowDownIcon className="h-4 w-4 text-primary" />
-                {t("cronjobs.enableLogging")}
-              </label>
-              <p className="text-xs text-muted-foreground mt-1">
-                {t("cronjobs.loggingDescription")}
-              </p>
-            </div>
-          </div>
-        </div>
-
-        <div className="flex justify-end gap-2 pt-3 border-t border-border">
+        <div className="flex justify-end gap-2 pt-3 border-t border-border/50">
           <Button
             type="button"
             variant="outline"
@@ -118,11 +88,11 @@ export const EditTaskModal = ({
             Cancel
           </Button>
           <Button type="submit" className="btn-primary glow-primary">
-            <PencilSimpleIcon className="h-4 w-4 mr-2" />
+            <Edit className="h-4 w-4 mr-2" />
             Update Task
           </Button>
         </div>
       </form>
     </Modal>
   );
-};
+}

app/_components/modals/ErrorDetailsModal.tsx

@@ -1,9 +1,9 @@
 "use client";
 
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { WarningCircleIcon, CopyIcon, XIcon } from "@phosphor-icons/react";
-import { showToast } from "@/app/_components/GlobalComponents/UIElements/Toast";
+import { Modal } from "../ui/Modal";
+import { Button } from "../ui/Button";
+import { AlertCircle, Copy, X } from "lucide-react";
+import { showToast } from "../ui/Toast";
 
 interface ErrorDetails {
   title: string;
@@ -54,7 +54,7 @@ Timestamp: ${error.timestamp}
       <div className="space-y-4">
         <div className="bg-destructive/5 border border-destructive/20 rounded-lg p-4">
           <div className="flex items-start gap-3">
-            <WarningCircleIcon className="h-5 w-5 text-destructive mt-0.5 flex-shrink-0" />
+            <AlertCircle className="h-5 w-5 text-destructive mt-0.5 flex-shrink-0" />
             <div className="flex-1">
               <h3 className="font-medium text-destructive mb-1">
                 {error.title}
@@ -69,7 +69,7 @@ Timestamp: ${error.timestamp}
             <h4 className="text-sm font-medium text-foreground mb-2">
               Details
             </h4>
-            <div className="bg-muted/30 p-3 rounded border border-border">
+            <div className="bg-muted/30 p-3 rounded border border-border/30">
               <pre className="text-sm font-mono text-foreground whitespace-pre-wrap break-words">
                 {error.details}
               </pre>
@@ -82,7 +82,7 @@ Timestamp: ${error.timestamp}
             <h4 className="text-sm font-medium text-foreground mb-2">
               Command
             </h4>
-            <div className="bg-muted/30 p-3 rounded border border-border">
+            <div className="bg-muted/30 p-3 rounded border border-border/30">
               <code className="text-sm font-mono text-foreground break-all">
                 {error.command}
               </code>
@@ -93,7 +93,7 @@ Timestamp: ${error.timestamp}
         {error.output && (
           <div>
             <h4 className="text-sm font-medium text-foreground mb-2">Output</h4>
-            <div className="bg-muted/30 p-3 rounded border border-border max-h-32 overflow-y-auto tui-scrollbar">
+            <div className="bg-muted/30 p-3 rounded border border-border/30 max-h-32 overflow-y-auto">
               <pre className="text-sm font-mono text-foreground whitespace-pre-wrap">
                 {error.output}
               </pre>
@@ -106,7 +106,7 @@ Timestamp: ${error.timestamp}
             <h4 className="text-sm font-medium text-foreground mb-2">
               Error Output
             </h4>
-            <div className="bg-destructive/5 p-3 rounded border border-destructive/20 max-h-32 overflow-y-auto tui-scrollbar">
+            <div className="bg-destructive/5 p-3 rounded border border-destructive/20 max-h-32 overflow-y-auto">
               <pre className="text-sm font-mono text-destructive whitespace-pre-wrap">
                 {error.stderr}
               </pre>
@@ -118,14 +118,14 @@ Timestamp: ${error.timestamp}
           Timestamp: {error.timestamp}
         </div>
 
-        <div className="flex justify-end gap-2 pt-3 border-t border-border">
+        <div className="flex justify-end gap-2 pt-3 border-t border-border/50">
           <Button
             variant="outline"
             onClick={handleCopyDetails}
             className="btn-outline"
           >
-            <CopyIcon className="h-4 w-4 mr-2" />
-            CopyIcon Details
+            <Copy className="h-4 w-4 mr-2" />
+            Copy Details
           </Button>
           <Button onClick={onClose} className="btn-primary">
             Close

app/_components/modals/ScriptModal.tsx

@@ -1,13 +1,12 @@
 "use client";
 
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
-import { BashEditor } from "@/app/_components/FeatureComponents/Scripts/BashEditor";
-import { BashSnippetHelper } from "@/app/_components/FeatureComponents/Scripts/BashSnippetHelper";
-import { showToast } from "@/app/_components/GlobalComponents/UIElements/Toast";
-import { FileTextIcon, CodeIcon, InfoIcon, TrashIcon } from "@phosphor-icons/react";
-import { useTranslations } from "next-intl";
+import { Modal } from "../ui/Modal";
+import { Button } from "../ui/Button";
+import { Input } from "../ui/Input";
+import { BashEditor } from "../BashEditor";
+import { BashSnippetHelper } from "../BashSnippetHelper";
+import { FileText, Code } from "lucide-react";
+import { showToast } from "../ui/Toast";
 
 interface ScriptModalProps {
   isOpen: boolean;
@@ -25,8 +24,6 @@ interface ScriptModalProps {
   };
   onFormChange: (updates: Partial<ScriptModalProps["form"]>) => void;
   additionalFormData?: Record<string, string>;
-  isDraft?: boolean;
-  onClearDraft?: () => void;
 }
 
 export const ScriptModal = ({
@@ -39,11 +36,7 @@ export const ScriptModal = ({
   form,
   onFormChange,
   additionalFormData = {},
-  isDraft = false,
-  onClearDraft,
 }: ScriptModalProps) => {
-  const t = useTranslations();
-
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
@@ -79,12 +72,12 @@ export const ScriptModal = ({
   };
 
   return (
-    <Modal isOpen={isOpen} onClose={onClose} title={title} size="2xl">
-      <form onSubmit={handleSubmit} className="space-y-6 terminal-font">
+    <Modal isOpen={isOpen} onClose={onClose} title={title} size="xl">
+      <form onSubmit={handleSubmit} className="space-y-6">
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <div>
-            <label className="block text-sm font-medium mb-2">
-              Script Name <span className="text-status-error">*</span>
+            <label className="block text-sm font-medium text-foreground mb-2">
+              Script Name <span className="text-red-500">*</span>
             </label>
             <Input
               value={form.name}
@@ -93,15 +86,15 @@ export const ScriptModal = ({
               required
               className={
                 !form.name.trim()
-                  ? "border-status-error focus:border-status-error"
+                  ? "border-red-300 focus:border-red-500 focus:ring-red-500"
                   : ""
               }
             />
           </div>
           <div>
-            <label className="block text-sm font-medium mb-2">
+            <label className="block text-sm font-medium text-foreground mb-2">
               Description{" "}
-              <span className="text-xs opacity-60">(optional)</span>
+              <span className="text-muted-foreground text-xs">(optional)</span>
             </label>
             <Input
               value={form.description}
@@ -112,27 +105,22 @@ export const ScriptModal = ({
         </div>
 
         <div className="grid grid-cols-1 lg:grid-cols-3 gap-6 h-[500px]">
-          <div className="lg:col-span-1 bg-background0 ascii-border p-4 flex flex-col h-full overflow-hidden">
+          <div className="lg:col-span-1 bg-muted/20 rounded-lg p-4 flex flex-col h-full overflow-hidden">
             <div className="flex items-center gap-2 mb-4 flex-shrink-0">
-              <CodeIcon className="h-4 w-4" />
-              <h3 className="text-sm font-medium">Snippets</h3>
+              <Code className="h-4 w-4 text-primary" />
+              <h3 className="text-sm font-medium text-foreground">Snippets</h3>
             </div>
-            <div className="flex-1 overflow-y-auto min-h-0 !pr-0 tui-scrollbar">
+            <div className="flex-1 overflow-y-auto min-h-0">
               <BashSnippetHelper onInsertSnippet={handleInsertSnippet} />
             </div>
           </div>
 
           <div className="lg:col-span-2 flex flex-col h-full overflow-hidden">
             <div className="flex items-center gap-2 mb-4 flex-shrink-0">
-              <FileTextIcon className="h-4 w-4" />
-              <h3 className="text-sm font-medium">
-                Script Content <span className="text-status-error">*</span>
+              <FileText className="h-4 w-4 text-primary" />
+              <h3 className="text-sm font-medium text-foreground">
+                Script Content <span className="text-red-500">*</span>
               </h3>
-              {isDraft && (
-                <span className="ml-auto px-2 py-0.5 text-xs font-medium bg-background0 text-status-info ascii-border">
-                  {t("scripts.draft")}
-                </span>
-              )}
             </div>
             <div className="flex-1 min-h-0">
               <BashEditor
@@ -145,36 +133,21 @@ export const ScriptModal = ({
           </div>
         </div>
 
-        <div className="flex justify-between items-center gap-3 pt-4 ascii-border border-t">
-          <div>
-            {isDraft && onClearDraft && (
-              <Button
-                type="button"
-                variant="ghost"
-                onClick={onClearDraft}
-                className="opacity-60 hover:opacity-100"
-              >
-                <TrashIcon className="h-4 w-4 mr-2" />
-                {t("scripts.clearDraft")}
-              </Button>
-            )}
-          </div>
-          <div className="flex gap-3">
-            <Button
-              type="button"
-              variant="outline"
-              onClick={onClose}
-              className="btn-outline"
-            >
-              {t("scripts.close")}
-            </Button>
-            <Button type="submit" className="btn-primary glow-primary">
-              {submitButtonIcon}
-              {submitButtonText}
-            </Button>
-          </div>
+        <div className="flex justify-end gap-3 pt-4 border-t border-border/30">
+          <Button
+            type="button"
+            variant="outline"
+            onClick={onClose}
+            className="btn-outline"
+          >
+            Cancel
+          </Button>
+          <Button type="submit" className="btn-primary glow-primary">
+            {submitButtonIcon}
+            {submitButtonText}
+          </Button>
         </div>
       </form>
     </Modal>
   );
-};
+}

app/_components/modals/SelectScriptModal.tsx

@@ -1,14 +1,13 @@
 "use client";
 
 import { useEffect, useState } from "react";
-import { Modal } from "@/app/_components/GlobalComponents/UIElements/Modal";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { Input } from "@/app/_components/GlobalComponents/FormElements/Input";
-import { FileTextIcon, MagnifyingGlassIcon, CheckIcon, TerminalIcon } from "@phosphor-icons/react";
-import { Script } from "@/app/_utils/scripts-utils";
+import { Modal } from "../ui/Modal";
+import { Button } from "../ui/Button";
+import { Input } from "../ui/Input";
+import { FileText, Search, Check, Terminal } from "lucide-react";
+import { type Script } from "@/app/_server/actions/scripts";
 import { getScriptContent } from "@/app/_server/actions/scripts";
-import { getHostScriptPath } from "@/app/_server/actions/scripts";
-import { useTranslations } from "next-intl";
+import { getHostScriptPath } from "@/app/_utils/scripts";
 
 interface SelectScriptModalProps {
   isOpen: boolean;
@@ -25,7 +24,6 @@ export const SelectScriptModal = ({
   onScriptSelect,
   selectedScriptId,
 }: SelectScriptModalProps) => {
-  const t = useTranslations();
   const [searchQuery, setSearchQuery] = useState("");
   const [previewScript, setPreviewScript] = useState<Script | null>(null);
   const [previewContent, setPreviewContent] = useState<string>("");
@@ -79,16 +77,16 @@ export const SelectScriptModal = ({
     <Modal
       isOpen={isOpen}
       onClose={handleClose}
-      title={t("scripts.selectScript")}
+      title="Select Script"
       size="xl"
     >
       <div className="space-y-4">
         <div className="relative">
-          <MagnifyingGlassIcon className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+          <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-muted-foreground" />
           <Input
             value={searchQuery}
             onChange={(e) => setSearchQuery(e.target.value)}
-            placeholder={t("scripts.searchScripts")}
+            placeholder="Search scripts..."
             className="pl-10"
           />
         </div>
@@ -97,13 +95,13 @@ export const SelectScriptModal = ({
           <div className="border border-border rounded-lg overflow-hidden">
             <div className="bg-muted/30 px-4 py-2 border-b border-border">
               <h3 className="text-sm font-medium text-foreground">
-                {t("scripts.availableScripts", { count: filteredScripts.length })}
+                Available Scripts ({filteredScripts.length})
               </h3>
             </div>
             <div className="overflow-y-auto h-full max-h-80">
               {filteredScripts.length === 0 ? (
                 <div className="p-4 text-center text-muted-foreground">
-                  {searchQuery ? t("scripts.noScriptsFound") : t("scripts.noScriptsAvailable")}
+                  {searchQuery ? "No scripts found" : "No scripts available"}
                 </div>
               ) : (
                 <div className="divide-y divide-border">
@@ -112,19 +110,19 @@ export const SelectScriptModal = ({
                       key={script.id}
                       onClick={() => handleScriptClick(script)}
                       className={`w-full p-4 text-left hover:bg-accent/30 transition-colors ${previewScript?.id === script.id
-                        ? "bg-primary/5 border-r-2 border-primary"
-                        : ""
+                          ? "bg-primary/5 border-r-2 border-primary"
+                          : ""
                         }`}
                     >
                       <div className="flex items-start justify-between">
                         <div className="flex-1 min-w-0">
                           <div className="flex items-center gap-2 mb-1">
-                            <FileTextIcon className="h-4 w-4 text-primary flex-shrink-0" />
+                            <FileText className="h-4 w-4 text-primary flex-shrink-0" />
                             <h4 className="font-medium text-foreground truncate">
                               {script.name}
                             </h4>
                             {selectedScriptId === script.id && (
-                              <CheckIcon className="h-4 w-4 text-status-success flex-shrink-0" />
+                              <Check className="h-4 w-4 text-green-500 flex-shrink-0" />
                             )}
                           </div>
                           <p className="text-sm text-muted-foreground line-clamp-2">
@@ -145,10 +143,10 @@ export const SelectScriptModal = ({
           <div className="border border-border rounded-lg overflow-hidden">
             <div className="bg-muted/30 px-4 py-2 border-b border-border">
               <h3 className="text-sm font-medium text-foreground">
-                {t("scripts.scriptPreview")}
+                Script Preview
               </h3>
             </div>
-            <div className="p-4 h-full max-h-80 overflow-y-auto tui-scrollbar">
+            <div className="p-4 h-full max-h-80 overflow-y-auto">
               {previewScript ? (
                 <div className="space-y-4">
                   <div>
@@ -162,12 +160,12 @@ export const SelectScriptModal = ({
 
                   <div>
                     <div className="flex items-center gap-2 mb-2">
-                      <TerminalIcon className="h-4 w-4 text-primary" />
+                      <Terminal className="h-4 w-4 text-primary" />
                       <span className="text-sm font-medium text-foreground">
-                        {t("scripts.commandPreview")}
+                        Command Preview
                       </span>
                     </div>
-                    <div className="bg-muted/30 p-3 rounded border border-border">
+                    <div className="bg-muted/30 p-3 rounded border border-border/30">
                       <code className="text-sm font-mono text-foreground break-all">
                         {hostScriptPath}
                       </code>
@@ -176,9 +174,9 @@ export const SelectScriptModal = ({
 
                   <div>
                     <span className="text-sm font-medium text-foreground">
-                      {t("scripts.scriptContent")}
+                      Script Content
                     </span>
-                    <div className="bg-muted/30 p-3 rounded border border-border mt-2 max-h-32 overflow-auto tui-scrollbar">
+                    <div className="bg-muted/30 p-3 rounded border border-border/30 mt-2 max-h-32 overflow-auto">
                       <pre className="text-xs font-mono text-foreground whitespace-pre-wrap">
                         {previewContent}
                       </pre>
@@ -187,22 +185,22 @@ export const SelectScriptModal = ({
                 </div>
               ) : (
                 <div className="text-center text-muted-foreground py-8">
-                  <FileTextIcon className="h-12 w-12 mx-auto mb-4 opacity-50" />
-                  <p>{t("scripts.selectScriptToPreview")}</p>
+                  <FileText className="h-12 w-12 mx-auto mb-4 opacity-50" />
+                  <p>Select a script to preview</p>
                 </div>
               )}
             </div>
           </div>
         </div>
 
-        <div className="flex justify-end gap-2 pt-3 border-t border-border">
+        <div className="flex justify-end gap-2 pt-3 border-t border-border/50">
           <Button
             type="button"
             variant="outline"
             onClick={handleClose}
             className="btn-outline"
           >
-            {t("common.cancel")}
+            Cancel
           </Button>
           <Button
             type="button"
@@ -210,8 +208,8 @@ export const SelectScriptModal = ({
             disabled={!previewScript}
             className="btn-primary glow-primary"
           >
-            <CheckIcon className="h-4 w-4 mr-2" />
-            {t("scripts.selectScript")}
+            <Check className="h-4 w-4 mr-2" />
+            Select Script
           </Button>
         </div>
       </div>

app/_components/ui/Button.tsx

@@ -0,0 +1,38 @@
+import { cn } from '@/app/_utils/cn';
+import { ButtonHTMLAttributes, forwardRef } from 'react';
+
+export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+  variant?: 'default' | 'destructive' | 'outline' | 'secondary' | 'ghost' | 'link';
+  size?: 'default' | 'sm' | 'lg' | 'icon';
+}
+
+export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
+  ({ className, variant = 'default', size = 'default', ...props }, ref) => {
+    return (
+      <button
+        className={cn(
+          'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+          {
+            'bg-primary text-primary-foreground hover:bg-primary/90': variant === 'default',
+            'bg-destructive text-destructive-foreground hover:bg-destructive/90': variant === 'destructive',
+            'border border-input bg-background hover:bg-accent hover:text-accent-foreground': variant === 'outline',
+            'bg-secondary text-secondary-foreground hover:bg-secondary/80': variant === 'secondary',
+            'hover:bg-accent hover:text-accent-foreground': variant === 'ghost',
+            'text-primary underline-offset-4 hover:underline': variant === 'link',
+          },
+          {
+            'h-10 px-4 py-2': size === 'default',
+            'h-9 rounded-md px-3': size === 'sm',
+            'h-11 rounded-md px-8': size === 'lg',
+            'h-10 w-10': size === 'icon',
+          },
+          className
+        )}
+        ref={ref}
+        {...props}
+      />
+    );
+  }
+);
+
+Button.displayName = 'Button';

app/_components/ui/Card.tsx

@@ -0,0 +1,72 @@
+import { cn } from '@/app/_utils/cn';
+import { HTMLAttributes, forwardRef } from 'react';
+
+export const Card = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div
+      ref={ref}
+      className={cn(
+        'rounded-lg border bg-card text-card-foreground shadow-sm',
+        className
+      )}
+      {...props}
+    />
+  )
+);
+Card.displayName = 'Card';
+
+const CardHeader = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div
+      ref={ref}
+      className={cn('flex flex-col space-y-1.5 p-6', className)}
+      {...props}
+    />
+  )
+);
+CardHeader.displayName = 'CardHeader';
+
+const CardTitle = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLHeadingElement>>(
+  ({ className, ...props }, ref) => (
+    <h3
+      ref={ref}
+      className={cn(
+        'text-2xl font-semibold leading-none tracking-tight',
+        className
+      )}
+      {...props}
+    />
+  )
+);
+CardTitle.displayName = 'CardTitle';
+
+const CardDescription = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLParagraphElement>>(
+  ({ className, ...props }, ref) => (
+    <p
+      ref={ref}
+      className={cn('text-sm text-muted-foreground', className)}
+      {...props}
+    />
+  )
+);
+CardDescription.displayName = 'CardDescription';
+
+const CardContent = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div ref={ref} className={cn('p-4 lg:p-6 pt-0', className)} {...props} />
+  )
+);
+CardContent.displayName = 'CardContent';
+
+const CardFooter = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
+  ({ className, ...props }, ref) => (
+    <div
+      ref={ref}
+      className={cn('flex items-center p-6 pt-0', className)}
+      {...props}
+    />
+  )
+);
+CardFooter.displayName = 'CardFooter';
+
+export { CardHeader, CardFooter, CardTitle, CardDescription, CardContent };

app/_components/ui/ErrorBadge.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import { WarningCircleIcon, XIcon } from "@phosphor-icons/react";
-import { JobError, removeJobError } from "@/app/_utils/error-utils";
+import { AlertCircle, X } from "lucide-react";
+import { JobError, removeJobError } from "@/app/_utils/errorState";
 
 interface ErrorBadgeProps {
   errors: JobError[];
@@ -30,7 +30,7 @@ export const ErrorBadge = ({
             className="flex items-center gap-1 px-2 py-1 bg-destructive/10 text-destructive border border-destructive/20 rounded text-xs hover:bg-destructive/20 transition-colors"
             title={error.message}
           >
-            <WarningCircleIcon className="h-3 w-3" />
+            <AlertCircle className="h-3 w-3" />
             <span className="hidden sm:inline">Error</span>
           </button>
           <button
@@ -38,7 +38,7 @@ export const ErrorBadge = ({
             className="p-1 text-destructive hover:bg-destructive/10 rounded transition-colors"
             title="Dismiss error"
           >
-            <XIcon className="h-3 w-3" />
+            <X className="h-3 w-3" />
           </button>
         </div>
       ))}

app/_components/ui/Input.tsx

@@ -0,0 +1,22 @@
+import { cn } from '@/app/_utils/cn';
+import { InputHTMLAttributes, forwardRef } from 'react';
+
+export interface InputProps extends InputHTMLAttributes<HTMLInputElement> { }
+
+export const Input = forwardRef<HTMLInputElement, InputProps>(
+  ({ className, type, ...props }, ref) => {
+    return (
+      <input
+        type={type}
+        className={cn(
+          'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
+          className
+        )}
+        ref={ref}
+        {...props}
+      />
+    );
+  }
+);
+
+Input.displayName = 'Input';

app/_components/ui/LogoutButton.tsx

@@ -0,0 +1,43 @@
+"use client";
+
+import { useState } from "react";
+import { useRouter } from "next/navigation";
+import { Button } from "./Button";
+import { LogOut } from "lucide-react";
+
+
+export const LogoutButton = () => {
+    const [isLoading, setIsLoading] = useState(false);
+    const router = useRouter();
+
+    const handleLogout = async () => {
+        setIsLoading(true);
+        try {
+            const response = await fetch("/api/auth/logout", {
+                method: "POST",
+            });
+
+            if (response.ok) {
+                router.push("/login");
+                router.refresh();
+            }
+        } catch (error) {
+            console.error("Logout error:", error);
+        } finally {
+            setIsLoading(false);
+        }
+    };
+
+    return (
+        <Button
+            variant="ghost"
+            size="icon"
+            onClick={handleLogout}
+            disabled={isLoading}
+            title="Logout"
+        >
+            <LogOut className="h-[1.2rem] w-[1.2rem]" />
+            <span className="sr-only">Logout</span>
+        </Button>
+    );
+};

app/_components/ui/MetricCard.tsx

@@ -1,12 +1,12 @@
-import { cn } from "@/app/_utils/global-utils";
-import { HTMLAttributes, forwardRef, ComponentType } from "react";
-import { IconProps } from "@phosphor-icons/react";
-import { StatusBadge } from "@/app/_components/GlobalComponents/Badges/StatusBadge";
-import { ProgressBar } from "@/app/_components/GlobalComponents/UIElements/ProgressBar";
-import { TruncatedText } from "@/app/_components/GlobalComponents/UIElements/TruncatedText";
+import { cn } from "@/app/_utils/cn";
+import { HTMLAttributes, forwardRef } from "react";
+import { LucideIcon } from "lucide-react";
+import { StatusBadge } from "./StatusBadge";
+import { ProgressBar } from "./ProgressBar";
+import { TruncatedText } from "./TruncatedText";
 
 export interface MetricCardProps extends HTMLAttributes<HTMLDivElement> {
-  icon: ComponentType<IconProps>;
+  icon: LucideIcon;
   label: string;
   value: string;
   detail?: string;
@@ -27,7 +27,7 @@ export const MetricCard = forwardRef<HTMLDivElement, MetricCardProps>(
       value,
       detail,
       status,
-      color,
+      color = "text-blue-500",
       variant = "basic",
       showProgress = false,
       progressValue = 0,
@@ -40,14 +40,14 @@ export const MetricCard = forwardRef<HTMLDivElement, MetricCardProps>(
       <div
         ref={ref}
         className={cn(
-          "flex items-start gap-3 p-3 tui-card-mini transition-colors duration-200 terminal-font",
+          "flex items-start gap-3 p-3 border border-border/50 rounded-lg hover:bg-accent/50 transition-colors duration-200 glass-card-hover",
           className
         )}
         {...props}
       >
         <div
           className={cn(
-            "p-2 ascii-border flex-shrink-0 bg-background0"
+            "p-2 rounded-lg border border-border/50 flex-shrink-0 bg-card/50"
           )}
         >
           <Icon className={cn("h-4 w-4", color)} />
@@ -55,7 +55,7 @@ export const MetricCard = forwardRef<HTMLDivElement, MetricCardProps>(
 
         <div className="flex-1 min-w-0">
           <div className="flex items-center gap-2 mb-1">
-            <p className="text-xs font-medium uppercase tracking-wide terminal-font">
+            <p className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
               {label}
             </p>
             {status && variant === "performance" && (
@@ -67,12 +67,12 @@ export const MetricCard = forwardRef<HTMLDivElement, MetricCardProps>(
             <TruncatedText
               text={value}
               maxLength={40}
-              className="text-sm font-medium terminal-font"
+              className="text-sm font-medium text-foreground"
             />
           </div>
 
           {detail && (
-            <p className="text-xs mb-2 terminal-font">{detail}</p>
+            <p className="text-xs text-muted-foreground mb-2">{detail}</p>
           )}
 
           {showProgress && (

app/_components/ui/Modal.tsx

@@ -0,0 +1,117 @@
+"use client";
+
+import { useEffect, useRef } from "react";
+import { X } from "lucide-react";
+import { cn } from "@/app/_utils/cn";
+import { Button } from "./Button";
+
+interface ModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  title: string;
+  children: React.ReactNode;
+  size?: "sm" | "md" | "lg" | "xl";
+  showCloseButton?: boolean;
+  preventCloseOnClickOutside?: boolean;
+}
+
+export const Modal = ({
+  isOpen,
+  onClose,
+  title,
+  children,
+  size = "md",
+  showCloseButton = true,
+  preventCloseOnClickOutside = false,
+}: ModalProps) => {
+  const modalRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const handleEscape = (e: KeyboardEvent) => {
+      if (e.key === "Escape") {
+        onClose();
+      }
+    };
+
+    if (isOpen) {
+      document.addEventListener("keydown", handleEscape);
+      document.body.style.overflow = "hidden";
+    }
+
+    return () => {
+      document.removeEventListener("keydown", handleEscape);
+      document.body.style.overflow = "unset";
+    };
+  }, [isOpen, onClose]);
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        modalRef.current &&
+        !modalRef.current.contains(event.target as Node) &&
+        !preventCloseOnClickOutside
+      ) {
+        const target = event.target as Element;
+        const isClickingOnModal = target.closest('[data-modal="true"]');
+        const isClickingOnBackdrop =
+          target.classList.contains("modal-backdrop");
+
+        if (isClickingOnBackdrop) {
+          onClose();
+        }
+      }
+    };
+
+    if (isOpen) {
+      document.addEventListener("mousedown", handleClickOutside);
+    }
+
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+    };
+  }, [isOpen, onClose, preventCloseOnClickOutside]);
+
+  if (!isOpen) return null;
+
+  const sizeClasses = {
+    sm: "max-w-md",
+    md: "max-w-lg",
+    lg: "max-w-2xl",
+    xl: "max-w-4xl",
+  };
+
+  return (
+    <div
+      className="fixed inset-0 z-50 flex items-end justify-center sm:items-center p-0 sm:p-4"
+      data-modal="true"
+    >
+      <div className="absolute inset-0 bg-black/50 backdrop-blur-sm modal-backdrop" />
+
+      <div
+        ref={modalRef}
+        className={cn(
+          "relative w-full bg-card border border-border shadow-lg overflow-y-auto",
+          "max-h-[85vh]",
+          "sm:rounded-lg sm:max-h-[90vh] sm:w-full",
+          sizeClasses[size]
+        )}
+      >
+        <div className="flex items-center justify-between p-4 sm:p-6 border-b border-border sticky top-0 bg-card z-10">
+          <h2 className="text-lg font-semibold text-foreground">{title}</h2>
+          {showCloseButton && (
+            <Button
+              variant="ghost"
+              size="icon"
+              onClick={onClose}
+              className="h-8 w-8"
+            >
+              <X className="h-4 w-4" />
+            </Button>
+          )}
+        </div>
+
+        <div className="p-4 sm:p-6">{children}</div>
+      </div>
+    </div>
+  );
+}

app/_components/ui/PWAInstallPrompt.tsx

@@ -42,14 +42,14 @@ export const PWAInstallPrompt = (): JSX.Element | null => {
       if (choice.outcome === "accepted") {
         setDeferred(null);
       }
-    } catch (_err) { }
+    } catch (_err) {}
   }, [deferred]);
 
   if (isInstalled || !deferred) return null;
 
   return (
     <button
-      className="px-3 py-1 rounded-md border border-border bg-background/80 hover:bg-background/60"
+      className="px-3 py-1 rounded-md border border-border/50 bg-background/80 hover:bg-background/60"
       onClick={onInstall}
     >
       Install App

app/_components/ui/PerformanceSummary.tsx

@@ -1,7 +1,7 @@
-import { cn } from "@/app/_utils/global-utils";
+import { cn } from "@/app/_utils/cn";
 import { HTMLAttributes, forwardRef } from "react";
-import { LightningIcon } from "@phosphor-icons/react";
-import { StatusBadge } from "@/app/_components/GlobalComponents/Badges/StatusBadge";
+import { Zap } from "lucide-react";
+import { StatusBadge } from "./StatusBadge";
 
 export interface PerformanceMetric {
   label: string;
@@ -20,14 +20,14 @@ export const PerformanceSummary = forwardRef<HTMLDivElement, PerformanceSummaryP
       <div
         ref={ref}
         className={cn(
-          "p-3 bg-background0 ascii-border glass-card terminal-font",
+          "p-3 bg-gradient-to-r from-purple-500/5 to-pink-500/5 border border-purple-500/20 rounded-lg glass-card",
           className
         )}
         {...props}
       >
         <div className="flex items-center gap-2 mb-3">
-          <LightningIcon className="h-4 w-4" />
-          <span className="text-sm font-medium">
+          <Zap className="h-4 w-4 text-purple-500" />
+          <span className="text-sm font-medium text-purple-600 dark:text-purple-400">
             Performance Summary
           </span>
         </div>

app/_components/ui/ProgressBar.tsx

@@ -1,4 +1,4 @@
-import { cn } from "@/app/_utils/global-utils";
+import { cn } from "@/app/_utils/cn";
 import { HTMLAttributes, forwardRef } from "react";
 
 export interface ProgressBarProps extends HTMLAttributes<HTMLDivElement> {
@@ -25,29 +25,35 @@ export const ProgressBar = forwardRef<HTMLDivElement, ProgressBarProps>(
     const percentage = Math.min(Math.max((value / max) * 100, 0), 100);
 
     const getColorClass = (percentage: number) => {
-      if (percentage >= 90) return "bg-red-600";
-      if (percentage >= 80) return "bg-yellow-600";
-      if (percentage >= 70) return "bg-yellow-600";
-      return "bg-green-600";
+      if (percentage >= 90) return "bg-destructive";
+      if (percentage >= 80) return "bg-orange-500";
+      if (percentage >= 70) return "bg-yellow-500";
+      return "bg-emerald-500";
     };
 
     const getGradientClass = (percentage: number) => {
-      return getColorClass(percentage);
+      if (percentage >= 90)
+        return "bg-gradient-to-r from-destructive to-red-600";
+      if (percentage >= 80)
+        return "bg-gradient-to-r from-orange-500 to-orange-600";
+      if (percentage >= 70)
+        return "bg-gradient-to-r from-yellow-500 to-yellow-600";
+      return "bg-gradient-to-r from-emerald-500 to-emerald-600";
     };
 
     return (
-      <div ref={ref} className={cn("w-full terminal-font", className)} {...props}>
+      <div ref={ref} className={cn("w-full", className)} {...props}>
         {showLabel && (
           <div className="flex justify-between items-center mb-1">
-            <span className="text-xs">Usage</span>
-            <span className="text-xs font-medium">
+            <span className="text-xs text-muted-foreground">Usage</span>
+            <span className="text-xs font-medium text-foreground">
               {Math.round(percentage)}%
             </span>
           </div>
         )}
 
         <div
-          className={cn("w-full bg-background2 ascii-border overflow-hidden", {
+          className={cn("w-full bg-muted rounded-full overflow-hidden", {
             "h-1.5": size === "sm",
             "h-2": size === "md",
             "h-3": size === "lg",

app/_components/ui/Sidebar.tsx

@@ -1,20 +1,20 @@
-import { cn } from "@/app/_utils/global-utils";
+import { cn } from "@/app/_utils/cn";
 import { HTMLAttributes, forwardRef, useState, useEffect } from "react";
 import React from "react";
 import {
-  CaretLeftIcon,
-  CaretRightIcon,
-  HardDrivesIcon,
-  ListIcon,
-  XIcon,
-  CpuIcon,
-  HardDriveIcon,
-  WifiHighIcon,
-} from "@phosphor-icons/react";
-import { useTranslations } from "next-intl";
+  ChevronLeft,
+  ChevronRight,
+  Server,
+  Menu,
+  X,
+  Cpu,
+  HardDrive,
+  Wifi,
+} from "lucide-react";
 
 export interface SidebarProps extends HTMLAttributes<HTMLDivElement> {
   children: React.ReactNode;
+  title?: string;
   defaultCollapsed?: boolean;
   quickStats?: {
     cpu: number;
@@ -28,13 +28,13 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
     {
       className,
       children,
+      title = "System Overview",
       defaultCollapsed = false,
       quickStats,
       ...props
     },
     ref
   ) => {
-    const t = useTranslations();
     const [isCollapsed, setIsCollapsed] = useState(defaultCollapsed);
     const [isMobileOpen, setIsMobileOpen] = useState(false);
 
@@ -54,18 +54,18 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
       <>
         <button
           onClick={() => setIsMobileOpen(!isMobileOpen)}
-          className="fixed bottom-4 right-4 z-50 lg:hidden p-2 bg-background0 ascii-border transition-colors terminal-font"
+          className="fixed bottom-4 right-4 z-50 lg:hidden p-2 bg-background/80 backdrop-blur-md border border-border/50 rounded-lg hover:bg-accent transition-colors"
         >
           {isMobileOpen ? (
-            <XIcon className="h-5 w-5" />
+            <X className="h-5 w-5" />
           ) : (
-            <ListIcon className="h-5 w-5" />
+            <Menu className="h-5 w-5" />
           )}
         </button>
 
         <div
           className={cn(
-            "fixed inset-0 bg-background0 z-20 lg:hidden transition-opacity duration-300",
+            "fixed inset-0 bg-black/50 z-20 lg:hidden transition-opacity duration-300",
             isMobileOpen ? "opacity-100" : "opacity-0 pointer-events-none"
           )}
           onClick={() => setIsMobileOpen(false)}
@@ -74,7 +74,7 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
         <div
           ref={ref}
           className={cn(
-            "bg-background0 ascii-border transition-all duration-300 ease-in-out terminal-font",
+            "bg-background/95 backdrop-blur-md border-r border-border/50 transition-all duration-300 ease-in-out glass-card",
             isMobileOpen
               ? "fixed left-0 top-0 h-full w-80 z-30 translate-x-0"
               : "fixed left-0 top-0 h-full w-80 z-30 -translate-x-full lg:translate-x-0",
@@ -92,28 +92,28 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
         >
           <button
             onClick={() => setIsCollapsed(!isCollapsed)}
-            className="absolute -right-3 top-[21.5vh] w-6 h-6 bg-background0 ascii-border items-center justify-center transition-colors z-40 hidden lg:flex"
+            className="absolute -right-3 top-[21.5vh] w-6 h-6 bg-background border border-border rounded-full items-center justify-center hover:bg-accent transition-colors z-40 hidden lg:flex"
           >
             {isCollapsed ? (
-              <CaretRightIcon className="h-3 w-3" />
+              <ChevronRight className="h-3 w-3" />
             ) : (
-              <CaretLeftIcon className="h-3 w-3" />
+              <ChevronLeft className="h-3 w-3" />
             )}
           </button>
 
-          <div className="p-4 ascii-border !border-t-0 border-l-0 !border-r-0 bg-background0">
+          <div className="p-4 border-b border-border/50 bg-background/95 backdrop-blur-md">
             <div
               className={cn(
                 "flex items-center gap-3",
                 isCollapsed && "lg:justify-center"
               )}
             >
-              <div className="p-2 bg-background0 ascii-border flex-shrink-0">
-                <HardDrivesIcon className="h-4 w-4" />
+              <div className="p-2 bg-gradient-to-br from-cyan-500/20 to-blue-500/20 rounded-lg flex-shrink-0">
+                <Server className="h-4 w-4 text-cyan-500" />
               </div>
               {(!isCollapsed || !isCollapsed) && (
-                <h2 className="text-sm font-semibold truncate terminal-font">
-                  {t("sidebar.systemOverview")}
+                <h2 className="text-sm font-semibold text-foreground truncate">
+                  {title}
                 </h2>
               )}
             </div>
@@ -121,7 +121,7 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
 
           <div
             className={cn(
-              "overflow-y-auto tui-scrollbar",
+              "overflow-y-auto custom-scrollbar",
               isCollapsed ? "lg:p-2" : "p-4",
               "h-full lg:h-[calc(100vh-88px-80px)]"
             )}
@@ -131,22 +131,22 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
                 <div className="flex flex-col items-center space-y-4">
                   {quickStats ? (
                     <>
-                      <div className="w-12 h-12 bg-background0 ascii-border flex flex-col items-center justify-center p-1">
-                        <CpuIcon className="h-3 w-3 mb-1" />
+                      <div className="w-12 h-12 bg-card/50 border border-border/30 rounded-lg flex flex-col items-center justify-center p-1">
+                        <Cpu className="h-3 w-3 text-pink-500 mb-1" />
                         <span className="text-xs font-bold text-foreground">
                           {quickStats.cpu}%
                         </span>
                       </div>
 
-                      <div className="w-12 h-12 bg-background0 ascii-border flex flex-col items-center justify-center p-1">
-                        <HardDriveIcon className="h-3 w-3 mb-1" />
+                      <div className="w-12 h-12 bg-card/50 border border-border/30 rounded-lg flex flex-col items-center justify-center p-1">
+                        <HardDrive className="h-3 w-3 text-cyan-500 mb-1" />
                         <span className="text-xs font-bold text-foreground">
                           {quickStats.memory}%
                         </span>
                       </div>
 
-                      <div className="w-12 h-12 bg-background0 ascii-border flex flex-col items-center justify-center p-1">
-                        <WifiHighIcon className="h-3 w-3 mb-1" />
+                      <div className="w-12 h-12 bg-card/50 border border-border/30 rounded-lg flex flex-col items-center justify-center p-1">
+                        <Wifi className="h-3 w-3 text-teal-500 mb-1" />
                         <div className="flex flex-col items-center">
                           <span className="text-xs font-bold text-foreground leading-none">
                             {quickStats.network}
@@ -163,9 +163,9 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
                         return (
                           <div
                             key={index}
-                            className="w-8 h-8 bg-background2 ascii-border flex items-center justify-center"
+                            className="w-8 h-8 bg-card/50 border border-border/30 rounded-lg flex items-center justify-center"
                           >
-                            <HardDrivesIcon className="h-4 w-4 text-muted-foreground" />
+                            <Server className="h-4 w-4 text-muted-foreground" />
                           </div>
                         );
                       }

app/_components/ui/StatusBadge.tsx

@@ -1,7 +1,6 @@
-import { cn } from "@/app/_utils/global-utils";
+import { cn } from "@/app/_utils/cn";
 import { HTMLAttributes, forwardRef } from "react";
-import { CheckCircleIcon, WarningIcon, XCircleIcon, PulseIcon } from "@phosphor-icons/react";
-import { useTranslations } from "next-intl";
+import { CheckCircle, AlertTriangle, XCircle, Activity } from "lucide-react";
 
 export interface StatusBadgeProps extends HTMLAttributes<HTMLDivElement> {
   status: string;
@@ -22,7 +21,6 @@ export const StatusBadge = forwardRef<HTMLDivElement, StatusBadgeProps>(
     },
     ref
   ) => {
-    const t = useTranslations();
     const getStatusConfig = (status: string) => {
       const lowerStatus = status.toLowerCase();
 
@@ -31,42 +29,47 @@ export const StatusBadge = forwardRef<HTMLDivElement, StatusBadgeProps>(
         case "operational":
         case "stable":
           return {
-            color: "text-status-success",
-            bgColor: "bg-background0",
-            icon: CheckCircleIcon,
-            label: t("system.optimal"),
+            color: "text-emerald-500",
+            bgColor: "bg-emerald-500/10",
+            borderColor: "border-emerald-500/20",
+            icon: CheckCircle,
+            label: "Optimal",
           };
         case "moderate":
         case "warning":
           return {
-            color: "text-status-warning",
-            bgColor: "bg-background0",
-            icon: WarningIcon,
-            label: t("system.warning"),
+            color: "text-yellow-500",
+            bgColor: "bg-yellow-500/10",
+            borderColor: "border-yellow-500/20",
+            icon: AlertTriangle,
+            label: "Warning",
           };
         case "high":
         case "slow":
           return {
-            color: "text-status-warning",
-            bgColor: "bg-background0",
-            icon: WarningIcon,
-            label: t("system.high"),
+            color: "text-orange-500",
+            bgColor: "bg-orange-500/10",
+            borderColor: "border-orange-500/20",
+            icon: AlertTriangle,
+            label: "High",
           };
         case "critical":
         case "poor":
         case "offline":
           return {
-            color: "text-status-error",
-            bgColor: "bg-background0",
-            icon: XCircleIcon,
-            label: t("system.critical"),
+            color: "text-destructive",
+            bgColor: "bg-destructive/10",
+            borderColor: "border-destructive/20",
+            icon: XCircle,
+            label: "Critical",
           };
         default:
           return {
-            color: "",
-            bgColor: "bg-background0",
-            icon: PulseIcon,
-            label: t("system.unknown"),
+            color: "text-muted-foreground",
+            bgColor: "bg-muted",
+            borderColor: "border-border",
+            icon: Activity,
+            label: "Unknown",
           };
       }
     };
@@ -78,8 +81,9 @@ export const StatusBadge = forwardRef<HTMLDivElement, StatusBadgeProps>(
       <div
         ref={ref}
         className={cn(
-          "inline-flex items-center gap-1.5 ascii-border px-2 py-1 terminal-font",
+          "inline-flex items-center gap-1.5 rounded-full border px-2 py-1",
           config.bgColor,
+          config.borderColor,
           {
             "text-xs": size === "sm",
             "text-sm": size === "md",

app/_components/ui/SystemStatus.tsx

@@ -1,7 +1,6 @@
-import { cn } from "@/app/_utils/global-utils";
+import { cn } from "@/app/_utils/cn";
 import { HTMLAttributes, forwardRef } from "react";
-import { PulseIcon } from "@phosphor-icons/react";
-import { useTranslations } from "next-intl";
+import { Activity } from "lucide-react";
 
 export interface SystemStatusProps extends HTMLAttributes<HTMLDivElement> {
   status: string;
@@ -15,34 +14,33 @@ export const SystemStatus = forwardRef<HTMLDivElement, SystemStatusProps>(
     { className, status, details, timestamp, isUpdating = false, ...props },
     ref
   ) => {
-    const t = useTranslations();
     const getStatusConfig = (status: string) => {
       const lowerStatus = status.toLowerCase();
 
       switch (lowerStatus) {
         case "operational":
           return {
-            bgColor: "bg-background0",
-            borderColor: "ascii-border",
-            dotColor: "bg-status-success",
+            bgColor: "bg-emerald-500/10",
+            borderColor: "border-emerald-500/20",
+            dotColor: "bg-emerald-500",
           };
         case "warning":
           return {
-            bgColor: "bg-background0",
-            borderColor: "ascii-border",
-            dotColor: "bg-status-warning",
+            bgColor: "bg-yellow-500/10",
+            borderColor: "border-yellow-500/20",
+            dotColor: "bg-yellow-500",
           };
         case "critical":
           return {
-            bgColor: "bg-background0",
-            borderColor: "ascii-border",
-            dotColor: "bg-status-error",
+            bgColor: "bg-destructive/10",
+            borderColor: "border-destructive/20",
+            dotColor: "bg-destructive",
           };
         default:
           return {
-            bgColor: "bg-background0",
-            borderColor: "ascii-border",
-            dotColor: "bg-status-success",
+            bgColor: "bg-muted",
+            borderColor: "border-border",
+            dotColor: "bg-muted-foreground",
           };
       }
     };
@@ -53,7 +51,7 @@ export const SystemStatus = forwardRef<HTMLDivElement, SystemStatusProps>(
       <div
         ref={ref}
         className={cn(
-          "p-4 glass-card terminal-font",
+          "p-4 border border-border/50 rounded-lg glass-card",
           config.bgColor,
           config.borderColor,
           className
@@ -61,16 +59,16 @@ export const SystemStatus = forwardRef<HTMLDivElement, SystemStatusProps>(
         {...props}
       >
         <div className="flex items-center gap-3">
-          <div className={cn("w-3 h-3", config.dotColor)} />
+          <div className={cn("w-3 h-3 rounded-full", config.dotColor)} />
           <div className="flex-1">
             <div className="flex items-center gap-2">
-              <PulseIcon className="h-4 w-4 text-muted-foreground" />
+              <Activity className="h-4 w-4 text-muted-foreground" />
               <span className="text-sm font-medium text-foreground">
-                {t("system.systemStatus")}: {status}
+                System Status: {status}
               </span>
             </div>
             <p className="text-xs text-muted-foreground mt-1">
-              {details} • {t("system.lastUpdated")}: {timestamp}
+              {details} • Last updated: {timestamp}
               {isUpdating && <span className="ml-2 animate-pulse">🔄</span>}
             </p>
           </div>

app/_components/ui/ThemeProvider.tsx

@@ -0,0 +1,12 @@
+'use client'
+
+import { ThemeProvider as NextThemesProvider } from 'next-themes';
+import { type ThemeProviderProps } from 'next-themes/dist/types';
+
+export const ThemeProvider = ({ children, ...props }: ThemeProviderProps) => {
+  return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
+}
+
+
+
+

app/_components/ui/ThemeToggle.tsx

@@ -0,0 +1,31 @@
+'use client'
+
+import { Moon, Sun } from 'lucide-react';
+import { useTheme } from 'next-themes';
+import { useEffect, useState } from 'react';
+import { Button } from './Button';
+
+export const ThemeToggle = () => {
+  const [mounted, setMounted] = useState(false);
+  const { theme, setTheme } = useTheme();
+
+  useEffect(() => {
+    setMounted(true);
+  }, []);
+
+  if (!mounted) {
+    return null;
+  }
+
+  return (
+    <Button
+      variant="ghost"
+      size="icon"
+      onClick={() => setTheme(theme === 'light' ? 'dark' : 'light')}
+    >
+      <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
+      <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
+      <span className="sr-only">Toggle theme</span>
+    </Button>
+  );
+};

app/_components/ui/Toast.tsx

@@ -1,9 +1,9 @@
 "use client";
 
 import { useEffect, useState } from "react";
-import { XIcon, CheckCircleIcon, WarningCircleIcon, InfoIcon, WarningIcon } from "@phosphor-icons/react";
-import { cn } from "@/app/_utils/global-utils";
-import { ErrorDetailsModal } from "@/app/_components/FeatureComponents/Modals/ErrorDetailsModal";
+import { X, CheckCircle, AlertCircle, Info, AlertTriangle } from "lucide-react";
+import { cn } from "@/app/_utils/cn";
+import { ErrorDetailsModal } from "../modals/ErrorDetailsModal";
 
 export interface Toast {
   id: string;
@@ -30,17 +30,19 @@ interface ToastProps {
 }
 
 const toastIcons = {
-  success: CheckCircleIcon,
-  error: WarningCircleIcon,
-  info: InfoIcon,
-  warning: WarningIcon,
+  success: CheckCircle,
+  error: AlertCircle,
+  info: Info,
+  warning: AlertTriangle,
 };
 
 const toastStyles = {
-  success: "ascii-border bg-background0 text-status-success",
-  error: "ascii-border bg-background0 text-status-error",
-  info: "ascii-border bg-background0 text-status-info",
-  warning: "ascii-border bg-background0 text-status-warning",
+  success:
+    "border-green-500/20 bg-green-500/10 text-green-700 dark:text-green-400",
+  error: "border-red-500/20 bg-red-500/10 text-red-700 dark:text-red-400",
+  info: "border-blue-500/20 bg-blue-500/10 text-blue-700 dark:text-blue-400",
+  warning:
+    "border-yellow-500/20 bg-yellow-500/10 text-yellow-700 dark:text-yellow-400",
 };
 
 export const Toast = ({ toast, onRemove, onErrorClick }: ToastProps) => {
@@ -60,15 +62,16 @@ export const Toast = ({ toast, onRemove, onErrorClick }: ToastProps) => {
   return (
     <div
       className={cn(
-        "flex items-start gap-3 p-4 terminal-font transition-all duration-300 ease-in-out",
+        "flex items-start gap-3 p-4 rounded-lg border backdrop-blur-md transition-all duration-300 ease-in-out",
         toastStyles[toast.type],
         isVisible ? "translate-x-0 opacity-100" : "translate-x-full opacity-0"
       )}
     >
       <Icon className="h-5 w-5 flex-shrink-0 mt-0.5" />
       <div
-        className={`flex-1 min-w-0 ${toast.type === "error" && toast.errorDetails ? "cursor-pointer" : ""
-          }`}
+        className={`flex-1 min-w-0 ${
+          toast.type === "error" && toast.errorDetails ? "cursor-pointer" : ""
+        }`}
         onClick={() => {
           if (toast.type === "error" && toast.errorDetails && onErrorClick) {
             onErrorClick(toast.errorDetails);
@@ -90,7 +93,7 @@ export const Toast = ({ toast, onRemove, onErrorClick }: ToastProps) => {
         }}
         className="flex-shrink-0 p-1 rounded-md hover:bg-black/10 transition-colors"
       >
-        <XIcon className="h-4 w-4" />
+        <X className="h-4 w-4" />
       </button>
     </div>
   );

app/_components/ui/TruncatedText.tsx

@@ -1,4 +1,4 @@
-import { cn } from "@/app/_utils/global-utils";
+import { cn } from "@/app/_utils/cn";
 import { HTMLAttributes, forwardRef, useState } from "react";
 
 export interface TruncatedTextProps extends HTMLAttributes<HTMLDivElement> {

app/_components/ui/UserFilter.tsx

@@ -1,10 +1,9 @@
 "use client";
 
 import { useState, useEffect } from "react";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { CaretDownIcon, UserIcon, XIcon } from "@phosphor-icons/react";
+import { Button } from "./Button";
+import { ChevronDown, User, X } from "lucide-react";
 import { fetchAvailableUsers } from "@/app/_server/actions/cronjobs";
-import { useTranslations } from "next-intl";
 
 interface UserFilterProps {
   selectedUser: string | null;
@@ -20,7 +19,6 @@ export const UserFilter = ({
   const [users, setUsers] = useState<string[]>([]);
   const [isOpen, setIsOpen] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
-  const t = useTranslations();
 
   useEffect(() => {
     const loadUsers = async () => {
@@ -42,7 +40,7 @@ export const UserFilter = ({
       <div
         className={`flex items-center gap-2 px-3 py-2 bg-muted/50 rounded-md ${className}`}
       >
-        <UserIcon className="h-4 w-4 text-muted-foreground" />
+        <User className="h-4 w-4 text-muted-foreground" />
         <span className="text-sm text-muted-foreground">Loading users...</span>
       </div>
     );
@@ -50,36 +48,35 @@ export const UserFilter = ({
 
   return (
     <div className={`relative ${className}`}>
-      <div className="flex items-center gap-1">
-        <Button
-          variant="outline"
-          onClick={() => setIsOpen(!isOpen)}
-          className="flex-1 justify-between"
-        >
-          <div className="flex items-center gap-2">
-            <UserIcon className="h-4 w-4" />
-            <span className="text-sm">
-              {selectedUser
-                ? `${t("common.userWithUsername", { user: selectedUser })}`
-                : t("common.allUsers")}
-            </span>
-          </div>
-          <CaretDownIcon className="h-4 w-4" />
-        </Button>
-        {selectedUser && (
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={() => onUserChange(null)}
-            className="p-2 h-8 w-8 flex-shrink-0"
-          >
-            <XIcon className="h-3 w-3" />
-          </Button>
-        )}
-      </div>
+      <Button
+        variant="outline"
+        onClick={() => setIsOpen(!isOpen)}
+        className="w-full justify-between"
+      >
+        <div className="flex items-center gap-2">
+          <User className="h-4 w-4" />
+          <span className="text-sm">
+            {selectedUser ? `User: ${selectedUser}` : "All users"}
+          </span>
+        </div>
+        <div className="flex items-center gap-1">
+          {selectedUser && (
+            <button
+              onClick={(e) => {
+                e.stopPropagation();
+                onUserChange(null);
+              }}
+              className="p-1 hover:bg-accent rounded"
+            >
+              <X className="h-3 w-3" />
+            </button>
+          )}
+          <ChevronDown className="h-4 w-4" />
+        </div>
+      </Button>
 
       {isOpen && (
-        <div className="absolute top-full left-0 right-0 mt-1 bg-background0 border border-border rounded-md shadow-lg z-50 max-h-48 overflow-y-auto tui-scrollbar">
+        <div className="absolute top-full left-0 right-0 mt-1 bg-background border border-border rounded-md shadow-lg z-50 max-h-48 overflow-y-auto">
           <button
             onClick={() => {
               onUserChange(null);
@@ -88,7 +85,7 @@ export const UserFilter = ({
             className={`w-full text-left px-3 py-2 text-sm hover:bg-accent transition-colors ${!selectedUser ? "bg-accent text-accent-foreground" : ""
               }`}
           >
-            {t("common.allUsers")}
+            All users
           </button>
           {users.map((user) => (
             <button
@@ -107,4 +104,4 @@ export const UserFilter = ({
       )}
     </div>
   );
-};
+}

app/_components/ui/UserSwitcher.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { useState, useEffect } from "react";
-import { Button } from "@/app/_components/GlobalComponents/UIElements/Button";
-import { CaretDownIcon, UserIcon } from "@phosphor-icons/react";
+import { Button } from "./Button";
+import { ChevronDown, User } from "lucide-react";
 import { fetchAvailableUsers } from "@/app/_server/actions/cronjobs";
 
 interface UserSwitcherProps {
@@ -43,7 +43,7 @@ export const UserSwitcher = ({
       <div
         className={`flex items-center gap-2 px-3 py-2 bg-muted/50 rounded-md ${className}`}
       >
-        <UserIcon className="h-4 w-4 text-muted-foreground" />
+        <User className="h-4 w-4 text-muted-foreground" />
         <span className="text-sm text-muted-foreground">Loading users...</span>
       </div>
     );
@@ -52,31 +52,23 @@ export const UserSwitcher = ({
   return (
     <div className={`relative ${className}`}>
       <Button
-        type="button"
         variant="outline"
-        onClick={(e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          setIsOpen(!isOpen);
-        }}
+        onClick={() => setIsOpen(!isOpen)}
         className="w-full justify-between"
       >
         <div className="flex items-center gap-2">
-          <UserIcon className="h-4 w-4" />
+          <User className="h-4 w-4" />
           <span className="text-sm">{selectedUser || "Select user"}</span>
         </div>
-        <CaretDownIcon className="h-4 w-4" />
+        <ChevronDown className="h-4 w-4" />
       </Button>
 
       {isOpen && (
-        <div className="absolute top-full left-0 right-0 mt-1 bg-background0 border border-border rounded-md shadow-lg z-50 max-h-48 overflow-y-auto tui-scrollbar">
+        <div className="absolute top-full left-0 right-0 mt-1 bg-background border border-border rounded-md shadow-lg z-50 max-h-48 overflow-y-auto">
           {users.map((user) => (
             <button
-              type="button"
               key={user}
-              onClick={(e) => {
-                e.preventDefault();
-                e.stopPropagation();
+              onClick={() => {
                 onUserChange(user);
                 setIsOpen(false);
               }}
@@ -90,4 +82,4 @@ export const UserSwitcher = ({
       )}
     </div>
   );
-};
+}

app/_consts/commands.ts

@@ -1,32 +0,0 @@
-export const WRITE_CRONTAB = (content: string, user: string) => {
-  return `crontab -u ${user} - << 'EOF'\n${content}\nEOF`;
-};
-
-export const READ_CRONTAB = (user: string) =>
-  `crontab -l -u ${user} 2>/dev/null || echo ""`;
-
-export const READ_CRON_FILE = () => 'crontab -l 2>/dev/null || echo ""';
-
-export const WRITE_CRON_FILE = (content: string) => {
-  return `crontab - << 'EOF'\n${content}\nEOF`;
-};
-
-export const WRITE_HOST_CRONTAB = (base64Content: string, user: string) => {
-  const escapedContent = base64Content.replace(/'/g, "'\\''");
-  return `echo '${escapedContent}' | base64 -d | crontab -u ${user} -`;
-};
-
-export const ID_U = (username: string) => `id -u ${username}`;
-
-export const ID_G = (username: string) => `id -g ${username}`;
-
-export const MAKE_SCRIPT_EXECUTABLE = (scriptPath: string) =>
-  `chmod +x "${scriptPath}"`;
-
-export const RUN_SCRIPT = (scriptPath: string) => `bash "${scriptPath}"`;
-
-export const GET_TARGET_USER = `getent passwd | grep ":/home/" | head -1 | cut -d: -f1`;
-
-export const GET_DOCKER_SOCKET_OWNER = 'stat -c "%U" /var/run/docker.sock';
-
-export const READ_CRONTABS_DIRECTORY = `ls /var/spool/cron/crontabs/ 2>/dev/null || echo ''`;

app/_consts/file.ts

@@ -1,5 +0,0 @@
-import path from "path";
-
-export const SCRIPTS_DIR = path.join("scripts");
-export const SNIPPETS_DIR = path.join("snippets");
-export const DATA_DIR = path.join("data");

app/_consts/nsenter.ts

@@ -1,7 +0,0 @@
-export const NSENTER_RUN_JOB = (
-  executionUser: string,
-  escapedCommand: string
-) => `nsenter -t 1 -m -u -i -n -p su - ${executionUser} -c '${escapedCommand}'`;
-
-export const NSENTER_HOST_CRONTAB = (command: string) =>
-  `nsenter -t 1 -m -u -i -n -p sh -c "${command}"`;

app/_contexts/SSEContext.tsx

@@ -1,96 +0,0 @@
-"use client";
-
-import React, {
-  createContext,
-  useContext,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
-import { SSEEvent } from "@/app/_utils/sse-events";
-import { usePageVisibility } from "@/app/_hooks/usePageVisibility";
-
-interface SSEContextType {
-  isConnected: boolean;
-  subscribe: (callback: (event: SSEEvent) => void) => () => void;
-}
-
-const SSEContext = createContext<SSEContextType | null>(null);
-
-export const SSEProvider: React.FC<{
-  children: React.ReactNode;
-  liveUpdatesEnabled: boolean;
-}> = ({ children, liveUpdatesEnabled }) => {
-  const [isConnected, setIsConnected] = useState(false);
-  const eventSourceRef = useRef<EventSource | null>(null);
-  const subscribersRef = useRef<Set<(event: SSEEvent) => void>>(new Set());
-  const isPageVisible = usePageVisibility();
-
-  useEffect(() => {
-    if (!liveUpdatesEnabled || !isPageVisible) {
-      if (eventSourceRef.current) {
-        eventSourceRef.current.close();
-        eventSourceRef.current = null;
-        setIsConnected(false);
-      }
-      return;
-    }
-
-    const eventSource = new EventSource("/api/events");
-
-    eventSource.onopen = () => {
-      setIsConnected(true);
-    };
-
-    eventSource.onerror = () => {
-      setIsConnected(false);
-    };
-
-    const eventTypes = [
-      "job-started",
-      "job-completed",
-      "job-failed",
-      "log-line",
-      "system-stats",
-      "heartbeat",
-    ];
-
-    eventTypes.forEach((eventType) => {
-      eventSource.addEventListener(eventType, (event: MessageEvent) => {
-        try {
-          const data = JSON.parse(event.data) as SSEEvent;
-          subscribersRef.current.forEach((callback) => callback(data));
-        } catch (error) {
-          console.error(`[SSE] Failed to parse ${eventType} event:`, error);
-        }
-      });
-    });
-
-    eventSourceRef.current = eventSource;
-
-    return () => {
-      eventSource.close();
-    };
-  }, [liveUpdatesEnabled, isPageVisible]);
-
-  const subscribe = (callback: (event: SSEEvent) => void) => {
-    subscribersRef.current.add(callback);
-    return () => {
-      subscribersRef.current.delete(callback);
-    };
-  };
-
-  return (
-    <SSEContext.Provider value={{ isConnected, subscribe }}>
-      {children}
-    </SSEContext.Provider>
-  );
-};
-
-export const useSSEContext = () => {
-  const context = useContext(SSEContext);
-  if (!context) {
-    throw new Error("useSSEContext must be used within SSEProvider");
-  }
-  return context;
-};

app/_hooks/useCronJobState.ts

@@ -1,258 +0,0 @@
-"use client";
-
-import { useState, useMemo, useEffect } from "react";
-import { CronJob } from "@/app/_utils/cronjob-utils";
-import { Script } from "@/app/_utils/scripts-utils";
-import {
-    getJobErrorsByJobId,
-    JobError,
-} from "@/app/_utils/error-utils";
-import {
-    handleErrorClick,
-    handleDelete,
-    handleClone,
-    handlePause,
-    handleResume,
-    handleRun,
-    handleEditSubmit,
-    handleNewCronSubmit,
-    handleToggleLogging,
-    handleBackup,
-} from "@/app/_components/FeatureComponents/Cronjobs/helpers";
-
-interface CronJobListProps {
-    cronJobs: CronJob[];
-    scripts: Script[];
-}
-
-export const useCronJobState = ({ cronJobs, scripts }: CronJobListProps) => {
-    const [deletingId, setDeletingId] = useState<string | null>(null);
-    const [editingJob, setEditingJob] = useState<CronJob | null>(null);
-    const [isEditModalOpen, setIsEditModalOpen] = useState(false);
-    const [isNewCronModalOpen, setIsNewCronModalOpen] = useState(false);
-    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-    const [isCloneModalOpen, setIsCloneModalOpen] = useState(false);
-    const [jobToDelete, setJobToDelete] = useState<CronJob | null>(null);
-    const [jobToClone, setJobToClone] = useState<CronJob | null>(null);
-    const [isCloning, setIsCloning] = useState(false);
-    const [runningJobId, setRunningJobId] = useState<string | null>(null);
-    const [selectedUser, setSelectedUser] = useState<string | null>(null);
-    const [jobErrors, setJobErrors] = useState<Record<string, JobError[]>>({});
-    const [errorModalOpen, setErrorModalOpen] = useState(false);
-    const [selectedError, setSelectedError] = useState<JobError | null>(null);
-    const [isLogsModalOpen, setIsLogsModalOpen] = useState(false);
-    const [jobForLogs, setJobForLogs] = useState<CronJob | null>(null);
-    const [isLiveLogModalOpen, setIsLiveLogModalOpen] = useState(false);
-    const [liveLogRunId, setLiveLogRunId] = useState<string>("");
-    const [liveLogJobId, setLiveLogJobId] = useState<string>("");
-    const [liveLogJobComment, setLiveLogJobComment] = useState<string>("");
-
-    const [editForm, setEditForm] = useState({
-        schedule: "",
-        command: "",
-        comment: "",
-        logsEnabled: false,
-    });
-    const [newCronForm, setNewCronForm] = useState({
-        schedule: "",
-        command: "",
-        comment: "",
-        selectedScriptId: null as string | null,
-        user: "",
-        logsEnabled: false,
-    });
-
-    useEffect(() => {
-        const savedUser = localStorage.getItem("selectedCronUser");
-        if (savedUser) {
-            setSelectedUser(savedUser);
-        }
-    }, []);
-
-    useEffect(() => {
-        if (selectedUser) {
-            localStorage.setItem("selectedCronUser", selectedUser);
-        } else {
-            localStorage.removeItem("selectedCronUser");
-        }
-    }, [selectedUser]);
-
-    const filteredJobs = useMemo(() => {
-        if (!selectedUser) return cronJobs;
-        return cronJobs.filter((job) => job.user === selectedUser);
-    }, [cronJobs, selectedUser]);
-
-    useEffect(() => {
-        const errors: Record<string, JobError[]> = {};
-        filteredJobs.forEach((job) => {
-            errors[job.id] = getJobErrorsByJobId(job.id);
-        });
-        setJobErrors(errors);
-    }, [filteredJobs]);
-
-
-    const refreshJobErrorsLocal = () => {
-        const errors: Record<string, JobError[]> = {};
-        filteredJobs.forEach((job) => {
-            errors[job.id] = getJobErrorsByJobId(job.id);
-        });
-        setJobErrors(errors);
-    };
-
-    const getHelperState = () => ({
-        setDeletingId,
-        setIsDeleteModalOpen,
-        setJobToDelete,
-        setIsCloneModalOpen,
-        setJobToClone,
-        setIsCloning,
-        setIsEditModalOpen,
-        setEditingJob,
-        setIsNewCronModalOpen,
-        setNewCronForm,
-        setRunningJobId,
-        refreshJobErrors: refreshJobErrorsLocal,
-        setIsLiveLogModalOpen,
-        setLiveLogRunId,
-        setLiveLogJobId,
-        setLiveLogJobComment,
-        jobToClone,
-        editingJob,
-        editForm,
-        newCronForm,
-    });
-
-    const handleErrorClickLocal = (error: JobError) => {
-        handleErrorClick(error, setSelectedError, setErrorModalOpen);
-    };
-
-    const handleDeleteLocal = async (id: string) => {
-        const job = cronJobs.find(j => j.id === id);
-        if (job) {
-            await handleDelete(job, getHelperState());
-        }
-    };
-
-    const handleCloneLocal = async (newComment: string) => {
-        await handleClone(newComment, getHelperState());
-    };
-
-    const handlePauseLocal = async (id: string) => {
-        const job = cronJobs.find(j => j.id === id);
-        if (job) {
-            await handlePause(job);
-        }
-    };
-
-    const handleResumeLocal = async (id: string) => {
-        const job = cronJobs.find(j => j.id === id);
-        if (job) {
-            await handleResume(job);
-        }
-    };
-
-    const handleRunLocal = async (id: string) => {
-        const job = cronJobs.find(j => j.id === id);
-        if (!job) return;
-        await handleRun(id, getHelperState(), job);
-    };
-
-    const handleToggleLoggingLocal = async (id: string) => {
-        const job = cronJobs.find(j => j.id === id);
-        if (job) {
-            await handleToggleLogging(job);
-        }
-    };
-
-    const handleViewLogs = (job: CronJob) => {
-        setJobForLogs(job);
-        setIsLogsModalOpen(true);
-    };
-
-    const confirmDelete = (job: CronJob) => {
-        setJobToDelete(job);
-        setIsDeleteModalOpen(true);
-    };
-
-    const confirmClone = (job: CronJob) => {
-        setJobToClone(job);
-        setIsCloneModalOpen(true);
-    };
-
-    const handleEdit = (job: CronJob) => {
-        setEditingJob(job);
-        setEditForm({
-            schedule: job.schedule,
-            command: job.command,
-            comment: job.comment || "",
-            logsEnabled: job.logsEnabled || false,
-        });
-        setIsEditModalOpen(true);
-    };
-
-    const handleEditSubmitLocal = async (e: React.FormEvent) => {
-        await handleEditSubmit(e, getHelperState());
-    };
-
-    const handleNewCronSubmitLocal = async (e: React.FormEvent) => {
-        await handleNewCronSubmit(e, getHelperState());
-    };
-
-    const handleBackupLocal = async (id: string) => {
-        const job = cronJobs.find(j => j.id === id);
-        if (job) {
-            await handleBackup(job);
-        }
-    };
-
-    return {
-        deletingId,
-        runningJobId,
-        selectedUser,
-        setSelectedUser,
-        jobErrors,
-        errorModalOpen,
-        setErrorModalOpen,
-        selectedError,
-        setSelectedError,
-        isLogsModalOpen,
-        setIsLogsModalOpen,
-        jobForLogs,
-        isLiveLogModalOpen,
-        setIsLiveLogModalOpen,
-        liveLogRunId,
-        liveLogJobId,
-        liveLogJobComment,
-        filteredJobs,
-        isNewCronModalOpen,
-        setIsNewCronModalOpen,
-        isEditModalOpen,
-        setIsEditModalOpen,
-        isDeleteModalOpen,
-        setIsDeleteModalOpen,
-        isCloneModalOpen,
-        setIsCloneModalOpen,
-        jobToDelete,
-        jobToClone,
-        isCloning,
-        editForm,
-        setEditForm,
-        newCronForm,
-        setNewCronForm,
-        handleErrorClickLocal,
-        refreshJobErrorsLocal,
-        handleDeleteLocal,
-        handleCloneLocal,
-        handlePauseLocal,
-        handleResumeLocal,
-        handleRunLocal,
-        handleToggleLoggingLocal,
-        handleViewLogs,
-        confirmDelete,
-        confirmClone,
-        handleEdit,
-        handleEditSubmitLocal,
-        handleNewCronSubmitLocal,
-        handleBackupLocal,
-    };
-};

app/_hooks/usePageVisibility.ts

@@ -1,24 +0,0 @@
-"use client";
-
-import { useEffect, useState } from "react";
-
-
-export function usePageVisibility(): boolean {
-  const [isVisible, setIsVisible] = useState<boolean>(
-    typeof document !== "undefined" ? !document.hidden : true
-  );
-
-  useEffect(() => {
-    const handleVisibilityChange = () => {
-      setIsVisible(!document.hidden);
-    };
-
-    document.addEventListener("visibilitychange", handleVisibilityChange);
-
-    return () => {
-      document.removeEventListener("visibilitychange", handleVisibilityChange);
-    };
-  }, []);
-
-  return isVisible;
-}

app/_hooks/useSSE.ts

@@ -1,126 +0,0 @@
-"use client";
-
-import { useEffect, useRef, useCallback } from "react";
-import { SSEEvent, SSEEventType } from "@/app/_utils/sse-events";
-
-type SSEEventHandler = (event: SSEEvent) => void;
-type SSEErrorHandler = (error: Event) => void;
-
-interface UseSSEOptions {
-  enabled?: boolean;
-  onEvent?: SSEEventHandler;
-  onError?: SSEErrorHandler;
-  onConnect?: () => void;
-  onDisconnect?: () => void;
-}
-
-/**
- * Custom hook for consuming Server-Sent Events
- *
- * @param options Configuration options
- * @returns Object with connection status and manual control functions
- *
- * @example
- * ```tsx
- * const { isConnected } = useSSE({
- *   enabled: true,
- *   onEvent: (event) => {
- *     if (event.type === 'job-started') {
- *       console.log('Job started:', event.data);
- *     }
- *   },
- * });
- * ```
- */
-export const useSSE = (options: UseSSEOptions = {}) => {
-  const { enabled = true, onEvent, onError, onConnect, onDisconnect } = options;
-
-  const eventSourceRef = useRef<EventSource | null>(null);
-  const isConnectedRef = useRef(false);
-  const onEventRef = useRef(onEvent);
-  const onErrorRef = useRef(onError);
-  const onConnectRef = useRef(onConnect);
-  const onDisconnectRef = useRef(onDisconnect);
-
-  useEffect(() => {
-    onEventRef.current = onEvent;
-    onErrorRef.current = onError;
-    onConnectRef.current = onConnect;
-    onDisconnectRef.current = onDisconnect;
-  });
-
-  const connect = useCallback(() => {
-    if (eventSourceRef.current || !enabled) {
-      return;
-    }
-
-    try {
-      const eventSource = new EventSource("/api/events");
-
-      eventSource.onopen = () => {
-        isConnectedRef.current = true;
-        onConnectRef.current?.();
-      };
-
-      eventSource.onerror = (error) => {
-        isConnectedRef.current = false;
-        onErrorRef.current?.(error);
-
-        if (eventSource.readyState === EventSource.CLOSED) {
-          onDisconnectRef.current?.();
-        }
-      };
-
-      const eventTypes: SSEEventType[] = [
-        "job-started",
-        "job-completed",
-        "job-failed",
-        "log-line",
-        "system-stats",
-        "heartbeat",
-      ];
-
-      eventTypes.forEach((eventType) => {
-        eventSource.addEventListener(eventType, (event: MessageEvent) => {
-          try {
-            const data = JSON.parse(event.data) as SSEEvent;
-            onEventRef.current?.(data);
-          } catch (error) {
-            console.error(`[SSE] Failed to parse ${eventType} event:`, error);
-          }
-        });
-      });
-
-      eventSourceRef.current = eventSource;
-    } catch (error) {
-      console.error("[SSE] Failed to create EventSource:", error);
-    }
-  }, [enabled]);
-
-  const disconnect = useCallback(() => {
-    if (eventSourceRef.current) {
-      eventSourceRef.current.close();
-      eventSourceRef.current = null;
-      isConnectedRef.current = false;
-      onDisconnectRef.current?.();
-    }
-  }, []);
-
-  useEffect(() => {
-    if (enabled) {
-      connect();
-    } else {
-      disconnect();
-    }
-
-    return () => {
-      disconnect();
-    };
-  }, [enabled, connect, disconnect]);
-
-  return {
-    isConnected: isConnectedRef.current,
-    connect,
-    disconnect,
-  };
-};

app/_providers/ThemeProvider.tsx

@@ -1,26 +0,0 @@
-'use client'
-
-import { ThemeProvider as NextThemesProvider } from 'next-themes';
-import { type ThemeProviderProps } from 'next-themes/dist/types';
-
-export const ThemeProvider = ({ children, ...props }: ThemeProviderProps) => {
-  return (
-    <NextThemesProvider
-      attribute="data-webtui-theme"
-      defaultTheme="light"
-      themes={['light', 'dark']}
-      value={{
-        light: 'catppuccin-latte',
-        dark: 'catppuccin-mocha',
-      }}
-      disableTransitionOnChange
-      {...props}
-    >
-      {children}
-    </NextThemesProvider>
-  );
-}
-
-
-
-

app/_scripts/cron-log-wrapper.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# Cr*nmaster Log Wrapper Script
-# Captures stdout, stderr, exit code, and timestamps for cronjob executions
-#
-# Usage: cron-log-wrapper.sh <logFolderName> <command...>
-# Example: cron-log-wrapper.sh "backup-database" bash /app/scripts/backup.sh
-
-set -u
-
-if [ $# -lt 2 ]; then
-    echo "ERROR: Usage: $0 <logFolderName> <command...>" >&2
-    exit 1
-fi
-
-LOG_FOLDER_NAME="$1"
-shift
-
-# Get the script's absolute directory path (e.g., ./data)
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-LOG_DIR="${SCRIPT_DIR}/logs/${LOG_FOLDER_NAME}"
-
-# Ensure the log directory exists
-mkdir -p "$LOG_DIR"
-
-TIMESTAMP_FILE=$(date '+%Y-%m-%d_%H-%M-%S')
-HUMAN_START_TIME=$(date '+%Y-%m-%d %H:%M:%S')
-LOG_FILE="${LOG_DIR}/${TIMESTAMP_FILE}.log"
-START_SECONDS=$SECONDS
-
-{
-    echo "--- [ JOB START ] ----------------------------------------------------"
-    echo "Command   : $*"
-    echo "Timestamp : ${HUMAN_START_TIME}"
-    echo "Host      : $(hostname)"
-    echo "User      : $(whoami)"
-    echo "--- [ JOB OUTPUT ] ---------------------------------------------------"
-    echo ""
-
-    # Execute the command, capturing its exit code
-    "$@"
-    EXIT_CODE=$?
-
-
-    DURATION=$((SECONDS - START_SECONDS))
-    HUMAN_END_TIME=$(date '+%Y-%m-%d %H:%M:%S')
-
-    if [ $EXIT_CODE -eq 0 ]; then
-        STATUS="SUCCESS"
-    else
-        STATUS="FAILED"
-    fi
-
-    echo ""
-    echo "--- [ JOB SUMMARY ] --------------------------------------------------"
-    echo "Timestamp : ${HUMAN_END_TIME}"
-    echo "Duration  : ${DURATION}s"
-    # ⚠️ ATTENTION: DO NOT MODIFY THE EXIT CODE LINE ⚠️
-    # The UI reads this exact format to detect job failures. Keep it as: "Exit Code : ${EXIT_CODE}"
-    echo "Exit Code : ${EXIT_CODE}"
-    echo "Status    : ${STATUS}"
-    echo "--- [ JOB END ] ------------------------------------------------------"
-
-    exit $EXIT_CODE
-
-} >> "$LOG_FILE" 2>&1
-
-# Pass the command's exit code back to cron
-exit $?

app/_server/actions/cronjobs/index.ts

@@ -3,27 +3,23 @@
 import {
   getCronJobs,
   addCronJob,
-  cleanupCrontab,
-  readUserCrontab,
-  writeUserCrontab,
-  findJobIndex,
+  deleteCronJob,
   updateCronJob,
+  pauseCronJob,
+  resumeCronJob,
+  cleanupCrontab,
   type CronJob,
-} from "@/app/_utils/cronjob-utils";
-import { getAllTargetUsers } from "@/app/_utils/crontab-utils";
+} from "@/app/_utils/system";
+import {
+  getAllTargetUsers,
+  getUserInfo,
+} from "@/app/_utils/system/hostCrontab";
 import { revalidatePath } from "next/cache";
-import { getScriptPathForCron } from "@/app/_server/actions/scripts";
-import { isDocker } from "@/app/_server/actions/global";
-import {
-  runJobSynchronously,
-  runJobInBackground,
-} from "@/app/_utils/job-execution-utils";
-import {
-  pauseJobInLines,
-  resumeJobInLines,
-  deleteJobInLines,
-} from "@/app/_utils/line-manipulation-utils";
-import { cleanCrontabContent } from "@/app/_utils/files-manipulation-utils";
+import { getScriptPath } from "@/app/_utils/scripts";
+import { exec } from "child_process";
+import { promisify } from "util";
+
+const execAsync = promisify(exec);
 
 export const fetchCronJobs = async (): Promise<CronJob[]> => {
   try {
@@ -43,7 +39,6 @@ export const createCronJob = async (
     const comment = formData.get("comment") as string;
     const selectedScriptId = formData.get("selectedScriptId") as string;
     const user = formData.get("user") as string;
-    const logsEnabled = formData.get("logsEnabled") === "true";
 
     if (!schedule) {
       return { success: false, message: "Schedule is required" };
@@ -52,12 +47,12 @@ export const createCronJob = async (
     let finalCommand = command;
 
     if (selectedScriptId) {
-      const { fetchScripts } = await import("@/app/_server/actions/scripts");
+      const { fetchScripts } = await import("../scripts");
       const scripts = await fetchScripts();
       const selectedScript = scripts.find((s) => s.id === selectedScriptId);
 
       if (selectedScript) {
-        finalCommand = await getScriptPathForCron(selectedScript.filename);
+        finalCommand = await getScriptPath(selectedScript.filename);
       } else {
         return { success: false, message: "Selected script not found" };
       }
@@ -68,13 +63,7 @@ export const createCronJob = async (
       };
     }
 
-    const success = await addCronJob(
-      schedule,
-      finalCommand,
-      comment,
-      user,
-      logsEnabled
-    );
+    const success = await addCronJob(schedule, finalCommand, comment, user);
     if (success) {
       revalidatePath("/");
       return { success: true, message: "Cron job created successfully" };
@@ -92,22 +81,10 @@ export const createCronJob = async (
 };
 
 export const removeCronJob = async (
-  jobData: { id: string; schedule: string; command: string; comment?: string; user: string }
+  id: string
 ): Promise<{ success: boolean; message: string; details?: string }> => {
   try {
-    const cronContent = await readUserCrontab(jobData.user);
-    const lines = cronContent.split("\n");
-
-    const jobIndex = findJobIndex(jobData, lines, jobData.user);
-
-    if (jobIndex === -1) {
-      return { success: false, message: "Cron job not found in crontab" };
-    }
-
-    const newCronEntries = deleteJobInLines(lines, jobIndex);
-    const newCron = await cleanCrontabContent(newCronEntries.join("\n"));
-    const success = await writeUserCrontab(jobData.user, newCron);
-
+    const success = await deleteCronJob(id);
     if (success) {
       revalidatePath("/");
       return { success: true, message: "Cron job deleted successfully" };
@@ -132,26 +109,12 @@ export const editCronJob = async (
     const schedule = formData.get("schedule") as string;
     const command = formData.get("command") as string;
     const comment = formData.get("comment") as string;
-    const logsEnabled = formData.get("logsEnabled") === "true";
 
     if (!id || !schedule || !command) {
       return { success: false, message: "Missing required fields" };
     }
 
-    const cronJobs = await getCronJobs(false);
-    const job = cronJobs.find((j) => j.id === id);
-
-    if (!job) {
-      return { success: false, message: "Cron job not found" };
-    }
-
-    const success = await updateCronJob(
-      job,
-      schedule,
-      command,
-      comment,
-      logsEnabled
-    );
+    const success = await updateCronJob(id, schedule, command, comment);
     if (success) {
       revalidatePath("/");
       return { success: true, message: "Cron job updated successfully" };
@@ -173,7 +136,7 @@ export const cloneCronJob = async (
   newComment: string
 ): Promise<{ success: boolean; message: string; details?: string }> => {
   try {
-    const cronJobs = await getCronJobs(false);
+    const cronJobs = await getCronJobs();
     const originalJob = cronJobs.find((job) => job.id === id);
 
     if (!originalJob) {
@@ -204,22 +167,10 @@ export const cloneCronJob = async (
 };
 
 export const pauseCronJobAction = async (
-  jobData: { id: string; schedule: string; command: string; comment?: string; user: string }
+  id: string
 ): Promise<{ success: boolean; message: string; details?: string }> => {
   try {
-    const cronContent = await readUserCrontab(jobData.user);
-    const lines = cronContent.split("\n");
-
-    const jobIndex = findJobIndex(jobData, lines, jobData.user);
-
-    if (jobIndex === -1) {
-      return { success: false, message: "Cron job not found in crontab" };
-    }
-
-    const newCronEntries = pauseJobInLines(lines, jobIndex, jobData.id);
-    const newCron = await cleanCrontabContent(newCronEntries.join("\n"));
-    const success = await writeUserCrontab(jobData.user, newCron);
-
+    const success = await pauseCronJob(id);
     if (success) {
       revalidatePath("/");
       return { success: true, message: "Cron job paused successfully" };
@@ -237,22 +188,10 @@ export const pauseCronJobAction = async (
 };
 
 export const resumeCronJobAction = async (
-  jobData: { id: string; schedule: string; command: string; comment?: string; user: string }
+  id: string
 ): Promise<{ success: boolean; message: string; details?: string }> => {
   try {
-    const cronContent = await readUserCrontab(jobData.user);
-    const lines = cronContent.split("\n");
-
-    const jobIndex = findJobIndex(jobData, lines, jobData.user);
-
-    if (jobIndex === -1) {
-      return { success: false, message: "Cron job not found in crontab" };
-    }
-
-    const newCronEntries = resumeJobInLines(lines, jobIndex, jobData.id);
-    const newCron = await cleanCrontabContent(newCronEntries.join("\n"));
-    const success = await writeUserCrontab(jobData.user, newCron);
-
+    const success = await resumeCronJob(id);
     if (success) {
       revalidatePath("/");
       return { success: true, message: "Cron job resumed successfully" };
@@ -301,41 +240,6 @@ export const cleanupCrontabAction = async (): Promise<{
   }
 };
 
-export const toggleCronJobLogging = async (
-  jobData: { id: string; schedule: string; command: string; comment?: string; user: string; logsEnabled?: boolean }
-): Promise<{ success: boolean; message: string; details?: string }> => {
-  try {
-    const newLogsEnabled = !jobData.logsEnabled;
-
-    const success = await updateCronJob(
-      jobData,
-      jobData.schedule,
-      jobData.command,
-      jobData.comment || "",
-      newLogsEnabled
-    );
-
-    if (success) {
-      revalidatePath("/");
-      return {
-        success: true,
-        message: newLogsEnabled
-          ? "Logging enabled successfully"
-          : "Logging disabled successfully",
-      };
-    } else {
-      return { success: false, message: "Failed to toggle logging" };
-    }
-  } catch (error: any) {
-    console.error("Error toggling logging:", error);
-    return {
-      success: false,
-      message: error.message || "Error toggling logging",
-      details: error.stack,
-    };
-  }
-};
-
 export const runCronJob = async (
   id: string
 ): Promise<{
@@ -343,11 +247,9 @@ export const runCronJob = async (
   message: string;
   output?: string;
   details?: string;
-  runId?: string;
-  mode?: "sync" | "async";
 }> => {
   try {
-    const cronJobs = await getCronJobs(false);
+    const cronJobs = await getCronJobs();
     const job = cronJobs.find((j) => j.id === id);
 
     if (!job) {
@@ -358,17 +260,38 @@ export const runCronJob = async (
       return { success: false, message: "Cannot run paused cron job" };
     }
 
-    const docker = await isDocker();
-    const liveUpdatesEnabled =
-      (typeof process.env.LIVE_UPDATES === "boolean" &&
-        process.env.LIVE_UPDATES === true) ||
-      process.env.LIVE_UPDATES !== "false";
+    const isDocker = process.env.DOCKER === "true";
+    let command = job.command;
 
-    if (job.logsEnabled && liveUpdatesEnabled) {
-      return runJobInBackground(job, docker);
+    if (isDocker) {
+      const userInfo = await getUserInfo(job.user);
+      const dockerExecUser = process.env.DOCKER_EXEC_USER;
+
+      let executionUser = userInfo ? userInfo.username : "root";
+
+      if (dockerExecUser && executionUser === "root") {
+        console.log(
+          `Overriding root execution. Running command as user: ${dockerExecUser}`
+        );
+        executionUser = dockerExecUser;
+      }
+
+      const escapedCommand = job.command.replace(/'/g, "'\\''");
+      command = `nsenter -t 1 -m -u -i -n -p su - ${executionUser} -c '${escapedCommand}'`;
     }
 
-    return runJobSynchronously(job, docker);
+    const { stdout, stderr } = await execAsync(command, {
+      timeout: 30000,
+      cwd: process.env.HOME || "/home",
+    });
+
+    const output = stdout || stderr || "Command executed successfully";
+
+    return {
+      success: true,
+      message: "Cron job executed successfully",
+      output: output.trim(),
+    };
   } catch (error: any) {
     console.error("Error running cron job:", error);
     const errorMessage =
@@ -376,240 +299,7 @@ export const runCronJob = async (
     return {
       success: false,
       message: "Failed to execute cron job",
-      output: errorMessage.trim(),
-      details: error.stack,
-    };
-  }
-};
-
-export const executeJob = async (
-  id: string,
-  runInBackground: boolean = true
-): Promise<{
-  success: boolean;
-  message: string;
-  output?: string;
-  details?: string;
-  runId?: string;
-  mode?: "sync" | "async";
-}> => {
-  try {
-    const cronJobs = await getCronJobs(false);
-    const job = cronJobs.find((j) => j.id === id);
-
-    if (!job) {
-      return { success: false, message: "Cron job not found" };
-    }
-
-    if (job.paused) {
-      return { success: false, message: "Cannot run paused cron job" };
-    }
-
-    const docker = await isDocker();
-
-    if (runInBackground) {
-      return runJobInBackground(job, docker);
-    }
-
-    return runJobSynchronously(job, docker);
-  } catch (error: any) {
-    console.error("Error executing cron job:", error);
-    const errorMessage =
-      error.stderr || error.message || "Unknown error occurred";
-    return {
-      success: false,
-      message: "Failed to execute cron job",
-      output: errorMessage.trim(),
-      details: error.stack,
-    };
-  }
-};
-
-export const backupCronJob = async (
-  job: CronJob
-): Promise<{ success: boolean; message: string; details?: string }> => {
-  try {
-    const {
-      backupJobToFile,
-    } = await import("@/app/_utils/backup-utils");
-    const success = await backupJobToFile(job);
-    if (success) {
-      return { success: true, message: "Cron job backed up successfully" };
-    } else {
-      return { success: false, message: "Failed to backup cron job" };
-    }
-  } catch (error: any) {
-    console.error("Error backing up cron job:", error);
-    return {
-      success: false,
-      message: error.message || "Error backing up cron job",
-      details: error.stack,
-    };
-  }
-};
-
-export const backupAllCronJobs = async (): Promise<{
-  success: boolean;
-  message: string;
-  details?: string;
-}> => {
-  try {
-    const {
-      backupAllJobsToFiles,
-    } = await import("@/app/_utils/backup-utils");
-    const result = await backupAllJobsToFiles();
-    if (result.success) {
-      return {
-        success: true,
-        message: `Backed up ${result.count} cron job(s) successfully`,
-      };
-    } else {
-      return { success: false, message: "Failed to backup cron jobs" };
-    }
-  } catch (error: any) {
-    console.error("Error backing up all cron jobs:", error);
-    return {
-      success: false,
-      message: error.message || "Error backing up all cron jobs",
-      details: error.stack,
-    };
-  }
-};
-
-export const fetchBackupFiles = async (): Promise<Array<{
-  filename: string;
-  job: CronJob;
-  backedUpAt: string;
-}>> => {
-  try {
-    const {
-      getAllBackupFiles,
-    } = await import("@/app/_utils/backup-utils");
-    return await getAllBackupFiles();
-  } catch (error) {
-    console.error("Error fetching backup files:", error);
-    return [];
-  }
-};
-
-export const restoreCronJob = async (
-  filename: string
-): Promise<{ success: boolean; message: string; details?: string }> => {
-  try {
-    const {
-      restoreJobFromBackup,
-    } = await import("@/app/_utils/backup-utils");
-
-    const result = await restoreJobFromBackup(filename);
-
-    if (!result.success || !result.job) {
-      return { success: false, message: "Failed to read backup file" };
-    }
-
-    const job = result.job;
-    const success = await addCronJob(
-      job.schedule,
-      job.command,
-      job.comment || "",
-      job.user,
-      job.logsEnabled || false
-    );
-
-    if (success) {
-      revalidatePath("/");
-      return { success: true, message: "Cron job restored successfully" };
-    } else {
-      return { success: false, message: "Failed to restore cron job" };
-    }
-  } catch (error: any) {
-    console.error("Error restoring cron job:", error);
-    return {
-      success: false,
-      message: error.message || "Error restoring cron job",
-      details: error.stack,
-    };
-  }
-};
-
-export const deleteBackup = async (
-  filename: string
-): Promise<{ success: boolean; message: string; details?: string }> => {
-  try {
-    const {
-      deleteBackupFile,
-    } = await import("@/app/_utils/backup-utils");
-
-    const success = await deleteBackupFile(filename);
-
-    if (success) {
-      return { success: true, message: "Backup deleted successfully" };
-    } else {
-      return { success: false, message: "Failed to delete backup" };
-    }
-  } catch (error: any) {
-    console.error("Error deleting backup:", error);
-    return {
-      success: false,
-      message: error.message || "Error deleting backup",
-      details: error.stack,
-    };
-  }
-};
-
-export const restoreAllCronJobs = async (): Promise<{
-  success: boolean;
-  message: string;
-  details?: string;
-}> => {
-  try {
-    const {
-      getAllBackupFiles,
-    } = await import("@/app/_utils/backup-utils");
-
-    const backups = await getAllBackupFiles();
-
-    if (backups.length === 0) {
-      return { success: false, message: "No backup files found" };
-    }
-
-    let successCount = 0;
-    let failedCount = 0;
-
-    for (const backup of backups) {
-      const job = backup.job;
-      const success = await addCronJob(
-        job.schedule,
-        job.command,
-        job.comment || "",
-        job.user,
-        job.logsEnabled || false
-      );
-
-      if (success) {
-        successCount++;
-      } else {
-        failedCount++;
-      }
-    }
-
-    revalidatePath("/");
-
-    if (failedCount === 0) {
-      return {
-        success: true,
-        message: `Successfully restored ${successCount} cron job(s)`,
-      };
-    } else {
-      return {
-        success: true,
-        message: `Restored ${successCount} job(s), ${failedCount} failed`,
-      };
-    }
-  } catch (error: any) {
-    console.error("Error restoring all cron jobs:", error);
-    return {
-      success: false,
-      message: error.message || "Error restoring all cron jobs",
+      output: errorMessage,
       details: error.stack,
     };
   }

app/_server/actions/global/index.ts

@@ -1,86 +0,0 @@
-"use server";
-
-import { existsSync, readFileSync } from "fs";
-import { execSync } from "child_process";
-
-export const isDocker = async (): Promise<boolean> => {
-  try {
-    if (existsSync("/.dockerenv")) {
-      return true;
-    }
-
-    if (existsSync("/proc/1/cgroup")) {
-      const cgroupContent = readFileSync("/proc/1/cgroup", "utf8");
-      return cgroupContent.includes("/docker/");
-    }
-
-    return false;
-  } catch (error) {
-    return false;
-  }
-};
-
-export const getContainerIdentifier = async (): Promise<string | null> => {
-  try {
-    const docker = await isDocker();
-    if (!docker) {
-      return null;
-    }
-
-    const containerId = execSync("hostname").toString().trim();
-    return containerId;
-  } catch (error) {
-    console.error("Failed to get container identifier:", error);
-    return null;
-  }
-};
-
-export const getHostDataPath = async (): Promise<string | null> => {
-  try {
-    const docker = await isDocker();
-    if (!docker) {
-      return null;
-    }
-
-    const containerId = await getContainerIdentifier();
-    if (!containerId) {
-      return null;
-    }
-
-    const stdout = execSync(
-      `docker inspect --format '{{range .Mounts}}{{if eq .Destination "/app/data"}}{{.Source}}{{end}}{{end}}' ${containerId}`,
-      { encoding: "utf8" }
-    );
-
-    const hostPath = stdout.trim();
-    return hostPath || null;
-  } catch (error) {
-    console.error("Failed to get host data path:", error);
-    return null;
-  }
-};
-
-export const getHostScriptsPath = async (): Promise<string | null> => {
-  try {
-    const docker = await isDocker();
-    if (!docker) {
-      return null;
-    }
-
-    const containerId = await getContainerIdentifier();
-    if (!containerId) {
-      return null;
-    }
-
-    const stdout = execSync(
-      `docker inspect --format '{{range .Mounts}}{{if eq .Destination "/app/scripts"}}{{.Source}}{{end}}{{end}}' ${containerId}`,
-      { encoding: "utf8" }
-    );
-
-    const hostPath = stdout.trim();
-    return hostPath || null;
-  } catch (error) {
-    console.error("Failed to get host scripts path:", error);
-    return null;
-  }
-};

app/_server/actions/logs/index.ts

@@ -1,354 +0,0 @@
-"use server";
-
-import { readdir, readFile, unlink, stat } from "fs/promises";
-import path from "path";
-import { existsSync } from "fs";
-import { DATA_DIR } from "@/app/_consts/file";
-
-export interface LogEntry {
-  filename: string;
-  timestamp: string;
-  fullPath: string;
-  size: number;
-  dateCreated: Date;
-  exitCode?: number;
-  hasError?: boolean;
-}
-
-export interface JobLogError {
-  hasError: boolean;
-  lastFailedLog?: string;
-  lastFailedTimestamp?: Date;
-  exitCode?: number;
-  latestExitCode?: number;
-  hasHistoricalFailures?: boolean;
-}
-
-const MAX_LOGS_PER_JOB = process.env.MAX_LOGS_PER_JOB
-  ? parseInt(process.env.MAX_LOGS_PER_JOB)
-  : 50;
-const MAX_LOG_AGE_DAYS = process.env.MAX_LOG_AGE_DAYS
-  ? parseInt(process.env.MAX_LOG_AGE_DAYS)
-  : 30;
-
-const getLogBasePath = async (): Promise<string> => {
-  return path.join(process.cwd(), DATA_DIR, "logs");
-};
-
-const getJobLogPath = async (jobId: string): Promise<string | null> => {
-  const basePath = await getLogBasePath();
-
-  if (!existsSync(basePath)) {
-    return null;
-  }
-
-  try {
-    const allFolders = await readdir(basePath);
-
-    const matchingFolder = allFolders.find(
-      (folder) => folder === jobId || folder.endsWith(`_${jobId}`)
-    );
-
-    if (matchingFolder) {
-      return path.join(basePath, matchingFolder);
-    }
-
-    return path.join(basePath, jobId);
-  } catch (error) {
-    console.error("Error finding log path:", error);
-    return path.join(basePath, jobId);
-  }
-};
-
-export const getJobLogs = async (
-  jobId: string,
-  skipCleanup: boolean = false,
-  includeExitCodes: boolean = false
-): Promise<LogEntry[]> => {
-  try {
-    const logDir = await getJobLogPath(jobId);
-
-    if (!logDir || !existsSync(logDir)) {
-      return [];
-    }
-
-    if (!skipCleanup) {
-      await cleanupJobLogs(jobId);
-    }
-
-    const files = await readdir(logDir);
-    const logFiles = files.filter((f) => f.endsWith(".log"));
-
-    const entries: LogEntry[] = [];
-    for (const file of logFiles) {
-      const fullPath = path.join(logDir, file);
-      const stats = await stat(fullPath);
-
-      let exitCode: number | undefined;
-      let hasError: boolean | undefined;
-
-      if (includeExitCodes) {
-        const exitCodeValue = await getExitCodeForLog(fullPath);
-        if (exitCodeValue !== null) {
-          exitCode = exitCodeValue;
-          hasError = exitCode !== 0;
-        }
-      }
-
-      entries.push({
-        filename: file,
-        timestamp: file.replace(".log", ""),
-        fullPath,
-        size: stats.size,
-        dateCreated: stats.birthtime,
-        exitCode,
-        hasError,
-      });
-    }
-
-    return entries.sort(
-      (a, b) => b.dateCreated.getTime() - a.dateCreated.getTime()
-    );
-  } catch (error) {
-    console.error(`Error reading logs for job ${jobId}:`, error);
-    return [];
-  }
-};
-
-export const getLogContent = async (
-  jobId: string,
-  filename: string
-): Promise<string> => {
-  try {
-    const logDir = await getJobLogPath(jobId);
-    if (!logDir) {
-      return "Log directory not found";
-    }
-
-    const logPath = path.join(logDir, filename);
-
-    const content = await readFile(logPath, "utf-8");
-    return content;
-  } catch (error) {
-    console.error(`Error reading log file ${filename}:`, error);
-    return "Error reading log file";
-  }
-};
-
-export const deleteLogFile = async (
-  jobId: string,
-  filename: string
-): Promise<{ success: boolean; message: string }> => {
-  try {
-    const logDir = await getJobLogPath(jobId);
-    if (!logDir) {
-      return {
-        success: false,
-        message: "Log directory not found",
-      };
-    }
-
-    const logPath = path.join(logDir, filename);
-
-    await unlink(logPath);
-
-    return {
-      success: true,
-      message: "Log file deleted successfully",
-    };
-  } catch (error: any) {
-    console.error(`Error deleting log file ${filename}:`, error);
-    return {
-      success: false,
-      message: error.message || "Error deleting log file",
-    };
-  }
-};
-
-export const deleteAllJobLogs = async (
-  jobId: string
-): Promise<{ success: boolean; message: string; deletedCount: number }> => {
-  try {
-    const logs = await getJobLogs(jobId);
-
-    let deletedCount = 0;
-    for (const log of logs) {
-      const result = await deleteLogFile(jobId, log.filename);
-      if (result.success) {
-        deletedCount++;
-      }
-    }
-
-    return {
-      success: true,
-      message: `Deleted ${deletedCount} log files`,
-      deletedCount,
-    };
-  } catch (error: any) {
-    console.error(`Error deleting all logs for job ${jobId}:`, error);
-    return {
-      success: false,
-      message: error.message || "Error deleting log files",
-      deletedCount: 0,
-    };
-  }
-};
-
-export const cleanupJobLogs = async (
-  jobId: string
-): Promise<{ success: boolean; message: string; deletedCount: number }> => {
-  try {
-    const logs = await getJobLogs(jobId, true);
-
-    if (logs.length === 0) {
-      return {
-        success: true,
-        message: "No logs to clean up",
-        deletedCount: 0,
-      };
-    }
-
-    let deletedCount = 0;
-    const now = new Date();
-    const maxAgeMs = MAX_LOG_AGE_DAYS * 24 * 60 * 60 * 1000;
-
-    for (const log of logs) {
-      const ageMs = now.getTime() - log.dateCreated.getTime();
-      if (ageMs > maxAgeMs) {
-        const result = await deleteLogFile(jobId, log.filename);
-        if (result.success) {
-          deletedCount++;
-        }
-      }
-    }
-
-    const remainingLogs = await getJobLogs(jobId, true);
-    if (remainingLogs.length > MAX_LOGS_PER_JOB) {
-      const logsToDelete = remainingLogs.slice(MAX_LOGS_PER_JOB);
-      for (const log of logsToDelete) {
-        const result = await deleteLogFile(jobId, log.filename);
-        if (result.success) {
-          deletedCount++;
-        }
-      }
-    }
-
-    return {
-      success: true,
-      message: `Cleaned up ${deletedCount} log files`,
-      deletedCount,
-    };
-  } catch (error: any) {
-    console.error(`Error cleaning up logs for job ${jobId}:`, error);
-    return {
-      success: false,
-      message: error.message || "Error cleaning up log files",
-      deletedCount: 0,
-    };
-  }
-};
-
-export const getJobLogStats = async (
-  jobId: string
-): Promise<{ count: number; totalSize: number; totalSizeMB: number }> => {
-  try {
-    const logs = await getJobLogs(jobId);
-
-    const totalSize = logs.reduce((sum, log) => sum + log.size, 0);
-    const totalSizeMB = totalSize / (1024 * 1024);
-
-    return {
-      count: logs.length,
-      totalSize,
-      totalSizeMB: Math.round(totalSizeMB * 100) / 100,
-    };
-  } catch (error) {
-    console.error(`Error getting log stats for job ${jobId}:`, error);
-    return {
-      count: 0,
-      totalSize: 0,
-      totalSizeMB: 0,
-    };
-  }
-};
-
-const getExitCodeForLog = async (logPath: string): Promise<number | null> => {
-  try {
-    const content = await readFile(logPath, "utf-8");
-    const exitCodeMatch = content.match(/Exit Code\s*:\s*(-?\d+)/i);
-    if (exitCodeMatch) {
-      return parseInt(exitCodeMatch[1]);
-    }
-    return null;
-  } catch (error) {
-    console.error(`Error getting exit code for ${logPath}:`, error);
-    return null;
-  }
-};
-
-export const getJobLogError = async (jobId: string): Promise<JobLogError> => {
-  try {
-    const logs = await getJobLogs(jobId);
-
-    if (logs.length === 0) {
-      return { hasError: false };
-    }
-
-    const latestLog = logs[0];
-    const latestExitCode = await getExitCodeForLog(latestLog.fullPath);
-
-    if (latestExitCode !== null && latestExitCode !== 0) {
-      return {
-        hasError: true,
-        lastFailedLog: latestLog.filename,
-        lastFailedTimestamp: latestLog.dateCreated,
-        exitCode: latestExitCode,
-        latestExitCode,
-        hasHistoricalFailures: false,
-      };
-    }
-
-    let hasHistoricalFailures = false;
-    let lastFailedLog: string | undefined;
-    let lastFailedTimestamp: Date | undefined;
-    let failedExitCode: number | undefined;
-
-    for (let i = 1; i < logs.length; i++) {
-      const exitCode = await getExitCodeForLog(logs[i].fullPath);
-      if (exitCode !== null && exitCode !== 0) {
-        hasHistoricalFailures = true;
-        lastFailedLog = logs[i].filename;
-        lastFailedTimestamp = logs[i].dateCreated;
-        failedExitCode = exitCode;
-        break;
-      }
-    }
-
-    return {
-      hasError: false,
-      latestExitCode: latestExitCode ?? undefined,
-      hasHistoricalFailures,
-      lastFailedLog,
-      lastFailedTimestamp,
-      exitCode: failedExitCode,
-    };
-  } catch (error) {
-    console.error(`Error checking log errors for job ${jobId}:`, error);
-    return { hasError: false };
-  }
-};
-
-export const getAllJobLogErrors = async (
-  jobIds: string[]
-): Promise<Map<string, JobLogError>> => {
-  const errorMap = new Map<string, JobLogError>();
-
-  await Promise.all(
-    jobIds.map(async (jobId) => {
-      const error = await getJobLogError(jobId);
-      errorMap.set(jobId, error);
-    })
-  );
-
-  return errorMap;
-};

app/_server/actions/scripts/index.ts

@@ -2,40 +2,16 @@
 
 import { revalidatePath } from "next/cache";
 import { writeFile, readFile, unlink, mkdir } from "fs/promises";
-import path from "path";
+import { join } from "path";
 import { existsSync } from "fs";
 import { exec } from "child_process";
 import { promisify } from "util";
-import { SCRIPTS_DIR } from "@/app/_consts/file";
-import { loadAllScripts, Script } from "@/app/_utils/scripts-utils";
-import { MAKE_SCRIPT_EXECUTABLE, RUN_SCRIPT } from "@/app/_consts/commands";
-import { isDocker, getHostScriptsPath } from "@/app/_server/actions/global";
+import { SCRIPTS_DIR, normalizeLineEndings } from "@/app/_utils/scripts";
+import { loadAllScripts, type Script } from "@/app/_utils/scriptScanner";
 
 const execAsync = promisify(exec);
 
-export const getScriptPathForCron = async (
-  filename: string
-): Promise<string> => {
-  const docker = await isDocker();
-
-  if (docker) {
-    const hostScriptsPath = await getHostScriptsPath();
-    if (hostScriptsPath) {
-      return `bash ${path.join(hostScriptsPath, filename)}`;
-    }
-    console.warn("Could not determine host scripts path, using container path");
-  }
-
-  return `bash ${path.join(process.cwd(), SCRIPTS_DIR, filename)}`;
-};
-
-export const getHostScriptPath = async (filename: string): Promise<string> => {
-  return `bash ${path.join(process.cwd(), SCRIPTS_DIR, filename)}`;
-};
-
-export const normalizeLineEndings = async (content: string): Promise<string> => {
-  return content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-};
+export type { Script } from "@/app/_utils/scriptScanner";
 
 const sanitizeScriptName = (name: string): string => {
   return name
@@ -61,34 +37,40 @@ const generateUniqueFilename = async (baseName: string): Promise<string> => {
 };
 
 const ensureScriptsDirectory = async () => {
-  const scriptsDir = path.join(process.cwd(), SCRIPTS_DIR);
+  const scriptsDir = await SCRIPTS_DIR();
   if (!existsSync(scriptsDir)) {
     await mkdir(scriptsDir, { recursive: true });
   }
 };
 
 const ensureHostScriptsDirectory = async () => {
-  const hostScriptsDir = path.join(process.cwd(), SCRIPTS_DIR);
+  const hostProjectDir = process.env.HOST_PROJECT_DIR || process.cwd();
+
+  const hostScriptsDir = join(hostProjectDir, "scripts");
   if (!existsSync(hostScriptsDir)) {
     await mkdir(hostScriptsDir, { recursive: true });
   }
 };
 
 const saveScriptFile = async (filename: string, content: string) => {
+  const isDocker = process.env.DOCKER === "true";
+  const scriptsDir = isDocker ? "/app/scripts" : await SCRIPTS_DIR();
   await ensureScriptsDirectory();
 
-  const scriptPath = path.join(process.cwd(), SCRIPTS_DIR, filename);
+  const scriptPath = join(scriptsDir, filename);
   await writeFile(scriptPath, content, "utf8");
 
   try {
-    await execAsync(MAKE_SCRIPT_EXECUTABLE(scriptPath));
+    await execAsync(`chmod +x "${scriptPath}"`);
   } catch (error) {
     console.error(`Failed to set execute permissions on ${scriptPath}:`, error);
   }
 };
 
 const deleteScriptFile = async (filename: string) => {
-  const scriptPath = path.join(process.cwd(), SCRIPTS_DIR, filename);
+  const isDocker = process.env.DOCKER === "true";
+  const scriptsDir = isDocker ? "/app/scripts" : await SCRIPTS_DIR();
+  const scriptPath = join(scriptsDir, filename);
   if (existsSync(scriptPath)) {
     await unlink(scriptPath);
   }
@@ -121,7 +103,7 @@ export const createScript = async (
 
 `;
 
-    const normalizedContent = await normalizeLineEndings(content);
+    const normalizedContent = normalizeLineEndings(content);
     const fullContent = metadataHeader + normalizedContent;
 
     await saveScriptFile(filename, fullContent);
@@ -172,7 +154,7 @@ export const updateScript = async (
 
 `;
 
-    const normalizedContent = await normalizeLineEndings(content);
+    const normalizedContent = normalizeLineEndings(content);
     const fullContent = metadataHeader + normalizedContent;
 
     await saveScriptFile(existingScript.filename, fullContent);
@@ -231,7 +213,7 @@ export const cloneScript = async (
 
 `;
 
-    const normalizedContent = await normalizeLineEndings(originalContent);
+    const normalizedContent = normalizeLineEndings(originalContent);
     const fullContent = metadataHeader + normalizedContent;
 
     await saveScriptFile(filename, fullContent);
@@ -258,7 +240,10 @@ export const cloneScript = async (
 
 export const getScriptContent = async (filename: string): Promise<string> => {
   try {
-    const scriptPath = path.join(process.cwd(), SCRIPTS_DIR, filename);
+    const isDocker = process.env.DOCKER === "true";
+    const scriptPath = isDocker
+      ? join("/app/scripts", filename)
+      : join(process.cwd(), "scripts", filename);
 
     if (existsSync(scriptPath)) {
       const content = await readFile(scriptPath, "utf8");
@@ -295,7 +280,10 @@ export const executeScript = async (
 }> => {
   try {
     await ensureHostScriptsDirectory();
-    const hostScriptPath = await getHostScriptPath(filename);
+    const isDocker = process.env.DOCKER === "true";
+    const hostScriptPath = isDocker
+      ? join("/app/scripts", filename)
+      : join(process.cwd(), "scripts", filename);
 
     if (!existsSync(hostScriptPath)) {
       return {
@@ -305,7 +293,7 @@ export const executeScript = async (
       };
     }
 
-    const { stdout, stderr } = await execAsync(RUN_SCRIPT(hostScriptPath), {
+    const { stdout, stderr } = await execAsync(`bash "${hostScriptPath}"`, {
       timeout: 30000,
     });
 

app/_server/actions/snippets/index.ts

@@ -6,9 +6,9 @@ import {
   getSnippetCategories,
   getSnippetById,
   type BashSnippet,
-} from "@/app/_utils/snippets-utils";
+} from "@/app/_utils/snippetScanner";
 
-export { type BashSnippet } from "@/app/_utils/snippets-utils";
+export { type BashSnippet } from "@/app/_utils/snippetScanner";
 
 export const fetchSnippets = async (): Promise<BashSnippet[]> => {
   try {

app/_server/actions/translations/index.ts

@@ -1,59 +0,0 @@
-import fs from "fs";
-import path from "path";
-import "server-only";
-
-/**
- * Load translation messages for a given locale.
- * First checks for custom translations in ./data/translations/,
- * then falls back to built-in translations in app/_translations/.
- *
- * This function is server-only and should only be called from server components
- * or server actions.
- */
-export const loadTranslationMessages = async (locale: string): Promise<any> => {
-  const customTranslationPath = path.join(
-    process.cwd(),
-    "data",
-    "translations",
-    `${locale}.json`
-  );
-
-  try {
-    if (fs.existsSync(customTranslationPath)) {
-      const customMessages = JSON.parse(
-        fs.readFileSync(customTranslationPath, "utf8")
-      );
-      return customMessages;
-    }
-  } catch (error) {
-    console.warn(`Failed to load custom translation for ${locale}:`, error);
-  }
-
-  try {
-    const messages = (await import(`../../../_translations/${locale}.json`))
-      .default;
-    return messages;
-  } catch (error) {
-    const fallbackMessages = (await import("../../../_translations/en.json"))
-      .default;
-    return fallbackMessages;
-  }
-};
-
-type TranslationFunction = (key: string) => string;
-
-
-export const getTranslations = async (
-  locale: string = process.env.LOCALE || "en"
-): Promise<TranslationFunction> => {
-  const messages = await loadTranslationMessages(locale);
-
-  return (key: string) => {
-    const keys = key.split(".");
-    let value: any = messages;
-    for (const k of keys) {
-      value = value?.[k];
-    }
-    return value || key;
-  };
-};

app/_translations/en.json

@@ -1,192 +0,0 @@
-{
-    "common": {
-        "cronManagementMadeEasy": "Cron Management made easy",
-        "allUsers": "All users",
-        "userWithUsername": "User: {user}",
-        "user": "User",
-        "change": "Change",
-        "description": "Description",
-        "optional": "Optional",
-        "cancel": "Cancel",
-        "close": "Close",
-        "refresh": "Refresh",
-        "loading": "Loading",
-        "version": "{version}"
-    },
-    "cronjobs": {
-        "cronJobs": "Cron Jobs",
-        "cronJob": "Cron Job",
-        "scheduledTasks": "Scheduled Tasks",
-        "nOfNJObs": "{filtered} of {total} scheduled tasks",
-        "forUser": "for user {user}",
-        "newTask": "New Task",
-        "runCronManually": "Run cron job manually",
-        "editCronJob": "Edit cron job",
-        "cloneCronJob": "Clone cron job",
-        "deleteCronJob": "Delete cron job",
-        "pauseCronJob": "Pause cron job",
-        "resumeCronJob": "Resume cron job",
-        "runCronJob": "Run cron job",
-        "runCronJobSuccess": "Cron job executed successfully",
-        "runCronJobFailed": "Failed to execute cron job",
-        "paused": "Paused",
-        "createNewScheduledTask": "Create new scheduled task",
-        "schedule": "Schedule",
-        "taskType": "Task Type",
-        "customCommand": "Custom Command",
-        "singleCommand": "Single command",
-        "command": "Command",
-        "whatDoesThisTaskDo": "What does this task do?",
-        "createTask": "Create Task",
-        "editScheduledTask": "Edit Scheduled Task",
-        "enableLogging": "Enable Logging",
-        "disableLogging": "Disable Logging",
-        "loggingDescription": "Capture stdout, stderr, exit codes, and timestamps for job executions. Logs are stored in ./data/logs and automatically cleaned up (defaults to 50 logs per job and 30 days retention, you can change these values in the environment variables).",
-        "logged": "Logged",
-        "viewLogs": "View Logs",
-        "logs": "logs",
-        "logFiles": "Log Files",
-        "logContent": "Log Content",
-        "selectLogToView": "Select a log file to view its content",
-        "noLogsFound": "No logs found for this job",
-        "confirmDeleteLog": "Are you sure you want to delete this log file?",
-        "confirmDeleteAllLogs": "Are you sure you want to delete all log files for this job? This action cannot be undone.",
-        "deleteAll": "Delete All",
-        "refresh": "Refresh",
-        "loading": "Loading",
-        "close": "Close",
-        "healthy": "Healthy",
-        "failed": "Failed (Exit: {exitCode})",
-        "backupJob": "Backup job",
-        "restoreJob": "Restore job",
-        "backupAll": "Backup All",
-        "backups": "Backups",
-        "restoreAll": "Restore All",
-        "confirmRestoreAll": "Are you sure you want to restore all backed up jobs? This will add them to your crontab.",
-        "backupJobSuccess": "Job backed up successfully",
-        "backupJobFailed": "Failed to backup job",
-        "backupAllSuccess": "All jobs backed up successfully",
-        "backupAllFailed": "Failed to backup all jobs",
-        "restoreJobSuccess": "Job restored successfully",
-        "restoreJobFailed": "Failed to restore job",
-        "moreActions": "More actions",
-        "restoreBackups": "Restore Backups",
-        "availableBackups": "Available Backups",
-        "noBackupsFound": "No backup files found",
-        "backedUpAt": "Backed up at",
-        "restoreThisBackup": "Restore this backup",
-        "deleteBackup": "Delete backup",
-        "confirmDeleteBackup": "Are you sure you want to delete this backup? This action cannot be undone.",
-        "backupDeleted": "Backup deleted successfully",
-        "filters": "Filters",
-        "filtersAndDisplay": "Filters & Display Options",
-        "filterByUser": "Filter by User",
-        "scheduleDisplay": "Schedule Display",
-        "cronSyntax": "Cron Syntax",
-        "humanReadable": "Human Readable",
-        "both": "Both",
-        "minimalMode": "Minimal Mode",
-        "minimalModeDescription": "Show compact view with icons instead of full text",
-        "applyFilters": "Apply Filters",
-        "nLines": "{count} lines",
-        "liveJobExecution": "Live Job Execution",
-        "running": "Running...",
-        "completed": "Completed (Exit: {exitCode})",
-        "jobFailed": "Failed (Exit: {exitCode})",
-        "showLast": "Show last:",
-        "viewFullLog": "View Full Log ({totalLines} lines)",
-        "viewFullLogNoCount": "View Full Log",
-        "viewingFullLog": "Viewing full log ({totalLines} lines)",
-        "viewingFullLogNoCount": "Viewing full log",
-        "backToWindowedView": "Back to Windowed View",
-        "showingLastOf": "Showing last {lineCount} of {totalLines} lines",
-        "showingLastLines": "Showing last {lineCount} lines",
-        "largeLogFileDetected": "Large log file detected",
-        "tailModeEnabled": "Tail mode enabled, showing last {tailLines} lines",
-        "showAllLines": "Show all lines",
-        "enableTailMode": "Enable tail mode",
-        "waitingForJobToStart": "Waiting for job to start...\n\nLogs will appear here in real-time.",
-        "runIdJobId": "Run ID: {runId} | Job ID: {jobId}"
-    },
-    "scripts": {
-        "scripts": "Scripts",
-        "scriptsLibrary": "Scripts Library",
-        "file": "File",
-        "newScript": "New Script",
-        "noScriptsYet": "No scripts yet",
-        "createReusableBashScripts": "Create reusable bash scripts to use in your scheduled tasks.",
-        "createYourFirstScript": "Create Your First Script",
-        "nOfNSavedScripts": "{count} saved scripts",
-        "savedScript": "Saved Script",
-        "selectFromLibrary": "Select from library",
-        "scriptPathReadOnly": "Script path is read-only. Edit the script in the Scripts Library",
-        "selectScript": "Select Script",
-        "availableScripts": "{count} available scripts",
-        "noScriptsFound": "No scripts found",
-        "noScriptsAvailable": "No scripts available",
-        "scriptPreview": "Script Preview",
-        "commandPreview": "Command Preview",
-        "scriptContent": "Script Content",
-        "selectScriptToPreview": "Select a script to preview",
-        "searchScripts": "Search scripts...",
-        "draft": "Draft",
-        "clearDraft": "Clear Draft",
-        "close": "Close",
-        "draftCleared": "Draft cleared"
-    },
-    "sidebar": {
-        "systemOverview": "System Overview",
-        "uptime": "Uptime",
-        "memory": "Memory",
-        "cpu": "CPU",
-        "gpu": "GPU",
-        "network": "Network",
-        "networkLatency": "Network Latency",
-        "memoryUsage": "Memory Usage",
-        "cpuUsage": "CPU Usage",
-        "systemInformation": "System Information",
-        "performanceMetrics": "Performance Metrics",
-        "statsUpdateEvery": "Stats update every",
-        "updating": "Updating",
-        "networkSpeedEstimatedFromLatency": "Network speed estimated from latency"
-    },
-    "system": {
-        "optimal": "Optimal",
-        "critical": "Critical",
-        "high": "High",
-        "moderate": "Moderate",
-        "warning": "Warning",
-        "unknown": "Unknown",
-        "connected": "Connected",
-        "allSystemsRunningNormally": "All systems running normally",
-        "highResourceUsageDetectedImmediateAttentionRequired": "High resource usage detected - immediate attention required",
-        "moderateResourceUsageMonitoringRecommended": "Moderate resource usage - monitoring recommended",
-        "unknownGPU": "Unknown GPU",
-        "noGPUDetected": "No GPU detected",
-        "gpuDetectionFailed": "GPU detection failed",
-        "available": "Available",
-        "systemStatus": "System Status",
-        "lastUpdated": "Last updated"
-    },
-    "login": {
-        "welcomeTitle": "Welcome to Cr*nMaster",
-        "signInWithPasswordOrSSO": "Sign in with password or SSO",
-        "signInWithSSO": "Sign in with SSO",
-        "enterPasswordToContinue": "Enter your password to continue",
-        "authenticationNotConfigured": "Authentication Not Configured",
-        "noAuthMethodsEnabled": "Neither password authentication nor OIDC SSO is enabled. Please configure at least one authentication method in your environment variables to be able to log in.",
-        "enterPassword": "Enter password",
-        "signingIn": "Signing in...",
-        "signIn": "Sign In",
-        "redirecting": "Redirecting...",
-        "redirectingToOIDC": "Redirecting to OIDC provider",
-        "pleaseWait": "Please wait...",
-        "orContinueWith": "Or continue with",
-        "loginFailed": "Login failed",
-        "genericError": "An error occurred. Please try again."
-    },
-    "warnings": {
-        "wrapperScriptModified": "Wrapper Script Modified",
-        "wrapperScriptModifiedDescription": "Your cron-log-wrapper.sh script has been modified from the official version. This may affect logging functionality. Consider reverting to the official version or ensure your changes don't break the required format for log parsing."
-    }
-}

app/_translations/it.json

@@ -1,188 +0,0 @@
-{
-    "common": {
-        "cronManagementMadeEasy": "Gestione Cron semplificata",
-        "allUsers": "Tutti gli utenti",
-        "userWithUsername": "Utente: {user}",
-        "user": "Utente",
-        "change": "Modifica",
-        "description": "Descrizione",
-        "optional": "Opzionale",
-        "cancel": "Annulla",
-        "refresh": "Aggiorna",
-        "close": "Chiudi",
-        "version": "{version}"
-    },
-    "cronjobs": {
-        "cronJobs": "Operazioni Cron",
-        "cronJob": "Operazione Cron",
-        "scheduledTasks": "Operazioni Pianificate",
-        "nOfNJObs": "{filtered} di {total} operazioni pianificate",
-        "forUser": "per l'utente {user}",
-        "newTask": "Nuova Operazione",
-        "runCronManually": "Esegui operazione cron manualmente",
-        "editCronJob": "Modifica operazione cron",
-        "cloneCronJob": "Clona operazione cron",
-        "deleteCronJob": "Elimina operazione cron",
-        "pauseCronJob": "Pausa operazione cron",
-        "resumeCronJob": "Riprendi operazione cron",
-        "runCronJob": "Esegui operazione cron",
-        "runCronJobSuccess": "Operazione cron eseguita con successo",
-        "runCronJobFailed": "Esecuzione operazione cron fallita",
-        "paused": "In pausa",
-        "createNewScheduledTask": "Crea nuova operazione pianificata",
-        "schedule": "Pianificazione",
-        "taskType": "Tipo di Operazione",
-        "customCommand": "Comando Personalizzato",
-        "singleCommand": "Comando singolo",
-        "command": "Comando",
-        "whatDoesThisTaskDo": "Cosa fa questa operazione?",
-        "createTask": "Crea Operazione",
-        "editScheduledTask": "Modifica Operazione Pianificata",
-        "enableLogging": "Abilita Logging",
-        "disableLogging": "Disabilita Logging",
-        "loggingDescription": "Cattura stdout, stderr, codici di uscita e timestamp per le esecuzioni dei job. I log sono memorizzati in ./data/logs e automaticamente puliti (per impostazione predefinita 50 log per job e 30 giorni di conservazione, puoi modificare questi valori nelle env variables).",
-        "logged": "Loggato",
-        "viewLogs": "Visualizza Log",
-        "logs": "log",
-        "logFiles": "File",
-        "logContent": "Contenuto Log",
-        "selectLogToView": "Seleziona un file per visualizzarne il contenuto",
-        "noLogsFound": "Nessun log trovato per questa operazione",
-        "confirmDeleteLog": "Sei sicuro di voler eliminare questo file?",
-        "confirmDeleteAllLogs": "Sei sicuro di voler eliminare tutti i file per questa operazione? Questa azione non può essere annullata.",
-        "deleteAll": "Elimina Tutto",
-        "refresh": "Aggiorna",
-        "loading": "Caricamento",
-        "close": "Chiudi",
-        "healthy": "Sano",
-        "failed": "Fallito (Exit: {exitCode})",
-        "backupJob": "Backup operazione",
-        "restoreJob": "Ripristina operazione",
-        "backupAll": "Backup Tutti",
-        "backups": "Backups",
-        "restoreAll": "Ripristina Tutti",
-        "confirmRestoreAll": "Sei sicuro di voler ripristinare tutte le operazioni salvate? Verranno aggiunte al tuo crontab.",
-        "backupJobSuccess": "Backup operazione completato con successo",
-        "backupJobFailed": "Backup operazione fallito",
-        "backupAllSuccess": "Backup di tutte le operazioni completato con successo",
-        "backupAllFailed": "Backup di tutte le operazioni fallito",
-        "restoreJobSuccess": "Operazione ripristinata con successo",
-        "restoreJobFailed": "Ripristino operazione fallito",
-        "moreActions": "Altre azioni",
-        "restoreBackups": "Ripristina Backup",
-        "availableBackups": "Backup Disponibili",
-        "noBackupsFound": "Nessun file di backup trovato",
-        "backedUpAt": "Backup effettuato il",
-        "restoreThisBackup": "Ripristina questo backup",
-        "deleteBackup": "Elimina backup",
-        "confirmDeleteBackup": "Sei sicuro di voler eliminare questo backup? Questa azione non può essere annullata.",
-        "backupDeleted": "Backup eliminato con successo",
-        "filters": "Filtri",
-        "filtersAndDisplay": "Filtri e Opzioni di Visualizzazione",
-        "filterByUser": "Filtra per Utente",
-        "scheduleDisplay": "Visualizzazione Pianificazione",
-        "cronSyntax": "Sintassi Cron",
-        "humanReadable": "Comprensibile",
-        "both": "Entrambi",
-        "minimalMode": "Modalità Minima",
-        "minimalModeDescription": "Mostra vista compatta con icone invece del testo completo",
-        "applyFilters": "Applica Filtri",
-        "nLines": "{count} linee",
-        "liveJobExecution": "Esecuzione Lavoro Live",
-        "running": "In esecuzione...",
-        "completed": "Completato (Exit: {exitCode})",
-        "jobFailed": "Fallito (Exit: {exitCode})",
-        "showLast": "Mostra ultime:",
-        "viewFullLog": "Visualizza Log Completo ({totalLines} linee)",
-        "viewingFullLog": "Visualizzazione log completo ({totalLines} linee)",
-        "backToWindowedView": "Torna alla Vista Finestrata",
-        "showingLastOf": "Mostrando ultime {lineCount} di {totalLines} linee",
-        "largeLogFileDetected": "Rilevato file di log di grandi dimensioni",
-        "tailModeEnabled": "Modalità tail abilitata, mostrando ultime {tailLines} linee",
-        "showAllLines": "Mostra tutte le linee",
-        "enableTailMode": "Abilita modalità tail",
-        "waitingForJobToStart": "In attesa che il lavoro inizi...\n\nI log appariranno qui in tempo reale.",
-        "runIdJobId": "ID Esecuzione: {runId} | ID Lavoro: {jobId}"
-    },
-    "scripts": {
-        "scripts": "Script",
-        "scriptsLibrary": "Libreria Script",
-        "file": "File",
-        "newScript": "Nuovo Script",
-        "noScriptsYet": "Ancora nessuno script",
-        "createReusableBashScripts": "Crea script bash riutilizzabili da usare nelle tue operazioni pianificate.",
-        "createYourFirstScript": "Crea il tuo primo script",
-        "nOfNSavedScripts": "{count} script salvati",
-        "savedScript": "Script Salvato",
-        "selectFromLibrary": "Seleziona dalla libreria",
-        "scriptPathReadOnly": "Il percorso dello script è di sola lettura. Modifica lo script nella Libreria Script",
-        "selectScript": "Seleziona Script",
-        "availableScripts": "{count} script disponibili",
-        "noScriptsFound": "Nessuno script trovato",
-        "noScriptsAvailable": "Nessuno script disponibile",
-        "scriptPreview": "Anteprima Script",
-        "commandPreview": "Anteprima Comando",
-        "scriptContent": "Contenuto Script",
-        "selectScriptToPreview": "Seleziona uno script per l'anteprima",
-        "searchScripts": "Cerca script...",
-        "draft": "Bozza",
-        "clearDraft": "Cancella Bozza",
-        "close": "Chiudi",
-        "draftCleared": "Bozza cancellata"
-    },
-    "sidebar": {
-        "systemOverview": "Panoramica del Sistema",
-        "uptime": "Uptime",
-        "memory": "Memoria",
-        "cpu": "CPU",
-        "gpu": "GPU",
-        "network": "Rete",
-        "networkLatency": "Latenza di Rete",
-        "memoryUsage": "Utilizzo Memoria",
-        "cpuUsage": "Utilizzo CPU",
-        "systemInformation": "Informazioni di Sistema",
-        "performanceMetrics": "Metriche delle Prestazioni",
-        "statsUpdateEvery": "Statistiche aggiornate ogni",
-        "updating": "Aggiornamento",
-        "networkSpeedEstimatedFromLatency": "Velocità di rete stimata dalla latenza"
-    },
-    "system": {
-        "optimal": "Ottimale",
-        "critical": "Critico",
-        "high": "Alto",
-        "moderate": "Moderato",
-        "warning": "Avviso",
-        "unknown": "Sconosciuto",
-        "connected": "Connesso",
-        "allSystemsRunningNormally": "Tutti i sistemi funzionano normalmente",
-        "highResourceUsageDetectedImmediateAttentionRequired": "Rilevato utilizzo elevato delle risorse - richiesta attenzione immediata",
-        "moderateResourceUsageMonitoringRecommended": "Utilizzo moderato delle risorse - monitoraggio raccomandato",
-        "unknownGPU": "GPU Sconosciuta",
-        "noGPUDetected": "Nessuna GPU rilevata",
-        "gpuDetectionFailed": "Rilevamento GPU fallito",
-        "available": "Disponibile",
-        "systemStatus": "Stato del Sistema",
-        "lastUpdated": "Ultimo aggiornamento"
-    },
-    "login": {
-        "welcomeTitle": "Benvenuto in Cr*nMaster",
-        "signInWithPasswordOrSSO": "Accedi con password o SSO",
-        "signInWithSSO": "Accedi con SSO",
-        "enterPasswordToContinue": "Inserisci la tua password per continuare",
-        "authenticationNotConfigured": "Autenticazione Non Configurata",
-        "noAuthMethodsEnabled": "Né l'autenticazione password né l'OIDC SSO sono abilitati. Si prega di configurare almeno un metodo di autenticazione nelle variabili d'ambiente per poter effettuare il login.",
-        "enterPassword": "Inserisci password",
-        "signingIn": "Accesso in corso...",
-        "signIn": "Accedi",
-        "redirecting": "Reindirizzamento...",
-        "redirectingToOIDC": "Reindirizzamento al provider OIDC",
-        "pleaseWait": "Attendere prego...",
-        "orContinueWith": "Oppure continua con",
-        "loginFailed": "Accesso fallito",
-        "genericError": "Si è verificato un errore. Riprova."
-    },
-    "warnings": {
-        "wrapperScriptModified": "Script Wrapper Modificato",
-        "wrapperScriptModifiedDescription": "Il tuo script cron-log-wrapper.sh è stato modificato dalla versione ufficiale. Questo potrebbe influenzare la funzionalità di logging. Considera di ripristinare la versione ufficiale o assicurati che le tue modifiche non interrompano il formato richiesto per l'analisi dei log."
-    }
-}

app/_utils/api-auth-utils.ts

@@ -1,97 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { validateSession, getSessionCookieName } from "./session-utils";
-
-export function validateApiKey(request: NextRequest): boolean {
-  const apiKey = process.env.API_KEY;
-
-  if (!apiKey) {
-    return true;
-  }
-
-  const authHeader = request.headers.get("authorization");
-
-  if (!authHeader) {
-    return false;
-  }
-
-  const match = authHeader.match(/^Bearer\s+(.+)$/i);
-  if (!match) {
-    return false;
-  }
-
-  const token = match[1];
-  return token === apiKey;
-}
-
-export async function validateSessionRequest(
-  request: NextRequest
-): Promise<boolean> {
-  const cookieName = getSessionCookieName();
-  const sessionId = request.cookies.get(cookieName)?.value;
-
-  if (!sessionId) {
-    return false;
-  }
-
-  return await validateSession(sessionId);
-}
-
-export function isAuthRequired(): boolean {
-  const hasPassword = !!process.env.AUTH_PASSWORD;
-  const hasSSO = process.env.SSO_MODE === "oidc";
-  const hasApiKey = !!process.env.API_KEY;
-
-  return hasPassword || hasSSO || hasApiKey;
-}
-
-export async function requireAuth(
-  request: NextRequest
-): Promise<Response | null> {
-  if (!isAuthRequired()) {
-    return null;
-  }
-
-  const hasValidSession = await validateSessionRequest(request);
-  if (hasValidSession) {
-    return null;
-  }
-
-  const apiKey = process.env.API_KEY;
-  if (apiKey) {
-    const hasValidApiKey = validateApiKey(request);
-    if (hasValidApiKey) {
-      return null;
-    }
-  }
-
-  if (process.env.DEBUGGER) {
-    console.log("[API Auth] Unauthorized request:", {
-      path: request.nextUrl.pathname,
-      hasSession: hasValidSession,
-      apiKeyConfigured: !!process.env.API_KEY,
-      hasAuthHeader: !!request.headers.get("authorization"),
-    });
-  }
-
-  return NextResponse.json(
-    {
-      error: "Unauthorized",
-      message:
-        "Authentication required. Use session cookie or API key (Bearer token).",
-    },
-    { status: 401 }
-  );
-}
-
-export function withAuth<T extends any[]>(
-  handler: (request: NextRequest, ...args: T) => Promise<Response>
-) {
-  return async (request: NextRequest, ...args: T): Promise<Response> => {
-    const authError = await requireAuth(request);
-    if (authError) {
-      return authError;
-    }
-
-    return handler(request, ...args);
-  };
-}

app/_utils/backup-utils.ts

@@ -1,189 +0,0 @@
-import { promises as fs } from "fs";
-import path from "path";
-import { getCronJobs, type CronJob } from "@/app/_utils/cronjob-utils";
-
-const BACKUP_DIR = path.join(process.cwd(), "data", "backup");
-
-const ensureBackupDirectoryExists = async (): Promise<void> => {
-  try {
-    await fs.mkdir(BACKUP_DIR, { recursive: true });
-  } catch (error) {
-    console.error("Error creating backup directory:", error);
-    throw error;
-  }
-};
-
-const sanitizeFilename = (id: string): string => {
-  return id.replace(/[^a-zA-Z0-9_-]/g, "_");
-};
-
-export const backupJobToFile = async (job: CronJob): Promise<boolean> => {
-  try {
-    await ensureBackupDirectoryExists();
-
-    const jobData = {
-      id: job.id,
-      schedule: job.schedule,
-      command: job.command,
-      comment: job.comment || "",
-      user: job.user,
-      paused: job.paused || false,
-      logsEnabled: job.logsEnabled || false,
-      backedUpAt: new Date().toISOString(),
-    };
-
-    const filename = `${sanitizeFilename(job.id)}.job`;
-    const filepath = path.join(BACKUP_DIR, filename);
-
-    await fs.writeFile(filepath, JSON.stringify(jobData, null, 2), "utf8");
-
-    return true;
-  } catch (error) {
-    console.error(`Error backing up job ${job.id}:`, error);
-    return false;
-  }
-};
-
-export const backupAllJobsToFiles = async (): Promise<{
-  success: boolean;
-  count: number;
-}> => {
-  try {
-    await ensureBackupDirectoryExists();
-
-    const cronJobs = await getCronJobs(false);
-
-    let successCount = 0;
-
-    for (const job of cronJobs) {
-      const success = await backupJobToFile(job);
-      if (success) {
-        successCount++;
-      }
-    }
-
-    return {
-      success: successCount === cronJobs.length,
-      count: successCount,
-    };
-  } catch (error) {
-    console.error("Error backing up all jobs:", error);
-    return {
-      success: false,
-      count: 0,
-    };
-  }
-};
-
-export const listBackupFiles = async (): Promise<string[]> => {
-  try {
-    await ensureBackupDirectoryExists();
-
-    const files = await fs.readdir(BACKUP_DIR);
-    return files.filter((file) => file.endsWith(".job"));
-  } catch (error) {
-    console.error("Error listing backup files:", error);
-    return [];
-  }
-};
-
-export const readBackupFile = async (
-  filename: string
-): Promise<CronJob | null> => {
-  try {
-    const filepath = path.join(BACKUP_DIR, filename);
-    const content = await fs.readFile(filepath, "utf8");
-    const jobData = JSON.parse(content);
-
-    return {
-      id: jobData.id,
-      schedule: jobData.schedule,
-      command: jobData.command,
-      comment: jobData.comment,
-      user: jobData.user,
-      paused: jobData.paused,
-      logsEnabled: jobData.logsEnabled,
-    };
-  } catch (error) {
-    console.error(`Error reading backup file ${filename}:`, error);
-    return null;
-  }
-};
-
-export const getAllBackupFiles = async (): Promise<
-  Array<{
-    filename: string;
-    job: CronJob;
-    backedUpAt: string;
-  }>
-> => {
-  try {
-    await ensureBackupDirectoryExists();
-
-    const files = await fs.readdir(BACKUP_DIR);
-    const jobFiles = files.filter((file) => file.endsWith(".job"));
-
-    const backups = await Promise.all(
-      jobFiles.map(async (filename) => {
-        try {
-          const filepath = path.join(BACKUP_DIR, filename);
-          const content = await fs.readFile(filepath, "utf8");
-          const jobData = JSON.parse(content);
-
-          return {
-            filename,
-            job: {
-              id: jobData.id,
-              schedule: jobData.schedule,
-              command: jobData.command,
-              comment: jobData.comment,
-              user: jobData.user,
-              paused: jobData.paused,
-              logsEnabled: jobData.logsEnabled,
-            } as CronJob,
-            backedUpAt: jobData.backedUpAt,
-          };
-        } catch (error) {
-          console.error(`Error reading backup file ${filename}:`, error);
-          return null;
-        }
-      })
-    );
-
-    return backups.filter((backup) => backup !== null) as Array<{
-      filename: string;
-      job: CronJob;
-      backedUpAt: string;
-    }>;
-  } catch (error) {
-    console.error("Error getting all backup files:", error);
-    return [];
-  }
-};
-
-export const restoreJobFromBackup = async (
-  filename: string
-): Promise<{ success: boolean; job?: CronJob }> => {
-  try {
-    const job = await readBackupFile(filename);
-    if (!job) {
-      return { success: false };
-    }
-
-    return { success: true, job };
-  } catch (error) {
-    console.error(`Error restoring job from backup ${filename}:`, error);
-    return { success: false };
-  }
-};
-
-export const deleteBackupFile = async (filename: string): Promise<boolean> => {
-  try {
-    const filepath = path.join(BACKUP_DIR, filename);
-    await fs.unlink(filepath);
-    return true;
-  } catch (error) {
-    console.error(`Error deleting backup file ${filename}:`, error);
-    return false;
-  }
-};

app/_utils/cn.ts

@@ -0,0 +1,6 @@
+import { type ClassValue, clsx } from "clsx"
+import { twMerge } from "tailwind-merge"
+
+export const cn = (...inputs: ClassValue[]) => {
+    return twMerge(clsx(inputs))
+}

app/_utils/cron/files-manipulation.ts

@@ -2,9 +2,7 @@
 
 import { exec } from "child_process";
 import { promisify } from "util";
-import { readHostCrontab, writeHostCrontab } from "@/app/_utils/crontab-utils";
-import { isDocker } from "@/app/_server/actions/global";
-import { READ_CRON_FILE, WRITE_CRON_FILE } from "@/app/_consts/commands";
+import { readHostCrontab, writeHostCrontab } from "../system/hostCrontab";
 
 const execAsync = promisify(exec);
 
@@ -29,11 +27,11 @@ export const cleanCrontabContent = async (content: string): Promise<string> => {
 }
 
 export const readCronFiles = async (): Promise<string> => {
-    const docker = await isDocker();
+    const isDocker = process.env.DOCKER === "true";
 
-    if (!docker) {
+    if (!isDocker) {
         try {
-            const { stdout } = await execAsync(READ_CRON_FILE());
+            const { stdout } = await execAsync('crontab -l 2>/dev/null || echo ""');
             return stdout;
         } catch (error) {
             console.error("Error reading crontab:", error);
@@ -45,11 +43,11 @@ export const readCronFiles = async (): Promise<string> => {
 }
 
 export const writeCronFiles = async (content: string): Promise<boolean> => {
-    const docker = await isDocker();
+    const isDocker = process.env.DOCKER === "true";
 
-    if (!docker) {
+    if (!isDocker) {
         try {
-            await execAsync(WRITE_CRON_FILE(content));
+            await execAsync('echo "' + content + '" | crontab -');
             return true;
         } catch (error) {
             console.error("Error writing crontab:", error);

app/_utils/cron/line-manipulation.ts

@@ -1,25 +1,8 @@
-import { CronJob } from "@/app/_utils/cronjob-utils";
-import { generateShortUUID } from "@/app/_utils/uuid-utils";
-import { createHash } from "crypto";
-
-const generateStableJobId = (
-  schedule: string,
-  command: string,
-  user: string,
-  comment?: string,
-  lineIndex?: number
-): string => {
-  const content = `${schedule}|${command}|${user}|${comment || ""}|${
-    lineIndex || 0
-  }`;
-  const hash = createHash("md5").update(content).digest("hex");
-  return hash.substring(0, 8);
-};
+import { CronJob } from "../system";
 
 export const pauseJobInLines = (
   lines: string[],
-  targetJobIndex: number,
-  uuid: string
+  targetJobIndex: number
 ): string[] => {
   const newCronEntries: string[] = [];
   let currentJobIndex = 0;
@@ -68,15 +51,9 @@ export const pauseJobInLines = (
         lines[i + 1].trim()
       ) {
         if (currentJobIndex === targetJobIndex) {
-          const commentText = trimmedLine.substring(1).trim();
-          const { comment, logsEnabled } = parseCommentMetadata(commentText);
-          const formattedComment = formatCommentWithMetadata(
-            comment,
-            logsEnabled,
-            uuid
-          );
+          const comment = trimmedLine.substring(1).trim();
           const nextLine = lines[i + 1].trim();
-          const pausedEntry = `# PAUSED: ${formattedComment}\n# ${nextLine}`;
+          const pausedEntry = `# PAUSED: ${comment}\n# ${nextLine}`;
           newCronEntries.push(pausedEntry);
           i += 2;
           currentJobIndex++;
@@ -94,8 +71,7 @@ export const pauseJobInLines = (
     }
 
     if (currentJobIndex === targetJobIndex) {
-      const formattedComment = formatCommentWithMetadata("", false, uuid);
-      const pausedEntry = `# PAUSED: ${formattedComment}\n# ${trimmedLine}`;
+      const pausedEntry = `# PAUSED:\n# ${trimmedLine}`;
       newCronEntries.push(pausedEntry);
     } else {
       newCronEntries.push(line);
@@ -110,8 +86,7 @@ export const pauseJobInLines = (
 
 export const resumeJobInLines = (
   lines: string[],
-  targetJobIndex: number,
-  uuid: string
+  targetJobIndex: number
 ): string[] => {
   const newCronEntries: string[] = [];
   let currentJobIndex = 0;
@@ -143,18 +118,10 @@ export const resumeJobInLines = (
 
     if (trimmedLine.startsWith("# PAUSED:")) {
       if (currentJobIndex === targetJobIndex) {
-        const commentText = trimmedLine.substring(9).trim();
-        const { comment, logsEnabled } = parseCommentMetadata(commentText);
+        const comment = trimmedLine.substring(9).trim();
         if (i + 1 < lines.length && lines[i + 1].trim().startsWith("# ")) {
           const cronLine = lines[i + 1].trim().substring(2);
-          const formattedComment = formatCommentWithMetadata(
-            comment,
-            logsEnabled,
-            uuid
-          );
-          const resumedEntry = formattedComment
-            ? `# ${formattedComment}\n${cronLine}`
-            : cronLine;
+          const resumedEntry = comment ? `# ${comment}\n${cronLine}` : cronLine;
           newCronEntries.push(resumedEntry);
           i += 2;
         } else {
@@ -187,107 +154,12 @@ export const resumeJobInLines = (
   return newCronEntries;
 };
 
-export const parseCommentMetadata = (
-  commentText: string
-): { comment: string; logsEnabled: boolean; uuid?: string } => {
-  if (!commentText) {
-    return { comment: "", logsEnabled: false };
-  }
-
-  const parts = commentText.split("|").map((p) => p.trim());
-  let comment = "";
-  let logsEnabled = false;
-  let uuid: string | undefined;
-
-  if (parts.length > 1) {
-    const firstPartIsMetadata =
-      parts[0].match(/logsEnabled:\s*(true|false)/i) ||
-      parts[0].match(/id:\s*([a-z0-9]{8}|[a-z0-9]{4}-[a-z0-9]{4})/i);
-
-    if (firstPartIsMetadata) {
-      comment = "";
-      const metadata = parts.join("|").trim();
-
-      const logsMatch = metadata.match(/logsEnabled:\s*(true|false)/i);
-      if (logsMatch) {
-        logsEnabled = logsMatch[1].toLowerCase() === "true";
-      }
-
-      const uuidMatches = Array.from(
-        metadata.matchAll(/id:\s*([a-z0-9]{8}|[a-z0-9]{4}-[a-z0-9]{4})/gi)
-      );
-      if (uuidMatches.length > 0) {
-        uuid = uuidMatches[uuidMatches.length - 1][1].toLowerCase();
-      }
-    } else {
-      comment = parts[0] || "";
-      const metadata = parts.slice(1).join("|").trim();
-
-      const logsMatch = metadata.match(/logsEnabled:\s*(true|false)/i);
-      if (logsMatch) {
-        logsEnabled = logsMatch[1].toLowerCase() === "true";
-      }
-
-      const uuidMatches = Array.from(
-        metadata.matchAll(/id:\s*([a-z0-9]{8}|[a-z0-9]{4}-[a-z0-9]{4})/gi)
-      );
-      if (uuidMatches.length > 0) {
-        uuid = uuidMatches[uuidMatches.length - 1][1].toLowerCase();
-      }
-    }
-  } else {
-    const logsMatch = commentText.match(/logsEnabled:\s*(true|false)/i);
-    const uuidMatch = commentText.match(
-      /id:\s*([a-z0-9]{8}|[a-z0-9]{4}-[a-z0-9]{4})/i
-    );
-
-    if (logsMatch || uuidMatch) {
-      if (logsMatch) {
-        logsEnabled = logsMatch[1].toLowerCase() === "true";
-      }
-      if (uuidMatch) {
-        uuid = uuidMatch[1].toLowerCase();
-      }
-      comment = "";
-    } else {
-      comment = parts[0] || "";
-    }
-  }
-
-  return { comment, logsEnabled, uuid };
-};
-
-export const formatCommentWithMetadata = (
-  comment: string,
-  logsEnabled: boolean,
-  uuid: string
-): string => {
-  const trimmedComment = comment.trim();
-  const metadataParts: string[] = [];
-
-  if (logsEnabled) {
-    metadataParts.push("logsEnabled: true");
-  }
-
-  metadataParts.push(`id: ${uuid}`);
-
-  const metadata = metadataParts.join(" | ");
-
-  if (trimmedComment) {
-    return `${trimmedComment} | ${metadata}`;
-  }
-
-  return metadata;
-};
-
 export const parseJobsFromLines = (
   lines: string[],
   user: string
 ): CronJob[] => {
   const jobs: CronJob[] = [];
   let currentComment = "";
-  let currentLogsEnabled = false;
-  let currentUuid: string | undefined;
   let jobIndex = 0;
   let i = 0;
 
@@ -309,8 +181,7 @@ export const parseJobsFromLines = (
     }
 
     if (trimmedLine.startsWith("# PAUSED:")) {
-      const commentText = trimmedLine.substring(9).trim();
-      const { comment, logsEnabled, uuid } = parseCommentMetadata(commentText);
+      const comment = trimmedLine.substring(9).trim();
 
       if (i + 1 < lines.length) {
         const nextLine = lines[i + 1].trim();
@@ -321,17 +192,13 @@ export const parseJobsFromLines = (
             const schedule = parts.slice(0, 5).join(" ");
             const command = parts.slice(5).join(" ");
 
-            const jobId =
-              uuid || generateStableJobId(schedule, command, user, comment, i);
-
             jobs.push({
-              id: jobId,
+              id: `${user}-${jobIndex}`,
               schedule,
               command,
               comment: comment || undefined,
               user,
               paused: true,
-              logsEnabled,
             });
 
             jobIndex++;
@@ -350,12 +217,7 @@ export const parseJobsFromLines = (
         !lines[i + 1].trim().startsWith("#") &&
         lines[i + 1].trim()
       ) {
-        const commentText = trimmedLine.substring(1).trim();
-        const { comment, logsEnabled, uuid } =
-          parseCommentMetadata(commentText);
-        currentComment = comment;
-        currentLogsEnabled = logsEnabled;
-        currentUuid = uuid;
+        currentComment = trimmedLine.substring(1).trim();
         i++;
         continue;
       } else {
@@ -378,24 +240,17 @@ export const parseJobsFromLines = (
     }
 
     if (schedule && command) {
-      const jobId =
-        currentUuid ||
-        generateStableJobId(schedule, command, user, currentComment, i);
-
       jobs.push({
-        id: jobId,
+        id: `${user}-${jobIndex}`,
         schedule,
         command,
         comment: currentComment || undefined,
         user,
         paused: false,
-        logsEnabled: currentLogsEnabled,
       });
 
       jobIndex++;
       currentComment = "";
-      currentLogsEnabled = false;
-      currentUuid = undefined;
     }
     i++;
   }
@@ -490,9 +345,7 @@ export const updateJobInLines = (
   targetJobIndex: number,
   schedule: string,
   command: string,
-  comment: string = "",
-  logsEnabled: boolean = false,
-  uuid: string
+  comment: string = ""
 ): string[] => {
   const newCronEntries: string[] = [];
   let currentJobIndex = 0;
@@ -524,13 +377,8 @@ export const updateJobInLines = (
 
     if (trimmedLine.startsWith("# PAUSED:")) {
       if (currentJobIndex === targetJobIndex) {
-        const formattedComment = formatCommentWithMetadata(
-          comment,
-          logsEnabled,
-          uuid
-        );
-        const newEntry = formattedComment
-          ? `# PAUSED: ${formattedComment}\n# ${schedule} ${command}`
+        const newEntry = comment
+          ? `# PAUSED: ${comment}\n# ${schedule} ${command}`
           : `# PAUSED:\n# ${schedule} ${command}`;
         newCronEntries.push(newEntry);
         if (i + 1 < lines.length && lines[i + 1].trim().startsWith("# ")) {
@@ -558,13 +406,8 @@ export const updateJobInLines = (
         lines[i + 1].trim()
       ) {
         if (currentJobIndex === targetJobIndex) {
-          const formattedComment = formatCommentWithMetadata(
-            comment,
-            logsEnabled,
-            uuid
-          );
-          const newEntry = formattedComment
-            ? `# ${formattedComment}\n${schedule} ${command}`
+          const newEntry = comment
+            ? `# ${comment}\n${schedule} ${command}`
             : `${schedule} ${command}`;
           newCronEntries.push(newEntry);
           i += 2;
@@ -582,13 +425,8 @@ export const updateJobInLines = (
     }
 
     if (currentJobIndex === targetJobIndex) {
-      const formattedComment = formatCommentWithMetadata(
-        comment,
-        logsEnabled,
-        uuid
-      );
-      const newEntry = formattedComment
-        ? `# ${formattedComment}\n${schedule} ${command}`
+      const newEntry = comment
+        ? `# ${comment}\n${schedule} ${command}`
         : `${schedule} ${command}`;
       newCronEntries.push(newEntry);
     } else {

app/_utils/cronParser.ts

@@ -1,4 +1,4 @@
-import cronstrue from 'cronstrue/i18n';
+import cronstrue from "cronstrue";
 
 export interface CronExplanation {
   humanReadable: string;
@@ -7,7 +7,7 @@ export interface CronExplanation {
   error?: string;
 }
 
-export const parseCronExpression = (expression: string, locale?: string): CronExplanation => {
+export const parseCronExpression = (expression: string): CronExplanation => {
   try {
     const cleanExpression = expression.trim();
 
@@ -23,7 +23,6 @@ export const parseCronExpression = (expression: string, locale?: string): CronEx
     const humanReadable = cronstrue.toString(cleanExpression, {
       verbose: true,
       throwExceptionOnParseError: false,
-      locale: locale || "en",
     });
 
     return {

app/_utils/cronjob-utils.ts

@@ -1,429 +0,0 @@
-import { exec } from "child_process";
-import { promisify } from "util";
-import {
-  readAllHostCrontabs,
-  writeHostCrontabForUser,
-} from "@/app/_utils/crontab-utils";
-import {
-  parseJobsFromLines,
-  deleteJobInLines,
-  updateJobInLines,
-  pauseJobInLines,
-  resumeJobInLines,
-  formatCommentWithMetadata,
-} from "@/app/_utils/line-manipulation-utils";
-import {
-  cleanCrontabContent,
-  readCronFiles,
-  writeCronFiles,
-} from "@/app/_utils/files-manipulation-utils";
-import { isDocker } from "@/app/_server/actions/global";
-import { READ_CRONTAB, WRITE_CRONTAB } from "@/app/_consts/commands";
-import {
-  wrapCommandWithLogger,
-  unwrapCommand,
-  isCommandWrapped,
-} from "@/app/_utils/wrapper-utils";
-import { generateShortUUID } from "@/app/_utils/uuid-utils";
-
-const execAsync = promisify(exec);
-
-export interface CronJob {
-  id: string;
-  schedule: string;
-  command: string;
-  comment?: string;
-  user: string;
-  paused?: boolean;
-  logsEnabled?: boolean;
-  logError?: {
-    hasError: boolean;
-    lastFailedLog?: string;
-    lastFailedTimestamp?: Date;
-    exitCode?: number;
-    latestExitCode?: number;
-    hasHistoricalFailures?: boolean;
-  };
-}
-
-export const readUserCrontab = async (user: string): Promise<string> => {
-  const docker = await isDocker();
-
-  if (docker) {
-    const userCrontabs = await readAllHostCrontabs();
-    const targetUserCrontab = userCrontabs.find((uc) => uc.user === user);
-    return targetUserCrontab?.content || "";
-  } else {
-    const { stdout } = await execAsync(READ_CRONTAB(user));
-    return stdout;
-  }
-};
-
-export const writeUserCrontab = async (
-  user: string,
-  content: string
-): Promise<boolean> => {
-  const docker = await isDocker();
-
-  if (docker) {
-    return await writeHostCrontabForUser(user, content);
-  } else {
-    try {
-      await execAsync(WRITE_CRONTAB(content, user));
-      return true;
-    } catch (error) {
-      console.error(`Error writing crontab for user ${user}:`, error);
-      return false;
-    }
-  }
-};
-
-const getAllUsers = async (): Promise<{ user: string; content: string }[]> => {
-  const docker = await isDocker();
-
-  if (docker) {
-    return await readAllHostCrontabs();
-  } else {
-    const { getAllTargetUsers } = await import("@/app/_utils/crontab-utils");
-    const users = await getAllTargetUsers();
-    const results: { user: string; content: string }[] = [];
-
-    for (const user of users) {
-      try {
-        const { stdout } = await execAsync(READ_CRONTAB(user));
-        results.push({ user, content: stdout });
-      } catch (error) {
-        console.error(`Error reading crontab for user ${user}:`, error);
-        results.push({ user, content: "" });
-      }
-    }
-
-    return results;
-  }
-};
-
-export const getCronJobs = async (
-  includeLogErrors: boolean = true
-): Promise<CronJob[]> => {
-  try {
-    const userCrontabs = await getAllUsers();
-    let allJobs: CronJob[] = [];
-
-    for (const { user, content } of userCrontabs) {
-      if (!content.trim()) continue;
-
-      const lines = content.split("\n");
-      const jobs = parseJobsFromLines(lines, user);
-
-      allJobs.push(...jobs);
-    }
-
-    if (includeLogErrors) {
-      const { getAllJobLogErrors } = await import("@/app/_server/actions/logs");
-      const jobIds = allJobs.map((job) => job.id);
-      const errorMap = await getAllJobLogErrors(jobIds);
-
-      allJobs = allJobs.map((job) => ({
-        ...job,
-        logError: errorMap.get(job.id),
-      }));
-    }
-
-    return allJobs;
-  } catch (error) {
-    console.error("Error getting cron jobs:", error);
-    return [];
-  }
-};
-
-export const addCronJob = async (
-  schedule: string,
-  command: string,
-  comment: string = "",
-  user?: string,
-  logsEnabled: boolean = false
-): Promise<boolean> => {
-  try {
-    const jobId = generateShortUUID();
-
-    if (user) {
-      const cronContent = await readUserCrontab(user);
-
-      let finalCommand = command;
-      if (logsEnabled && !isCommandWrapped(command)) {
-        const docker = await isDocker();
-        finalCommand = await wrapCommandWithLogger(
-          jobId,
-          command,
-          docker,
-          comment
-        );
-      } else if (logsEnabled && isCommandWrapped(command)) {
-        finalCommand = command;
-      }
-
-      const formattedComment = formatCommentWithMetadata(
-        comment,
-        logsEnabled,
-        jobId
-      );
-
-      const newEntry = `# ${formattedComment}\n${schedule} ${finalCommand}`;
-
-      let newCron;
-      if (cronContent.trim() === "") {
-        newCron = newEntry;
-      } else {
-        const existingContent = cronContent.trim();
-        newCron = await cleanCrontabContent(existingContent + "\n" + newEntry);
-      }
-
-      return await writeUserCrontab(user, newCron);
-    } else {
-      const cronContent = await readCronFiles();
-
-      let finalCommand = command;
-      if (logsEnabled && !isCommandWrapped(command)) {
-        const docker = await isDocker();
-        finalCommand = await wrapCommandWithLogger(
-          jobId,
-          command,
-          docker,
-          comment
-        );
-      } else if (logsEnabled && isCommandWrapped(command)) {
-        finalCommand = command;
-      }
-
-      const formattedComment = formatCommentWithMetadata(
-        comment,
-        logsEnabled,
-        jobId
-      );
-
-      const newEntry = `# ${formattedComment}\n${schedule} ${finalCommand}`;
-
-      let newCron;
-      if (cronContent.trim() === "") {
-        newCron = newEntry;
-      } else {
-        const existingContent = cronContent.trim();
-        newCron = await cleanCrontabContent(existingContent + "\n" + newEntry);
-      }
-
-      return await writeCronFiles(newCron);
-    }
-  } catch (error) {
-    console.error("Error adding cron job:", error);
-    return false;
-  }
-};
-
-export const deleteCronJob = async (id: string): Promise<boolean> => {
-  try {
-    const allJobs = await getCronJobs(false);
-    const targetJob = allJobs.find((j) => j.id === id);
-
-    if (!targetJob) {
-      console.error(`Job with id ${id} not found`);
-      return false;
-    }
-
-    const user = targetJob.user;
-    const cronContent = await readUserCrontab(user);
-    const lines = cronContent.split("\n");
-    const userJobs = parseJobsFromLines(lines, user);
-    const jobIndex = userJobs.findIndex((j) => j.id === id);
-
-    if (jobIndex === -1) {
-      console.error(`Job with id ${id} not found in parsed jobs`);
-      return false;
-    }
-
-    const newCronEntries = deleteJobInLines(lines, jobIndex);
-    const newCron = await cleanCrontabContent(newCronEntries.join("\n"));
-
-    return await writeUserCrontab(user, newCron);
-  } catch (error) {
-    console.error("Error deleting cron job:", error);
-    return false;
-  }
-};
-
-export const updateCronJob = async (
-  jobData: {
-    id: string;
-    schedule: string;
-    command: string;
-    comment?: string;
-    user: string;
-  },
-  schedule: string,
-  command: string,
-  comment: string = "",
-  logsEnabled: boolean = false
-): Promise<boolean> => {
-  try {
-    const user = jobData.user;
-    const cronContent = await readUserCrontab(user);
-    const lines = cronContent.split("\n");
-
-    const jobIndex = findJobIndex(jobData, lines, user);
-
-    if (jobIndex === -1) {
-      console.error(`Job not found in crontab`);
-      return false;
-    }
-
-    const isWrapped = isCommandWrapped(command);
-
-    let finalCommand = command;
-
-    if (logsEnabled && !isWrapped) {
-      const docker = await isDocker();
-      finalCommand = await wrapCommandWithLogger(
-        jobData.id,
-        command,
-        docker,
-        comment
-      );
-    } else if (!logsEnabled && isWrapped) {
-      finalCommand = unwrapCommand(command);
-    } else if (logsEnabled && isWrapped) {
-      const unwrapped = unwrapCommand(command);
-      const docker = await isDocker();
-      finalCommand = await wrapCommandWithLogger(
-        jobData.id,
-        unwrapped,
-        docker,
-        comment
-      );
-    } else {
-      finalCommand = command;
-    }
-
-    const newCronEntries = updateJobInLines(
-      lines,
-      jobIndex,
-      schedule,
-      finalCommand,
-      comment,
-      logsEnabled,
-      jobData.id
-    );
-    const newCron = await cleanCrontabContent(newCronEntries.join("\n"));
-
-    return await writeUserCrontab(user, newCron);
-  } catch (error) {
-    console.error("Error updating cron job:", error);
-    return false;
-  }
-};
-
-export const pauseCronJob = async (id: string): Promise<boolean> => {
-  try {
-    const allJobs = await getCronJobs(false);
-    const targetJob = allJobs.find((j) => j.id === id);
-
-    if (!targetJob) {
-      console.error(`Job with id ${id} not found`);
-      return false;
-    }
-
-    const user = targetJob.user;
-    const cronContent = await readUserCrontab(user);
-    const lines = cronContent.split("\n");
-    const userJobs = parseJobsFromLines(lines, user);
-    const jobIndex = userJobs.findIndex((j) => j.id === id);
-
-    if (jobIndex === -1) {
-      console.error(`Job with id ${id} not found in parsed jobs`);
-      return false;
-    }
-
-    const newCronEntries = pauseJobInLines(lines, jobIndex, id);
-    const newCron = await cleanCrontabContent(newCronEntries.join("\n"));
-
-    return await writeUserCrontab(user, newCron);
-  } catch (error) {
-    console.error("Error pausing cron job:", error);
-    return false;
-  }
-};
-
-export const resumeCronJob = async (id: string): Promise<boolean> => {
-  try {
-    const allJobs = await getCronJobs(false);
-    const targetJob = allJobs.find((j) => j.id === id);
-
-    if (!targetJob) {
-      console.error(`Job with id ${id} not found`);
-      return false;
-    }
-
-    const user = targetJob.user;
-    const cronContent = await readUserCrontab(user);
-    const lines = cronContent.split("\n");
-    const userJobs = parseJobsFromLines(lines, user);
-    const jobIndex = userJobs.findIndex((j) => j.id === id);
-
-    if (jobIndex === -1) {
-      console.error(`Job with id ${id} not found in parsed jobs`);
-      return false;
-    }
-
-    const newCronEntries = resumeJobInLines(lines, jobIndex, id);
-    const newCron = await cleanCrontabContent(newCronEntries.join("\n"));
-
-    return await writeUserCrontab(user, newCron);
-  } catch (error) {
-    console.error("Error resuming cron job:", error);
-    return false;
-  }
-};
-
-export const cleanupCrontab = async (): Promise<boolean> => {
-  try {
-    const userCrontabs = await getAllUsers();
-
-    for (const { user, content } of userCrontabs) {
-      if (!content.trim()) continue;
-
-      const cleanedContent = await cleanCrontabContent(content);
-      await writeUserCrontab(user, cleanedContent);
-    }
-
-    return true;
-  } catch (error) {
-    console.error("Error cleaning crontab:", error);
-    return false;
-  }
-};
-
-export const findJobIndex = (
-  jobData: {
-    id: string;
-    schedule: string;
-    command: string;
-    comment?: string;
-    user: string;
-    paused?: boolean;
-  },
-  lines: string[],
-  user: string
-): number => {
-  const cronContentStr = lines.join("\n");
-  const userJobs = parseJobsFromLines(lines, user);
-
-  if (cronContentStr.includes(`id: ${jobData.id}`)) {
-    return userJobs.findIndex((j) => j.id === jobData.id);
-  }
-
-  return userJobs.findIndex(
-    (j) =>
-      j.schedule === jobData.schedule &&
-      j.command === jobData.command &&
-      j.user === jobData.user &&
-      (j.comment || "") === (jobData.comment || "")
-  );
-};

app/_utils/errorState.ts

@@ -11,44 +11,13 @@ export interface JobError {
 }
 
 const STORAGE_KEY = "cronmaster-job-errors";
-const MAX_LOG_AGE_DAYS = parseInt(
-  process.env.NEXT_PUBLIC_MAX_LOG_AGE_DAYS || "30",
-  10
-);
-
-/**
- * Clean up old errors from localStorage based on MAX_LOG_AGE_DAYS.
- * This is called automatically when getting errors.
- */
-const cleanupOldErrors = (errors: JobError[]): JobError[] => {
-  const maxAgeMs = MAX_LOG_AGE_DAYS * 24 * 60 * 60 * 1000;
-  const now = Date.now();
-
-  return errors.filter((error) => {
-    try {
-      const errorTime = new Date(error.timestamp).getTime();
-      const age = now - errorTime;
-      return age < maxAgeMs;
-    } catch {
-      return true;
-    }
-  });
-};
 
 export const getJobErrors = (): JobError[] => {
   if (typeof window === "undefined") return [];
 
   try {
     const stored = localStorage.getItem(STORAGE_KEY);
-    const errors = stored ? JSON.parse(stored) : [];
-
-    const cleanedErrors = cleanupOldErrors(errors);
-
-    if (cleanedErrors.length !== errors.length) {
-      localStorage.setItem(STORAGE_KEY, JSON.stringify(cleanedErrors));
-    }
-
-    return cleanedErrors;
+    return stored ? JSON.parse(stored) : [];
   } catch {
     return [];
   }

app/_utils/global-utils.ts

@@ -1,30 +0,0 @@
-import { type ClassValue, clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
-
-export const cn = (...inputs: ClassValue[]) => {
-  return twMerge(clsx(inputs));
-};
-
-export const copyToClipboard = async (text: string): Promise<boolean> => {
-  try {
-    if (navigator?.clipboard?.writeText) {
-      await navigator.clipboard.writeText(text);
-      return true;
-    } else {
-      const textArea = document.createElement("textarea");
-      textArea.value = text;
-      textArea.style.position = "fixed";
-      textArea.style.left = "-9999px";
-      textArea.style.top = "-9999px";
-      document.body.appendChild(textArea);
-      textArea.focus();
-      textArea.select();
-      const successful = document.execCommand("copy");
-      document.body.removeChild(textArea);
-      return successful;
-    }
-  } catch (err) {
-    console.error("Failed to copy to clipboard:", err);
-    return false;
-  }
-};

app/_utils/job-execution-utils.ts

@@ -1,236 +0,0 @@
-import { exec, spawn } from "child_process";
-import { promisify } from "util";
-import { CronJob } from "./cronjob-utils";
-import { getUserInfo } from "./crontab-utils";
-import { NSENTER_RUN_JOB } from "../_consts/nsenter";
-import {
-  saveRunningJob,
-  updateRunningJob,
-  getRunningJob,
-  removeRunningJob,
-} from "./running-jobs-utils";
-import { sseBroadcaster } from "./sse-broadcaster";
-import { generateLogFolderName, cleanupOldLogFiles } from "./wrapper-utils";
-import { watchForLogFile } from "./log-watcher";
-
-const execAsync = promisify(exec);
-
-export const runJobSynchronously = async (
-  job: CronJob,
-  docker: boolean
-): Promise<{
-  success: boolean;
-  message: string;
-  output?: string;
-  mode: "sync";
-}> => {
-  let command: string;
-
-  if (docker) {
-    const userInfo = await getUserInfo(job.user);
-    const executionUser = userInfo ? userInfo.username : "root";
-    const escapedCommand = job.command.replace(/'/g, "'\\''");
-    command = NSENTER_RUN_JOB(executionUser, escapedCommand);
-  } else {
-    command = job.command;
-  }
-
-  const { stdout, stderr } = await execAsync(command, {
-    timeout: 300000,
-    cwd: process.env.HOME || "/home",
-  });
-
-  const output = stdout || stderr || "Command executed successfully";
-
-  return {
-    success: true,
-    message: "Cron job executed successfully",
-    output: output.trim(),
-    mode: "sync",
-  };
-};
-
-export const runJobInBackground = async (
-  job: CronJob,
-  docker: boolean
-): Promise<{
-  success: boolean;
-  message: string;
-  runId: string;
-  mode: "async";
-}> => {
-  const runId = `run-${job.id}-${Date.now()}`;
-  const logFolderName = generateLogFolderName(job.id, job.comment);
-
-  let command: string;
-  let shellArgs: string[];
-
-  if (docker) {
-    const userInfo = await getUserInfo(job.user);
-    const executionUser = userInfo ? userInfo.username : "root";
-    const escapedCommand = job.command.replace(/'/g, "'\\''");
-    const nsenterCmd = NSENTER_RUN_JOB(executionUser, escapedCommand);
-
-    command = "sh";
-    shellArgs = ["-c", nsenterCmd];
-  } else {
-    command = "sh";
-    shellArgs = ["-c", job.command];
-  }
-
-  const child = spawn(command, shellArgs, {
-    detached: true,
-    stdio: "ignore",
-  });
-
-  child.unref();
-
-  const jobStartTime = new Date();
-
-  saveRunningJob({
-    id: runId,
-    cronJobId: job.id,
-    pid: child.pid!,
-    startTime: jobStartTime.toISOString(),
-    status: "running",
-    logFolderName,
-  });
-
-  watchForLogFile(runId, logFolderName, jobStartTime, (logFileName) => {
-    try {
-      updateRunningJob(runId, { logFileName });
-      console.log(`[RunningJob] Cached logFileName for ${runId}: ${logFileName}`);
-    } catch (error) {
-      console.error(`[RunningJob] Failed to cache logFileName for ${runId}:`, error);
-    }
-  });
-
-  sseBroadcaster.broadcast({
-    type: "job-started",
-    timestamp: jobStartTime.toISOString(),
-    data: {
-      runId,
-      cronJobId: job.id,
-      hasLogging: true,
-    },
-  });
-
-  monitorRunningJob(runId, child.pid!);
-
-  return {
-    success: true,
-    message: "Job started in background",
-    runId,
-    mode: "async",
-  };
-};
-
-const monitorRunningJob = (runId: string, pid: number): void => {
-  const checkInterval = setInterval(async () => {
-    try {
-      const isRunning = await isProcessStillRunning(pid);
-
-      if (!isRunning) {
-        clearInterval(checkInterval);
-
-        const exitCode = await getExitCodeFromLog(runId);
-
-        updateRunningJob(runId, {
-          status: exitCode === 0 ? "completed" : "failed",
-          exitCode,
-        });
-
-        setTimeout(async () => {
-          try {
-            removeRunningJob(runId);
-            await cleanupOldLogFiles(runningJob?.cronJobId || "");
-          } catch (error) {
-            console.error(`Error cleaning up job ${runId}:`, error);
-          }
-        }, 5000);
-
-        const runningJob = getRunningJob(runId);
-
-        if (runningJob) {
-          if (exitCode === 0) {
-            sseBroadcaster.broadcast({
-              type: "job-completed",
-              timestamp: new Date().toISOString(),
-              data: {
-                runId,
-                cronJobId: runningJob.cronJobId,
-                exitCode,
-              },
-            });
-          } else {
-            sseBroadcaster.broadcast({
-              type: "job-failed",
-              timestamp: new Date().toISOString(),
-              data: {
-                runId,
-                cronJobId: runningJob.cronJobId,
-                exitCode: exitCode ?? -1,
-              },
-            });
-          }
-        }
-      }
-    } catch (error) {
-      console.error(`[Monitor] Error checking job ${runId}:`, error);
-      clearInterval(checkInterval);
-    }
-  }, 2000);
-};
-
-const isProcessStillRunning = async (pid: number): Promise<boolean> => {
-  try {
-    await execAsync(`kill -0 ${pid} 2>/dev/null`);
-    return true;
-  } catch {
-    return false;
-  }
-};
-
-const getExitCodeFromLog = async (
-  runId: string
-): Promise<number | undefined> => {
-  try {
-    const { readdir, readFile, access } = await import("fs/promises");
-    const path = await import("path");
-
-    const job = getRunningJob(runId);
-    if (!job || !job.logFolderName) {
-      return undefined;
-    }
-
-    const logDir = path.join(process.cwd(), "data", "logs", job.logFolderName);
-
-    try {
-      await access(logDir);
-    } catch {
-      return undefined;
-    }
-
-    const files = await readdir(logDir);
-
-    const sortedFiles = files.sort().reverse();
-    if (sortedFiles.length === 0) {
-      return undefined;
-    }
-
-    const latestLog = await readFile(
-      path.join(logDir, sortedFiles[0]),
-      "utf-8"
-    );
-
-    const exitCodeMatch = latestLog.match(/Exit Code\s*:\s*(\d+)/);
-    if (exitCodeMatch) {
-      return parseInt(exitCodeMatch[1], 10);
-    }
-
-    return undefined;
-  } catch (error) {
-    console.error("Error reading exit code from log:", error);
-    return undefined;
-  }
-};

app/_utils/log-watcher.ts

@@ -1,156 +0,0 @@
-import { watch } from "fs";
-import { existsSync, readFileSync, readdirSync, statSync } from "fs";
-import path from "path";
-import { sseBroadcaster } from "./sse-broadcaster";
-import { getRunningJob } from "./running-jobs-utils";
-
-const DATA_DIR = path.join(process.cwd(), "data");
-const LOGS_DIR = path.join(DATA_DIR, "logs");
-
-let watcher: ReturnType<typeof watch> | null = null;
-
-const parseExitCodeFromLog = (content: string): number | null => {
-  const match = content.match(/Exit Code\s*:\s*(\d+)/);
-  return match ? parseInt(match[1], 10) : null;
-};
-
-const processLogFile = (logFilePath: string) => {
-  try {
-    const pathParts = logFilePath.split(path.sep);
-    const logsIndex = pathParts.indexOf("logs");
-
-    if (logsIndex === -1 || logsIndex >= pathParts.length - 2) {
-      return;
-    }
-
-    const jobFolderName = pathParts[logsIndex + 1];
-
-    if (!existsSync(logFilePath)) {
-      return;
-    }
-
-    const content = readFileSync(logFilePath, "utf-8");
-
-    const exitCode = parseExitCodeFromLog(content);
-
-    if (exitCode === null) {
-      return;
-    }
-
-    const runningJob = getRunningJob(`run-${jobFolderName}`);
-
-    if (exitCode === 0) {
-      sseBroadcaster.broadcast({
-        type: "job-completed",
-        timestamp: new Date().toISOString(),
-        data: {
-          runId: runningJob?.id || `run-${jobFolderName}`,
-          cronJobId: runningJob?.cronJobId || jobFolderName,
-          exitCode,
-        },
-      });
-    } else {
-      sseBroadcaster.broadcast({
-        type: "job-failed",
-        timestamp: new Date().toISOString(),
-        data: {
-          runId: runningJob?.id || `run-${jobFolderName}`,
-          cronJobId: runningJob?.cronJobId || jobFolderName,
-          exitCode,
-        },
-      });
-    }
-  } catch (error) {
-    console.error("[LogWatcher] Error processing log file:", error);
-  }
-};
-
-export const startLogWatcher = () => {
-  if (watcher) {
-    return;
-  }
-
-  if (!existsSync(LOGS_DIR)) {
-    return;
-  }
-
-  watcher = watch(LOGS_DIR, { recursive: true }, (eventType, filename) => {
-    if (!filename || !filename.endsWith(".log")) {
-      return;
-    }
-
-    const fullPath = path.join(LOGS_DIR, filename);
-
-    if (eventType === "change") {
-      setTimeout(() => {
-        processLogFile(fullPath);
-      }, 500);
-    }
-  });
-};
-
-export const stopLogWatcher = () => {
-  if (watcher) {
-    watcher.close();
-    watcher = null;
-  }
-};
-
-export const watchForLogFile = (
-  runId: string,
-  logFolderName: string,
-  jobStartTime: Date,
-  callback: (logFileName: string) => void
-): NodeJS.Timeout => {
-  const logDir = path.join(LOGS_DIR, logFolderName);
-  const startTime = jobStartTime.getTime();
-  const maxAttempts = 30;
-  let attempts = 0;
-
-  const checkInterval = setInterval(() => {
-    attempts++;
-
-    if (attempts > maxAttempts) {
-      console.warn(`[LogWatcher] Timeout waiting for log file for ${runId}`);
-      clearInterval(checkInterval);
-      return;
-    }
-
-    try {
-      if (!existsSync(logDir)) {
-        return;
-      }
-
-      const files = readdirSync(logDir);
-      const logFiles = files
-        .filter((f) => f.endsWith(".log"))
-        .map((f) => {
-          const filePath = path.join(logDir, f);
-          try {
-            const stats = statSync(filePath);
-            return {
-              name: f,
-              birthtime: stats.birthtime || stats.mtime,
-            };
-          } catch {
-            return null;
-          }
-        })
-        .filter((f): f is { name: string; birthtime: Date } => f !== null);
-
-      const matchingFile = logFiles.find((f) => {
-        const fileTime = f.birthtime.getTime();
-        return fileTime >= startTime - 5000 && fileTime <= startTime + 30000;
-      });
-
-      if (matchingFile) {
-        clearInterval(checkInterval);
-        callback(matchingFile.name);
-      }
-    } catch (error) {
-      console.error(`[LogWatcher] Error watching for log file ${runId}:`, error);
-    }
-  }, 500);
-
-  return checkInterval;
-};

app/_utils/process-utils.ts

@@ -1,32 +0,0 @@
-import { exec } from "child_process";
-import { promisify } from "util";
-
-const execAsync = promisify(exec);
-
-export const isProcessRunning = async (pid: number): Promise<boolean> => {
-  try {
-    await execAsync(`kill -0 ${pid} 2>/dev/null`);
-    return true;
-  } catch {
-    return false;
-  }
-};
-
-export const killProcess = async (pid: number, signal: string = "SIGTERM"): Promise<boolean> => {
-  try {
-    await execAsync(`kill -${signal} ${pid} 2>/dev/null`);
-    return true;
-  } catch (error) {
-    console.error(`Failed to kill process ${pid}:`, error);
-    return false;
-  }
-};
-
-export const getProcessInfo = async (pid: number): Promise<string | null> => {
-  try {
-    const { stdout } = await execAsync(`ps -p ${pid} -o pid,cmd 2>/dev/null`);
-    return stdout.trim();
-  } catch {
-    return null;
-  }
-};

app/_utils/running-jobs-utils.ts

@@ -1,98 +0,0 @@
-import { readFileSync, writeFileSync, existsSync } from "fs";
-import path from "path";
-import { DATA_DIR } from "../_consts/file";
-
-export interface RunningJob {
-  id: string;
-  cronJobId: string;
-  pid: number;
-  startTime: string;
-  status: "running" | "completed" | "failed";
-  exitCode?: number;
-  logFolderName?: string;
-  logFileName?: string;
-  lastReadPosition?: number;
-}
-
-const RUNNING_JOBS_FILE = path.join(process.cwd(), DATA_DIR, "running-jobs.json");
-
-export const getAllRunningJobs = (): RunningJob[] => {
-  try {
-    if (!existsSync(RUNNING_JOBS_FILE)) {
-      return [];
-    }
-    const data = readFileSync(RUNNING_JOBS_FILE, "utf-8");
-    return JSON.parse(data);
-  } catch (error) {
-    console.error("Error reading running jobs:", error);
-    return [];
-  }
-};
-
-export const getRunningJob = (runId: string): RunningJob | null => {
-  const jobs = getAllRunningJobs();
-  return jobs.find((job) => job.id === runId) || null;
-};
-
-export const saveRunningJob = (job: RunningJob): void => {
-  try {
-    const jobs = getAllRunningJobs();
-    jobs.push(job);
-    writeFileSync(RUNNING_JOBS_FILE, JSON.stringify(jobs, null, 2), "utf-8");
-  } catch (error) {
-    console.error("Error saving running job:", error);
-    throw error;
-  }
-};
-
-export const updateRunningJob = (runId: string, updates: Partial<RunningJob>): void => {
-  try {
-    const jobs = getAllRunningJobs();
-    const index = jobs.findIndex((job) => job.id === runId);
-
-    if (index === -1) {
-      throw new Error(`Running job ${runId} not found`);
-    }
-
-    jobs[index] = { ...jobs[index], ...updates };
-    writeFileSync(RUNNING_JOBS_FILE, JSON.stringify(jobs, null, 2), "utf-8");
-  } catch (error) {
-    console.error("Error updating running job:", error);
-    throw error;
-  }
-};
-
-export const removeRunningJob = (runId: string): void => {
-  try {
-    const jobs = getAllRunningJobs();
-    const filtered = jobs.filter((job) => job.id !== runId);
-    writeFileSync(RUNNING_JOBS_FILE, JSON.stringify(filtered, null, 2), "utf-8");
-  } catch (error) {
-    console.error("Error removing running job:", error);
-    throw error;
-  }
-};
-
-export const cleanupOldRunningJobs = (): void => {
-  try {
-    const jobs = getAllRunningJobs();
-    const oneHourAgo = Date.now() - 60 * 60 * 1000;
-
-    const filtered = jobs.filter((job) => {
-      if (job.status === "running") {
-        return true;
-      }
-      const jobTime = new Date(job.startTime).getTime();
-      return jobTime > oneHourAgo;
-    });
-
-    writeFileSync(RUNNING_JOBS_FILE, JSON.stringify(filtered, null, 2), "utf-8");
-  } catch (error) {
-    console.error("Error cleaning up old running jobs:", error);
-  }
-};
-
-export const getRunningJobsForCronJob = (cronJobId: string): RunningJob[] => {
-  const jobs = getAllRunningJobs();
-  return jobs.filter((job) => job.cronJobId === cronJobId && job.status === "running");
-};

app/_utils/scriptScanner.ts

@@ -1,6 +1,5 @@
 import { promises as fs } from "fs";
 import path from "path";
-import { SCRIPTS_DIR } from "../_consts/file";
 
 export interface Script {
   id: string;
@@ -68,7 +67,10 @@ const scanScriptsDirectory = async (dirPath: string): Promise<Script[]> => {
 }
 
 export const loadAllScripts = async (): Promise<Script[]> => {
-  const scriptsDir = path.join(process.cwd(), SCRIPTS_DIR);
+  const isDocker = process.env.DOCKER === "true";
+  const scriptsDir = isDocker
+    ? "/app/scripts"
+    : path.join(process.cwd(), "scripts");
   return await scanScriptsDirectory(scriptsDir);
 }
 
@@ -86,4 +88,4 @@ export const getScriptById = (
   id: string
 ): Script | undefined => {
   return scripts.find((script) => script.id === id);
-};
+}