Merge pull request #757 from tone-row/dev

v1.59.0

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "1.58.2",
+  "version": "1.59.0",
   "main": "module/module.js",
   "license": "MIT",
   "scripts": {

app/scripts/screenshot-templates.mjs

@@ -3,7 +3,6 @@ import fs from "fs";
 import { chromium } from "playwright";
 import { exec } from "child_process";
 import util from "util";
-import { writeFile } from "fs/promises";
 
 const execAsync = util.promisify(exec);
 

app/src/components/Layout.tsx

@@ -1,5 +1,5 @@
 import cx from "classnames";
-import { X, Wrench } from "phosphor-react";
+import { X } from "phosphor-react";
 import { lazy, memo, ReactNode, Suspense, useState } from "react";
 
 import { useFullscreen, useIsEditorView } from "../lib/hooks";
@@ -9,9 +9,6 @@ import { Header } from "./Header";
 import styles from "./Layout.module.css";
 import Loading from "./Loading";
 import { VersionCheck } from "./VersionCheck";
-import * as Dialog from "@radix-ui/react-dialog";
-import { Overlay, Content } from "../ui/Dialog";
-import { Trans, t } from "@lingui/macro";
 const PaywallModal = lazy(() => import("./PaywallModal"));
 
 const Layout = memo(({ children }: { children: ReactNode }) => {

app/src/components/LoadTemplateDialog.tsx

@@ -150,23 +150,26 @@ export function LoadTemplateDialog() {
                 </div>
               </div>
             ) : (
-              <div className="h-full overflow-y-auto">
+              <div className="h-full overflow-y-auto minimal-scrollbar">
                 <div
-                  className="grid gap-1 grid-cols-2 md:grid-cols-3"
+                  className="grid gap-2 grid-cols-2 md:grid-cols-3"
                   aria-label="Templates"
                 >
                   {templates.map((template) => (
                     <button
                       key={template}
                       onClick={() => setTemplate(template)}
-                      className="overflow-hidden shadow-sm opacity-70 dark:opacity-90 hover:opacity-100 aspect-square"
+                      className="overflow-hidden aspect-square relative group rounded-md"
                     >
                       <img
                         key={template}
                         src={`/template-screenshots/thumb_${template}.png`}
-                        className="rounded object-contain object-center w-full h-full"
+                        className="object-contain object-center w-full h-full"
                         alt={template}
                       />
+                      <div className="group-hover:opacity-100 opacity-0 transition-opacity duration-200 absolute bottom-0 left-0 right-0 bg-black/80 flex items-center justify-center text-white py-2 text-xs font-mono">
+                        {template}
+                      </div>
                     </button>
                   ))}
                 </div>

app/src/index.css

@@ -465,3 +465,16 @@ body.dark .pricing-highlights {
     calc(100% - 64px) 100%
   );
 }
+
+.minimal-scrollbar::-webkit-scrollbar {
+  @apply w-2;
+}
+.minimal-scrollbar::-webkit-scrollbar-thumb {
+  @apply bg-neutral-300 dark:bg-neutral-800 rounded-full cursor-pointer;
+}
+.minimal-scrollbar:hover::-webkit-scrollbar-thumb {
+  @apply bg-neutral-400 dark:bg-neutral-700;
+}
+.minimal-scrollbar::-webkit-scrollbar-track {
+  @apply bg-transparent;
+}

app/src/lib/prepareChart/prepareChart.test.ts

@@ -1,8 +1,6 @@
 import { readFileSync } from "fs";
 import { join } from "path";
 
-import { cytoscapeStyle as style } from "../themes/original";
-import { cytoscapeStyle as darkStyle } from "../themes/original-dark";
 import { theme, cytoscapeStyle } from "../templates/default-template";
 import { initialDoc } from "../useDoc";
 import { prepareChart } from "./prepareChart";

app/src/lib/templates/decision-flow-template.ts

@@ -1,150 +1,92 @@
 import { FFTheme } from "../FFTheme";
 
 export const content = `
-Should we launch the product? .decision
-  Yes: High demand
-    Prepare marketing campaign .action
-      Set budget .input
-      Create ads .input
-    Scale production .action
-      Hire staff .input
-      Increase inventory .input
-  No: More research needed
-    Conduct market analysis .action.color_blue
-      Positive results: Proceed
-        (Should we launch the product?)
-      Negative results: Abandon
-        End project .terminal.color_red
-    Improve product .action.color_green
-      Minor changes
-        (Should we launch the product?)
-      Major overhaul
-        Seek additional funding .action.color_orange
-          Approved: Continue
-            (Should we launch the product?)
-          Denied: Abandon
-            (End project)
+Start
+  Should we launch the product? .decision
+    Yes: Market ready
+      Launch campaign .action
+        Set budget .input
+          Launch .terminal.color_blue
+    No: Need improvements
+      Improve product .action.color_green
+        (Market ready)
 `;
 
 export const theme: FFTheme = {
-  layoutName: "layered",
+  layoutName: "mrtree",
   direction: "DOWN",
-  spacingFactor: 1.25,
+  spacingFactor: 1.2,
 
-  background: "#f2e9e4",
+  background: "#ffffff",
   fontFamily: "Roboto",
-  nodeBackground: "#4a4e69",
-  nodeForeground: "#ffffff",
-  borderWidth: 0,
-  edgeColor: "#22223b",
+  nodeBackground: "#f8fafc",
+  nodeForeground: "#1e293b",
+  borderWidth: 2,
+  edgeColor: "#64748b",
   padding: 16,
-  borderColor: "#ced4da",
+  borderColor: "#64748b",
   textMaxWidth: 150,
   lineHeight: 1.3,
-  textMarginY: 0,
+  textMarginY: 1.75,
   useFixedHeight: false,
   shape: "rectangle",
-  curveStyle: "round-taxi",
+  curveStyle: "bezier",
   edgeWidth: 2,
   sourceArrowShape: "none",
   targetArrowShape: "triangle",
   sourceDistanceFromNode: 0,
-  targetDistanceFromNode: 10,
-  arrowScale: 1.2,
-  edgeTextSize: 12,
+  targetDistanceFromNode: 0,
+  arrowScale: 1.75,
+  edgeTextSize: 0.9,
   rotateEdgeLabel: false,
   fixedHeight: 100,
 };
 
 export const cytoscapeStyle = `
 @import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;500&display=swap');
 
-node {
-  font-weight: 500;
-  text-halign: center;
-  text-valign: center;
-  color: #ffffff;
-  background-color: #4a4e69;
-  border-width: 0;
-  font-size: 14px;
-  text-wrap: wrap;
-  text-max-width: 130px;
-  padding: 12px;
-  width: 160px;
-  height: 80px;
-  text-outline-color: #22223b;
-  text-outline-width: 1px;
-  text-outline-opacity: 0.5;
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-edge {
-  taxi-direction: downward;
-  target-arrow-shape: triangle;
-  target-arrow-color: #22223b;
-  line-color: #22223b;
-  width: 2px;
-  font-size: 12px;
-  font-weight: 500;
-  color: #22223b;
-  text-background-color: #f2e9e4;
-  text-background-opacity: 1;
-  text-background-padding: 3px;
-  curve-style: unbundled-bezier;
-  control-point-distances: 0 -20 -20 20 0;
-  control-point-weights: 0.25 0.5 0.75;
-}
-
 .decision {
   shape: diamond;
-  background-color: #f72585;
-  width: 160px;
-  height: 160px;
+  background-color: #f1f5f9;
+  height: 150px;
 }
 
 .action {
   shape: rectangle;
-  background-color: #4361ee;
+  background-color: #bfdbfe;
+  border-color: #3b82f6;
 }
 
 .input {
   shape: parallelogram;
-  background-color: #4cc9f0;
-  width: 140px;
-  height: 70px;
+  background-color: #ddd6fe;
+  border-color: #7c3aed;
 }
 
 .terminal {
   shape: ellipse;
-  background-color: #7209b7;
-  width: 140px;
-  height: 70px;
-}
-
-.recurse {
-  shape: rectangle;
-  background-color: #4895ef;
-  border-width: 3px;
-  border-style: dashed;
-  border-color: #f72585;
-  width: 140px;
-  height: 70px;
+  background-color: #fecaca;
+  border-color: #dc2626;
 }
 
 .color_blue {
-  background-color: #4cc9f0;
+  background-color: #bfdbfe;
+  border-color: #3b82f6;
 }
 
 .color_green {
-  background-color: #52b788;
+  background-color: #bbf7d0;
+  border-color: #16a34a;
 }
 
 .color_red {
-  background-color: #e63946;
+  background-color: #fecaca;
+  border-color: #dc2626;
 }
 
 .color_orange {
-  background-color: #fb8500;
+  background-color: #fed7aa;
+  border-color: #f97316;
 }
 
 @keyframes pulse {