From b4fd4cbc7056b5e60e8018a5fc528b33348a307d Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 02:45:31 +0200
Subject: [PATCH 01/15] feat: setup simple version control route

---
 panel/src/layout/MainRouter.tsx                      |  6 ++++++
 panel/src/layout/ServerSidebar/ServerMenu.tsx        |  5 ++++-
 .../pages/VersionControl/VersionControlHeader.tsx    | 12 ++++++++++++
 .../src/pages/VersionControl/VersionControlPage.tsx  |  9 +++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 panel/src/pages/VersionControl/VersionControlHeader.tsx
 create mode 100644 panel/src/pages/VersionControl/VersionControlPage.tsx

diff --git a/panel/src/layout/MainRouter.tsx b/panel/src/layout/MainRouter.tsx
index 8014d3a73..0b5356bbc 100644
--- a/panel/src/layout/MainRouter.tsx
+++ b/panel/src/layout/MainRouter.tsx
@@ -9,6 +9,7 @@ import Iframe from "@/pages/Iframe";
 import NotFound from "@/pages/NotFound";
 import TestingPage from "@/pages/TestingPage/TestingPage";
 import LiveConsolePage from "@/pages/LiveConsole/LiveConsolePage";
+import VersionControlPage from "@/pages/VersionControl/VersionControlPage";
 import PlayersPage from "@/pages/Players/PlayersPage";
 import HistoryPage from "@/pages/History/HistoryPage";
 import BanTemplatesPage from "@/pages/BanTemplates/BanTemplatesPage";
@@ -98,6 +99,11 @@ const allRoutes: RouteType[] = [
         title: 'CFG Editor',
         children: <Iframe legacyUrl="cfgEditor" />
     },
+    {
+        path: '/server/version-control',
+        title: 'Version Control',
+        children: <VersionControlPage />
+    },
     {
         path: '/server/setup',
         title: 'Server Setup',
diff --git a/panel/src/layout/ServerSidebar/ServerMenu.tsx b/panel/src/layout/ServerSidebar/ServerMenu.tsx
index d7eccf1e6..e570ac841 100644
--- a/panel/src/layout/ServerSidebar/ServerMenu.tsx
+++ b/panel/src/layout/ServerSidebar/ServerMenu.tsx
@@ -5,7 +5,7 @@ import { serverConfigPendingStepAtom, serverNameAtom } from '@/hooks/status';
 import { cn } from '@/lib/utils';
 import { ServerConfigPendingStepType } from '@shared/socketioTypes';
 import { useAtomValue } from 'jotai';
-import { BoxIcon, ChevronRightSquareIcon, DnaIcon, EyeIcon, FileEditIcon, HourglassIcon, LayoutDashboardIcon } from 'lucide-react';
+import { BoxIcon, ChevronRightSquareIcon, DnaIcon, EyeIcon, FileEditIcon, HistoryIcon, HourglassIcon, LayoutDashboardIcon } from 'lucide-react';
 import { useEffect, useRef, useState } from 'react';
 import { useLocation } from 'wouter';
 
@@ -94,6 +94,9 @@ export default function ServerMenu() {
                 <MenuNavLink href="/server/cfg-editor" disabled={!hasPerm('server.cfg.editor')}>
                     <FileEditIcon className="mr-2 h-4 w-4" />CFG Editor
                 </MenuNavLink>
+                <MenuNavLink href="/server/version-control" disabled={!hasPerm('server.cfg.versionControl')}>
+                    <HistoryIcon className="mr-2 h-4 w-4" />Version Control
+                </MenuNavLink>
                 {window.txConsts.showAdvanced && (
                     <MenuNavLink href="/advanced" className='text-accent' disabled={!hasPerm('all_permisisons')}>
                         <DnaIcon className="mr-2 h-4 w-4" />Advanced
diff --git a/panel/src/pages/VersionControl/VersionControlHeader.tsx b/panel/src/pages/VersionControl/VersionControlHeader.tsx
new file mode 100644
index 000000000..de2fdfe90
--- /dev/null
+++ b/panel/src/pages/VersionControl/VersionControlHeader.tsx
@@ -0,0 +1,12 @@
+import { HistoryIcon } from "lucide-react";
+
+export default function VersionControlHeader() {
+    return (
+        <div className="flex flex-col flex-shrink px-1 sm:px-4 py-2 space-y-4 border-b">
+            <div className="flex items-center space-x-2">
+                <HistoryIcon className="mr-2 h-4 w-4" />
+                <p className="font-mono text-sm">Version Control</p>
+            </div>
+        </div>
+    )
+}
diff --git a/panel/src/pages/VersionControl/VersionControlPage.tsx b/panel/src/pages/VersionControl/VersionControlPage.tsx
new file mode 100644
index 000000000..9cd4ec12f
--- /dev/null
+++ b/panel/src/pages/VersionControl/VersionControlPage.tsx
@@ -0,0 +1,9 @@
+import VersionControlHeader from "./VersionControlHeader";
+
+export default function VersionControlPage() {
+  return (
+    <div className="dark text-primary flex flex-col h-full w-full bg-card border md:rounded-xl overflow-clip">
+        <VersionControlHeader />
+    </div>
+  );
+}

From 6d8336c105a87c6c6e6091dda4ac43a973e16350 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 03:30:20 +0200
Subject: [PATCH 02/15] feat: misc work on ui & permissions

---
 core/components/AdminVault/index.js           |  1 +
 docs/permissions.md                           |  1 +
 nui/src/state/permissions.state.ts            |  1 +
 panel/src/layout/ServerSidebar/ServerMenu.tsx |  2 +-
 .../VersionControl/VersionControlHeader.tsx   | 54 ++++++++++++--
 .../VersionControl/VersionControlPage.tsx     | 72 ++++++++++++++++++-
 6 files changed, 122 insertions(+), 9 deletions(-)

diff --git a/core/components/AdminVault/index.js b/core/components/AdminVault/index.js
index ce48ebaaf..6ccd22368 100644
--- a/core/components/AdminVault/index.js
+++ b/core/components/AdminVault/index.js
@@ -46,6 +46,7 @@ export default class AdminVault {
             'control.server': 'Start/Stop Server + Scheduler',
             'commands.resources': 'Start/Stop Resources',
             'server.cfg.editor': 'Read/Write server.cfg',
+            'version_control': 'Version Control: Manage',
             'txadmin.log.view': 'View System Logs', //FIXME: rename to system.log.view
 
             'menu.vehicle': 'Spawn / Fix Vehicles',
diff --git a/docs/permissions.md b/docs/permissions.md
index d66805035..8e9986657 100644
--- a/docs/permissions.md
+++ b/docs/permissions.md
@@ -9,6 +9,7 @@ The permissions are saved in the `txData/admins.json` file and can be edited thr
 - `settings.view`: Settings: View (no tokens);
 - `settings.write`: Settings: Change;
 - `console.view`: Console: View;
+- `version_control`: Version Control: Manage;
 - `console.write`: Console: Write;
 - `control.server`: Start/Stop/Restart Server;
 - `commands.resources`: Start/Stop Resources;
diff --git a/nui/src/state/permissions.state.ts b/nui/src/state/permissions.state.ts
index 2c12c83cf..0334ef611 100644
--- a/nui/src/state/permissions.state.ts
+++ b/nui/src/state/permissions.state.ts
@@ -15,6 +15,7 @@ export type ResolvablePermission =
   | "players.warn"
   | "players.whitelist"
   | "console.view"
+  | "version_control"
   | "console.write"
   | "control.server"
   | "server.cfg.editor"
diff --git a/panel/src/layout/ServerSidebar/ServerMenu.tsx b/panel/src/layout/ServerSidebar/ServerMenu.tsx
index e570ac841..b7b5ee924 100644
--- a/panel/src/layout/ServerSidebar/ServerMenu.tsx
+++ b/panel/src/layout/ServerSidebar/ServerMenu.tsx
@@ -94,7 +94,7 @@ export default function ServerMenu() {
                 <MenuNavLink href="/server/cfg-editor" disabled={!hasPerm('server.cfg.editor')}>
                     <FileEditIcon className="mr-2 h-4 w-4" />CFG Editor
                 </MenuNavLink>
-                <MenuNavLink href="/server/version-control" disabled={!hasPerm('server.cfg.versionControl')}>
+                <MenuNavLink href="/server/version-control" disabled={!hasPerm('version_control')}>
                     <HistoryIcon className="mr-2 h-4 w-4" />Version Control
                 </MenuNavLink>
                 {window.txConsts.showAdvanced && (
diff --git a/panel/src/pages/VersionControl/VersionControlHeader.tsx b/panel/src/pages/VersionControl/VersionControlHeader.tsx
index de2fdfe90..ff8ee771f 100644
--- a/panel/src/pages/VersionControl/VersionControlHeader.tsx
+++ b/panel/src/pages/VersionControl/VersionControlHeader.tsx
@@ -1,11 +1,53 @@
-import { HistoryIcon } from "lucide-react";
+import { BookIcon, FolderGit2, FolderPenIcon, HistoryIcon, RefreshCcw } from "lucide-react";
+import { Link } from "wouter";
 
-export default function VersionControlHeader() {
+interface Props {
+    repository: string;
+    childAmount: number;
+    updateAvailableAmount: number;
+}
+
+export default function VersionControlHeader({repository, childAmount, updateAvailableAmount}: Props) {
     return (
-        <div className="flex flex-col flex-shrink px-1 sm:px-4 py-2 space-y-4 border-b">
-            <div className="flex items-center space-x-2">
-                <HistoryIcon className="mr-2 h-4 w-4" />
-                <p className="font-mono text-sm">Version Control</p>
+        <div className="flex flex-row w-full bg-card md:rounded-xl border gap-4 p-4 justify-between">
+            <a href={"https://github.com/" + repository} target="_blank">
+                <div className="flex flex-row gap-4 items-center hover:bg-secondary/75 rounded-md p-2">
+                    <BookIcon className="h-12 aspect-square"/>
+                    <div className="flex flex-col">
+                        <h2 className="text-muted-foreground">Head Repository</h2>
+                        <h1>{repository}</h1>
+                    </div>
+                </div>
+            </a>
+
+            <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
+
+            <div className="flex flex-row gap-4 items-center rounded-md p-2">
+                <FolderGit2 className="h-12 aspect-square"/>
+                <div className="flex flex-col">
+                    <h2 className="text-muted-foreground">Resource Count</h2>
+                    <h1>{childAmount}</h1>
+                </div>
+            </div>
+
+            <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
+
+            <div className="flex flex-row gap-4 items-center rounded-md p-2">
+                <FolderPenIcon className="h-12 aspect-square"/>
+                <div className="flex flex-col">
+                    <h2 className="text-muted-foreground">Out of date resources</h2>
+                    <h1>{updateAvailableAmount}</h1>
+                </div>
+            </div>
+
+            <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
+
+            <div className="flex flex-row gap-4 items-center hover:bg-secondary/75 rounded-md p-2 cursor-pointer">
+                <RefreshCcw className="h-12 aspect-square"/>
+                <div className="flex flex-col">
+                    <h2>Manual Refresh</h2>
+                    <h1 className="text-muted-foreground">Check for outdated resources</h1>
+                </div>
             </div>
         </div>
     )
diff --git a/panel/src/pages/VersionControl/VersionControlPage.tsx b/panel/src/pages/VersionControl/VersionControlPage.tsx
index 9cd4ec12f..c1cc465e9 100644
--- a/panel/src/pages/VersionControl/VersionControlPage.tsx
+++ b/panel/src/pages/VersionControl/VersionControlPage.tsx
@@ -1,9 +1,77 @@
+import { ChangeEvent, useCallback, useEffect, useState } from "react";
 import VersionControlHeader from "./VersionControlHeader";
 
+interface Resource {
+  submoduleName: string;
+  repository: string;
+  path: string;
+  isUpToDate: boolean;
+}
+
 export default function VersionControlPage() {
+  const [repository, setRepository] = useState<string>(
+    "westroleplay/local-dev-env"
+  );
+  const [childAmount, setChildAmount] = useState<number>(0);
+  const [updateAvailableAmount, setUpdateAvailableAmount] = useState<number>(0);
+  const [searchValue, setSearchValue] = useState<string>("");
+  const [resources, setResources] = useState<Resource[]>([
+    {
+      submoduleName: "core",
+      path: "fx-data/resources/[wsrp]/core",
+      repository: "https://github.com/westroleplay/core",
+      isUpToDate: true
+    },
+    {
+      submoduleName: "default",
+      path: "fx-data/resources/[wsrp]/default",
+      repository: "https://github.com/westroleplay/default",
+      isUpToDate: true
+    },
+    {
+      submoduleName: "chat",
+      path: "fx-data/resources/[wsrp]/chat",
+      repository: "https://github.com/westroleplay/chat",
+      isUpToDate: false
+    },
+    {
+      submoduleName: "oxmysql",
+      path: "fx-data/resources/[standalone]/oxmysql",
+      repository: "https://github.com/overextended/core",
+      isUpToDate: false
+    }
+  ]);
+
+  useEffect(() => {
+    setChildAmount(resources.length);
+    setUpdateAvailableAmount(
+      resources.filter((r) => r.isUpToDate === false).length
+    );
+  }, [resources]);
+
+  const updateSearchValue = useCallback((e: ChangeEvent<HTMLInputElement>) => {
+    setSearchValue(e.target.value);
+  }, []);
+
   return (
-    <div className="dark text-primary flex flex-col h-full w-full bg-card border md:rounded-xl overflow-clip">
-        <VersionControlHeader />
+    <div className="flex flex-col w-full h-full gap-4">
+      <VersionControlHeader
+        repository={repository}
+        updateAvailableAmount={updateAvailableAmount}
+        childAmount={childAmount}
+      />
+
+      <div className="dark text-primary flex flex-col h-full w-full bg-card border md:rounded-xl overflow-clip p-4">
+        <input
+          className="p-2 rounded bg-primary-foreground border"
+          type="text"
+          name="resource"
+          id="resourceInput"
+          value={searchValue}
+          onChange={updateSearchValue}
+          placeholder="Filter child repositories by name..."
+        />
+      </div>
     </div>
   );
 }

From 9d99f445d8d5af70125c6fc1d59902ee249b120f Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 04:03:19 +0200
Subject: [PATCH 03/15] feat: further work on resource filtering + style

---
 .../VersionControl/VersionControlHeader.tsx   | 106 ++++++++-------
 .../VersionControl/VersionControlPage.tsx     | 125 ++++++++++++++++--
 2 files changed, 174 insertions(+), 57 deletions(-)

diff --git a/panel/src/pages/VersionControl/VersionControlHeader.tsx b/panel/src/pages/VersionControl/VersionControlHeader.tsx
index ff8ee771f..3ec3194ca 100644
--- a/panel/src/pages/VersionControl/VersionControlHeader.tsx
+++ b/panel/src/pages/VersionControl/VersionControlHeader.tsx
@@ -1,54 +1,66 @@
-import { BookIcon, FolderGit2, FolderPenIcon, HistoryIcon, RefreshCcw } from "lucide-react";
+import {
+  BookIcon,
+  FolderGit2,
+  FolderPenIcon,
+  HistoryIcon,
+  RefreshCcw
+} from "lucide-react";
 import { Link } from "wouter";
 
 interface Props {
-    repository: string;
-    childAmount: number;
-    updateAvailableAmount: number;
+  repository: string;
+  childAmount: number;
+  updateAvailableAmount: number;
 }
 
-export default function VersionControlHeader({repository, childAmount, updateAvailableAmount}: Props) {
-    return (
-        <div className="flex flex-row w-full bg-card md:rounded-xl border gap-4 p-4 justify-between">
-            <a href={"https://github.com/" + repository} target="_blank">
-                <div className="flex flex-row gap-4 items-center hover:bg-secondary/75 rounded-md p-2">
-                    <BookIcon className="h-12 aspect-square"/>
-                    <div className="flex flex-col">
-                        <h2 className="text-muted-foreground">Head Repository</h2>
-                        <h1>{repository}</h1>
-                    </div>
-                </div>
-            </a>
-
-            <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
-
-            <div className="flex flex-row gap-4 items-center rounded-md p-2">
-                <FolderGit2 className="h-12 aspect-square"/>
-                <div className="flex flex-col">
-                    <h2 className="text-muted-foreground">Resource Count</h2>
-                    <h1>{childAmount}</h1>
-                </div>
-            </div>
-
-            <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
-
-            <div className="flex flex-row gap-4 items-center rounded-md p-2">
-                <FolderPenIcon className="h-12 aspect-square"/>
-                <div className="flex flex-col">
-                    <h2 className="text-muted-foreground">Out of date resources</h2>
-                    <h1>{updateAvailableAmount}</h1>
-                </div>
-            </div>
-
-            <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
-
-            <div className="flex flex-row gap-4 items-center hover:bg-secondary/75 rounded-md p-2 cursor-pointer">
-                <RefreshCcw className="h-12 aspect-square"/>
-                <div className="flex flex-col">
-                    <h2>Manual Refresh</h2>
-                    <h1 className="text-muted-foreground">Check for outdated resources</h1>
-                </div>
-            </div>
+export default function VersionControlHeader({
+  repository,
+  childAmount,
+  updateAvailableAmount
+}: Props) {
+  return (
+    <div className="flex flex-row w-full bg-card md:rounded-xl border gap-4 p-4 justify-between">
+      <a href={`https://github.com/${repository}`} target="_blank">
+        <div className="flex flex-row gap-4 items-center hover:bg-secondary/75 rounded-md p-2">
+          <BookIcon className="h-12 aspect-square" />
+          <div className="flex flex-col">
+            <h2 className="text-muted-foreground">Head Repository</h2>
+            <h1>{repository}</h1>
+          </div>
         </div>
-    )
+      </a>
+
+      <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
+
+      <div className="flex flex-row gap-4 items-center rounded-md p-2">
+        <FolderGit2 className="h-12 aspect-square" />
+        <div className="flex flex-col">
+          <h2 className="text-muted-foreground">Resource Count</h2>
+          <h1>{childAmount}</h1>
+        </div>
+      </div>
+
+      <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
+
+      <div className="flex flex-row gap-4 items-center rounded-md p-2">
+        <FolderPenIcon className="h-12 aspect-square" />
+        <div className="flex flex-col">
+          <h2 className="text-muted-foreground">Out of date resources</h2>
+          <h1>{updateAvailableAmount}</h1>
+        </div>
+      </div>
+
+      <div className="bg-muted-foreground/25 w-[1px] h-[80%] my-auto"></div>
+
+      <div className="flex flex-row gap-4 items-center hover:bg-secondary/75 rounded-md p-2 cursor-pointer">
+        <RefreshCcw className="h-12 aspect-square" />
+        <div className="flex flex-col">
+          <h2>Manual Refresh</h2>
+          <h1 className="text-muted-foreground">
+            Check for outdated resources
+          </h1>
+        </div>
+      </div>
+    </div>
+  );
 }
diff --git a/panel/src/pages/VersionControl/VersionControlPage.tsx b/panel/src/pages/VersionControl/VersionControlPage.tsx
index c1cc465e9..189096a1c 100644
--- a/panel/src/pages/VersionControl/VersionControlPage.tsx
+++ b/panel/src/pages/VersionControl/VersionControlPage.tsx
@@ -1,11 +1,18 @@
 import { ChangeEvent, useCallback, useEffect, useState } from "react";
 import VersionControlHeader from "./VersionControlHeader";
+import { Button } from "@/components/ui/button";
 
 interface Resource {
   submoduleName: string;
   repository: string;
   path: string;
-  isUpToDate: boolean;
+  commit: string;
+  isUpToDate:
+    | true
+    | {
+        prId: number;
+        latestCommit: string;
+      };
 }
 
 export default function VersionControlPage() {
@@ -19,33 +26,44 @@ export default function VersionControlPage() {
     {
       submoduleName: "core",
       path: "fx-data/resources/[wsrp]/core",
-      repository: "https://github.com/westroleplay/core",
+      repository: "westroleplay/core",
+      commit: "5440e03",
       isUpToDate: true
     },
     {
       submoduleName: "default",
       path: "fx-data/resources/[wsrp]/default",
-      repository: "https://github.com/westroleplay/default",
+      repository: "westroleplay/default",
+      commit: "a320e03",
       isUpToDate: true
     },
     {
       submoduleName: "chat",
       path: "fx-data/resources/[wsrp]/chat",
-      repository: "https://github.com/westroleplay/chat",
-      isUpToDate: false
+      repository: "westroleplay/chat",
+      commit: "3025dba",
+      isUpToDate: {
+        prId: 7,
+        latestCommit: "d36428f"
+      }
     },
     {
       submoduleName: "oxmysql",
       path: "fx-data/resources/[standalone]/oxmysql",
-      repository: "https://github.com/overextended/core",
-      isUpToDate: false
+      repository: "overextended/oxmysql",
+      commit: "5440e03",
+      isUpToDate: {
+        prId: 8,
+        latestCommit: "19d55a2"
+      }
     }
   ]);
+  const [formattedResources, setFormattedResources] = useState<Resource[]>([]);
 
   useEffect(() => {
     setChildAmount(resources.length);
     setUpdateAvailableAmount(
-      resources.filter((r) => r.isUpToDate === false).length
+      resources.filter((r) => r.isUpToDate !== true).length
     );
   }, [resources]);
 
@@ -53,6 +71,24 @@ export default function VersionControlPage() {
     setSearchValue(e.target.value);
   }, []);
 
+  useEffect(() => {
+    let newFilteredResources = resources;
+
+    if (searchValue.trim().length !== 0) {
+      newFilteredResources = newFilteredResources.filter((r) => {
+        return (
+          r.repository.toLowerCase().indexOf(searchValue.toLowerCase()) !==
+            -1 ||
+          r.path.toLowerCase().indexOf(searchValue.toLowerCase()) !== -1 ||
+          r.submoduleName.toLowerCase().indexOf(searchValue.toLowerCase()) !==
+            -1
+        );
+      });
+    }
+
+    setFormattedResources(newFilteredResources);
+  }, [searchValue, resources]);
+
   return (
     <div className="flex flex-col w-full h-full gap-4">
       <VersionControlHeader
@@ -61,9 +97,9 @@ export default function VersionControlPage() {
         childAmount={childAmount}
       />
 
-      <div className="dark text-primary flex flex-col h-full w-full bg-card border md:rounded-xl overflow-clip p-4">
+      <div className="dark text-primary flex flex-col h-full w-full bg-card border md:rounded-xl overflow-clip py-4 gap-4">
         <input
-          className="p-2 rounded bg-primary-foreground border"
+          className="p-2 rounded bg-primary-foreground border mx-4"
           type="text"
           name="resource"
           id="resourceInput"
@@ -71,6 +107,75 @@ export default function VersionControlPage() {
           onChange={updateSearchValue}
           placeholder="Filter child repositories by name..."
         />
+
+        <div className="flex flex-col">
+          {formattedResources.map((r) => {
+            return (
+              <div
+                key={r.submoduleName}
+                className="flex flex-row justify-between py-2 odd:bg-slate-100/5 px-4"
+              >
+                <div className="flex flex-col">
+                  <h1>
+                    <a
+                      href={`https://github.com/${r.repository}`}
+                      target="_blank"
+                    >
+                      <span
+                        className={
+                          r.isUpToDate === true
+                            ? "hover:[text-shadow:_0px_0px_3px_#00bf8f] text-[#00bf8f]"
+                            : "hover:[text-shadow:_0px_0px_3px_#fd4a4a] text-[#fd4a4a]"
+                        }
+                      >
+                        {r.repository}
+                      </span>
+                    </a>{" "}
+                    (
+                    <a
+                      target="_blank"
+                      href={`https://github.com/${r.repository}/commit/${r.commit}`}
+                    >
+                      <span className="hover:[text-shadow:_0px_0px_3px_#fff]">
+                        {r.commit}
+                      </span>
+                    </a>
+                    {r.isUpToDate !== true ? (
+                      <a
+                        target="_blank"
+                        href={`https://github.com/${r.repository}/commit/${r.isUpToDate.latestCommit}`}
+                      >
+                        <span className="hover:[text-shadow:_0px_0px_3px_#fff] font-bold">
+                          {`, newest: ${r.isUpToDate.latestCommit}`}
+                        </span>
+                      </a>
+                    ) : null}
+                    )
+                  </h1>
+                  <h2 className="text-muted-foreground">{r.path}</h2>
+                </div>
+
+                <div className="flex flex-col justify-center">
+                  {r.isUpToDate !== true ? (
+                    <a
+                      href={`https://github.com/${repository}/pull/${r.isUpToDate.prId.toString()}`}
+                      target="_blank"
+                    >
+                      <Button
+                        variant="outline"
+                        color="primary"
+                        size="sm"
+                        className="border-warning text-warning hover:bg-warning hover:text-white"
+                      >
+                        View Update PR
+                      </Button>
+                    </a>
+                  ) : null}
+                </div>
+              </div>
+            );
+          })}
+        </div>
       </div>
     </div>
   );

From 1de3d5fa336d20ffc1d94fa77926945d9d05fe15 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 04:07:45 +0200
Subject: [PATCH 04/15] feat: show outdated resources first + sort logic

---
 .../VersionControl/VersionControlPage.tsx     | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/panel/src/pages/VersionControl/VersionControlPage.tsx b/panel/src/pages/VersionControl/VersionControlPage.tsx
index 189096a1c..788043912 100644
--- a/panel/src/pages/VersionControl/VersionControlPage.tsx
+++ b/panel/src/pages/VersionControl/VersionControlPage.tsx
@@ -71,6 +71,16 @@ export default function VersionControlPage() {
     setSearchValue(e.target.value);
   }, []);
 
+  const alphabeticalSort = (a: Resource, b: Resource) => {
+    if (a.repository < b.repository) {
+      return -1;
+    }
+    if (a.repository > b.repository) {
+      return 1;
+    }
+    return 0;
+  };
+
   useEffect(() => {
     let newFilteredResources = resources;
 
@@ -86,7 +96,16 @@ export default function VersionControlPage() {
       });
     }
 
-    setFormattedResources(newFilteredResources);
+    setFormattedResources([
+      // We want the outdated resources to be first
+      // But we also wish for each list (outdated & up-to-date) to be alphabetically sorted
+      ...newFilteredResources
+        .filter((r) => r.isUpToDate !== true)
+        .sort(alphabeticalSort),
+      ...newFilteredResources
+        .filter((r) => r.isUpToDate === true)
+        .sort(alphabeticalSort)
+    ]);
   }, [searchValue, resources]);
 
   return (

From 24f93039cfeb6cfc0f70aaf1f4e093ceae2accc2 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 04:22:47 +0200
Subject: [PATCH 05/15] feat: setup web api route for resources

---
 core/components/WebServer/router.ts           |   3 +
 core/webroutes/index.js                       |   2 +
 core/webroutes/versionControl/actions.ts      |   0
 core/webroutes/versionControl/resources.ts    |  42 +++++++
 .../VersionControl/VersionControlPage.tsx     | 110 ++++++++----------
 5 files changed, 93 insertions(+), 64 deletions(-)
 create mode 100644 core/webroutes/versionControl/actions.ts
 create mode 100644 core/webroutes/versionControl/resources.ts

diff --git a/core/components/WebServer/router.ts b/core/components/WebServer/router.ts
index 6c20aef7c..4aed34bf1 100644
--- a/core/components/WebServer/router.ts
+++ b/core/components/WebServer/router.ts
@@ -107,6 +107,9 @@ export default (config: WebServerConfigType) => {
     router.get('/history/action', apiAuthMw, webRoutes.history_actionModal);
     router.post('/history/:action', apiAuthMw, webRoutes.history_actions);
 
+    // Version Control routes
+    router.get('/versionControl/resources', apiAuthMw, webRoutes.version_control_resources);
+
     //Player routes
     router.get('/player', apiAuthMw, webRoutes.player_modal);
     router.get('/player/stats', apiAuthMw, webRoutes.player_stats);
diff --git a/core/webroutes/index.js b/core/webroutes/index.js
index 3d5e3162c..ad7e2c829 100644
--- a/core/webroutes/index.js
+++ b/core/webroutes/index.js
@@ -48,6 +48,8 @@ export { default as fxserver_controls } from './fxserver/controls';
 export { default as fxserver_downloadLog } from './fxserver/downloadLog';
 export { default as fxserver_schedule } from './fxserver/schedule';
 
+export { default as version_control_resources } from './versionControl/resources';
+
 export { default as history_stats } from './history/stats';
 export { default as history_search } from './history/search';
 export { default as history_actionModal } from './history/actionModal';
diff --git a/core/webroutes/versionControl/actions.ts b/core/webroutes/versionControl/actions.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/webroutes/versionControl/resources.ts b/core/webroutes/versionControl/resources.ts
new file mode 100644
index 000000000..2ed6e393f
--- /dev/null
+++ b/core/webroutes/versionControl/resources.ts
@@ -0,0 +1,42 @@
+import { AuthedCtx } from "@core/components/WebServer/ctxTypes";
+
+export default async function VersionControlResources(ctx: AuthedCtx) {
+  return ctx.send({
+    resources: [
+      {
+        submoduleName: "core",
+        path: "fx-data/resources/[wsrp]/core",
+        repository: "westroleplay/core",
+        commit: "5440e03",
+        isUpToDate: true
+      },
+      {
+        submoduleName: "default",
+        path: "fx-data/resources/[wsrp]/default",
+        repository: "westroleplay/default",
+        commit: "a320e03",
+        isUpToDate: true
+      },
+      {
+        submoduleName: "chat",
+        path: "fx-data/resources/[wsrp]/chat",
+        repository: "westroleplay/chat",
+        commit: "3025dba",
+        isUpToDate: {
+          prId: 7,
+          latestCommit: "d36428f"
+        }
+      },
+      {
+        submoduleName: "oxmysql",
+        path: "fx-data/resources/[standalone]/oxmysql",
+        repository: "overextended/oxmysql",
+        commit: "5440e03",
+        isUpToDate: {
+          prId: 8,
+          latestCommit: "19d55a2"
+        }
+      }
+    ]
+  });
+}
diff --git a/panel/src/pages/VersionControl/VersionControlPage.tsx b/panel/src/pages/VersionControl/VersionControlPage.tsx
index 788043912..c00199e10 100644
--- a/panel/src/pages/VersionControl/VersionControlPage.tsx
+++ b/panel/src/pages/VersionControl/VersionControlPage.tsx
@@ -1,6 +1,8 @@
 import { ChangeEvent, useCallback, useEffect, useState } from "react";
 import VersionControlHeader from "./VersionControlHeader";
 import { Button } from "@/components/ui/button";
+import { useAuthedFetcher, useBackendApi } from "@/hooks/fetch";
+import { useQuery } from "@tanstack/react-query";
 
 interface Resource {
   submoduleName: string;
@@ -16,56 +18,34 @@ interface Resource {
 }
 
 export default function VersionControlPage() {
+  const authedFetcher = useAuthedFetcher();
   const [repository, setRepository] = useState<string>(
     "westroleplay/local-dev-env"
   );
   const [childAmount, setChildAmount] = useState<number>(0);
   const [updateAvailableAmount, setUpdateAvailableAmount] = useState<number>(0);
   const [searchValue, setSearchValue] = useState<string>("");
-  const [resources, setResources] = useState<Resource[]>([
-    {
-      submoduleName: "core",
-      path: "fx-data/resources/[wsrp]/core",
-      repository: "westroleplay/core",
-      commit: "5440e03",
-      isUpToDate: true
-    },
-    {
-      submoduleName: "default",
-      path: "fx-data/resources/[wsrp]/default",
-      repository: "westroleplay/default",
-      commit: "a320e03",
-      isUpToDate: true
-    },
-    {
-      submoduleName: "chat",
-      path: "fx-data/resources/[wsrp]/chat",
-      repository: "westroleplay/chat",
-      commit: "3025dba",
-      isUpToDate: {
-        prId: 7,
-        latestCommit: "d36428f"
-      }
-    },
-    {
-      submoduleName: "oxmysql",
-      path: "fx-data/resources/[standalone]/oxmysql",
-      repository: "overextended/oxmysql",
-      commit: "5440e03",
-      isUpToDate: {
-        prId: 8,
-        latestCommit: "19d55a2"
-      }
-    }
-  ]);
+  const {
+    isPending: queryIsPending,
+    error: queryError,
+    data: queryData
+  } = useQuery<{
+    resources: Resource[];
+  }>({
+    queryKey: ["getResources"],
+    gcTime: 30_000,
+    queryFn: () => authedFetcher("/versionControl/resources")
+  });
   const [formattedResources, setFormattedResources] = useState<Resource[]>([]);
 
   useEffect(() => {
-    setChildAmount(resources.length);
-    setUpdateAvailableAmount(
-      resources.filter((r) => r.isUpToDate !== true).length
-    );
-  }, [resources]);
+    if (queryData !== undefined) {
+      setChildAmount(queryData.resources.length);
+      setUpdateAvailableAmount(
+        queryData.resources.filter((r) => r.isUpToDate !== true).length
+      );
+    }
+  }, [queryData]);
 
   const updateSearchValue = useCallback((e: ChangeEvent<HTMLInputElement>) => {
     setSearchValue(e.target.value);
@@ -82,31 +62,33 @@ export default function VersionControlPage() {
   };
 
   useEffect(() => {
-    let newFilteredResources = resources;
+    if (queryData !== undefined) {
+      let newFilteredResources = queryData.resources;
 
-    if (searchValue.trim().length !== 0) {
-      newFilteredResources = newFilteredResources.filter((r) => {
-        return (
-          r.repository.toLowerCase().indexOf(searchValue.toLowerCase()) !==
-            -1 ||
-          r.path.toLowerCase().indexOf(searchValue.toLowerCase()) !== -1 ||
-          r.submoduleName.toLowerCase().indexOf(searchValue.toLowerCase()) !==
-            -1
-        );
-      });
-    }
+      if (searchValue.trim().length !== 0) {
+        newFilteredResources = newFilteredResources.filter((r) => {
+          return (
+            r.repository.toLowerCase().indexOf(searchValue.toLowerCase()) !==
+              -1 ||
+            r.path.toLowerCase().indexOf(searchValue.toLowerCase()) !== -1 ||
+            r.submoduleName.toLowerCase().indexOf(searchValue.toLowerCase()) !==
+              -1
+          );
+        });
+      }
 
-    setFormattedResources([
-      // We want the outdated resources to be first
-      // But we also wish for each list (outdated & up-to-date) to be alphabetically sorted
-      ...newFilteredResources
-        .filter((r) => r.isUpToDate !== true)
-        .sort(alphabeticalSort),
-      ...newFilteredResources
-        .filter((r) => r.isUpToDate === true)
-        .sort(alphabeticalSort)
-    ]);
-  }, [searchValue, resources]);
+      setFormattedResources([
+        // We want the outdated resources to be first
+        // But we also wish for each list (outdated & up-to-date) to be alphabetically sorted
+        ...newFilteredResources
+          .filter((r) => r.isUpToDate !== true)
+          .sort(alphabeticalSort),
+        ...newFilteredResources
+          .filter((r) => r.isUpToDate === true)
+          .sort(alphabeticalSort)
+      ]);
+    }
+  }, [searchValue, queryData]);
 
   return (
     <div className="flex flex-col w-full h-full gap-4">

From 6b4ef0d261a65cd11d10131028e74a6f711ffaf4 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 04:29:18 +0200
Subject: [PATCH 06/15] feat: add loader for resources section

---
 .../VersionControl/VersionControlPage.tsx     | 123 +++++++++---------
 1 file changed, 64 insertions(+), 59 deletions(-)

diff --git a/panel/src/pages/VersionControl/VersionControlPage.tsx b/panel/src/pages/VersionControl/VersionControlPage.tsx
index c00199e10..d1a37eadf 100644
--- a/panel/src/pages/VersionControl/VersionControlPage.tsx
+++ b/panel/src/pages/VersionControl/VersionControlPage.tsx
@@ -1,8 +1,9 @@
 import { ChangeEvent, useCallback, useEffect, useState } from "react";
 import VersionControlHeader from "./VersionControlHeader";
 import { Button } from "@/components/ui/button";
-import { useAuthedFetcher, useBackendApi } from "@/hooks/fetch";
+import { useAuthedFetcher } from "@/hooks/fetch";
 import { useQuery } from "@tanstack/react-query";
+import { LoaderCircle } from "lucide-react";
 
 interface Resource {
   submoduleName: string;
@@ -109,73 +110,77 @@ export default function VersionControlPage() {
           placeholder="Filter child repositories by name..."
         />
 
-        <div className="flex flex-col">
-          {formattedResources.map((r) => {
-            return (
-              <div
-                key={r.submoduleName}
-                className="flex flex-row justify-between py-2 odd:bg-slate-100/5 px-4"
-              >
-                <div className="flex flex-col">
-                  <h1>
-                    <a
-                      href={`https://github.com/${r.repository}`}
-                      target="_blank"
-                    >
-                      <span
-                        className={
-                          r.isUpToDate === true
-                            ? "hover:[text-shadow:_0px_0px_3px_#00bf8f] text-[#00bf8f]"
-                            : "hover:[text-shadow:_0px_0px_3px_#fd4a4a] text-[#fd4a4a]"
-                        }
+        <div className="flex flex-col relative h-full">
+          {queryIsPending === true ? (
+            <LoaderCircle className="my-auto mx-auto w-24 h-24 animate-spin" />
+          ) : (
+            formattedResources.map((r) => {
+              return (
+                <div
+                  key={r.submoduleName}
+                  className="flex flex-row justify-between py-2 odd:bg-slate-100/5 px-4"
+                >
+                  <div className="flex flex-col">
+                    <h1>
+                      <a
+                        href={`https://github.com/${r.repository}`}
+                        target="_blank"
                       >
-                        {r.repository}
-                      </span>
-                    </a>{" "}
-                    (
-                    <a
-                      target="_blank"
-                      href={`https://github.com/${r.repository}/commit/${r.commit}`}
-                    >
-                      <span className="hover:[text-shadow:_0px_0px_3px_#fff]">
-                        {r.commit}
-                      </span>
-                    </a>
-                    {r.isUpToDate !== true ? (
+                        <span
+                          className={
+                            r.isUpToDate === true
+                              ? "hover:[text-shadow:_0px_0px_3px_#00bf8f] text-[#00bf8f]"
+                              : "hover:[text-shadow:_0px_0px_3px_#fd4a4a] text-[#fd4a4a]"
+                          }
+                        >
+                          {r.repository}
+                        </span>
+                      </a>{" "}
+                      (
                       <a
                         target="_blank"
-                        href={`https://github.com/${r.repository}/commit/${r.isUpToDate.latestCommit}`}
+                        href={`https://github.com/${r.repository}/commit/${r.commit}`}
                       >
-                        <span className="hover:[text-shadow:_0px_0px_3px_#fff] font-bold">
-                          {`, newest: ${r.isUpToDate.latestCommit}`}
+                        <span className="hover:[text-shadow:_0px_0px_3px_#fff]">
+                          {r.commit}
                         </span>
                       </a>
-                    ) : null}
-                    )
-                  </h1>
-                  <h2 className="text-muted-foreground">{r.path}</h2>
-                </div>
+                      {r.isUpToDate !== true ? (
+                        <a
+                          target="_blank"
+                          href={`https://github.com/${r.repository}/commit/${r.isUpToDate.latestCommit}`}
+                        >
+                          <span className="hover:[text-shadow:_0px_0px_3px_#fff] font-bold">
+                            {`, newest: ${r.isUpToDate.latestCommit}`}
+                          </span>
+                        </a>
+                      ) : null}
+                      )
+                    </h1>
+                    <h2 className="text-muted-foreground">{r.path}</h2>
+                  </div>
 
-                <div className="flex flex-col justify-center">
-                  {r.isUpToDate !== true ? (
-                    <a
-                      href={`https://github.com/${repository}/pull/${r.isUpToDate.prId.toString()}`}
-                      target="_blank"
-                    >
-                      <Button
-                        variant="outline"
-                        color="primary"
-                        size="sm"
-                        className="border-warning text-warning hover:bg-warning hover:text-white"
+                  <div className="flex flex-col justify-center">
+                    {r.isUpToDate !== true ? (
+                      <a
+                        href={`https://github.com/${repository}/pull/${r.isUpToDate.prId.toString()}`}
+                        target="_blank"
                       >
-                        View Update PR
-                      </Button>
-                    </a>
-                  ) : null}
+                        <Button
+                          variant="outline"
+                          color="primary"
+                          size="sm"
+                          className="border-warning text-warning hover:bg-warning hover:text-white"
+                        >
+                          View Update PR
+                        </Button>
+                      </a>
+                    ) : null}
+                  </div>
                 </div>
-              </div>
-            );
-          })}
+              );
+            })
+          )}
         </div>
       </div>
     </div>

From d233dc61cd4ff0c681abd7cd5e267359a3c3d733 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 04:35:55 +0200
Subject: [PATCH 07/15] chore: setup error handling for resource fetch

---
 .../VersionControl/VersionControlHeader.tsx   | 13 +++--------
 .../VersionControl/VersionControlPage.tsx     | 22 ++++++++++++++++---
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/panel/src/pages/VersionControl/VersionControlHeader.tsx b/panel/src/pages/VersionControl/VersionControlHeader.tsx
index 3ec3194ca..4ad19570a 100644
--- a/panel/src/pages/VersionControl/VersionControlHeader.tsx
+++ b/panel/src/pages/VersionControl/VersionControlHeader.tsx
@@ -1,16 +1,9 @@
-import {
-  BookIcon,
-  FolderGit2,
-  FolderPenIcon,
-  HistoryIcon,
-  RefreshCcw
-} from "lucide-react";
-import { Link } from "wouter";
+import { BookIcon, FolderGit2, FolderPenIcon, RefreshCcw } from "lucide-react";
 
 interface Props {
   repository: string;
-  childAmount: number;
-  updateAvailableAmount: number;
+  childAmount: number | string;
+  updateAvailableAmount: number | string;
 }
 
 export default function VersionControlHeader({
diff --git a/panel/src/pages/VersionControl/VersionControlPage.tsx b/panel/src/pages/VersionControl/VersionControlPage.tsx
index d1a37eadf..ce3314afa 100644
--- a/panel/src/pages/VersionControl/VersionControlPage.tsx
+++ b/panel/src/pages/VersionControl/VersionControlPage.tsx
@@ -23,9 +23,12 @@ export default function VersionControlPage() {
   const [repository, setRepository] = useState<string>(
     "westroleplay/local-dev-env"
   );
-  const [childAmount, setChildAmount] = useState<number>(0);
-  const [updateAvailableAmount, setUpdateAvailableAmount] = useState<number>(0);
+  const [childAmount, setChildAmount] = useState<number | string>("...");
+  const [updateAvailableAmount, setUpdateAvailableAmount] = useState<
+    number | string
+  >("...");
   const [searchValue, setSearchValue] = useState<string>("");
+  const [error, setError] = useState("");
   const {
     isPending: queryIsPending,
     error: queryError,
@@ -48,6 +51,10 @@ export default function VersionControlPage() {
     }
   }, [queryData]);
 
+  useEffect(() => {
+    setError(queryError ? queryError.message : "");
+  }, [queryError]);
+
   const updateSearchValue = useCallback((e: ChangeEvent<HTMLInputElement>) => {
     setSearchValue(e.target.value);
   }, []);
@@ -111,7 +118,16 @@ export default function VersionControlPage() {
         />
 
         <div className="flex flex-col relative h-full">
-          {queryIsPending === true ? (
+          {error ? (
+            <div className="my-auto mx-auto w-fit h-fit">
+              <h1 className="text-destructive font-bold text-[1.4rem]">
+                Couldnt fetch resources...
+              </h1>
+              <p className="text-destructive text-center text-[1.1rem]">
+                {error}
+              </p>
+            </div>
+          ) : queryIsPending === true ? (
             <LoaderCircle className="my-auto mx-auto w-24 h-24 animate-spin" />
           ) : (
             formattedResources.map((r) => {

From f99ea9aba9b045652d906eecc15d77366d5b4331 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 16:08:58 +0200
Subject: [PATCH 08/15] feat: setup data file for version_control

---
 core/components/FxRunner/index.js             |  1 +
 core/components/HealthMonitor/index.js        |  1 +
 core/components/VersionControl/index.ts       | 16 ++++
 .../VersionControl/svRuntime/config.ts        |  6 ++
 .../VersionControl/svRuntime/index.ts         | 85 +++++++++++++++++++
 .../VersionControl/svRuntime/perfSchemas.ts   | 22 +++++
 core/txAdmin.ts                               |  6 ++
 7 files changed, 137 insertions(+)
 create mode 100644 core/components/VersionControl/index.ts
 create mode 100644 core/components/VersionControl/svRuntime/config.ts
 create mode 100644 core/components/VersionControl/svRuntime/index.ts
 create mode 100644 core/components/VersionControl/svRuntime/perfSchemas.ts

diff --git a/core/components/FxRunner/index.js b/core/components/FxRunner/index.js
index 9d9371195..320fb4b9b 100644
--- a/core/components/FxRunner/index.js
+++ b/core/components/FxRunner/index.js
@@ -394,6 +394,7 @@ export default class FXRunner {
             globals.resourcesManager.handleServerStop();
             globals.playerlistManager.handleServerStop(this.currentMutex);
             globals.statsManager.svRuntime.logServerClose(reasonString);
+            globals.versionControl.svRuntime.handleServerStop(reasonString);
             return null;
         } catch (error) {
             const msg = "Couldn't kill the server. Perhaps What Is Dead May Never Die.";
diff --git a/core/components/HealthMonitor/index.js b/core/components/HealthMonitor/index.js
index 2201ae176..4e5e900ae 100644
--- a/core/components/HealthMonitor/index.js
+++ b/core/components/HealthMonitor/index.js
@@ -209,6 +209,7 @@ export default class HealthMonitor {
                 this.hasServerStartedYet = true;
                 globals.statsManager.txRuntime.registerFxserverBoot(processUptime);
                 globals.statsManager.svRuntime.logServerBoot(processUptime);
+                globals.versionControl.svRuntime.handleServerBoot(processUptime);
             }
             return;
         }
diff --git a/core/components/VersionControl/index.ts b/core/components/VersionControl/index.ts
new file mode 100644
index 000000000..e0d1d9327
--- /dev/null
+++ b/core/components/VersionControl/index.ts
@@ -0,0 +1,16 @@
+const modulename = "StatsManager";
+import consoleFactory from "@extras/console";
+import type TxAdmin from "@core/txAdmin.js";
+import SvRuntimeVersionControl from "./svRuntime";
+const console = consoleFactory(modulename);
+
+/**
+ * Module responsible for handling version control
+ */
+export default class VersionControl {
+  public readonly svRuntime: SvRuntimeVersionControl;
+
+  constructor(txAdmin: TxAdmin) {
+    this.svRuntime = new SvRuntimeVersionControl(txAdmin);
+  }
+}
diff --git a/core/components/VersionControl/svRuntime/config.ts b/core/components/VersionControl/svRuntime/config.ts
new file mode 100644
index 000000000..74b31efea
--- /dev/null
+++ b/core/components/VersionControl/svRuntime/config.ts
@@ -0,0 +1,6 @@
+import { VcFileType } from "./perfSchemas";
+
+export const defaultData: VcFileType = {
+  resources: [],
+  repository: null
+};
diff --git a/core/components/VersionControl/svRuntime/index.ts b/core/components/VersionControl/svRuntime/index.ts
new file mode 100644
index 000000000..9a408702b
--- /dev/null
+++ b/core/components/VersionControl/svRuntime/index.ts
@@ -0,0 +1,85 @@
+import TxAdmin from "@core/txAdmin";
+import consoleFactory from "@extras/console";
+import fsp from "node:fs/promises";
+import { VcFileSchema, VcFileType } from "./perfSchemas";
+import { ZodError } from "zod";
+import { throttle } from "throttle-debounce";
+import { defaultData } from "./config";
+import { existsSync } from "node:fs";
+
+const modulename = "VersionControl";
+const DATA_FILE_NAME = "version_control.json";
+const console = consoleFactory(modulename);
+
+export default class SvRuntimeVersionControl {
+  readonly #txAdmin: TxAdmin;
+  private readonly dataFilePath: string;
+  private versionControlData: VcFileType | null = null;
+  private queueSaveVersionControlData = throttle(
+    15_000,
+    this.saveVersionControlData.bind(this),
+    { noLeading: true }
+  );
+
+  constructor(txAdmin: TxAdmin) {
+    this.#txAdmin = txAdmin;
+    this.dataFilePath = `${txAdmin.info.serverProfilePath}/data/${DATA_FILE_NAME}`;
+    this.loadVersionControlData();
+  }
+
+  private async loadVersionControlData() {
+    if (existsSync(this.dataFilePath)) {
+      try {
+        const rawFileData = await fsp.readFile(this.dataFilePath, "utf8");
+        const fileData = JSON.parse(rawFileData);
+        if (fileData?.version !== DATA_FILE_NAME)
+          throw new Error("invalid version");
+        const versionControlData = VcFileSchema.parse(fileData);
+        this.versionControlData = versionControlData;
+      } catch (error) {
+        if ((error as any)?.code === "ENOENT") {
+          console.verbose.debug(
+            `${DATA_FILE_NAME} not found, starting with empty stats.`
+          );
+          this.versionControlData = defaultData;
+        } else if (error instanceof ZodError) {
+          console.warn(`Failed to load ${DATA_FILE_NAME} due to invalid data.`);
+        } else {
+          console.warn(
+            `Failed to load ${DATA_FILE_NAME} with message: ${
+              (error as Error).message
+            }`
+          );
+        }
+        console.warn("Since this is not a critical file, it will be reset.");
+      }
+    } else {
+      console.verbose.debug(
+        `${DATA_FILE_NAME} not found, starting with empty stats.`
+      );
+      this.versionControlData = defaultData;
+    }
+  }
+  public handleServerBoot(duration: number) {
+    this.queueSaveVersionControlData();
+  }
+
+  public handleServerStop(reason: string) {
+    this.queueSaveVersionControlData();
+  }
+
+  private async saveVersionControlData() {
+    try {
+      await fsp.writeFile(
+        this.dataFilePath,
+        JSON.stringify(this.versionControlData)
+      );
+    } catch (error) {
+      console.warn(
+        `Failed to save ${DATA_FILE_NAME} with message: ${
+          (error as Error).message
+        }`
+      );
+    }
+  }
+}
diff --git a/core/components/VersionControl/svRuntime/perfSchemas.ts b/core/components/VersionControl/svRuntime/perfSchemas.ts
new file mode 100644
index 000000000..f83bbda40
--- /dev/null
+++ b/core/components/VersionControl/svRuntime/perfSchemas.ts
@@ -0,0 +1,22 @@
+import * as z from "zod";
+
+export const VcFileResourceSchema = z.object({
+  submoduleName: z.string(),
+  repository: z.string(),
+  path: z.string(),
+  commit: z.string(),
+  isUpToDate: z.boolean().or(
+    z.object({
+      prId: z.number(),
+      latestCommit: z.string()
+    })
+  )
+});
+
+export const VcFileSchema = z.object({
+  resources: z.array(VcFileResourceSchema),
+  repository: z.null().or(z.string())
+});
+
+export type VcFileType = z.infer<typeof VcFileSchema>;
+export type VcFileResourceType = z.infer<typeof VcFileResourceSchema>;
diff --git a/core/txAdmin.ts b/core/txAdmin.ts
index 4aa5adf80..56962a107 100644
--- a/core/txAdmin.ts
+++ b/core/txAdmin.ts
@@ -16,6 +16,7 @@ import Logger from '@core/components/Logger';
 import HealthMonitor from '@core/components/HealthMonitor';
 import Scheduler from '@core/components/Scheduler';
 import StatsManager from '@core/components/StatsManager';
+import VersionControl from '@core/components/VersionControl';
 import Translator from '@core/components/Translator';
 import WebServer from '@core/components/WebServer';
 import ResourcesManager from '@core/components/ResourcesManager';
@@ -46,6 +47,7 @@ const globalsInternal: Record<string, any> = {
     healthMonitor: null,
     scheduler: null,
     statsManager: null,
+    versionControl: null,
     translator: null,
     webServer: null,
     resourcesManager: null,
@@ -78,6 +80,7 @@ export default class TxAdmin {
     healthMonitor;
     scheduler;
     statsManager;
+    versionControl;
     webServer;
     resourcesManager;
     playerlistManager;
@@ -177,6 +180,9 @@ export default class TxAdmin {
             this.statsManager = new StatsManager(this);
             globalsInternal.statsManager = this.statsManager;
 
+            this.versionControl = new VersionControl(this);
+            globalsInternal.versionControl = this.versionControl;
+
             this.webServer = new WebServer(this, profileConfig.webServer);
             globalsInternal.webServer = this.webServer;
 

From 609b1b52e9689c2c8481d8c049f42d65a1037785 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Thu, 11 Jul 2024 16:42:01 +0200
Subject: [PATCH 09/15] feat: setup deployer step for VC

---
 core/extras/deployer.js            |   2 +-
 core/webroutes/deployer/actions.js |  18 +++--
 core/webroutes/deployer/stepper.js |   2 +
 web/standalone/deployer.ejs        | 118 +++++++++++++++++------------
 4 files changed, 84 insertions(+), 56 deletions(-)

diff --git a/core/extras/deployer.js b/core/extras/deployer.js
index 25945330c..5fc2020cb 100644
--- a/core/extras/deployer.js
+++ b/core/extras/deployer.js
@@ -1,6 +1,6 @@
 const modulename = 'Deployer';
 import path from 'node:path';
-import { cloneDeep }  from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
 import dateFormat from 'dateformat';
 import fse from 'fs-extra';
 import open from 'open';
diff --git a/core/webroutes/deployer/actions.js b/core/webroutes/deployer/actions.js
index 53e6aaca3..fc58314e4 100644
--- a/core/webroutes/deployer/actions.js
+++ b/core/webroutes/deployer/actions.js
@@ -35,6 +35,7 @@ export default async function DeployerActions(ctx) {
     }
 
     //Delegate to the specific action functions
+    console.log('action', action);
     if (action == 'confirmRecipe') {
         return await handleConfirmRecipe(ctx);
     } else if (action == 'setVariables') {
@@ -167,13 +168,16 @@ async function handleSetVariables(ctx) {
         ? addPrincipalLines.join('\n')
         : '# Deployer Note: this admin master has no identifiers to be automatically added.\n# add_principal identifier.discord:111111111111111111 group.admin #example';
 
-    //Start deployer
-    try {
-        ctx.admin.logAction('Running recipe.');
-        globals.deployer.start(userVars);
-    } catch (error) {
-        return ctx.send({ type: 'danger', message: error.message });
-    }
+    console.log('globals.deployer.step', globals.deployer.step);
+    globals.deployer.step = 'versionControl';
+
+    // //Start deployer
+    // try {
+    //     ctx.admin.logAction('Running recipe.');
+    //     globals.deployer.start(userVars);
+    // } catch (error) {
+    //     return ctx.send({ type: 'danger', message: error.message });
+    // }
 
     return ctx.send({ success: true });
 }
diff --git a/core/webroutes/deployer/stepper.js b/core/webroutes/deployer/stepper.js
index fbd3fbe1a..ac3fd095f 100644
--- a/core/webroutes/deployer/stepper.js
+++ b/core/webroutes/deployer/stepper.js
@@ -42,6 +42,8 @@ export default async function DeployerStepper(ctx) {
             description: globals.deployer.recipe.description,
             raw: globals.deployer.recipe.raw,
         };
+    } else if (globals.deployer.step === 'versionControl') {
+        console.log('hi');
     } else if (globals.deployer.step === 'input') {
         renderData.defaultLicenseKey = process.env.TXADMIN_DEFAULT_LICENSE || '';
         renderData.requireDBConfig = globals.deployer.recipe.requireDBConfig;
diff --git a/web/standalone/deployer.ejs b/web/standalone/deployer.ejs
index 1d4c148eb..ca76c7058 100644
--- a/web/standalone/deployer.ejs
+++ b/web/standalone/deployer.ejs
@@ -36,7 +36,7 @@
             font-size: large;
         }
 
-        #step3Log {
+        #step5Log {
             white-space: break-spaces;
             word-break: break-all;
         }
@@ -98,9 +98,26 @@
                             </div>
                         </div>
                         <div class="card-footer text-muted">Step 2: Input Parameters</div>
-                        <div class="card-footer text-muted">Step 3: Run Recipe</div>
-                        <div class="card-footer text-muted">Step 4: Configure server.cfg</div>
-        
+                        <div class="card-footer text-muted">Step 3: Configure version control</div>
+                        <div class="card-footer text-muted">Step 4: Run Recipe</div>
+                        <div class="card-footer text-muted">Step 5: Configure server.cfg</div>
+                    <% } else if (step === 'versionControl') { %>
+                        <div class="card-header">Step 1: Review Recipe ✔️</div>
+                        <div class="card-header">Step 2: Input Parameters ✔️</div>
+                        <div class="card-header font-weight-bold ">Step 3: Version Control</div>
+                        <div class="card-body">
+                            hello, test
+
+                            <div class="row justify-content-center m-2">
+                                <button class="btn btn-outline-danger" type="button" 
+                                    onclick="cancelAction()">Cancel and Return to Setup</button>
+                                &nbsp; &nbsp;
+                                <button class="btn btn-info" type="button" 
+                                    onclick="step3Action();" autofocus>Next</button>
+                            </div>
+                        </div>
+                        <div class="card-header text-muted ">Step 4: Run Recipe</div>
+                        <div class="card-footer text-muted">Step 5: Configure server.cfg</div>
                     <% } else if (step === 'input') { %>
                         <div class="card-header">Step 1: Review Recipe ✔️</div>
                         <div class="card-header font-weight-bold ">Step 2: Input Parameters</div>
@@ -235,17 +252,18 @@
                                 <button class="btn btn-outline-danger" type="button" 
                                     onclick="cancelAction()">Cancel and Return to Setup</button>
                                 &nbsp; &nbsp;
-                                <button class="btn btn-success" type="button" 
-                                    onclick="step2Action();">Run Recipe</button>
+                                <button class="btn btn-info" type="button" 
+                                    onclick="step2Action();" autofocus>Next</button>
                             </div>
                         </div>
-                        <div class="card-footer text-muted">Step 3: Run Recipe</div>
-                        <div class="card-footer text-muted">Step 4: Configure server.cfg</div>
-
+                        <div class="card-footer text-muted">Step 3: Version Control</div>
+                        <div class="card-footer text-muted">Step 4: Run Recipe</div>
+                        <div class="card-footer text-muted">Step 5: Configure server.cfg</div>
                     <% } else if (step === 'run') { %>
                         <div class="card-header">Step 1: Review Recipe ✔️</div>
                         <div class="card-header">Step 2: Input Parameters ✔️</div>
-                        <div class="card-header font-weight-bold ">Step 3: Run Recipe</div>
+                        <div class="card-header font-weight-bold ">Step 3: Version Control</div>
+                        <div class="card-header font-weight-bold ">Step 4: Run Recipe</div>
                         <div class="card-body">
                             <div class="row mb-1 mt-0 text-center">
                                 <div class="col-8 mx-auto card d-block border-primary p-2 mb-1">
@@ -255,26 +273,25 @@
                             </div>
                             <div class="row mb-3">
                                 <div class="col-10 mx-auto card d-block p-2 m-0">
-                                    <pre id="step3Log" class="text-body"><h3 class="text-center">🐌🐌🐌</h3></pre>
+                                    <pre id="step5Log" class="text-body"><h3 class="text-center">🐌🐌🐌</h3></pre>
                                 </div>
                             </div>
                             <div class="mx-auto col-8">
                                 <div class="progress">
                                     <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" 
                                         aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" 
-                                        style="width: 0%" id="step3Progress">0%</div>
+                                        style="width: 0%" id="step5Progress">0%</div>
                                 </div>
-                                <span class="text-danger font-weight-bold d-none" id="step3Error"></span>
+                                <span class="text-danger font-weight-bold d-none" id="step5Error"></span>
                             </div>
                             <div class="row justify-content-center m-2">
                                 <button class="btn btn-outline-danger d-none" type="button" 
-                                    onclick="cancelAction();" id="step3CancelButton">Cancel and Return to Setup</button>
+                                    onclick="cancelAction();" id="step5CancelButton">Cancel and Return to Setup</button>
                                 <button type="button" class="btn btn-info d-none"
-                                    onclick="window.location.reload();" id="step3NextButton">Next</button>
+                                    onclick="window.location.reload();" id="step5NextButton">Next</button>
                             </div>
                         </div>
-                        <div class="card-footer text-muted">Step 3: Configure server.cfg</div>
-        
+                        <div class="card-footer text-muted">Step 5: Configure server.cfg</div>
                     <% } else if (step === 'configure') { %>
                         <style>
                             .CodeMirror{
@@ -283,8 +300,9 @@
                         </style>
                         <div class="card-header">Step 1: Review Recipe ✔️</div>
                         <div class="card-header">Step 2: Input Parameters ✔️</div>
-                        <div class="card-header">Step 3: Run Recipe ✔️</div>
-                        <div class="card-header font-weight-bold">Step 4: Configure server.cfg</div>
+                        <div class="card-header">Step 3: Version Control ✔️</div>
+                        <div class="card-header">Step 4: Run Recipe</div>
+                        <div class="card-header font-weight-bold">Step 5: Configure server.cfg</div>
                         <div class="card-body">
                             <div class="row mb-1 mt-0 text-center">
                                 <div class="col-8 mx-auto card d-block border-primary p-2 mb-1">
@@ -297,7 +315,7 @@
                             <div class="row justify-content-center m-2">
                                 <button class="btn btn-outline-danger" type="button" onclick="cancelAction()">Cancel and Return to Setup</button>
                                 &nbsp; &nbsp;
-                                <button class="btn btn-success" type="button" onclick="step4Action();">Save & Run Server</button>
+                                <button class="btn btn-success" type="button" onclick="step5Action();">Save & Run Server</button>
                             </div>
                         </div>
         
@@ -409,7 +427,6 @@
                 step2Action();
             });
         }
-
         function step2Action(){
             if(!step2elements.form.reportValidity()) return;
             const postData = {
@@ -464,12 +481,17 @@
         }
 
         //============================================== Step3 action
-        const step3elements = {
-            log: document.getElementById('step3Log'),
-            progress: document.getElementById('step3Progress'),
-            error: document.getElementById('step3Error'),
-            cancelButton: document.getElementById('step3CancelButton'),
-            nextButton: document.getElementById('step3NextButton'),
+        function step3Action(){
+            console.log("init version control here");
+        }
+
+        //============================================== Step5 action
+        const step5elements = {
+            log: document.getElementById('step5Log'),
+            progress: document.getElementById('step5Progress'),
+            error: document.getElementById('step5Error'),
+            cancelButton: document.getElementById('step5CancelButton'),
+            nextButton: document.getElementById('step5NextButton'),
         }
         const refreshStatus = async () => {
             txAdminAPI({
@@ -478,37 +500,37 @@
                 timeout: REQ_TIMEOUT_LONG,
                 success: function (data) {
                     if (checkApiLogoutRefresh(data)) return;
-                    step3elements.error.classList.add('d-none');
-                    step3elements.log.innerText = data.log;
+                    step5elements.error.classList.add('d-none');
+                    step5elements.log.innerText = data.log;
                     
                     if(data.status == 'done'){
-                        step3elements.progress.classList.remove('progress-bar-animated', 'progress-bar-striped');
-                        step3elements.progress.classList.add('bg-success');
-                        step3elements.nextButton.classList.remove('d-none');
-                        step3elements.progress.ariaValueNow = 100;
-                        step3elements.progress.style.width = '100%';
-                        step3elements.progress.innerText = 'DONE';
+                        step5elements.progress.classList.remove('progress-bar-animated', 'progress-bar-striped');
+                        step5elements.progress.classList.add('bg-success');
+                        step5elements.nextButton.classList.remove('d-none');
+                        step5elements.progress.ariaValueNow = 100;
+                        step5elements.progress.style.width = '100%';
+                        step5elements.progress.innerText = 'DONE';
                         
                     }else if(data.status == 'failed'){
-                        step3elements.progress.classList.remove('progress-bar-animated', 'progress-bar-striped');
-                        step3elements.progress.classList.add('bg-danger');
-                        step3elements.cancelButton.classList.remove('d-none');
-                        step3elements.progress.ariaValueNow = 100;
-                        step3elements.progress.style.width = '100%';
-                        step3elements.progress.innerText = 'FAILED';
+                        step5elements.progress.classList.remove('progress-bar-animated', 'progress-bar-striped');
+                        step5elements.progress.classList.add('bg-danger');
+                        step5elements.cancelButton.classList.remove('d-none');
+                        step5elements.progress.ariaValueNow = 100;
+                        step5elements.progress.style.width = '100%';
+                        step5elements.progress.innerText = 'FAILED';
 
                     }else{
                         const ariaMin = (data.progress > 5)? data.progress : 5;
-                        step3elements.progress.ariaValueNow = ariaMin;
-                        step3elements.progress.style.width = ariaMin + '%';
-                        step3elements.progress.innerText = data.progress + '%';
-                        step3elements.progress.scrollIntoView();
+                        step5elements.progress.ariaValueNow = ariaMin;
+                        step5elements.progress.style.width = ariaMin + '%';
+                        step5elements.progress.innerText = data.progress + '%';
+                        step5elements.progress.scrollIntoView();
 
                     }
                 },
                 error: function (xmlhttprequest, textstatus, message) {
-                    step3elements.error.innerText = `Error: ${textstatus}`;
-                    step3elements.error.classList.remove('d-none');
+                    step5elements.error.innerText = `Error: ${textstatus}`;
+                    step5elements.error.classList.remove('d-none');
                 }
             });
         }
@@ -517,7 +539,7 @@
 
 
         //============================================== Step4 action
-        function step4Action(){
+        function step5Action(){
             const serverCFG = window.CMInstance.getValue();
             if(serverCFG.length < 256){
                 return $.notify({ message: `Your settings.cfg file is too small, there is a good chance it is not valid.` }, { type: 'warning' });

From befd34bf8c3db0fca08b74e6d89e96724e0e39a2 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Fri, 12 Jul 2024 19:51:37 +0200
Subject: [PATCH 10/15] feat: finalize version control step in deployer

---
 core/components/ConfigVault.js     |   8 +
 core/extras/deployer.js            |  10 +-
 core/extras/setupProfile.js        |   7 +-
 core/package.json                  |   1 +
 core/webroutes/deployer/actions.js |  54 +++-
 core/webroutes/deployer/stepper.js |   2 +-
 core/webroutes/settings/save.ts    |  46 +++-
 core/webroutes/setup/post.js       |  10 +-
 package-lock.json                  | 418 +++++++++++++++++++++++++++++
 web/main/settings.ejs              |   1 -
 web/standalone/deployer.ejs        |  64 ++++-
 11 files changed, 589 insertions(+), 32 deletions(-)

diff --git a/core/components/ConfigVault.js b/core/components/ConfigVault.js
index 67ddb7bdb..289cf5a73 100644
--- a/core/components/ConfigVault.js
+++ b/core/components/ConfigVault.js
@@ -100,6 +100,7 @@ export default class ConfigVault {
             logger: null,
             monitor: null,
             playerDatabase: null,
+            versionControl: null,
             webServer: null,
             discordBot: null,
             fxRunner: null,
@@ -110,6 +111,7 @@ export default class ConfigVault {
         //      this entire config vault is stupid.
         //      use convict, lodash defaults or something like that
         cfg.playerDatabase = cfg.playerDatabase ?? cfg.playerController ?? {};
+        cfg.versionControl = cfg.versionControl ?? {};
 
         try {
             out.global = {
@@ -123,6 +125,9 @@ export default class ConfigVault {
                 hideDefaultWarning: toDefault(cfg.global.hideDefaultWarning, false),
                 hideDefaultScheduledRestartWarning: toDefault(cfg.global.hideDefaultScheduledRestartWarning, false),
             };
+            out.versionControl = {
+                githubAuthKey: toDefault(cfg.versionControl.githubAuthKey, null),
+            };
             out.logger = toDefault(cfg.logger, {}); //not in template
             out.monitor = {
                 restarterSchedule: toDefault(cfg.monitor.restarterSchedule, []),
@@ -221,6 +226,9 @@ export default class ConfigVault {
             cfg.logger.admin = toDefault(cfg.logger.admin, {});
             cfg.logger.console = toDefault(cfg.logger.console, {});
 
+            //Version Control
+            cfg.versionControl.githubAuthKey = toDefault(cfg.versionControl.githubAuthKey, null);
+
             //Monitor
             cfg.monitor.restarterSchedule = cfg.monitor.restarterSchedule || [];
             cfg.monitor.cooldown = parseInt(cfg.monitor.cooldown) || 60; //not in template - 45 > 60 > 90 -> 60 after fixing the "extra time" logic
diff --git a/core/extras/deployer.js b/core/extras/deployer.js
index 5fc2020cb..2b26fdd9a 100644
--- a/core/extras/deployer.js
+++ b/core/extras/deployer.js
@@ -163,6 +163,7 @@ export class Deployer {
         this.progress = 0;
         this.serverName = customMetaData.serverName || globals.txAdmin.globalConfig.serverName || '';
         this.logLines = [];
+        this.userVars = null;
 
         //Load recipe
         const impRecipe = (originalRecipe !== false)
@@ -225,11 +226,10 @@ export class Deployer {
 
     /**
      * Starts the deployment process
-     * @param {string} userInputs
      */
-    start(userInputs) {
-        if (this.step !== 'input') throw new Error('expected input step');
-        Object.assign(this.recipe.variables, userInputs);
+    start() {
+        if (this.step !== 'versionControl') throw new Error('expected versionControl step');
+        console.log(this.recipe.variables);
         this.logLines = [];
         this.customLog(`Starting deployment of ${this.recipe.name}.`);
         this.deployFailed = false;
@@ -290,7 +290,7 @@ export class Deployer {
                         + JSON.stringify([
                             txEnv.txAdminVersion,
                             await getOsDistro(),
-                            contextVariables.$step
+                            contextVariables.$step,
                         ]);
                 }
                 this.customLogError(msg);
diff --git a/core/extras/setupProfile.js b/core/extras/setupProfile.js
index 70f960156..d40cdfcf6 100644
--- a/core/extras/setupProfile.js
+++ b/core/extras/setupProfile.js
@@ -19,6 +19,9 @@ const defaultConfig = {
     monitor: {
         restarterSchedule: [],
     },
+    versionControl: {
+        githubAuthKey: null,
+    },
     webServer: {},
     discordBot: {
         enabled: false,
@@ -62,9 +65,9 @@ export default (osType, fxServerPath, fxServerVersion, serverProfile, profilePat
     if (osType == 'windows') {
         try {
             const batLines = [
-                `@echo off`,
+                '@echo off',
                 `"${fxServerPath}/FXServer.exe" +set serverProfile "${serverProfile}"`,
-                `pause`
+                'pause',
             ];
             const batFolder = path.resolve(fxServerPath, '..');
             const batPath = path.join(batFolder, `start_${fxServerVersion}_${serverProfile}.bat`);
diff --git a/core/package.json b/core/package.json
index ed71267e2..3ddd2f0eb 100644
--- a/core/package.json
+++ b/core/package.json
@@ -48,6 +48,7 @@
     "nanoid-dictionary": "^4.3.0",
     "node-polyglot": "^2.5.0",
     "node-stream-zip": "^1.15.0",
+    "octokit": "^4.0.2",
     "open": "7.1.0",
     "openid-client": "^5.6.5",
     "pidtree": "^0.6.0",
diff --git a/core/webroutes/deployer/actions.js b/core/webroutes/deployer/actions.js
index fc58314e4..6bfee9ae2 100644
--- a/core/webroutes/deployer/actions.js
+++ b/core/webroutes/deployer/actions.js
@@ -35,11 +35,12 @@ export default async function DeployerActions(ctx) {
     }
 
     //Delegate to the specific action functions
-    console.log('action', action);
     if (action == 'confirmRecipe') {
         return await handleConfirmRecipe(ctx);
     } else if (action == 'setVariables') {
         return await handleSetVariables(ctx);
+    } else if (action == 'setVersionControlVariables') {
+        return await handleSetVersionControlVariables(ctx);
     } else if (action == 'commit') {
         return await handleSaveConfig(ctx);
     } else if (action == 'cancel') {
@@ -75,6 +76,43 @@ async function handleConfirmRecipe(ctx) {
     return ctx.send({ success: true });
 }
 
+//================================================================
+/**
+ * Handle submition of the version control variables
+ * @param {object} ctx
+ */
+async function handleSetVersionControlVariables(ctx) {
+    if (typeof ctx.request.body.githubAuthKey !== 'string' && ctx.request.body.githubAuthKey !== null) {
+        return ctx.utils.error(400, 'Invalid Request - invalid parameters');
+    }
+
+    const newGlobalConfig = globals.configVault.getScopedStructure('versionControl');
+    newGlobalConfig.githubAuthKey = ctx.request.body.githubAuthKey;
+
+    try {
+        globals.configVault.saveProfile('versionControl', newGlobalConfig);
+    } catch (error) {
+        console.warn(`[${ctx.admin.name}] Error changing version control settings via deployer.`);
+        console.verbose.dir(error);
+        return ctx.send({
+            type: 'danger',
+            markdown: true,
+            message: `**Error saving the configuration file:** ${error.message}`,
+        });
+    }
+    globals.txAdmin.refreshConfig();
+    ctx.admin.logAction('Changing version control settings via deployer.');
+
+    //Start deployer
+    try {
+        ctx.admin.logAction('Running recipe.');
+        globals.deployer.start();
+    } catch (error) {
+        return ctx.send({ type: 'danger', message: error.message });
+    }
+
+    return ctx.send({ success: true });
+}
 
 //================================================================
 /**
@@ -124,7 +162,7 @@ async function handleSetVariables(ctx) {
                 }
                 outMessage = `${error?.message}<br>\n${specificError}`;
             } else if (error.message?.includes('auth_gssapi_client')) {
-                outMessage = `Your database does not accept the required authentication method. Please update your MySQL/MariaDB server and try again.`;
+                outMessage = 'Your database does not accept the required authentication method. Please update your MySQL/MariaDB server and try again.';
             }
 
             return ctx.send({ type: 'danger', message: `<b>Database connection failed:</b> ${outMessage}` });
@@ -168,17 +206,9 @@ async function handleSetVariables(ctx) {
         ? addPrincipalLines.join('\n')
         : '# Deployer Note: this admin master has no identifiers to be automatically added.\n# add_principal identifier.discord:111111111111111111 group.admin #example';
 
-    console.log('globals.deployer.step', globals.deployer.step);
+    Object.assign(globals.deployer.recipe.variables, userVars);
     globals.deployer.step = 'versionControl';
 
-    // //Start deployer
-    // try {
-    //     ctx.admin.logAction('Running recipe.');
-    //     globals.deployer.start(userVars);
-    // } catch (error) {
-    //     return ctx.send({ type: 'danger', message: error.message });
-    // }
-
     return ctx.send({ success: true });
 }
 
@@ -232,7 +262,7 @@ async function handleSaveConfig(ctx) {
         return ctx.send({
             type: 'danger',
             markdown: true,
-            message: `**Error saving the configuration file:** ${error.message}`
+            message: `**Error saving the configuration file:** ${error.message}`,
         });
     }
 
diff --git a/core/webroutes/deployer/stepper.js b/core/webroutes/deployer/stepper.js
index ac3fd095f..115b3fc7f 100644
--- a/core/webroutes/deployer/stepper.js
+++ b/core/webroutes/deployer/stepper.js
@@ -43,7 +43,7 @@ export default async function DeployerStepper(ctx) {
             raw: globals.deployer.recipe.raw,
         };
     } else if (globals.deployer.step === 'versionControl') {
-        console.log('hi');
+        // todo: perhaps add logic here;
     } else if (globals.deployer.step === 'input') {
         renderData.defaultLicenseKey = process.env.TXADMIN_DEFAULT_LICENSE || '';
         renderData.requireDBConfig = globals.deployer.recipe.requireDBConfig;
diff --git a/core/webroutes/settings/save.ts b/core/webroutes/settings/save.ts
index 72704c2f1..7546bf26b 100644
--- a/core/webroutes/settings/save.ts
+++ b/core/webroutes/settings/save.ts
@@ -19,7 +19,7 @@ const isUndefined = (x: unknown) => (typeof x === 'undefined');
  */
 export default async function SettingsSave(ctx: AuthedCtx) {
     //Sanity check
-    if (isUndefined(ctx.params.scope)) {
+    if (!('params' in ctx) || ctx.params === null || typeof ctx.params !== 'object' || Array.isArray(ctx.params) === true || !('scope' in ctx.params) || typeof ctx.params.scope !== 'string') {
         return ctx.utils.error(400, 'Invalid Request');
     }
     let scope = ctx.params.scope;
@@ -43,6 +43,8 @@ export default async function SettingsSave(ctx: AuthedCtx) {
         return await handleMonitor(ctx);
     } else if (scope == 'discord') {
         return await handleDiscord(ctx);
+    } else if (scope == 'versionControl'){
+        return await handleVersionControl(ctx);
     } else if (scope == 'menu') {
         return await handleMenu(ctx);
     } else {
@@ -140,7 +142,7 @@ async function handleFXServer(ctx: AuthedCtx) {
         const resPath = path.join(cfg.serverDataPath, 'resources');
         const resStat = await fsp.stat(resPath);
         if (!resStat.isDirectory()) {
-            throw new Error("Couldn't locate or read a resources folder inside of the base path.");
+            throw new Error('Couldn\'t locate or read a resources folder inside of the base path.');
         }
     } catch (error) {
         const msg = cfg.serverDataPath.includes('resources')
@@ -239,7 +241,7 @@ async function handlePlayerDatabase(ctx: AuthedCtx) {
     if (invalidRoleInputs.length) {
         return ctx.send({
             type: 'danger',
-            message: `The whitelist role(s) "${invalidRoleInputs.join(', ')}" do not appear to be valid`
+            message: `The whitelist role(s) '${invalidRoleInputs.join(', ')}' do not appear to be valid`
         });
     }
 
@@ -350,6 +352,44 @@ async function handleMonitor(ctx: AuthedCtx) {
     });
 }
 
+//================================================================
+/**
+ * Handle Discord settings
+ */
+async function handleVersionControl(ctx: AuthedCtx) {
+    if(typeof ctx.request.body.githubAuthKey === 'string' || ctx.request.body.githubAuthKey === null) {
+        //Prepare body input
+        const cfg = {
+            githubAuthKey: (ctx.request.body.githubAuthKey === 'true'),
+        };
+
+        //Preparing & saving config
+        const newConfig = ctx.txAdmin.configVault.getScopedStructure('versionControl');
+        newConfig.githubAuthKey = cfg.githubAuthKey;
+        try {
+            ctx.txAdmin.configVault.saveProfile('versionControl', newConfig);
+        } catch (error) {
+            console.warn(`[${ctx.admin.name}] Error changing Version Control settings.`);
+            console.verbose.dir(error);
+            return ctx.send({
+                type: 'danger',
+                markdown: true,
+                message: `**Error saving the configuration file:** ${(error as Error).message}`
+            });
+        }
+
+        //Sending output
+        ctx.txAdmin.refreshConfig();
+        ctx.admin.logAction('Changing version control settings.');
+        return ctx.send({
+            type: 'success',
+            markdown: true,
+            message: `**Version control configuration saved!**`
+        });
+    } else {
+        return ctx.utils.error(400, 'Invalid Request - invalid parameters')
+    }
+}
 
 //================================================================
 /**
diff --git a/core/webroutes/setup/post.js b/core/webroutes/setup/post.js
index b5630758c..ef8a55ed3 100644
--- a/core/webroutes/setup/post.js
+++ b/core/webroutes/setup/post.js
@@ -111,7 +111,7 @@ async function handleValidateRecipeURL(ctx) {
     try {
         const recipeText = await got.get({
             url: recipeURL,
-            timeout: { request: 4500 }
+            timeout: { request: 4500 },
         }).text();
         if (typeof recipeText !== 'string') throw new Error('This URL did not return a string.');
         const recipe = parseValidateRecipe(recipeText);
@@ -282,7 +282,7 @@ async function handleSaveLocal(ctx) {
         return ctx.send({
             type: 'danger',
             markdown: true,
-            message: `**Error saving the configuration file:** ${error.message}`
+            message: `**Error saving the configuration file:** ${error.message}`,
         });
     }
 
@@ -331,7 +331,7 @@ async function handleSaveDeployerImport(ctx) {
     try {
         recipeText = await got.get({
             url: recipeURL,
-            timeout: { request: 4500 }
+            timeout: { request: 4500 },
         }).text();
         if (typeof recipeText !== 'string') throw new Error('This URL did not return a string.');
     } catch (error) {
@@ -349,7 +349,7 @@ async function handleSaveDeployerImport(ctx) {
         return ctx.send({
             type: 'danger',
             markdown: true,
-            message: `**Error saving the configuration file:** ${error.message}`
+            message: `**Error saving the configuration file:** ${error.message}`,
         });
     }
     globals.txAdmin.refreshConfig();
@@ -395,7 +395,7 @@ async function handleSaveDeployerCustom(ctx) {
         return ctx.send({
             type: 'danger',
             markdown: true,
-            message: `**Error saving the configuration file:** ${error.message}`
+            message: `**Error saving the configuration file:** ${error.message}`,
         });
     }
     globals.txAdmin.refreshConfig();
diff --git a/package-lock.json b/package-lock.json
index a0c1894ec..7e02f8728 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -70,6 +70,7 @@
         "nanoid-dictionary": "^4.3.0",
         "node-polyglot": "^2.5.0",
         "node-stream-zip": "^1.15.0",
+        "octokit": "^4.0.2",
         "open": "7.1.0",
         "openid-client": "^5.6.5",
         "pidtree": "^0.6.0",
@@ -3208,6 +3209,378 @@
         "node": "^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/@octokit/app": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/app/-/app-15.1.0.tgz",
+      "integrity": "sha512-TkBr7QgOmE6ORxvIAhDbZsqPkF7RSqTY4pLTtUQCvr6dTXqvi2fFo46q3h1lxlk/sGMQjqyZ0kEahkD/NyzOHg==",
+      "dependencies": {
+        "@octokit/auth-app": "^7.0.0",
+        "@octokit/auth-unauthenticated": "^6.0.0",
+        "@octokit/core": "^6.1.2",
+        "@octokit/oauth-app": "^7.0.0",
+        "@octokit/plugin-paginate-rest": "^11.0.0",
+        "@octokit/types": "^13.0.0",
+        "@octokit/webhooks": "^13.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-app": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-7.1.0.tgz",
+      "integrity": "sha512-cazGaJPSgeZ8NkVYeM/C5l/6IQ5vZnsI8p1aMucadCkt/bndI+q+VqwrlnWbASRmenjOkf1t1RpCKrif53U8gw==",
+      "dependencies": {
+        "@octokit/auth-oauth-app": "^8.1.0",
+        "@octokit/auth-oauth-user": "^5.1.0",
+        "@octokit/request": "^9.1.1",
+        "@octokit/request-error": "^6.1.1",
+        "@octokit/types": "^13.4.1",
+        "lru-cache": "^10.0.0",
+        "universal-github-app-jwt": "^2.2.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-app/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+    },
+    "node_modules/@octokit/auth-oauth-app": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-8.1.1.tgz",
+      "integrity": "sha512-5UtmxXAvU2wfcHIPPDWzVSAWXVJzG3NWsxb7zCFplCWEmMCArSZV0UQu5jw5goLQXbFyOr5onzEH37UJB3zQQg==",
+      "dependencies": {
+        "@octokit/auth-oauth-device": "^7.0.0",
+        "@octokit/auth-oauth-user": "^5.0.1",
+        "@octokit/request": "^9.0.0",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-oauth-device": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-7.1.1.tgz",
+      "integrity": "sha512-HWl8lYueHonuyjrKKIup/1tiy0xcmQCdq5ikvMO1YwkNNkxb6DXfrPjrMYItNLyCP/o2H87WuijuE+SlBTT8eg==",
+      "dependencies": {
+        "@octokit/oauth-methods": "^5.0.0",
+        "@octokit/request": "^9.0.0",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-oauth-user": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-5.1.1.tgz",
+      "integrity": "sha512-rRkMz0ErOppdvEfnemHJXgZ9vTPhBuC6yASeFaB7I2yLMd7QpjfrL1mnvRPlyKo+M6eeLxrKanXJ9Qte29SRsw==",
+      "dependencies": {
+        "@octokit/auth-oauth-device": "^7.0.1",
+        "@octokit/oauth-methods": "^5.0.0",
+        "@octokit/request": "^9.0.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.1.tgz",
+      "integrity": "sha512-rh3G3wDO8J9wSjfI436JUKzHIxq8NaiL0tVeB2aXmG6p/9859aUOAjA9pmSPNGGZxfwmaJ9ozOJImuNVJdpvbA==",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/auth-unauthenticated": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-unauthenticated/-/auth-unauthenticated-6.1.0.tgz",
+      "integrity": "sha512-zPSmfrUAcspZH/lOFQnVnvjQZsIvmfApQH6GzJrkIunDooU1Su2qt2FfMTSVPRp7WLTQyC20Kd55lF+mIYaohQ==",
+      "dependencies": {
+        "@octokit/request-error": "^6.0.1",
+        "@octokit/types": "^13.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.2.tgz",
+      "integrity": "sha512-hEb7Ma4cGJGEUNOAVmyfdB/3WirWMg5hDuNFVejGEDFqupeOysLc2sG6HJxY2etBp5YQu5Wtxwi020jS9xlUwg==",
+      "dependencies": {
+        "@octokit/auth-token": "^5.0.0",
+        "@octokit/graphql": "^8.0.0",
+        "@octokit/request": "^9.0.0",
+        "@octokit/request-error": "^6.0.1",
+        "@octokit/types": "^13.0.0",
+        "before-after-hook": "^3.0.2",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
+      "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
+      "dependencies": {
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.1.tgz",
+      "integrity": "sha512-ukiRmuHTi6ebQx/HFRCXKbDlOh/7xEV6QUXaE7MJEKGNAncGI/STSbOkl12qVXZrfZdpXctx5O9X1AIaebiDBg==",
+      "dependencies": {
+        "@octokit/request": "^9.0.0",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/oauth-app": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-app/-/oauth-app-7.1.3.tgz",
+      "integrity": "sha512-EHXbOpBkSGVVGF1W+NLMmsnSsJRkcrnVmDKt0TQYRBb6xWfWzoi9sBD4DIqZ8jGhOWO/V8t4fqFyJ4vDQDn9bg==",
+      "dependencies": {
+        "@octokit/auth-oauth-app": "^8.0.0",
+        "@octokit/auth-oauth-user": "^5.0.1",
+        "@octokit/auth-unauthenticated": "^6.0.0-beta.1",
+        "@octokit/core": "^6.0.0",
+        "@octokit/oauth-authorization-url": "^7.0.0",
+        "@octokit/oauth-methods": "^5.0.0",
+        "@types/aws-lambda": "^8.10.83",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/oauth-authorization-url": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-authorization-url/-/oauth-authorization-url-7.1.1.tgz",
+      "integrity": "sha512-ooXV8GBSabSWyhLUowlMIVd9l1s2nsOGQdlP2SQ4LnkEsGXzeCvbSbCPdZThXhEFzleGPwbapT0Sb+YhXRyjCA==",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/oauth-methods": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-methods/-/oauth-methods-5.1.2.tgz",
+      "integrity": "sha512-C5lglRD+sBlbrhCUTxgJAFjWgJlmTx5bQ7Ch0+2uqRjYv7Cfb5xpX4WuSC9UgQna3sqRGBL9EImX9PvTpMaQ7g==",
+      "dependencies": {
+        "@octokit/oauth-authorization-url": "^7.0.0",
+        "@octokit/request": "^9.1.0",
+        "@octokit/request-error": "^6.1.0",
+        "@octokit/types": "^13.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+      "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg=="
+    },
+    "node_modules/@octokit/openapi-webhooks-types": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-webhooks-types/-/openapi-webhooks-types-8.3.0.tgz",
+      "integrity": "sha512-vKLsoR4xQxg4Z+6rU/F65ItTUz/EXbD+j/d4mlq2GW8TsA4Tc8Kdma2JTAAJ5hrKWUQzkR/Esn2fjsqiVRYaQg=="
+    },
+    "node_modules/@octokit/plugin-paginate-graphql": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-graphql/-/plugin-paginate-graphql-5.2.2.tgz",
+      "integrity": "sha512-7znSVvlNAOJisCqAnjN1FtEziweOHSjPGAuc5W58NeGNAr/ZB57yCsjQbXDlWsVryA7hHQaEQPcBbJYFawlkyg==",
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
+      }
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "11.3.3",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.3.tgz",
+      "integrity": "sha512-o4WRoOJZlKqEEgj+i9CpcmnByvtzoUYC6I8PD2SA95M+BJ2x8h7oLcVOg9qcowWXBOdcTRsMZiwvM3EyLm9AfA==",
+      "dependencies": {
+        "@octokit/types": "^13.5.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.2.4.tgz",
+      "integrity": "sha512-gusyAVgTrPiuXOdfqOySMDztQHv6928PQ3E4dqVGEtOvRXAKRbJR4b1zQyniIT9waqaWk/UDaoJ2dyPr7Bk7Iw==",
+      "dependencies": {
+        "@octokit/types": "^13.5.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
+      }
+    },
+    "node_modules/@octokit/plugin-retry": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-7.1.1.tgz",
+      "integrity": "sha512-G9Ue+x2odcb8E1XIPhaFBnTTIrrUDfXN05iFXiqhR+SeeeDMMILcAnysOsxUpEWcQp2e5Ft397FCXTcPkiPkLw==",
+      "dependencies": {
+        "@octokit/request-error": "^6.0.0",
+        "@octokit/types": "^13.0.0",
+        "bottleneck": "^2.15.3"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
+      }
+    },
+    "node_modules/@octokit/plugin-throttling": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-9.3.0.tgz",
+      "integrity": "sha512-B5YTToSRTzNSeEyssnrT7WwGhpIdbpV9NKIs3KyTWHX6PhpYn7gqF/+lL3BvsASBM3Sg5BAUYk7KZx5p/Ec77w==",
+      "dependencies": {
+        "@octokit/types": "^13.0.0",
+        "bottleneck": "^2.15.3"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.1.tgz",
+      "integrity": "sha512-pyAguc0p+f+GbQho0uNetNQMmLG1e80WjkIaqqgUkihqUp0boRU6nKItXO4VWnr+nbZiLGEyy4TeKRwqaLvYgw==",
+      "dependencies": {
+        "@octokit/endpoint": "^10.0.0",
+        "@octokit/request-error": "^6.0.1",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz",
+      "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==",
+      "dependencies": {
+        "@octokit/types": "^13.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+      "dependencies": {
+        "@octokit/openapi-types": "^22.2.0"
+      }
+    },
+    "node_modules/@octokit/webhooks": {
+      "version": "13.2.8",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-13.2.8.tgz",
+      "integrity": "sha512-nQyf5UDEgIeZB65rXSvK9ep9PkYthbnmXu/VK9AJcMMOvH1UwzcvYNd9DN++HIr8HXwbqB1FAEv5CnNARQEsaQ==",
+      "dependencies": {
+        "@octokit/openapi-webhooks-types": "8.3.0",
+        "@octokit/request-error": "^6.0.1",
+        "@octokit/webhooks-methods": "^5.0.0",
+        "aggregate-error": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/webhooks-methods": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-5.1.0.tgz",
+      "integrity": "sha512-yFZa3UH11VIxYnnoOYCVoJ3q4ChuSOk2IVBBQ0O3xtKX4x9bmKb/1t+Mxixv2iUhzMdOl1qeWJqEhouXXzB3rQ==",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/webhooks/node_modules/aggregate-error": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-5.0.0.tgz",
+      "integrity": "sha512-gOsf2YwSlleG6IjRYG2A7k0HmBMEo6qVNk9Bp/EaLgAJT5ngH6PXbqa4ItvnEwCm/velL5jAnQgsHsWnjhGmvw==",
+      "dependencies": {
+        "clean-stack": "^5.2.0",
+        "indent-string": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@octokit/webhooks/node_modules/clean-stack": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-5.2.0.tgz",
+      "integrity": "sha512-TyUIUJgdFnCISzG5zu3291TAsE77ddchd0bepon1VVQrKLGKFED4iXFEDQ24mIPdPBbyE16PK3F8MYE1CmcBEQ==",
+      "dependencies": {
+        "escape-string-regexp": "5.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@octokit/webhooks/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@octokit/webhooks/node_modules/indent-string": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+      "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -4779,6 +5152,11 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/aws-lambda": {
+      "version": "8.10.141",
+      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.141.tgz",
+      "integrity": "sha512-SMWlRBukG9KV8ZNjwemp2AzDibp/czIAeKKTw09nCPbWxVskIxactCJCGOp4y6I1hCMY7T7UGfySvBLXNeUbEw=="
+    },
     "node_modules/@types/body-parser": {
       "version": "1.19.4",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
@@ -6269,6 +6647,11 @@
         "node": "^4.5.0 || >= 5.9"
       }
     },
+    "node_modules/before-after-hook": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
+      "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A=="
+    },
     "node_modules/bin-links": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.3.tgz",
@@ -6303,6 +6686,11 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "node_modules/bottleneck": {
+      "version": "2.19.5",
+      "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz",
+      "integrity": "sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw=="
+    },
     "node_modules/boxen": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz",
@@ -12822,6 +13210,26 @@
       "integrity": "sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ==",
       "license": "MIT"
     },
+    "node_modules/octokit": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/octokit/-/octokit-4.0.2.tgz",
+      "integrity": "sha512-wbqF4uc1YbcldtiBFfkSnquHtECEIpYD78YUXI6ri1Im5OO2NLo6ZVpRdbJpdnpZ05zMrVPssNiEo6JQtea+Qg==",
+      "dependencies": {
+        "@octokit/app": "^15.0.0",
+        "@octokit/core": "^6.0.0",
+        "@octokit/oauth-app": "^7.0.0",
+        "@octokit/plugin-paginate-graphql": "^5.0.0",
+        "@octokit/plugin-paginate-rest": "^11.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^13.0.0",
+        "@octokit/plugin-retry": "^7.0.0",
+        "@octokit/plugin-throttling": "^9.0.0",
+        "@octokit/request-error": "^6.0.0",
+        "@octokit/types": "^13.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/oidc-token-hash": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz",
@@ -16035,6 +16443,16 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/universal-github-app-jwt": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/universal-github-app-jwt/-/universal-github-app-jwt-2.2.0.tgz",
+      "integrity": "sha512-G5o6f95b5BggDGuUfKDApKaCgNYy2x7OdHY0zSMF081O0EJobw+1130VONhrA7ezGSV2FNOGyM+KQpQZAr9bIQ=="
+    },
+    "node_modules/universal-user-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
+      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q=="
+    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
diff --git a/web/main/settings.ejs b/web/main/settings.ejs
index 347d7b5d0..2d69eb42e 100644
--- a/web/main/settings.ejs
+++ b/web/main/settings.ejs
@@ -796,7 +796,6 @@
         });
     });
 
-
     //============================================== FXServer Settings
     $('#frmFXServer-save').click(function () {
         let data = {
diff --git a/web/standalone/deployer.ejs b/web/standalone/deployer.ejs
index ca76c7058..15e1d7316 100644
--- a/web/standalone/deployer.ejs
+++ b/web/standalone/deployer.ejs
@@ -106,7 +106,35 @@
                         <div class="card-header">Step 2: Input Parameters ✔️</div>
                         <div class="card-header font-weight-bold ">Step 3: Version Control</div>
                         <div class="card-body">
-                            hello, test
+                            <div class="row mb-1 mt-0 text-center">
+                                <div class="col-8 mx-auto card d-block border-danger p-2 mb-1">
+                                    This will initialize github repositories for your server, for version control to work
+                                    <br/>
+                                    <span class="text-danger font-weight-bold">
+                                        PLEASE NOTE: This should not be used unless you know what you're doing, nor is it required for your server to work correctly. Press "Next" without inputting anything if you dont know what you're doing
+                                    </span>
+                                </div>
+                            </div>
+
+                            <br/>
+
+                            <form id="step3-form">
+                                <div class="form-group row">
+                                    <label for="step3-githubAuthKey" class="col-sm-3 col-form-label">
+                                        Github Auth Token
+                                    </label>
+                                    <div class="col-sm-9">
+                                        <input type="text" class="form-control blur-input" id="step3-githubAuthKey" maxlength="86" 
+                                            autocomplete="off" placeholder="ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
+                                            value="<%= defaults.license %>" required autofocus>
+                                        <span class="form-text text-muted">
+                                            Your github auth token can be obtained <a href="https://github.com/settings/tokens/new?scopes=repo" target="_blank" rel="noopener noreferrer">here</a>.
+                                            <br/>
+                                            Please make sure the expiration is set to <b>No expiration</b>, and that you select the <b>repo</b> and <b>admin:org</b> permissions
+                                        </span>
+                                    </div>
+                                </div>
+                            </form>
 
                             <div class="row justify-content-center m-2">
                                 <button class="btn btn-outline-danger" type="button" 
@@ -481,8 +509,38 @@
         }
 
         //============================================== Step3 action
+        const step3elements = {
+            form: document.getElementById('step3-form'),
+            githubAuthKey: document.getElementById('step3-githubAuthKey'),
+        }
         function step3Action(){
-            console.log("init version control here");
+            if(!step3elements.form.reportValidity()) return;
+            const postData = {
+                githubAuthKey: step3elements.githubAuthKey.value.trim()
+            }
+
+            txAdminAPI({
+                type: "POST",
+                url: '/deployer/recipe/setVersionControlVariables',
+                timeout: REQ_TIMEOUT_LONG,
+                data: postData,
+                success: function (data) {
+                    if (checkApiLogoutRefresh(data)) return;
+                    if (data.success == true){
+                        window.location.reload(true);
+                    }else{
+                        notify.update('progress', 0);
+                        notify.update('type', data.type);
+                        notify.update('message', data.message);
+                    }
+                    
+                },
+                error: function (xmlhttprequest, textstatus, message) {
+                    notify.update('progress', 0);
+                    notify.update('type', 'danger');
+                    notify.update('message', message);
+                }
+            });
         }
 
         //============================================== Step5 action
@@ -538,7 +596,7 @@
         if(currentStep == 'run') setInterval(refreshStatus, 1000);
 
 
-        //============================================== Step4 action
+        //============================================== Step5 action
         function step5Action(){
             const serverCFG = window.CMInstance.getValue();
             if(serverCFG.length < 256){

From 64b5d1933482cc34b4cc8beddf7db7bba48b8d48 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Sat, 13 Jul 2024 03:30:17 +0200
Subject: [PATCH 11/15] feat: further values in version control deployment

---
 core/components/ConfigVault.js              |   9 ++
 core/components/FxRunner/index.js           |  16 +--
 core/components/Logger/index.js             |   5 +-
 core/components/VersionControl/index.ts     |  82 ++++++++++++-
 core/components/WebServer/router.ts         |   3 +-
 core/extras/setupProfile.js                 |   1 +
 core/package.json                           |   1 +
 core/webroutes/deployer/actions.js          |  56 +++++++--
 core/webroutes/deployer/status.js           |   5 -
 core/webroutes/deployer/stepper.js          |   5 +-
 core/webroutes/index.js                     |   3 +-
 core/webroutes/settings/save.ts             |  12 +-
 core/webroutes/versionControl/owners.ts     |   6 +
 package-lock.json                           |  85 +++++++++++++
 panel/src/pages/Dashboard/DashboardPage.tsx |   2 +-
 shared/consts.ts                            |   1 +
 web/standalone/deployer.ejs                 | 125 +++++++++++++++++++-
 17 files changed, 371 insertions(+), 46 deletions(-)
 create mode 100644 core/webroutes/versionControl/owners.ts

diff --git a/core/components/ConfigVault.js b/core/components/ConfigVault.js
index 289cf5a73..aa57e2d95 100644
--- a/core/components/ConfigVault.js
+++ b/core/components/ConfigVault.js
@@ -53,6 +53,9 @@ export default class ConfigVault {
             let cfgData = this.getConfigFromFile();
             this.configFile = this.setupConfigStructure(cfgData);
             this.config = this.setupConfigDefaults(this.configFile);
+            if (globals.versionControl) {
+                globals.versionControl.configUpdated();
+            }
             this.setupFolderStructure();
         } catch (error) {
             console.error(error);
@@ -127,6 +130,7 @@ export default class ConfigVault {
             };
             out.versionControl = {
                 githubAuthKey: toDefault(cfg.versionControl.githubAuthKey, null),
+                githubOwner: toDefault(cfg.versionControl.githubAuthKey, null),
             };
             out.logger = toDefault(cfg.logger, {}); //not in template
             out.monitor = {
@@ -228,6 +232,7 @@ export default class ConfigVault {
 
             //Version Control
             cfg.versionControl.githubAuthKey = toDefault(cfg.versionControl.githubAuthKey, null);
+            cfg.versionControl.githubOwner = toDefault(cfg.versionControl.githubOwner, null);
 
             //Monitor
             cfg.monitor.restarterSchedule = cfg.monitor.restarterSchedule || [];
@@ -354,5 +359,9 @@ export default class ConfigVault {
         fs.writeFileSync(this.configFilePath, JSON.stringify(toSave, null, 2), 'utf8');
         this.configFile = toSave;
         this.config = this.setupConfigDefaults(this.configFile);
+
+        if (scope == 'versionControl' && globals.versionControl) {
+            globals.versionControl.configUpdated();
+        }
     }
 };
diff --git a/core/components/FxRunner/index.js b/core/components/FxRunner/index.js
index 320fb4b9b..82c600a01 100644
--- a/core/components/FxRunner/index.js
+++ b/core/components/FxRunner/index.js
@@ -150,7 +150,7 @@ export default class FXRunner {
     async spawnServer(announce) {
         //If the server is already alive
         if (this.fxChild !== null) {
-            const msg = `The server is already started.`;
+            const msg = 'The server is already started.';
             console.error(msg);
             return msg;
         }
@@ -166,13 +166,13 @@ export default class FXRunner {
             || typeof this.spawnVariables.command == 'undefined'
             || typeof this.spawnVariables.args == 'undefined'
         ) {
-            const msg = `this.spawnVariables is not set.`;
+            const msg = 'this.spawnVariables is not set.';
             console.error(msg);
             return msg;
         }
         //If there is any FXServer configuration missing
         if (this.config.serverDataPath === null || this.config.cfgPath === null) {
-            const msg = `Cannot start the server with missing configuration (serverDataPath || cfgPath).`;
+            const msg = 'Cannot start the server with missing configuration (serverDataPath || cfgPath).';
             console.error(msg);
             return msg;
         }
@@ -218,8 +218,8 @@ export default class FXRunner {
                 type: 'success',
                 description: {
                     key: 'server_actions.spawning_discord',
-                    data: { servername: globals.txAdmin.globalConfig.serverName }
-                }
+                    data: { servername: globals.txAdmin.globalConfig.serverName },
+                },
             });
         }
 
@@ -335,7 +335,7 @@ export default class FXRunner {
             //Start server again :)
             return this.spawnServer();
         } catch (error) {
-            const errMsg = `Couldn't restart the server.`;
+            const errMsg = 'Couldn\'t restart the server.';
             console.error(errMsg);
             console.verbose.dir(error);
             return errMsg;
@@ -377,8 +377,8 @@ export default class FXRunner {
                 type: messageColor,
                 description: {
                     key: `server_actions.${messageType}_discord`,
-                    data: tOptions
-                }
+                    data: tOptions,
+                },
             });
 
             //Awaiting restart delay
diff --git a/core/components/Logger/index.js b/core/components/Logger/index.js
index bb4158251..501aabf52 100644
--- a/core/components/Logger/index.js
+++ b/core/components/Logger/index.js
@@ -1,10 +1,7 @@
-const modulename = 'Logger';
 import AdminLogger from './handlers/admin';
 import FXServerLogger from './handlers/fxserver';
 import ServerLogger from './handlers/server';
-import { getLogSizes } from './loggerUtils.js'
-import consoleFactory from '@extras/console';
-const console = consoleFactory(modulename);
+import { getLogSizes } from './loggerUtils.js';
 
 // NOTE: to turn this into an universal class outside txAdmin() instance
 // when a txAdmin profile starts, it does universal.logger.start(profilename)
diff --git a/core/components/VersionControl/index.ts b/core/components/VersionControl/index.ts
index e0d1d9327..4ee4e581b 100644
--- a/core/components/VersionControl/index.ts
+++ b/core/components/VersionControl/index.ts
@@ -1,16 +1,96 @@
-const modulename = "StatsManager";
+const modulename = "VersionControl";
 import consoleFactory from "@extras/console";
 import type TxAdmin from "@core/txAdmin.js";
 import SvRuntimeVersionControl from "./svRuntime";
+import { Octokit } from "octokit";
+import fetch from "node-fetch";
+
 const console = consoleFactory(modulename);
 
 /**
  * Module responsible for handling version control
  */
 export default class VersionControl {
+  readonly #txAdmin: TxAdmin;
   public readonly svRuntime: SvRuntimeVersionControl;
+  private octokit: Octokit | null;
+  private githubAuthKey: string | null;
+  private githubOwner: string | null;
+
+  private async updateGithubAuthKey(newValue: string | null) {
+    this.githubAuthKey = newValue;
+    await this.updateOctokitValue();
+  }
+
+  public async isAuthKeyValid(key: string) {
+    try {
+      const val = await new Octokit({
+        auth: key,
+        request: {
+          fetch: fetch
+        }
+      }).rest.users.getAuthenticated();
+
+      return val.status === 200;
+    } catch (err) {
+      console.verbose.warn(err);
+      return false;
+    }
+  }
+
+  private async updateOctokitValue() {
+    if (this.githubAuthKey !== null) {
+      if ((await this.isAuthKeyValid(this.githubAuthKey)) === true) {
+        this.octokit = new Octokit({
+          auth: this.githubAuthKey,
+          request: {
+            fetch: fetch
+          }
+        });
+        console.verbose.log("Valid github auth key");
+      } else {
+        console.info("Invalid github auth key");
+      }
+    } else {
+      this.octokit = null;
+    }
+  }
+
+  public configUpdated() {
+    const cfg = this.#txAdmin.configVault.getScoped("versionControl");
+
+    this.updateGithubAuthKey(cfg.githubAuthKey);
+    this.githubOwner = cfg.githubOwner;
+  }
+
+  public async getOwners() {
+    const resp: string[] = [];
+
+    if (this.octokit !== null) {
+      const orgsResp = await this.octokit.request("GET /user/orgs");
+
+      const { data: userResp } =
+        await this.octokit.rest.users.getAuthenticated();
+
+      if (userResp) {
+        resp.push(userResp.login);
+      }
+
+      if (orgsResp && orgsResp.status === 200) {
+        orgsResp.data.forEach((v: { login: string }) => {
+          resp.push(v.login);
+        });
+      }
+    }
+
+    return resp;
+  }
 
   constructor(txAdmin: TxAdmin) {
+    this.#txAdmin = txAdmin;
+    this.githubAuthKey = null;
+    this.githubOwner = null;
+    this.configUpdated();
     this.svRuntime = new SvRuntimeVersionControl(txAdmin);
   }
 }
diff --git a/core/components/WebServer/router.ts b/core/components/WebServer/router.ts
index 4aed34bf1..9b4decd8e 100644
--- a/core/components/WebServer/router.ts
+++ b/core/components/WebServer/router.ts
@@ -108,7 +108,8 @@ export default (config: WebServerConfigType) => {
     router.post('/history/:action', apiAuthMw, webRoutes.history_actions);
 
     // Version Control routes
-    router.get('/versionControl/resources', apiAuthMw, webRoutes.version_control_resources);
+    router.get('/versionControl/resources', apiAuthMw, webRoutes.versionControl_resources);
+    router.get("/versionControl/owners", apiAuthMw, webRoutes.versionControl_owners)
 
     //Player routes
     router.get('/player', apiAuthMw, webRoutes.player_modal);
diff --git a/core/extras/setupProfile.js b/core/extras/setupProfile.js
index d40cdfcf6..2e271656b 100644
--- a/core/extras/setupProfile.js
+++ b/core/extras/setupProfile.js
@@ -21,6 +21,7 @@ const defaultConfig = {
     },
     versionControl: {
         githubAuthKey: null,
+        githubOwner: null,
     },
     webServer: {},
     discordBot: {
diff --git a/core/package.json b/core/package.json
index 3ddd2f0eb..10c5da506 100644
--- a/core/package.json
+++ b/core/package.json
@@ -46,6 +46,7 @@
     "mysql2": "^3.9.4",
     "nanoid": "^4.0.2",
     "nanoid-dictionary": "^4.3.0",
+    "node-fetch": "^3.3.2",
     "node-polyglot": "^2.5.0",
     "node-stream-zip": "^1.15.0",
     "octokit": "^4.0.2",
diff --git a/core/webroutes/deployer/actions.js b/core/webroutes/deployer/actions.js
index 6bfee9ae2..c9b6f0606 100644
--- a/core/webroutes/deployer/actions.js
+++ b/core/webroutes/deployer/actions.js
@@ -12,7 +12,6 @@ const console = consoleFactory(modulename);
 //Helper functions
 const isUndefined = (x) => { return (typeof x === 'undefined'); };
 
-
 /**
  * Handle all the server control actions
  * @param {object} ctx
@@ -82,12 +81,47 @@ async function handleConfirmRecipe(ctx) {
  * @param {object} ctx
  */
 async function handleSetVersionControlVariables(ctx) {
-    if (typeof ctx.request.body.githubAuthKey !== 'string' && ctx.request.body.githubAuthKey !== null) {
+    if (ctx.request.body.key !== 'githubAutoFork' && ctx.request.body.key !== 'githubAuthKey' && ctx.request.body.key !== 'githubOwner') {
+        return ctx.utils.error(400, 'Invalid Request - invalid parameters');
+    }
+
+    // User doesnt want version control
+    if (ctx.request.body.value === null) {
+        return ctx.send({ success: true });
+    }
+
+    if (typeof ctx.request.body.value !== 'string') {
         return ctx.utils.error(400, 'Invalid Request - invalid parameters');
     }
 
+    // User doesnt want version control
+    if (ctx.request.body.value.trim().length <= 0) {
+        return ctx.send({ success: true });
+    }
+
+    //Validating auth key
+    if (
+        ctx.request.body.key === 'githubAuthKey'
+        && !consts.regexGithubAuthKey.test(ctx.request.body.value)
+    ) {
+        return ctx.send({ type: 'danger', message: 'The Github Auth Key does not appear to be valid.' });
+    }
+
+    if (ctx.request.body.key === 'githubAuthKey' && (await globals.versionControl.isAuthKeyValid(ctx.request.body.value)) === false) {
+        return ctx.send({ type: 'danger', message: 'The Github Auth Key does not appear to be valid.' });
+    }
+
+    //Validating github auto fork
+    if (ctx.request.body.key === 'githubAutoFork') {
+        if (ctx.request.body.value !== 'true' && ctx.request.body.value !== 'false') {
+            return ctx.utils.error(400, 'Invalid Request - invalid parameters');
+        } else {
+            ctx.request.body.value = ctx.request.body.value === 'true';
+        }
+    }
+
     const newGlobalConfig = globals.configVault.getScopedStructure('versionControl');
-    newGlobalConfig.githubAuthKey = ctx.request.body.githubAuthKey;
+    newGlobalConfig[ctx.request.body.key] = ctx.request.body.value;
 
     try {
         globals.configVault.saveProfile('versionControl', newGlobalConfig);
@@ -103,13 +137,15 @@ async function handleSetVersionControlVariables(ctx) {
     globals.txAdmin.refreshConfig();
     ctx.admin.logAction('Changing version control settings via deployer.');
 
-    //Start deployer
-    try {
-        ctx.admin.logAction('Running recipe.');
-        globals.deployer.start();
-    } catch (error) {
-        return ctx.send({ type: 'danger', message: error.message });
-    }
+    globals.deployer.recipe.variables[ctx.request.body.key] = ctx.request.body.value;
+
+    // //Start deployer
+    // try {
+    //     ctx.admin.logAction('Running recipe.');
+    //     globals.deployer.start();
+    // } catch (error) {
+    //     return ctx.send({ type: 'danger', message: error.message });
+    // }
 
     return ctx.send({ success: true });
 }
diff --git a/core/webroutes/deployer/status.js b/core/webroutes/deployer/status.js
index 218084265..3b6b18483 100644
--- a/core/webroutes/deployer/status.js
+++ b/core/webroutes/deployer/status.js
@@ -1,8 +1,3 @@
-const modulename = 'WebServer:DeployerStatus';
-import consoleFactory from '@extras/console';
-const console = consoleFactory(modulename);
-
-
 /**
  * Returns the output page containing the live console
  * @param {object} ctx
diff --git a/core/webroutes/deployer/stepper.js b/core/webroutes/deployer/stepper.js
index 115b3fc7f..6648807fc 100644
--- a/core/webroutes/deployer/stepper.js
+++ b/core/webroutes/deployer/stepper.js
@@ -43,7 +43,10 @@ export default async function DeployerStepper(ctx) {
             raw: globals.deployer.recipe.raw,
         };
     } else if (globals.deployer.step === 'versionControl') {
-        // todo: perhaps add logic here;
+        renderData.githubOwners = await globals.versionControl.getOwners();
+        renderData.githubAuthKey = globals.deployer.recipe.variables.githubAuthKey ?? '';
+        renderData.githubOwner = globals.deployer.recipe.variables.githubOwner ?? 'none';
+        renderData.githubAutoFork = typeof globals.deployer.recipe.variables.githubAutoFork === 'boolean' ? globals.deployer.recipe.variables.githubAutoFork : false;
     } else if (globals.deployer.step === 'input') {
         renderData.defaultLicenseKey = process.env.TXADMIN_DEFAULT_LICENSE || '';
         renderData.requireDBConfig = globals.deployer.recipe.requireDBConfig;
diff --git a/core/webroutes/index.js b/core/webroutes/index.js
index ad7e2c829..bd525ea07 100644
--- a/core/webroutes/index.js
+++ b/core/webroutes/index.js
@@ -48,7 +48,8 @@ export { default as fxserver_controls } from './fxserver/controls';
 export { default as fxserver_downloadLog } from './fxserver/downloadLog';
 export { default as fxserver_schedule } from './fxserver/schedule';
 
-export { default as version_control_resources } from './versionControl/resources';
+export { default as versionControl_resources } from './versionControl/resources';
+export { default as versionControl_owners } from './versionControl/owners';
 
 export { default as history_stats } from './history/stats';
 export { default as history_search } from './history/search';
diff --git a/core/webroutes/settings/save.ts b/core/webroutes/settings/save.ts
index 7546bf26b..e19a08e22 100644
--- a/core/webroutes/settings/save.ts
+++ b/core/webroutes/settings/save.ts
@@ -354,18 +354,14 @@ async function handleMonitor(ctx: AuthedCtx) {
 
 //================================================================
 /**
- * Handle Discord settings
+ * Handle version control
  */
 async function handleVersionControl(ctx: AuthedCtx) {
-    if(typeof ctx.request.body.githubAuthKey === 'string' || ctx.request.body.githubAuthKey === null) {
-        //Prepare body input
-        const cfg = {
-            githubAuthKey: (ctx.request.body.githubAuthKey === 'true'),
-        };
-
+    if((typeof ctx.request.body.githubAuthKey === 'string' || ctx.request.body.githubAuthKey === null) && (typeof ctx.request.body.githubOwner === 'string' || ctx.request.body.githubOwner === null)) {
         //Preparing & saving config
         const newConfig = ctx.txAdmin.configVault.getScopedStructure('versionControl');
-        newConfig.githubAuthKey = cfg.githubAuthKey;
+        newConfig.githubAuthKey = ctx.request.body.githubAuthKey;
+        newConfig.githubOwner = ctx.request.body.githubOwner;
         try {
             ctx.txAdmin.configVault.saveProfile('versionControl', newConfig);
         } catch (error) {
diff --git a/core/webroutes/versionControl/owners.ts b/core/webroutes/versionControl/owners.ts
new file mode 100644
index 000000000..7f54ee72e
--- /dev/null
+++ b/core/webroutes/versionControl/owners.ts
@@ -0,0 +1,6 @@
+import { AuthedCtx } from "@core/components/WebServer/ctxTypes";
+
+export default async function VersionControlOwners(ctx: AuthedCtx) {
+  /// @ts-ignore
+  return ctx.send(await globals.versionControl.getOwners());
+}
diff --git a/package-lock.json b/package-lock.json
index 7e02f8728..8b2d59d52 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,6 +68,7 @@
         "mysql2": "^3.9.4",
         "nanoid": "^4.0.2",
         "nanoid-dictionary": "^4.3.0",
+        "node-fetch": "^3.3.2",
         "node-polyglot": "^2.5.0",
         "node-stream-zip": "^1.15.0",
         "octokit": "^4.0.2",
@@ -7988,6 +7989,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/dateformat": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz",
@@ -9400,6 +9409,28 @@
         "reusify": "^1.0.4"
       }
     },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -9578,6 +9609,17 @@
         "node": ">= 14.17"
       }
     },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
     "node_modules/fraction.js": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
@@ -12806,6 +12848,41 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
     "node_modules/node-gyp": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
@@ -17356,6 +17433,14 @@
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/panel/src/pages/Dashboard/DashboardPage.tsx b/panel/src/pages/Dashboard/DashboardPage.tsx
index 35dd2c2c6..08edc9efa 100644
--- a/panel/src/pages/Dashboard/DashboardPage.tsx
+++ b/panel/src/pages/Dashboard/DashboardPage.tsx
@@ -47,7 +47,7 @@ export default function DashboardPage() {
             <DynamicNewItem featName='dashboardNewCharts' durationDays={28}>
                 <div className="mx-auto max-w-4xl w-full sm:w-auto sm:min-w-[28rem] relative overflow-hidden z-40 p-3 pr-10 flex items-center justify-between space-x-4 rounded-xl border shadow-lg transition-all text-black/75 dark:text-white/90 border-warning/70 bg-warning-hint animate-toastbar-enter opacity-50 hover:opacity-100">
                     <div className="flex-shrink-0 flex flex-col gap-2 items-center">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" className="lucide lucide-warning stroke-warning animate-toastbar-icon">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="lucide lucide-warning stroke-warning animate-toastbar-icon">
                             <circle cx="12" cy="12" r="10"></circle>
                             <path d="M12 16v-4"></path>
                             <path d="M12 8h.01"></path>
diff --git a/shared/consts.ts b/shared/consts.ts
index fae550d93..eaed6668d 100644
--- a/shared/consts.ts
+++ b/shared/consts.ts
@@ -32,6 +32,7 @@ export default {
     //Other stuff
     regexSvLicenseOld: /^\w{32}$/,
     regexSvLicenseNew: /^cfxk_\w{1,60}_\w{1,20}$/,
+    regexGithubAuthKey: /^ghp_\w{36}$/,
     regexValidIP: /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/,
     noLookAlikesAlphabet,
     nuiWebpipePath: 'https://monitor/WebPipe/',
diff --git a/web/standalone/deployer.ejs b/web/standalone/deployer.ejs
index 15e1d7316..9a7477af5 100644
--- a/web/standalone/deployer.ejs
+++ b/web/standalone/deployer.ejs
@@ -124,13 +124,61 @@
                                         Github Auth Token
                                     </label>
                                     <div class="col-sm-9">
-                                        <input type="text" class="form-control blur-input" id="step3-githubAuthKey" maxlength="86" 
-                                            autocomplete="off" placeholder="ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
-                                            value="<%= defaults.license %>" required autofocus>
+                                        <div style="display: flex; flex-direction: row; gap: 0.5rem;">
+                                            <input type="text" class="form-control blur-input" id="step3-githubAuthKey" maxlength="86" 
+                                                autocomplete="off" placeholder="ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
+                                                value="<%= githubAuthKey %>" required autofocus>
+                                            <button class="btn btn-success" type="button" 
+                                                onclick="step3SaveKeyAction();" autofocus>Save</button>
+                                        </div>
                                         <span class="form-text text-muted">
                                             Your github auth token can be obtained <a href="https://github.com/settings/tokens/new?scopes=repo" target="_blank" rel="noopener noreferrer">here</a>.
                                             <br/>
-                                            Please make sure the expiration is set to <b>No expiration</b>, and that you select the <b>repo</b> and <b>admin:org</b> permissions
+                                            Please make sure the expiration is set to <b>No expiration</b>, and that you select the <b>repo</b>, <b>user</b> and <b>admin:org</b> permissions
+                                        </span>
+                                    </div>
+                                </div>
+
+                                <div class="form-group row">
+                                    <label for="step3-githubOwner" class="col-sm-3 col-form-label">
+                                        Github Repository Owner
+                                    </label>
+                                    <div class="col-sm-9">
+                                        <div style="display: flex; flex-direction: row; gap: 0.5rem;">
+                                            <select id="step3-githubOwner" name="players" class="form-control" value="<%= githubOwner %>" required <% if (githubAuthKey === null) { %>disabled<% } %>>
+                                                <% if (githubAuthKey == null) { %>
+                                                    <option value="none" selected disabled>Input github key first</option>
+                                                <% } else { %>
+                                                    <option value="none" <% if (githubOwner === 'none') { %>selected<% } %> disabled>Select owner</option>
+                                                    <% for (const owner of githubOwners) { %>
+                                                        <option value="<%= owner %>" <% if (githubOwner === owner) { %>selected<% } %>><%= owner %></option>
+                                                    <% } %>
+                                                <% } %>
+                                            </select>
+                                            <button class="btn btn-success" type="button" id="step3-owner-button"  <% if (githubAuthKey === null) { %>disabled<% } %>
+                                                onclick="step3SaveOwnerAction();" autofocus>Save</button>
+                                        </div>
+                                        <span class="form-text text-muted">
+                                            This dropdown is for selecting which github account / orginization should own the repositories related to your server
+                                        </span>
+                                    </div>
+                                </div>
+
+                                <div class="form-group row">
+                                    <label for="step3-githubAutoFork" class="col-sm-3 col-form-label">
+                                        Github Auto Fork
+                                    </label>
+                                    <div class="col-sm-9">
+                                        <div style="display: flex; flex-direction: row; gap: 0.5rem;">
+                                            <select id="step3-githubAutoFork" class="form-control" value="<%= githubAutoFork %>" required>
+                                                <option value="false" <% if (githubAutoFork === false) { %>selected<% } %>>No</option>
+                                                <option value="true" <% if (githubAutoFork === true) { %>selected<% } %>>Yes</option>
+                                            </select>
+                                            <button class="btn btn-success" type="button" 
+                                                onclick="step3SaveForkAction();" autofocus>Save</button>
+                                        </div>
+                                        <span class="form-text text-muted">
+                                            If this is enabled, then all the repositories from this server deployer will be auto forked to your own organization/user
                                         </span>
                                     </div>
                                 </div>
@@ -512,13 +560,78 @@
         const step3elements = {
             form: document.getElementById('step3-form'),
             githubAuthKey: document.getElementById('step3-githubAuthKey'),
+            githubOwner: document.getElementById('step3-githubOwner'),
+            githubAutoFork: document.getElementById('step3-githubAutoFork')
+        }
+        function step3Action() {
+            
+        }
+        function step3SaveOwnerAction() {
+            if(!step3elements.form.reportValidity()) return;
+            const postData = {
+                key: 'githubOwner',
+                value: step3elements.githubOwner.value.trim()
+            }
+
+            const notify = $.notify({ message: '<p class="text-center">Saving...</p>' }, {});
+            txAdminAPI({
+                type: "POST",
+                url: '/deployer/recipe/setVersionControlVariables',
+                timeout: REQ_TIMEOUT_LONG,
+                data: postData,
+                success: function (data) {
+                    if (checkApiLogoutRefresh(data)) return;
+                    if (data.success == false){
+                        notify.update('progress', 0);
+                        notify.update('type', data.type);
+                        notify.update('message', data.message);
+                    }
+                    
+                },
+                error: function (xmlhttprequest, textstatus, message) {
+                    notify.update('progress', 0);
+                    notify.update('type', 'danger');
+                    notify.update('message', message);
+                }
+            });
+        }
+        function step3SaveForkAction() {
+            if(!step3elements.form.reportValidity()) return;
+            const postData = {
+                key: 'githubAutoFork',
+                value: step3elements.githubAutoFork.value.trim()
+            }
+
+            const notify = $.notify({ message: '<p class="text-center">Saving...</p>' }, {});
+            txAdminAPI({
+                type: "POST",
+                url: '/deployer/recipe/setVersionControlVariables',
+                timeout: REQ_TIMEOUT_LONG,
+                data: postData,
+                success: function (data) {
+                    if (checkApiLogoutRefresh(data)) return;
+                    if (data.success == false){
+                        notify.update('progress', 0);
+                        notify.update('type', data.type);
+                        notify.update('message', data.message);
+                    }
+                    
+                },
+                error: function (xmlhttprequest, textstatus, message) {
+                    notify.update('progress', 0);
+                    notify.update('type', 'danger');
+                    notify.update('message', message);
+                }
+            });
         }
-        function step3Action(){
+        function step3SaveKeyAction() {
             if(!step3elements.form.reportValidity()) return;
             const postData = {
-                githubAuthKey: step3elements.githubAuthKey.value.trim()
+                key: 'githubAuthKey',
+                value: step3elements.githubAuthKey.value.trim()
             }
 
+            const notify = $.notify({ message: '<p class="text-center">Saving...</p>' }, {});
             txAdminAPI({
                 type: "POST",
                 url: '/deployer/recipe/setVersionControlVariables',

From ee75c7d47cb31c888464442a40366d06e5e5c4cb Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Sat, 13 Jul 2024 03:31:54 +0200
Subject: [PATCH 12/15] chore: misc format warnings

---
 core/components/Scheduler.js | 15 +++++++--------
 web/standalone/setup.ejs     |  2 ++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/components/Scheduler.js b/core/components/Scheduler.js
index ef55545fd..ba1c7ef27 100644
--- a/core/components/Scheduler.js
+++ b/core/components/Scheduler.js
@@ -38,7 +38,7 @@ export default class Scheduler {
         this.calculatedNextRestartMinuteFloorTs = false;
         this.checkSchedule();
 
-        //Cron Function 
+        //Cron Function
         setInterval(() => {
             this.checkSchedule();
             globals.webServer?.webSocket.pushRefresh('status');
@@ -101,7 +101,7 @@ export default class Scheduler {
             //Dispatch `txAdmin:events:skippedNextScheduledRestart`
             globals.fxRunner.sendEvent('skippedNextScheduledRestart', {
                 secondsRemaining: Math.floor((prevMinuteFloorTs - Date.now()) / 1000),
-                temporary
+                temporary,
             });
         } else {
             this.nextSkip = false;
@@ -193,7 +193,7 @@ export default class Scheduler {
 
         //Checking if skipped
         if (this.nextSkip === this.calculatedNextRestartMinuteFloorTs) {
-            console.verbose.log(`Skipping next scheduled restart`);
+            console.verbose.log('Skipping next scheduled restart');
             return;
         }
 
@@ -212,7 +212,6 @@ export default class Scheduler {
 
             //reset next scheduled
             this.nextTempSchedule = false;
-
         } else if (scheduleWarnings.includes(nextDistMins)) {
             const tOptions = {
                 smart_count: nextDistMins,
@@ -224,14 +223,14 @@ export default class Scheduler {
                 type: 'warning',
                 description: {
                     key: 'restarter.schedule_warn_discord',
-                    data: tOptions
-                }
+                    data: tOptions,
+                },
             });
 
-            //Dispatch `txAdmin:events:scheduledRestart` 
+            //Dispatch `txAdmin:events:scheduledRestart`
             globals.fxRunner.sendEvent('scheduledRestart', {
                 secondsRemaining: nextDistMins * 60,
-                translatedMessage: globals.translator.t('restarter.schedule_warn', tOptions)
+                translatedMessage: globals.translator.t('restarter.schedule_warn', tOptions),
             });
         }
     }
diff --git a/web/standalone/setup.ejs b/web/standalone/setup.ejs
index 65754a0ca..ec307d5ca 100644
--- a/web/standalone/setup.ejs
+++ b/web/standalone/setup.ejs
@@ -79,9 +79,11 @@
         }
         .template-cards > .titleText{
             -webkit-line-clamp: 1;
+            line-clamp: 1;
         }
         .template-cards > .description{
             -webkit-line-clamp: 2;
+            line-clamp: 2;
         }
         .template-cards > .titleText::before{
             content: "⭐";

From d42914f4654e89b04dd818452994c294fc16aa0f Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Sun, 14 Jul 2024 04:29:42 +0200
Subject: [PATCH 13/15] feat: further misc work on deployment

---
 core/components/ConfigVault.js          |  1 +
 core/components/VersionControl/index.ts | 16 ++++-
 core/extras/deployer.js                 | 10 ++-
 core/extras/setupProfile.js             |  1 +
 core/webroutes/deployer/actions.js      | 29 ++++++---
 core/webroutes/deployer/stepper.js      |  6 ++
 core/webroutes/settings/save.ts         |  3 +-
 web/standalone/deployer.ejs             | 83 +++++++++++++++++++++++--
 8 files changed, 131 insertions(+), 18 deletions(-)

diff --git a/core/components/ConfigVault.js b/core/components/ConfigVault.js
index aa57e2d95..3a779e6ef 100644
--- a/core/components/ConfigVault.js
+++ b/core/components/ConfigVault.js
@@ -131,6 +131,7 @@ export default class ConfigVault {
             out.versionControl = {
                 githubAuthKey: toDefault(cfg.versionControl.githubAuthKey, null),
                 githubOwner: toDefault(cfg.versionControl.githubAuthKey, null),
+                githubParentRepo: toDefault(cfg.versionControl.githubParentRepo, null)
             };
             out.logger = toDefault(cfg.logger, {}); //not in template
             out.monitor = {
diff --git a/core/components/VersionControl/index.ts b/core/components/VersionControl/index.ts
index 4ee4e581b..25b8cb3e4 100644
--- a/core/components/VersionControl/index.ts
+++ b/core/components/VersionControl/index.ts
@@ -13,9 +13,10 @@ const console = consoleFactory(modulename);
 export default class VersionControl {
   readonly #txAdmin: TxAdmin;
   public readonly svRuntime: SvRuntimeVersionControl;
-  private octokit: Octokit | null;
+  public octokit: Octokit | null;
   private githubAuthKey: string | null;
   private githubOwner: string | null;
+  private githubParentRepo: string | null;
 
   private async updateGithubAuthKey(newValue: string | null) {
     this.githubAuthKey = newValue;
@@ -38,6 +39,18 @@ export default class VersionControl {
     }
   }
 
+  public async getUsername() {
+    if (this.octokit) {
+      const { data } = await this.octokit.rest.users.getAuthenticated();
+
+      if (data) {
+        return data.login;
+      }
+    }
+
+    return null;
+  }
+
   private async updateOctokitValue() {
     if (this.githubAuthKey !== null) {
       if ((await this.isAuthKeyValid(this.githubAuthKey)) === true) {
@@ -61,6 +74,7 @@ export default class VersionControl {
 
     this.updateGithubAuthKey(cfg.githubAuthKey);
     this.githubOwner = cfg.githubOwner;
+    this.githubParentRepo = cfg.githubParentRepo;
   }
 
   public async getOwners() {
diff --git a/core/extras/deployer.js b/core/extras/deployer.js
index 2b26fdd9a..081d71791 100644
--- a/core/extras/deployer.js
+++ b/core/extras/deployer.js
@@ -161,6 +161,8 @@ export class Deployer {
         this.originalRecipe = originalRecipe;
         this.deploymentID = deploymentID;
         this.progress = 0;
+        this.validGithubData = false;
+        this.isOwnerOrganization = false;
         this.serverName = customMetaData.serverName || globals.txAdmin.globalConfig.serverName || '';
         this.logLines = [];
         this.userVars = null;
@@ -227,14 +229,18 @@ export class Deployer {
     /**
      * Starts the deployment process
      */
-    start() {
+    async start() {
         if (this.step !== 'versionControl') throw new Error('expected versionControl step');
-        console.log(this.recipe.variables);
         this.logLines = [];
         this.customLog(`Starting deployment of ${this.recipe.name}.`);
         this.deployFailed = false;
         this.progress = 0;
         this.step = 'run';
+        this.validGithubData = typeof globals.deployer.recipe.variables.githubAutoFork === 'boolean' && typeof globals.deployer.recipe.variables.githubAuthKey === 'string' && globals.deployer.recipe.variables.githubAuthKey.trim().length > 0 && typeof globals.deployer.recipe.variables.githubOwner === 'string' && globals.deployer.recipe.variables.githubOwner.trim().length > 0 && typeof globals.deployer.recipe.variables.githubParentRepo === 'string' && globals.deployer.recipe.variables.githubParentRepo.trim().length > 0;
+        if (this.validGithubData == true) {
+            const localUsername = await globals.versionControl.getUsername();
+            this.isOwnerOrganization = this.recipe.variables.githubOwner === localUsername;
+        }
         this.runTasks();
     }
 
diff --git a/core/extras/setupProfile.js b/core/extras/setupProfile.js
index 2e271656b..84d5de960 100644
--- a/core/extras/setupProfile.js
+++ b/core/extras/setupProfile.js
@@ -22,6 +22,7 @@ const defaultConfig = {
     versionControl: {
         githubAuthKey: null,
         githubOwner: null,
+        githubParentRepo: null,
     },
     webServer: {},
     discordBot: {
diff --git a/core/webroutes/deployer/actions.js b/core/webroutes/deployer/actions.js
index c9b6f0606..956a4c8ea 100644
--- a/core/webroutes/deployer/actions.js
+++ b/core/webroutes/deployer/actions.js
@@ -38,6 +38,8 @@ export default async function DeployerActions(ctx) {
         return await handleConfirmRecipe(ctx);
     } else if (action == 'setVariables') {
         return await handleSetVariables(ctx);
+    } else if (action == 'runRecipe') {
+        return await handleRunRecipe(ctx);
     } else if (action == 'setVersionControlVariables') {
         return await handleSetVersionControlVariables(ctx);
     } else if (action == 'commit') {
@@ -75,13 +77,30 @@ async function handleConfirmRecipe(ctx) {
     return ctx.send({ success: true });
 }
 
+//================================================================
+/**
+ * Handle submition of the version control variables
+ * @param {object} ctx
+ */
+async function handleRunRecipe(ctx) {
+    //Start deployer
+    try {
+        ctx.admin.logAction('Running recipe.');
+        await globals.deployer.start();
+    } catch (error) {
+        return ctx.send({ type: 'danger', message: error.message });
+    }
+
+    return ctx.send({ success: true });
+}
+
 //================================================================
 /**
  * Handle submition of the version control variables
  * @param {object} ctx
  */
 async function handleSetVersionControlVariables(ctx) {
-    if (ctx.request.body.key !== 'githubAutoFork' && ctx.request.body.key !== 'githubAuthKey' && ctx.request.body.key !== 'githubOwner') {
+    if (ctx.request.body.key !== 'githubAutoFork' && ctx.request.body.key !== 'githubAuthKey' && ctx.request.body.key !== 'githubOwner' && ctx.request.body.key !== 'githubParentRepo') {
         return ctx.utils.error(400, 'Invalid Request - invalid parameters');
     }
 
@@ -139,14 +158,6 @@ async function handleSetVersionControlVariables(ctx) {
 
     globals.deployer.recipe.variables[ctx.request.body.key] = ctx.request.body.value;
 
-    // //Start deployer
-    // try {
-    //     ctx.admin.logAction('Running recipe.');
-    //     globals.deployer.start();
-    // } catch (error) {
-    //     return ctx.send({ type: 'danger', message: error.message });
-    // }
-
     return ctx.send({ success: true });
 }
 
diff --git a/core/webroutes/deployer/stepper.js b/core/webroutes/deployer/stepper.js
index 6648807fc..975fd1974 100644
--- a/core/webroutes/deployer/stepper.js
+++ b/core/webroutes/deployer/stepper.js
@@ -29,6 +29,11 @@ export default async function DeployerStepper(ctx) {
         serverProfile: globals.info.serverProfile,
         deploymentID: globals.deployer.deploymentID,
         requireDBConfig: false,
+        githubOwners: [],
+        githubAuthKey: '',
+        githubOwner: 'none',
+        githubParentRepo: '',
+        githubAutoFork: false,
         defaultLicenseKey: '',
         recipe: undefined,
         defaults: {},
@@ -46,6 +51,7 @@ export default async function DeployerStepper(ctx) {
         renderData.githubOwners = await globals.versionControl.getOwners();
         renderData.githubAuthKey = globals.deployer.recipe.variables.githubAuthKey ?? '';
         renderData.githubOwner = globals.deployer.recipe.variables.githubOwner ?? 'none';
+        renderData.githubParentRepo = globals.deployer.recipe.variables.githubParentRepo ?? '';
         renderData.githubAutoFork = typeof globals.deployer.recipe.variables.githubAutoFork === 'boolean' ? globals.deployer.recipe.variables.githubAutoFork : false;
     } else if (globals.deployer.step === 'input') {
         renderData.defaultLicenseKey = process.env.TXADMIN_DEFAULT_LICENSE || '';
diff --git a/core/webroutes/settings/save.ts b/core/webroutes/settings/save.ts
index e19a08e22..4f9f0bcb4 100644
--- a/core/webroutes/settings/save.ts
+++ b/core/webroutes/settings/save.ts
@@ -357,11 +357,12 @@ async function handleMonitor(ctx: AuthedCtx) {
  * Handle version control
  */
 async function handleVersionControl(ctx: AuthedCtx) {
-    if((typeof ctx.request.body.githubAuthKey === 'string' || ctx.request.body.githubAuthKey === null) && (typeof ctx.request.body.githubOwner === 'string' || ctx.request.body.githubOwner === null)) {
+    if((typeof ctx.request.body.githubAuthKey === 'string' || ctx.request.body.githubAuthKey === null) && (typeof ctx.request.body.githubParentRepo === 'string' || ctx.request.body.githubParentRepo === null) && (typeof ctx.request.body.githubOwner === 'string' || ctx.request.body.githubOwner === null)) {
         //Preparing & saving config
         const newConfig = ctx.txAdmin.configVault.getScopedStructure('versionControl');
         newConfig.githubAuthKey = ctx.request.body.githubAuthKey;
         newConfig.githubOwner = ctx.request.body.githubOwner;
+        newConfig.githubParentRepo = ctx.request.body.githubParentRepo;
         try {
             ctx.txAdmin.configVault.saveProfile('versionControl', newConfig);
         } catch (error) {
diff --git a/web/standalone/deployer.ejs b/web/standalone/deployer.ejs
index 9a7477af5..8afda5d3d 100644
--- a/web/standalone/deployer.ejs
+++ b/web/standalone/deployer.ejs
@@ -127,7 +127,7 @@
                                         <div style="display: flex; flex-direction: row; gap: 0.5rem;">
                                             <input type="text" class="form-control blur-input" id="step3-githubAuthKey" maxlength="86" 
                                                 autocomplete="off" placeholder="ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
-                                                value="<%= githubAuthKey %>" required autofocus>
+                                                value="<%= githubAuthKey %>" autofocus>
                                             <button class="btn btn-success" type="button" 
                                                 onclick="step3SaveKeyAction();" autofocus>Save</button>
                                         </div>
@@ -182,6 +182,22 @@
                                         </span>
                                     </div>
                                 </div>
+                                <div class="form-group row">
+                                    <label for="step3-githubParentRepo" class="col-sm-3 col-form-label">
+                                        Github Parent Repo Name
+                                    </label>
+                                    <div class="col-sm-9">
+                                        <div style="display: flex; flex-direction: row; gap: 0.5rem;">
+                                            <input type="text" class="form-control" id="step3-githubParentRepo" maxlength="86" 
+                                                autocomplete="off" value="<%= githubParentRepo %>" autofocus placeholder="Repository name">
+                                            <button class="btn btn-success" type="button" 
+                                                onclick="step3SaveRepoNameAction();" autofocus>Save</button>
+                                        </div>
+                                        <span class="form-text text-muted">
+                                            This will be the name of the new github repository
+                                        </span>
+                                    </div>
+                                </div>
                             </form>
 
                             <div class="row justify-content-center m-2">
@@ -561,10 +577,32 @@
             form: document.getElementById('step3-form'),
             githubAuthKey: document.getElementById('step3-githubAuthKey'),
             githubOwner: document.getElementById('step3-githubOwner'),
-            githubAutoFork: document.getElementById('step3-githubAutoFork')
+            githubAutoFork: document.getElementById('step3-githubAutoFork'),
+            githubParentRepo: document.getElementById('step3-githubParentRepo')
         }
         function step3Action() {
-            
+            const notify = $.notify({ message: '<p class="text-center">Saving...</p>' }, {});
+            txAdminAPI({
+                type: "POST",
+                url: '/deployer/recipe/runRecipe',
+                timeout: REQ_TIMEOUT_LONG,
+                data: {},
+                success: function (data) {
+                    if (checkApiLogoutRefresh(data)) return;
+                    if (data.success == true){
+                        window.location.reload(true);
+                    }else{
+                        notify.update('progress', 0);
+                        notify.update('type', data.type);
+                        notify.update('message', data.message);
+                    }
+                },
+                error: function (xmlhttprequest, textstatus, message) {
+                    notify.update('progress', 0);
+                    notify.update('type', 'danger');
+                    notify.update('message', message);
+                }
+            });
         }
         function step3SaveOwnerAction() {
             if(!step3elements.form.reportValidity()) return;
@@ -581,7 +619,9 @@
                 data: postData,
                 success: function (data) {
                     if (checkApiLogoutRefresh(data)) return;
-                    if (data.success == false){
+                    if (data.success == true){
+                        window.location.reload(true);
+                    }else{
                         notify.update('progress', 0);
                         notify.update('type', data.type);
                         notify.update('message', data.message);
@@ -610,7 +650,40 @@
                 data: postData,
                 success: function (data) {
                     if (checkApiLogoutRefresh(data)) return;
-                    if (data.success == false){
+                    if (data.success == true){
+                        window.location.reload(true);
+                    }else{
+                        notify.update('progress', 0);
+                        notify.update('type', data.type);
+                        notify.update('message', data.message);
+                    }
+                    
+                },
+                error: function (xmlhttprequest, textstatus, message) {
+                    notify.update('progress', 0);
+                    notify.update('type', 'danger');
+                    notify.update('message', message);
+                }
+            });
+        }
+        function step3SaveRepoNameAction() {
+            if(!step3elements.form.reportValidity()) return;
+            const postData = {
+                key: 'githubParentRepo',
+                value: step3elements.githubParentRepo.value.trim()
+            }
+
+            const notify = $.notify({ message: '<p class="text-center">Saving...</p>' }, {});
+            txAdminAPI({
+                type: "POST",
+                url: '/deployer/recipe/setVersionControlVariables',
+                timeout: REQ_TIMEOUT_LONG,
+                data: postData,
+                success: function (data) {
+                    if (checkApiLogoutRefresh(data)) return;
+                    if (data.success == true){
+                        window.location.reload(true);
+                    }else{
                         notify.update('progress', 0);
                         notify.update('type', data.type);
                         notify.update('message', data.message);

From fd9f9c58602da01bf3a5c42c67c28845a45ab687 Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Sun, 14 Jul 2024 18:25:24 +0200
Subject: [PATCH 14/15] feat: add repository creation

---
 core/components/VersionControl/index.ts | 47 +++++++++++++++++++++++++
 core/extras/deployer.js                 |  5 ++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/core/components/VersionControl/index.ts b/core/components/VersionControl/index.ts
index 25b8cb3e4..6641e2c37 100644
--- a/core/components/VersionControl/index.ts
+++ b/core/components/VersionControl/index.ts
@@ -23,6 +23,53 @@ export default class VersionControl {
     await this.updateOctokitValue();
   }
 
+  public async createGithubRepo(
+    repoName: string,
+    ownerName: string,
+    isOrganization: boolean
+  ): Promise<[boolean, any?]> {
+    console.log({
+      repoName,
+      ownerName,
+      isOrganization
+    });
+    if (this.octokit) {
+      if (isOrganization === true) {
+        const resp = this.octokit.request("POST /orgs/{org}/repos", {
+          org: ownerName,
+          name: repoName,
+          description: "Server repository created by txAdmin",
+          private: true,
+          has_issues: true,
+          has_projects: true,
+          has_wiki: true,
+          is_template: false
+        });
+        console.log("resp", JSON.stringify(resp));
+
+        if (resp.status === 200) {
+          return [true, resp.data];
+        }
+      } else {
+        const resp = this.octokit.request("POST /user/repos", {
+          name: repoName,
+          description: "Server repository created by txAdmin",
+          private: true,
+          has_issues: true,
+          has_projects: true,
+          has_wiki: true,
+          is_template: false
+        });
+
+        if (resp.status === 200) {
+          return [true, resp.data];
+        }
+      }
+    }
+
+    return [false];
+  }
+
   public async isAuthKeyValid(key: string) {
     try {
       const val = await new Octokit({
diff --git a/core/extras/deployer.js b/core/extras/deployer.js
index 081d71791..c80fd7a5a 100644
--- a/core/extras/deployer.js
+++ b/core/extras/deployer.js
@@ -239,7 +239,10 @@ export class Deployer {
         this.validGithubData = typeof globals.deployer.recipe.variables.githubAutoFork === 'boolean' && typeof globals.deployer.recipe.variables.githubAuthKey === 'string' && globals.deployer.recipe.variables.githubAuthKey.trim().length > 0 && typeof globals.deployer.recipe.variables.githubOwner === 'string' && globals.deployer.recipe.variables.githubOwner.trim().length > 0 && typeof globals.deployer.recipe.variables.githubParentRepo === 'string' && globals.deployer.recipe.variables.githubParentRepo.trim().length > 0;
         if (this.validGithubData == true) {
             const localUsername = await globals.versionControl.getUsername();
-            this.isOwnerOrganization = this.recipe.variables.githubOwner === localUsername;
+            this.isOwnerOrganization = this.recipe.variables.githubOwner !== localUsername;
+
+            const repoCreationResp = await globals.versionControl.createGithubRepo(this.recipe.variables.githubParentRepo, this.recipe.variables.githubOwner, this.isOwnerOrganization);
+            console.log('repoCreationResp', repoCreationResp);
         }
         this.runTasks();
     }

From 159ae4f1a9301f9387cb47ba96adaa51af362fff Mon Sep 17 00:00:00 2001
From: Zerio <neoboij@gmail.com>
Date: Mon, 15 Jul 2024 03:30:36 +0200
Subject: [PATCH 15/15] feat: initial repo commit

---
 core/extras/deployer.js            |  85 ++++++-
 core/extras/helpers.ts             | 396 +++++++++++++++--------------
 core/extras/recipeEngine.js        |   8 +-
 core/webroutes/deployer/actions.js |   4 +
 web/standalone/deployer.ejs        | 140 ++--------
 5 files changed, 316 insertions(+), 317 deletions(-)

diff --git a/core/extras/deployer.js b/core/extras/deployer.js
index c80fd7a5a..3dd920b6f 100644
--- a/core/extras/deployer.js
+++ b/core/extras/deployer.js
@@ -9,6 +9,8 @@ import getOsDistro from '@core/extras/getOsDistro.js';
 import { txEnv } from '@core/globalData';
 import recipeEngine from './recipeEngine.js';
 import consoleFactory from '@extras/console';
+import { githubRepoSourceRegex } from './helpers.js';
+import { spawnSync } from 'node:child_process';
 const console = consoleFactory(modulename);
 
 
@@ -240,9 +242,6 @@ export class Deployer {
         if (this.validGithubData == true) {
             const localUsername = await globals.versionControl.getUsername();
             this.isOwnerOrganization = this.recipe.variables.githubOwner !== localUsername;
-
-            const repoCreationResp = await globals.versionControl.createGithubRepo(this.recipe.variables.githubParentRepo, this.recipe.variables.githubOwner, this.isOwnerOrganization);
-            console.log('repoCreationResp', repoCreationResp);
         }
         this.runTasks();
     }
@@ -258,11 +257,49 @@ export class Deployer {
         } catch (error) { }
     }
 
+    getSubmoduleFileData() {
+        let resp = '';
+
+        if (this.recipe.variables.githubAutoFork === true) {
+            for (let i = 0; i < this.recipe.tasks.length; i++) {
+                const v = this.recipe.tasks[i];
+
+                // todo: perhaps this should be verified the same way as in `./recipeEngine`
+                // todo: the last part here needs to be checked in a better way. we want all git submodules to be created in the root repo. therefore we need checks to see if there's technically a submodule containing another submodule
+                if (v.action === 'download_github' && typeof v.src === 'string' && typeof v.dest === 'string' && v.src !== 'https://github.com/citizenfx/cfx-server-data' && v.dest !== './resources') {
+                    const srcMatch = v.src.match(githubRepoSourceRegex);
+                    if (!srcMatch || !srcMatch[3] || !srcMatch[4]) throw new Error('invalid repository');
+                    const repoOwner = srcMatch[3];
+                    const repoName = srcMatch[4];
+
+                    if (i !== 0) {
+                        resp += '\n\n';
+                    }
+
+                    resp += `[submodule "${repoName}"]\npath = "${v.dest}"\nurl = "https://github.com/${this.recipe.variables.githubAutoFork === true ? this.recipe.variables.githubOwner : repoOwner}/${repoName}"`;
+                }
+            }
+        }
+
+        return resp;
+    }
+
     /**
      * (Private) Run the tasks in a sequential way.
      */
     async runTasks() {
         if (this.step !== 'run') throw new Error('expected run step');
+
+        if (this.validGithubData === true) {
+            const repoCreationResp = await globals.versionControl.createGithubRepo(this.recipe.variables.githubParentRepo, this.recipe.variables.githubOwner, this.isOwnerOrganization);
+
+            if (repoCreationResp) {
+                this.customLog('Created github repo');
+            } else {
+                this.customLog('Couldnt create github repo');
+            }
+        }
+
         const contextVariables = cloneDeep(this.recipe.variables);
         contextVariables.deploymentID = this.deploymentID;
         contextVariables.serverName = this.serverName;
@@ -272,7 +309,7 @@ export class Deployer {
 
         //Run all the tasks
         for (let index = 0; index < this.recipe.tasks.length; index++) {
-            this.progress = Math.round((index / this.recipe.tasks.length) * 100);
+            this.progress = Math.round((index / this.recipe.tasks.length) * (this.validGithubData === true ? 90 : 100));
             const task = this.recipe.tasks[index];
             const taskID = `[task${index + 1}:${task.action}]`;
             this.customLog(`Running ${taskID}...`);
@@ -307,10 +344,6 @@ export class Deployer {
             }
         }
 
-        //Set progress
-        this.progress = 100;
-        this.customLog('All tasks completed.');
-
         //Check deploy folder validity (resources + server.cfg)
         try {
             if (!fse.existsSync(path.join(this.deployPath, 'resources'))) {
@@ -336,6 +369,40 @@ export class Deployer {
             return await this.markFailedDeploy();
         }
 
+        this.customLog('Starting github version control setup');
+        if (this.validGithubData) {
+            fse.writeFileSync(path.join(this.deployPath, '.gitmodules'), this.getSubmoduleFileData());
+            this.customLog('Wrote git submodules file!');
+            fse.writeFileSync(path.join(this.deployPath, './resources/.gitignore'), 'node_modules\ncache\npackage-lock.json');
+            fse.writeFileSync(path.join(this.deployPath, '.gitignore'), 'cache\n.replxx_history\n./*.bkp');
+
+            // todo: we need to check earlier if the `git` cli exists or not
+            // todo: if commit signing is turned on, this wont work
+            const cmdValue = [
+                'git init',
+                'git add .',
+                'git commit -am "feat: initial commit"',
+                'git branch -M main',
+                `git remote add origin https://github.com/${this.recipe.variables.githubOwner}/${this.recipe.variables.githubParentRepo}.git`,
+                'git push -u origin main',
+            ].join(' && ');
+            const gitResp = spawnSync(cmdValue, [], {
+                cwd: this.deployPath,
+                shell: true,
+                detached: true,
+            });
+
+            if (gitResp.status === 0) {
+                this.customLog('Pushed initial commit to github');
+            } else {
+                this.customLog('Failed to push initial commit to github');
+            }
+        }
+
+        //Set progress
+        this.progress = 100;
+        this.customLog('All tasks completed.');
+
         //Else: success :)
         this.customLog('Deploy finished and folder validated. All done!');
         this.step = 'configure';
@@ -345,4 +412,4 @@ export class Deployer {
             } catch (error) { }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/extras/helpers.ts b/core/extras/helpers.ts
index 4fa002d71..80e02714b 100644
--- a/core/extras/helpers.ts
+++ b/core/extras/helpers.ts
@@ -6,274 +6,302 @@ import consts from "../../shared/consts";
  */
 let __ascii: string;
 export const txAdminASCII = () => {
-    //NOTE: precalculating the ascii art for efficiency
-    // import figlet from 'figlet';
-    // let ascii = figlet.textSync('txAdmin');
-    // let b64 = Buffer.from(ascii).toString('base64');
-    // console.log(b64);
-    if (!__ascii) {
-        const preCalculated = `ICBfICAgICAgICAgICAgXyAgICAgICBfICAgICAgICAgICBfICAgICAgIAogfCB8X19fICBfX
+  //NOTE: precalculating the ascii art for efficiency
+  // import figlet from 'figlet';
+  // let ascii = figlet.textSync('txAdmin');
+  // let b64 = Buffer.from(ascii).toString('base64');
+  // console.log(b64);
+  if (!__ascii) {
+    const preCalculated = `ICBfICAgICAgICAgICAgXyAgICAgICBfICAgICAgICAgICBfICAgICAgIAogfCB8X19fICBfX
     yAgIC8gXCAgIF9ffCB8XyBfXyBfX18gKF8pXyBfXyAgCiB8IF9fXCBcLyAvICAvIF8gXCAvIF9gIHwgJ18gYCBfIFx8IHwg
     J18gXCAKIHwgfF8gPiAgPCAgLyBfX18gXCAoX3wgfCB8IHwgfCB8IHwgfCB8IHwgfAogIFxfXy9fL1xfXC9fLyAgIFxfXF9
     fLF98X3wgfF98IHxffF98X3wgfF98CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA=`;
-        __ascii = Buffer.from(preCalculated, 'base64').toString('ascii');
-    }
-    return __ascii;
+    __ascii = Buffer.from(preCalculated, "base64").toString("ascii");
+  }
+  return __ascii;
 };
 
+export const githubRepoSourceRegex =
+  /^((https?:\/\/github\.com\/)?|@)?([\w.\-_]+)\/([\w.\-_]+).*$/;
 
 /**
  * Extracts hours and minutes from an string containing times
  */
 export const parseSchedule = (scheduleTimes: string[]) => {
-    const valid = [];
-    const invalid = [];
-    for (const timeInput of scheduleTimes) {
-        if (typeof timeInput !== 'string') continue;
-        const timeTrim = timeInput.trim();
-        if (!timeTrim.length) continue;
-
-        const hmRegex = /^([01]?[0-9]|2[0-4]):([0-5][0-9])$/gm;
-        const m = hmRegex.exec(timeTrim);
-        if (m === null) {
-            invalid.push(timeTrim);
-        } else {
-            if (m[1] === '24') m[1] = '00'; //Americans, amirite?!?!
-            valid.push({
-                string: m[1].padStart(2, '0') + ':' + m[2].padStart(2, '0'),
-                hours: parseInt(m[1]),
-                minutes: parseInt(m[2]),
-            });
-        }
+  const valid = [];
+  const invalid = [];
+  for (const timeInput of scheduleTimes) {
+    if (typeof timeInput !== "string") continue;
+    const timeTrim = timeInput.trim();
+    if (!timeTrim.length) continue;
+
+    const hmRegex = /^([01]?[0-9]|2[0-4]):([0-5][0-9])$/gm;
+    const m = hmRegex.exec(timeTrim);
+    if (m === null) {
+      invalid.push(timeTrim);
+    } else {
+      if (m[1] === "24") m[1] = "00"; //Americans, amirite?!?!
+      valid.push({
+        string: m[1].padStart(2, "0") + ":" + m[2].padStart(2, "0"),
+        hours: parseInt(m[1]),
+        minutes: parseInt(m[2])
+      });
     }
-    return { valid, invalid };
+  }
+  return { valid, invalid };
 };
 
-
 /**
  * Redacts sv_licenseKey, steam_webApiKey, sv_tebexSecret, and rcon_password from a string
  */
 export const redactApiKeys = (src: string) => {
-    if (typeof src !== 'string' || !src.length) return src;
-    return src
-        .replace(/licenseKey\s+["']?cfxk_\w{1,60}_(\w+)["']?.?$/gim, 'licenseKey [REDACTED cfxk...$1]')
-        .replace(/steam_webApiKey\s+["']?\w{32}["']?.?$/gim, 'steam_webApiKey [REDACTED]')
-        .replace(/sv_tebexSecret\s+["']?\w{40}["']?.?$/gim, 'sv_tebexSecret [REDACTED]')
-        .replace(/rcon_password\s+["']?[^"']+["']?.?$/gim, 'rcon_password [REDACTED]')
-        .replace(/mysql_connection_string\s+["']?[^"']+["']?.?$/gim, 'mysql_connection_string [REDACTED]')
-        .replace(/discord\.com\/api\/webhooks\/\d{17,20}\/\w{10,}.?$/gim, 'discord.com/api/webhooks/[REDACTED]/[REDACTED]');
+  if (typeof src !== "string" || !src.length) return src;
+  return src
+    .replace(
+      /licenseKey\s+["']?cfxk_\w{1,60}_(\w+)["']?.?$/gim,
+      "licenseKey [REDACTED cfxk...$1]"
+    )
+    .replace(
+      /steam_webApiKey\s+["']?\w{32}["']?.?$/gim,
+      "steam_webApiKey [REDACTED]"
+    )
+    .replace(
+      /sv_tebexSecret\s+["']?\w{40}["']?.?$/gim,
+      "sv_tebexSecret [REDACTED]"
+    )
+    .replace(
+      /rcon_password\s+["']?[^"']+["']?.?$/gim,
+      "rcon_password [REDACTED]"
+    )
+    .replace(
+      /mysql_connection_string\s+["']?[^"']+["']?.?$/gim,
+      "mysql_connection_string [REDACTED]"
+    )
+    .replace(
+      /discord\.com\/api\/webhooks\/\d{17,20}\/\w{10,}.?$/gim,
+      "discord.com/api/webhooks/[REDACTED]/[REDACTED]"
+    );
 };
 
-
 /**
  * Returns the unix timestamp in seconds.
  */
 export const now = () => Math.round(Date.now() / 1000);
 
-
 /**
  * Returns false if any argument is undefined
  */
-export const anyUndefined = (...args: any) => [...args].some((x) => (typeof x === 'undefined'));
-
+export const anyUndefined = (...args: any) =>
+  [...args].some((x) => typeof x === "undefined");
 
 /**
  * Calculates expiration and duration from a ban duration string like "1 day"
  */
 export const calcExpirationFromDuration = (inputDuration: string) => {
-    let expiration;
-    let duration;
-    if (inputDuration === 'permanent') {
-        expiration = false as const;
-    } else {
-        const [multiplierInput, unit] = inputDuration.split(/\s+/);
-        const multiplier = parseInt(multiplierInput);
-        if (isNaN(multiplier) || multiplier < 1) {
-            throw new Error(`The duration multiplier must be a number above 1.`);
-        }
+  let expiration;
+  let duration;
+  if (inputDuration === "permanent") {
+    expiration = false as const;
+  } else {
+    const [multiplierInput, unit] = inputDuration.split(/\s+/);
+    const multiplier = parseInt(multiplierInput);
+    if (isNaN(multiplier) || multiplier < 1) {
+      throw new Error(`The duration multiplier must be a number above 1.`);
+    }
 
-        if (unit.startsWith('hour')) {
-            duration = multiplier * 3600;
-        } else if (unit.startsWith('day')) {
-            duration = multiplier * 86400;
-        } else if (unit.startsWith('week')) {
-            duration = multiplier * 604800;
-        } else if (unit.startsWith('month')) {
-            duration = multiplier * 2592000; //30 days
-        } else {
-            throw new Error(`Invalid ban duration. Supported units: hours, days, weeks, months`);
-        }
-        expiration = now() + duration;
+    if (unit.startsWith("hour")) {
+      duration = multiplier * 3600;
+    } else if (unit.startsWith("day")) {
+      duration = multiplier * 86400;
+    } else if (unit.startsWith("week")) {
+      duration = multiplier * 604800;
+    } else if (unit.startsWith("month")) {
+      duration = multiplier * 2592000; //30 days
+    } else {
+      throw new Error(
+        `Invalid ban duration. Supported units: hours, days, weeks, months`
+      );
     }
+    expiration = now() + duration;
+  }
 
-    return { expiration, duration };
+  return { expiration, duration };
 };
 
-
 /**
  * Validates a single identifier and return its parts lowercased
  */
 export const parsePlayerId = (idString: string) => {
-    if (typeof idString !== 'string') {
-        return { isIdValid: false, idType: null, idValue: null, idlowerCased: null };
-    }
-
-    const idlowerCased = idString.toLocaleLowerCase();
-    const [idType, idValue] = idlowerCased.split(':', 2);
-    const validator = consts.validIdentifiers[idType as keyof typeof consts.validIdentifiers];
-    if (validator && validator.test(idlowerCased)) {
-        return { isIdValid: true, idType, idValue, idlowerCased };
-    } else {
-        return { isIdValid: false, idType, idValue, idlowerCased };
-    }
-}
-
+  if (typeof idString !== "string") {
+    return {
+      isIdValid: false,
+      idType: null,
+      idValue: null,
+      idlowerCased: null
+    };
+  }
+
+  const idlowerCased = idString.toLocaleLowerCase();
+  const [idType, idValue] = idlowerCased.split(":", 2);
+  const validator =
+    consts.validIdentifiers[idType as keyof typeof consts.validIdentifiers];
+  if (validator && validator.test(idlowerCased)) {
+    return { isIdValid: true, idType, idValue, idlowerCased };
+  } else {
+    return { isIdValid: false, idType, idValue, idlowerCased };
+  }
+};
 
 /**
  * Get valid, invalid and license identifier from array of ids
  */
 export const parsePlayerIds = (ids: string[]) => {
-    let invalidIdsArray: string[] = [];
-    let validIdsArray: string[] = [];
-    const validIdsObject: PlayerIdsObjectType = {
-        discord: null,
-        fivem: null,
-        license: null,
-        license2: null,
-        live: null,
-        steam: null,
-        xbl: null,
-    }
-
-    for (const idString of ids) {
-        if (typeof idString !== 'string') continue;
-        const { isIdValid, idType, idValue } = parsePlayerId(idString);
-        if (isIdValid) {
-            validIdsArray.push(idString);
-            validIdsObject[idType as keyof PlayerIdsObjectType] = idValue;
-        } else {
-            invalidIdsArray.push(idString);
-        }
+  let invalidIdsArray: string[] = [];
+  let validIdsArray: string[] = [];
+  const validIdsObject: PlayerIdsObjectType = {
+    discord: null,
+    fivem: null,
+    license: null,
+    license2: null,
+    live: null,
+    steam: null,
+    xbl: null
+  };
+
+  for (const idString of ids) {
+    if (typeof idString !== "string") continue;
+    const { isIdValid, idType, idValue } = parsePlayerId(idString);
+    if (isIdValid) {
+      validIdsArray.push(idString);
+      validIdsObject[idType as keyof PlayerIdsObjectType] = idValue;
+    } else {
+      invalidIdsArray.push(idString);
     }
+  }
 
-    return { invalidIdsArray, validIdsArray, validIdsObject };
-}
-
+  return { invalidIdsArray, validIdsArray, validIdsObject };
+};
 
 /**
  * Get valid and invalid player HWIDs
  */
 export const filterPlayerHwids = (hwids: string[]) => {
-    let invalidHwidsArray: string[] = [];
-    let validHwidsArray: string[] = [];
+  let invalidHwidsArray: string[] = [];
+  let validHwidsArray: string[] = [];
 
-    for (const hwidString of hwids) {
-        if (typeof hwidString !== 'string') continue;
-        if (consts.regexValidHwidToken.test(hwidString)) {
-            validHwidsArray.push(hwidString);
-        } else {
-            invalidHwidsArray.push(hwidString);
-        }
+  for (const hwidString of hwids) {
+    if (typeof hwidString !== "string") continue;
+    if (consts.regexValidHwidToken.test(hwidString)) {
+      validHwidsArray.push(hwidString);
+    } else {
+      invalidHwidsArray.push(hwidString);
     }
+  }
 
-    return { invalidHwidsArray, validHwidsArray };
-}
-
+  return { invalidHwidsArray, validHwidsArray };
+};
 
 /**
  * Attempts to parse a user-provided string into an array of valid identifiers.
  * This function is lenient and will attempt to parse any string into an array of valid identifiers.
  * For non-prefixed ids, it will attempt to parse it as discord, fivem, steam, or license.
  * Returns an array of valid ids/hwids, and array of invalid identifiers.
- * 
+ *
  * Stricter version of this function is parsePlayerIds
  */
 export const parseLaxIdsArrayInput = (fullInput: string) => {
-    const validIds: string[] = [];
-    const validHwids: string[] = [];
-    const invalids: string[] = [];
-
-    if (typeof fullInput !== 'string') {
-        return { validIds, validHwids, invalids };
-    }
-    const inputs = fullInput.toLowerCase().split(/[,;\s]+/g).filter(Boolean);
+  const validIds: string[] = [];
+  const validHwids: string[] = [];
+  const invalids: string[] = [];
 
-    for (const input of inputs) {
-        if (input.includes(':')) {
-            if (consts.regexValidHwidToken.test(input)) {
-                validHwids.push(input);
-            } else if (Object.values(consts.validIdentifiers).some((regex) => regex.test(input))) {
-                validIds.push(input);
-            } else {
-                const [type, value] = input.split(':', 1);
-                if (consts.validIdentifierParts[type as keyof typeof consts.validIdentifierParts]?.test(value)) {
-                    validIds.push(input);
-                } else {
-                    invalids.push(input);
-                }
-            }
-        } else if (consts.validIdentifierParts.discord.test(input)) {
-            validIds.push(`discord:${input}`);
-        } else if (consts.validIdentifierParts.fivem.test(input)) {
-            validIds.push(`fivem:${input}`);
-        } else if (consts.validIdentifierParts.license.test(input)) {
-            validIds.push(`license:${input}`);
-        } else if (consts.validIdentifierParts.steam.test(input)) {
-            validIds.push(`steam:${input}`);
+  if (typeof fullInput !== "string") {
+    return { validIds, validHwids, invalids };
+  }
+  const inputs = fullInput
+    .toLowerCase()
+    .split(/[,;\s]+/g)
+    .filter(Boolean);
+
+  for (const input of inputs) {
+    if (input.includes(":")) {
+      if (consts.regexValidHwidToken.test(input)) {
+        validHwids.push(input);
+      } else if (
+        Object.values(consts.validIdentifiers).some((regex) =>
+          regex.test(input)
+        )
+      ) {
+        validIds.push(input);
+      } else {
+        const [type, value] = input.split(":", 1);
+        if (
+          consts.validIdentifierParts[
+            type as keyof typeof consts.validIdentifierParts
+          ]?.test(value)
+        ) {
+          validIds.push(input);
         } else {
-            invalids.push(input);
+          invalids.push(input);
         }
+      }
+    } else if (consts.validIdentifierParts.discord.test(input)) {
+      validIds.push(`discord:${input}`);
+    } else if (consts.validIdentifierParts.fivem.test(input)) {
+      validIds.push(`fivem:${input}`);
+    } else if (consts.validIdentifierParts.license.test(input)) {
+      validIds.push(`license:${input}`);
+    } else if (consts.validIdentifierParts.steam.test(input)) {
+      validIds.push(`steam:${input}`);
+    } else {
+      invalids.push(input);
     }
+  }
 
-    return { validIds, validHwids, invalids };
-}
-
-
+  return { validIds, validHwids, invalids };
+};
 
 /**
  * Extracts the fivem:xxxxxx identifier from the nameid field from the userInfo oauth response.
  * Example: https://forum.cfx.re/internal/user/271816 -> fivem:271816
  */
 export const getIdFromOauthNameid = (nameid: string) => {
-    try {
-        const res = /\/user\/(\d{1,8})/.exec(nameid);
-        //@ts-expect-error
-        return `fivem:${res[1]}`;
-    } catch (error) {
-        return false;
-    }
-}
-
+  try {
+    const res = /\/user\/(\d{1,8})/.exec(nameid);
+    //@ts-expect-error
+    return `fivem:${res[1]}`;
+  } catch (error) {
+    return false;
+  }
+};
 
 /**
  * Parses a number or string to a float with a limited precision.
  */
 export const parseLimitedFloat = (src: number | string, precision = 6) => {
-    const srcAsNum = typeof src === 'string' ? parseFloat(src) : src;
-    return parseFloat(srcAsNum.toFixed(precision));
-}
-
+  const srcAsNum = typeof src === "string" ? parseFloat(src) : src;
+  return parseFloat(srcAsNum.toFixed(precision));
+};
 
 /**
  * Parses a fxserver version convar into a number.
  */
 export const parseFxserverVersion = (version: any) => {
-    if (typeof version !== 'string') throw new Error(`expected string`);
-
-    let platform: string | null = null;
-    if (version.includes('win32')) {
-        platform = 'windows';
-    } else if (version.includes('linux')) {
-        platform = 'linux';
-    }
-
-    let build: number | null = null;
-    try {
-        const res = /v1\.0\.0\.(\d{4,5})\s*/.exec(version);
-        // @ts-ignore: let it throw
-        const num = parseInt(res[1]);
-        if (!isNaN(num)) build = num;
-    } catch (error) { }
-
-    return { platform, build };
+  if (typeof version !== "string") throw new Error(`expected string`);
+
+  let platform: string | null = null;
+  if (version.includes("win32")) {
+    platform = "windows";
+  } else if (version.includes("linux")) {
+    platform = "linux";
+  }
+
+  let build: number | null = null;
+  try {
+    const res = /v1\.0\.0\.(\d{4,5})\s*/.exec(version);
+    // @ts-ignore: let it throw
+    const num = parseInt(res[1]);
+    if (!isNaN(num)) build = num;
+  } catch (error) {}
+
+  return { platform, build };
 };
diff --git a/core/extras/recipeEngine.js b/core/extras/recipeEngine.js
index cb2ed6ed2..f5aa1f691 100644
--- a/core/extras/recipeEngine.js
+++ b/core/extras/recipeEngine.js
@@ -5,10 +5,11 @@ import fsp from 'node:fs/promises';
 import path from 'node:path';
 import stream from 'node:stream';
 import StreamZip from 'node-stream-zip';
-import { cloneDeep, escapeRegExp }  from 'lodash-es';
+import { cloneDeep, escapeRegExp } from 'lodash-es';
 import mysql from 'mysql2/promise';
 import got from '@core/extras/got.js';
 import consoleFactory from '@extras/console';
+import { githubRepoSourceRegex } from './helpers';
 const console = consoleFactory(modulename);
 
 
@@ -84,7 +85,6 @@ const taskDownloadFile = async (options, basePath, deployerCtx) => {
  * Downloads a github repository with an optional reference (branch, tag, commit hash) or subpath.
  * If the directory structure does not exist, it is created.
  */
-const githubRepoSourceRegex = /^((https?:\/\/github\.com\/)?|@)?([\w.\-_]+)\/([\w.\-_]+).*$/;
 const validatorDownloadGithub = (options) => {
     return (
         typeof options.src == 'string'
@@ -112,8 +112,8 @@ const taskDownloadGithub = async (options, basePath, deployerCtx) => {
         const data = await got.get(
             `https://api.github.com/repos/${repoOwner}/${repoName}`,
             {
-                timeout: { request: 15e3 }
-            }
+                timeout: { request: 15e3 },
+            },
         ).json();
         if (typeof data !== 'object' || !data.default_branch) {
             throw new Error('reference not set, and wasn ot able to detect using github\'s api');
diff --git a/core/webroutes/deployer/actions.js b/core/webroutes/deployer/actions.js
index 956a4c8ea..81f3d751d 100644
--- a/core/webroutes/deployer/actions.js
+++ b/core/webroutes/deployer/actions.js
@@ -83,6 +83,10 @@ async function handleConfirmRecipe(ctx) {
  * @param {object} ctx
  */
 async function handleRunRecipe(ctx) {
+    globals.deployer.recipe.variables['githubAutoFork'] = ctx.request.body.githubAutoFork === 'true';
+    globals.deployer.recipe.variables['githubParentRepo'] = typeof ctx.request.body.githubParentRepo === 'string' ? ctx.request.body.githubParentRepo : null;
+    globals.deployer.recipe.variables['githubOwner'] = typeof ctx.request.body.githubOwner === 'string' ? ctx.request.body.githubOwner : null;
+
     //Start deployer
     try {
         ctx.admin.logAction('Running recipe.');
diff --git a/web/standalone/deployer.ejs b/web/standalone/deployer.ejs
index 8afda5d3d..7a70319b1 100644
--- a/web/standalone/deployer.ejs
+++ b/web/standalone/deployer.ejs
@@ -144,20 +144,16 @@
                                         Github Repository Owner
                                     </label>
                                     <div class="col-sm-9">
-                                        <div style="display: flex; flex-direction: row; gap: 0.5rem;">
-                                            <select id="step3-githubOwner" name="players" class="form-control" value="<%= githubOwner %>" required <% if (githubAuthKey === null) { %>disabled<% } %>>
-                                                <% if (githubAuthKey == null) { %>
-                                                    <option value="none" selected disabled>Input github key first</option>
-                                                <% } else { %>
-                                                    <option value="none" <% if (githubOwner === 'none') { %>selected<% } %> disabled>Select owner</option>
-                                                    <% for (const owner of githubOwners) { %>
-                                                        <option value="<%= owner %>" <% if (githubOwner === owner) { %>selected<% } %>><%= owner %></option>
-                                                    <% } %>
+                                        <select id="step3-githubOwner" name="players" class="form-control" value="<%= githubOwner %>" required <% if (githubAuthKey === null) { %>disabled<% } %>>
+                                            <% if (githubAuthKey == null) { %>
+                                                <option value="none" selected disabled>Input github key first</option>
+                                            <% } else { %>
+                                                <option value="none" <% if (githubOwner === 'none') { %>selected<% } %> disabled>Select owner</option>
+                                                <% for (const owner of githubOwners) { %>
+                                                    <option value="<%= owner %>" <% if (githubOwner === owner) { %>selected<% } %>><%= owner %></option>
                                                 <% } %>
-                                            </select>
-                                            <button class="btn btn-success" type="button" id="step3-owner-button"  <% if (githubAuthKey === null) { %>disabled<% } %>
-                                                onclick="step3SaveOwnerAction();" autofocus>Save</button>
-                                        </div>
+                                            <% } %>
+                                        </select>
                                         <span class="form-text text-muted">
                                             This dropdown is for selecting which github account / orginization should own the repositories related to your server
                                         </span>
@@ -169,30 +165,23 @@
                                         Github Auto Fork
                                     </label>
                                     <div class="col-sm-9">
-                                        <div style="display: flex; flex-direction: row; gap: 0.5rem;">
-                                            <select id="step3-githubAutoFork" class="form-control" value="<%= githubAutoFork %>" required>
-                                                <option value="false" <% if (githubAutoFork === false) { %>selected<% } %>>No</option>
-                                                <option value="true" <% if (githubAutoFork === true) { %>selected<% } %>>Yes</option>
-                                            </select>
-                                            <button class="btn btn-success" type="button" 
-                                                onclick="step3SaveForkAction();" autofocus>Save</button>
-                                        </div>
+                                        <select id="step3-githubAutoFork" class="form-control" value="<%= githubAutoFork %>" required>
+                                            <option value="false" <% if (githubAutoFork === false) { %>selected<% } %>>No</option>
+                                            <option value="true" <% if (githubAutoFork === true) { %>selected<% } %>>Yes</option>
+                                        </select>
                                         <span class="form-text text-muted">
                                             If this is enabled, then all the repositories from this server deployer will be auto forked to your own organization/user
                                         </span>
                                     </div>
                                 </div>
+
                                 <div class="form-group row">
                                     <label for="step3-githubParentRepo" class="col-sm-3 col-form-label">
                                         Github Parent Repo Name
                                     </label>
                                     <div class="col-sm-9">
-                                        <div style="display: flex; flex-direction: row; gap: 0.5rem;">
-                                            <input type="text" class="form-control" id="step3-githubParentRepo" maxlength="86" 
-                                                autocomplete="off" value="<%= githubParentRepo %>" autofocus placeholder="Repository name">
-                                            <button class="btn btn-success" type="button" 
-                                                onclick="step3SaveRepoNameAction();" autofocus>Save</button>
-                                        </div>
+                                        <input type="text" class="form-control" id="step3-githubParentRepo" maxlength="86" 
+                                            autocomplete="off" value="<%= githubParentRepo %>" autofocus placeholder="Repository name">
                                         <span class="form-text text-muted">
                                             This will be the name of the new github repository
                                         </span>
@@ -586,99 +575,11 @@
                 type: "POST",
                 url: '/deployer/recipe/runRecipe',
                 timeout: REQ_TIMEOUT_LONG,
-                data: {},
-                success: function (data) {
-                    if (checkApiLogoutRefresh(data)) return;
-                    if (data.success == true){
-                        window.location.reload(true);
-                    }else{
-                        notify.update('progress', 0);
-                        notify.update('type', data.type);
-                        notify.update('message', data.message);
-                    }
-                },
-                error: function (xmlhttprequest, textstatus, message) {
-                    notify.update('progress', 0);
-                    notify.update('type', 'danger');
-                    notify.update('message', message);
-                }
-            });
-        }
-        function step3SaveOwnerAction() {
-            if(!step3elements.form.reportValidity()) return;
-            const postData = {
-                key: 'githubOwner',
-                value: step3elements.githubOwner.value.trim()
-            }
-
-            const notify = $.notify({ message: '<p class="text-center">Saving...</p>' }, {});
-            txAdminAPI({
-                type: "POST",
-                url: '/deployer/recipe/setVersionControlVariables',
-                timeout: REQ_TIMEOUT_LONG,
-                data: postData,
-                success: function (data) {
-                    if (checkApiLogoutRefresh(data)) return;
-                    if (data.success == true){
-                        window.location.reload(true);
-                    }else{
-                        notify.update('progress', 0);
-                        notify.update('type', data.type);
-                        notify.update('message', data.message);
-                    }
-                    
-                },
-                error: function (xmlhttprequest, textstatus, message) {
-                    notify.update('progress', 0);
-                    notify.update('type', 'danger');
-                    notify.update('message', message);
-                }
-            });
-        }
-        function step3SaveForkAction() {
-            if(!step3elements.form.reportValidity()) return;
-            const postData = {
-                key: 'githubAutoFork',
-                value: step3elements.githubAutoFork.value.trim()
-            }
-
-            const notify = $.notify({ message: '<p class="text-center">Saving...</p>' }, {});
-            txAdminAPI({
-                type: "POST",
-                url: '/deployer/recipe/setVersionControlVariables',
-                timeout: REQ_TIMEOUT_LONG,
-                data: postData,
-                success: function (data) {
-                    if (checkApiLogoutRefresh(data)) return;
-                    if (data.success == true){
-                        window.location.reload(true);
-                    }else{
-                        notify.update('progress', 0);
-                        notify.update('type', data.type);
-                        notify.update('message', data.message);
-                    }
-                    
+                data: {
+                    githubOwner: step3elements.githubOwner.value.trim(),
+                    githubAutoFork: step3elements.githubAutoFork.value.trim(),
+                    githubParentRepo: step3elements.githubParentRepo.value.trim()
                 },
-                error: function (xmlhttprequest, textstatus, message) {
-                    notify.update('progress', 0);
-                    notify.update('type', 'danger');
-                    notify.update('message', message);
-                }
-            });
-        }
-        function step3SaveRepoNameAction() {
-            if(!step3elements.form.reportValidity()) return;
-            const postData = {
-                key: 'githubParentRepo',
-                value: step3elements.githubParentRepo.value.trim()
-            }
-
-            const notify = $.notify({ message: '<p class="text-center">Saving...</p>' }, {});
-            txAdminAPI({
-                type: "POST",
-                url: '/deployer/recipe/setVersionControlVariables',
-                timeout: REQ_TIMEOUT_LONG,
-                data: postData,
                 success: function (data) {
                     if (checkApiLogoutRefresh(data)) return;
                     if (data.success == true){
@@ -688,7 +589,6 @@
                         notify.update('type', data.type);
                         notify.update('message', data.message);
                     }
-                    
                 },
                 error: function (xmlhttprequest, textstatus, message) {
                     notify.update('progress', 0);