Skip to content

Allow seeing what other users are doing like when they are creating rectangles, lines, etc. #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 12, 2025
Merged

Allow seeing what other users are doing like when they are creating rectangles, lines, etc. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c0e68e
chore: initial commit
jesusmpc Mar 12, 2025
f67d924
chore: fix lint issues
jesusmpc Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import "./globals.css";
import { AppProviders } from "./providers";

const notoSans = Noto_Sans({
preload: true,
variable: "--font-noto-sans",
subsets: ["latin"],
});

const notoSansMono = Noto_Sans_Mono({
preload: true,
variable: "--font-noto-sans-mono",
subsets: ["latin"],
});
Expand All @@ -28,9 +30,7 @@ export default function RootLayout({
<body
className={`${notoSans.variable} ${notoSansMono.variable} antialiased`}
>
<AppProviders>
{children}
</AppProviders>
<AppProviders>{children}</AppProviders>
</body>
</html>
);
Expand Down
15 changes: 10 additions & 5 deletions code/components/actions/workspace-tool/workspace-tool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import { v4 as uuidv4 } from "uuid";
import { Vector2d } from "konva/lib/types";
import { WeaveWorkspaceToolActionState } from "./types";
import { WORKSPACE_TOOL_STATE } from "./constants";
import { WEAVE_NODE_LAYER_ID, WeaveAction, WeaveNodesSelectionPlugin } from "@inditextech/weavejs-sdk";
import {
WEAVE_NODE_LAYER_ID,
WeaveAction,
WeaveNodesSelectionPlugin,
} from "@inditextech/weavejs-sdk";
import Konva from "konva";

export class WorkspaceToolAction extends WeaveAction {
Expand Down Expand Up @@ -61,7 +65,8 @@ export class WorkspaceToolAction extends WeaveAction {
private addWorkspace() {
const stage = this.instance.getStage();

const selectionPlugin = this.instance.getPlugin<WeaveNodesSelectionPlugin>("nodesSelection");
const selectionPlugin =
this.instance.getPlugin<WeaveNodesSelectionPlugin>("nodesSelection");
if (selectionPlugin) {
const tr = selectionPlugin.getTransformer();
tr.hide();
Expand Down Expand Up @@ -127,14 +132,14 @@ export class WorkspaceToolAction extends WeaveAction {

stage.container().style.cursor = "default";

const selectionPlugin = this.instance.getPlugin<WeaveNodesSelectionPlugin>("nodesSelection");
const selectionPlugin =
this.instance.getPlugin<WeaveNodesSelectionPlugin>("nodesSelection");
if (selectionPlugin) {
const tr = selectionPlugin.getTransformer();
tr.show();
const node = stage.findOne(`#${this.workspaceId}`);
if (node) {
selectionPlugin.setSelectedNodes([node]);
}
this.instance.triggerAction("selectionTool");
}

this.workspaceId = null;
Expand Down
2 changes: 0 additions & 2 deletions code/components/nodes/pantone/pantone.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ export class PantoneNode extends WeaveNode {
};
delete pantoneParams.zIndex;

console.log("pantoneParams", pantoneParams);

const pantone = new Konva.Group({
...pantoneParams,
width: pantoneParams.width,
Expand Down
9 changes: 8 additions & 1 deletion code/components/nodes/workspace/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,16 @@ import {
WeaveStateElement,
} from "@inditextech/weavejs-sdk";
import Konva from "konva";
import { Noto_Sans_Mono } from "next/font/google";

export const WORKSPACE_NODE_TYPE = "workspace";

const notoSansMono = Noto_Sans_Mono({
preload: true,
variable: "--font-noto-sans-mono",
subsets: ["latin"],
});

export class WorkspaceNode extends WeaveNode {
protected nodeType = WORKSPACE_NODE_TYPE;

Expand Down Expand Up @@ -70,7 +77,7 @@ export class WorkspaceNode extends WeaveNode {
width: workspaceWidth,
height: titleHeight - 10,
fontSize: 20,
fontFamily: "NeueHelveticaZara",
fontFamily: notoSansMono.style.fontFamily,
align: "left",
text: workspaceParams.title,
stroke: "black",
Expand Down
102 changes: 53 additions & 49 deletions code/components/room-components/overlay/room-information-overlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,57 +62,61 @@ export function RoomInformationOverlay() {

return (
<div className="absolute top-2 left-2 flex gap-1 justify-center items-center">
<div className="p-2 px-3 bg-white border border-zinc-200 shadow-xs flex justify-start items-center gap-2">
<Logo kind="small" />
<div className="w-[1px] h-5 mx-1 bg-accent"></div>
<DropdownMenu onOpenChange={(open) => setMenuOpen(open)}>
<DropdownMenuTrigger
className={cn(
"rounded-none cursor-pointer p-1 px-3 hover:bg-accent focus:outline-none",
{
["bg-accent"]: menuOpen,
["bg-white"]: !menuOpen,
}
)}
>
<div className="flex justify-start items-center gap-2 font-noto-sans-mono text-foreground !normal-case min-h-[32px]">
<div className="font-noto-sans text-xl font-extralight">
{room}
</div>
{menuOpen ? <ChevronUp /> : <ChevronDown />}
</div>
</DropdownMenuTrigger>
<DropdownMenuContent
align="start"
side="bottom"
alignOffset={0}
sideOffset={4}
className="font-noto-sans-mono rounded-none"
>
<DropdownMenuItem
className="text-foreground cursor-pointer hover:rounded-none"
onClick={handleExportToImage}
>
<ImageIcon /> Export to image
</DropdownMenuItem>
<DropdownMenuItem
className="text-foreground cursor-pointer hover:rounded-none"
onClick={handleExportToPdf}
<div className="bg-white border border-zinc-200 shadow-xs flex justify-start items-center gap-0">
<div className="bg-accent h-[50px] flex justify-start items-center p-1 px-2">
<Logo kind="small" />
</div>
<div className="flex justify-start items-center p-1 gap-1">
{/* <div className="w-[1px] h-5 mx-1 bg-accent"></div> */}
<DropdownMenu onOpenChange={(open) => setMenuOpen(open)}>
<DropdownMenuTrigger
className={cn(
"rounded-none cursor-pointer p-1 px-3 hover:bg-accent focus:outline-none",
{
["bg-accent"]: menuOpen,
["bg-white"]: !menuOpen,
}
)}
>
<FileText />
Export to PDF
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
className="text-foreground cursor-pointer hover:rounded-none"
onClick={handleExitRoom}
<div className="flex justify-start items-center gap-2 font-noto-sans-mono text-foreground !normal-case min-h-[32px]">
<div className="font-noto-sans text-lg font-extralight">
{room}
</div>
{menuOpen ? <ChevronUp /> : <ChevronDown />}
</div>
</DropdownMenuTrigger>
<DropdownMenuContent
align="start"
side="bottom"
alignOffset={0}
sideOffset={4}
className="font-noto-sans-mono rounded-none"
>
<LogOut /> Exit room
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
<div className="w-[1px] h-5 mx-1 bg-accent"></div>
<ConnectionStatus weaveConnectionStatus={weaveConnectionStatus} />
<DropdownMenuItem
className="text-foreground cursor-pointer hover:rounded-none"
onClick={handleExportToImage}
>
<ImageIcon /> Export to image
</DropdownMenuItem>
<DropdownMenuItem
className="text-foreground cursor-pointer hover:rounded-none"
onClick={handleExportToPdf}
>
<FileText />
Export to PDF
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
className="text-foreground cursor-pointer hover:rounded-none"
onClick={handleExitRoom}
>
<LogOut /> Exit room
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
{/* <div className="w-[1px] h-5 mx-1 bg-accent"></div> */}
<ConnectionStatus weaveConnectionStatus={weaveConnectionStatus} />
</div>
</div>
</div>
);
Expand Down
Loading