gitxelectron 1.2.9 → 1.3.1

package/out/renderer/assets/{index-xMfzgem_.js → index-Ctq_B0UN.js}

@@ -24015,9 +24015,9 @@ function CloneRepoWizard({ onClose, onSuccess }) {
         )
       ] })
     ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-6", children: [
-      error && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-danger/10 border border-danger/30 text-danger px-4 py-3 rounded-lg text-sm flex items-start gap-3", children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5 flex-shrink-0 mt-0.5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" }) }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "break-words", children: error })
+      error && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-danger/10 border border-danger/30 text-danger px-4 py-3 rounded-lg text-xs flex items-start gap-3 max-h-36 overflow-y-auto custom-scrollbar", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5 flex-shrink-0 mt-0.5 text-danger", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" }) }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "break-words font-mono text-[11px] leading-relaxed select-text", children: error })
       ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-4", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
@@ -24230,7 +24230,8 @@ const CollaborationRepoView = ({
   isRefreshing,
   onOpenExternal,
   onUnlinkMapping,
-  onChangeFolder
+  onChangeFolder,
+  onSyncCollabRepo
 }) => {
   const filteredRepos = collaboratedRepos.filter((repo) => {
     if (!collabSearch.trim()) return true;
@@ -24470,7 +24471,7 @@ const CollaborationRepoView = ({
               )
             ] }),
             /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-xs text-secondary line-clamp-2 min-h-[34px] break-words leading-relaxed", children: repo.description || /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "italic text-secondary/50", children: "No repository description provided." }) }),
-            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "border-t border-border/60 pt-3 flex flex-col sm:flex-row sm:items-center justify-between gap-2.5 min-w-0", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "border-t border-border/60 pt-3 flex flex-wrap items-center justify-between gap-3 min-w-0", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "min-w-0 flex-1", children: savedPath ? isMissing ? /* @__PURE__ */ jsxRuntimeExports.jsxs(
                 "div",
                 {
@@ -24495,7 +24496,7 @@ const CollaborationRepoView = ({
                 /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-secondary/40" }),
                 /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Not cloned yet" })
               ] }) }),
-              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-1.5 flex-shrink-0 self-end sm:self-center", children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-wrap items-center justify-end gap-1.5 flex-shrink-0", children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsxs(
                   "button",
                   {
@@ -24512,6 +24513,22 @@ const CollaborationRepoView = ({
                     ]
                   }
                 ),
+                savedPath && !isMissing && onSyncCollabRepo && /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                  "button",
+                  {
+                    type: "button",
+                    onClick: (e) => {
+                      e.stopPropagation();
+                      onSyncCollabRepo(repo, savedPath);
+                    },
+                    className: "px-2.5 py-1.5 text-xs font-semibold rounded-xl transition-all shadow-xs flex items-center gap-1 bg-blue-600/15 hover:bg-blue-600/25 text-blue-400 border border-blue-500/30",
+                    title: "Pull all latest team changes into this folder immediately",
+                    children: [
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "⬇️" }),
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Pull" })
+                    ]
+                  }
+                ),
                 savedPath && /* @__PURE__ */ jsxRuntimeExports.jsx(
                   "button",
                   {
@@ -26062,9 +26079,15 @@ Are you SURE you want to link "${repoName}" to this folder?`
     try {
       const remotes = await window.api.getRemotes();
       if (remotes.length > 0) {
-        await window.api.pullFromRemote(remotes[0].name, branches.current);
+        const result = await window.api.pullFromRemote(remotes[0].name, branches?.current);
         await refreshRepoState();
-        showToast("Successfully pulled latest changes!", "success");
+        if (result?.alreadyUpToDate) {
+          showToast("✨ Local files are already completely up to date with GitHub!", "info");
+        } else if (result?.message) {
+          showToast(`✅ ${result.message}`, "success");
+        } else {
+          showToast("✅ Successfully updated local files with team changes!", "success");
+        }
       } else {
         setShowSetupWizard(true);
       }
@@ -26074,6 +26097,23 @@ Are you SURE you want to link "${repoName}" to this folder?`
       setIsPulling(false);
     }
   };
+  const handleSyncCollabRepo = async (repo, savedPath) => {
+    try {
+      showToast(`Syncing ${repo.name} with GitHub...`, "info");
+      await window.api.setRepoPath(savedPath);
+      const res = await window.api.pullFromRemote();
+      if (res?.alreadyUpToDate) {
+        showToast(`✨ ${repo.name} is already completely up to date!`, "info");
+      } else {
+        showToast(`✅ ${repo.name}: ${res?.message || "Synced latest team changes!"}`, "success");
+      }
+      if (repoPath === savedPath) {
+        await refreshRepoState();
+      }
+    } catch (e) {
+      showToast(`Failed to sync ${repo.name}: ${e.message}`, "error");
+    }
+  };
   const autonomousHealAndPush = async (initialError, operation, overrideRepoPath, overrideBranch) => {
     let currentError = initialError;
     let attempts = 0;
@@ -27440,6 +27480,19 @@ Are you SURE you want to link "${repoName}" to this folder?`
                   t("universalPush")
                 ]
               }
+            ),
+            repoPath && /* @__PURE__ */ jsxRuntimeExports.jsxs(
+              "button",
+              {
+                onClick: handlePull,
+                disabled: isPulling,
+                className: `w-full font-medium py-2 px-4 rounded-md transition-all border text-sm flex items-center justify-center gap-2 shadow-sm ${(status?.behind ?? 0) > 0 ? "bg-blue-600/25 text-blue-300 border-blue-500/50 hover:bg-blue-600/35 ring-1 ring-blue-500/30 animate-pulse" : "bg-surface-hover hover:brightness-110 text-primary border-border hover:border-brand/40"}`,
+                title: "Download and update all new files pushed by team members on GitHub to your local folder",
+                children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-4 h-4 text-accent", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" }) }),
+                  isPulling ? "Pulling..." : (status?.behind ?? 0) > 0 ? `Pull (${status.behind})` : "Pull"
+                ]
+              }
             )
           ] }),
           collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mb-4", children: [
@@ -28039,10 +28092,11 @@ Are you SURE you want to link "${repoName}" to this folder?`
                 "button",
                 {
                   onClick: handlePull,
-                  disabled: isPulling || status.conflicted.length > 0,
-                  className: "ml-2 px-3 py-1 bg-surface-hover hover:brightness-110 text-primary rounded-md font-semibold transition-all disabled:opacity-50 border border-border flex items-center gap-1",
+                  disabled: isPulling || status?.conflicted?.length > 0,
+                  title: "Download and update all new files and changes pushed by your team on GitHub to your computer",
+                  className: `ml-2 px-3 py-1.5 rounded-lg font-semibold transition-all duration-200 border flex items-center gap-1.5 shadow-sm text-xs ${(status?.behind ?? 0) > 0 ? "bg-gradient-to-r from-blue-600 to-indigo-600 hover:from-blue-500 hover:to-indigo-500 text-white border-blue-400/40 ring-2 ring-blue-500/20 animate-pulse" : "bg-surface-hover hover:brightness-110 text-primary border-border hover:border-brand/40"} disabled:opacity-50`,
                   children: isPulling ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsxs("svg", { className: "w-3 h-3 animate-spin", fill: "none", viewBox: "0 0 24 24", children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsxs("svg", { className: "w-3.5 h-3.5 animate-spin text-accent", fill: "none", viewBox: "0 0 24 24", children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsx(
                         "circle",
                         {
@@ -28063,9 +28117,11 @@ Are you SURE you want to link "${repoName}" to this folder?`
                         }
                       )
                     ] }),
-                    " ",
-                    "Pulling"
-                  ] }) : "Pull"
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Pulling..." })
+                  ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-3.5 h-3.5 text-accent", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" }) }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: (status?.behind ?? 0) > 0 ? `Pull (${status.behind})` : "Pull" })
+                  ] })
                 }
               )
             ] })
@@ -28107,7 +28163,8 @@ Are you SURE you want to link "${repoName}" to this folder?`
                 isRefreshing,
                 onOpenExternal: (url) => window.api.openExternal(url),
                 onUnlinkMapping: removeMapping,
-                onChangeFolder: handleSelectCollabFolder
+                onChangeFolder: handleSelectCollabFolder,
+                onSyncCollabRepo: handleSyncCollabRepo
               }
             )
           ] }) : /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [

package/out/renderer/index.html

@@ -21,8 +21,8 @@
       href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap"
       rel="stylesheet"
     />
-    <script type="module" crossorigin src="./assets/index-xMfzgem_.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-BbL4wUJk.css">
+    <script type="module" crossorigin src="./assets/index-Ctq_B0UN.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-C1EI1txt.css">
   </head>
 
   <body class="bg-gray-900 text-white font-sans antialiased overflow-hidden">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitxelectron",
-  "version": "1.2.9",
+  "version": "1.3.1",
   "description": "An elegant, completely silent auto-syncing Git client. Works as a desktop app and npm CLI tool.",
   "main": "./out/main/index.js",
   "files": [