Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions components/projects/ProjectItem.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@
.container {
cursor: pointer;
width: 100%;
padding: 16px 16px;
padding: 24px;

display: flex;
flex-direction: row;
align-items: center;
gap: 16px;

border-radius: 18px;
border-style: solid;
border-width: 3px;
border-color: var(--tertiary);
border: none;
background-color: var(--project-item-bg);
box-shadow: var(--panel-shadow);

transition: border-color 0.2s;
}
Expand Down
5 changes: 5 additions & 0 deletions components/projects/ProjectPageContainer.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
width: 100%;
}

.header_title {
position: relative;
top: 0.8rem;
}

.header_info {
display: flex;
flex-direction: row;
Expand Down
13 changes: 10 additions & 3 deletions components/projects/ProjectPageContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
"use client";

import { useCallback, useEffect, useRef, useState } from "react";
import { useCookieUser, useIsPro, useProjectMemberships, ExtendedProjectMembershipPayload } from "@src/lib/utils/hooks";
import {
useCookieUser,
useIsPro,
useProjectMemberships,
ExtendedProjectMembershipPayload,
} from "@src/lib/utils/hooks";
import { join } from "@src/lib/utils/misc";
import { importFileAsProject, getSupportedImportExtensions } from "@src/lib/import/import-project";
import { redirectScreenplay } from "@src/lib/utils/redirects";
Expand Down Expand Up @@ -99,7 +104,7 @@ const ProjectPageContainer = () => {
<div className={page.center}>
<div className={page.header}>
<div className={page.header_info}>
<h1>{t("pageTitle")}</h1>
<h1 className={page.header_title}>{t("pageTitle")}</h1>
<div className={page.header_btns}>
<button
className={`${page.import_btn} ${form.btn}`}
Expand Down Expand Up @@ -133,7 +138,9 @@ const ProjectPageContainer = () => {
})}
</div>
</div>
<div className={join(page.bottomShadow, showShadow ? page.showShadow : "")} />
<div
className={join(page.bottomShadow, showShadow ? page.showShadow : "")}
/>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/projects/ProjectUnavailableDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const ProjectUnavailableDialog = () => {
const { getCachedProject, migrateToCachedProject } =
await import("@src/lib/persistence/storage-provider/local-persistence");
const cachedProject = await getCachedProject(projectId);
const metadataTitle = repository?.getState().metadata().get("title");
const metadataTitle = repository?.getTitle();
const title = cachedProject?.title || project?.project?.title || metadataTitle || "Untitled Project";
const newProject = await migrateToCachedProject(projectId, title, cachedProject?.description ?? undefined);
router.replace(`/projects/screenplay?projectId=${newProject.id}`);
Expand Down
8 changes: 4 additions & 4 deletions src/lib/adapters/screenplay-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import FileSaver from "file-saver";
import { isTauri } from "@tauri-apps/api/core";
import { replaceScreenplay } from "../screenplay/editor";
import { Editor } from "@tiptap/react";
import { ProjectData, ProjectState } from "../project/project-state";
import { BoardData, LayoutData, ProjectData, ProjectMetadata, ProjectState } from "../project/project-state";
import { ProjectRepository } from "../project/project-repository";

export type BaseExportOptions = {
Expand Down Expand Up @@ -80,7 +80,7 @@ export abstract class ProjectAdapter<TExportOptions extends BaseExportOptions =
if (project.metadata) {
const metadataMap = ydoc.metadata();
Object.entries(project.metadata).forEach(([key, value]) => {
metadataMap.set(key, value);
metadataMap.set(key as keyof ProjectMetadata, value);
});
}

Expand Down Expand Up @@ -112,14 +112,14 @@ export abstract class ProjectAdapter<TExportOptions extends BaseExportOptions =
const boardMap = ydoc.board();
boardMap.clear();
Object.entries(project.board).forEach(([key, value]) => {
boardMap.set(key, value);
boardMap.set(key as keyof BoardData, value);
});
}

if (project.layout) {
const layoutMap = ydoc.layout();
Object.entries(project.layout).forEach(([key, value]) => {
layoutMap.set(key, value);
layoutMap.set(key as keyof LayoutData, value);
});
}

Expand Down
8 changes: 4 additions & 4 deletions src/lib/import/import-project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Creates remote projects for logged-in users, local projects for offline/desktop.
*/

import { ProjectData, ProjectState } from "@src/lib/project/project-state";
import { BoardData, LayoutData, ProjectData, ProjectMetadata, ProjectState } from "@src/lib/project/project-state";
import { getAdapterByFilename } from "@src/lib/adapters/registry";
import { createCachedProject, createCachedProjectWithId } from "@src/lib/persistence/storage-provider/local-persistence";
import { writeYjsDocumentLocally } from "@src/lib/persistence/y-local-provider";
Expand Down Expand Up @@ -90,7 +90,7 @@ async function createLocalYjsDocument(projectId: string, projectData: ProjectDat
// Maps
if (projectData.metadata) {
const metadataMap = ydoc.metadata();
Object.entries(projectData.metadata).forEach(([key, value]) => metadataMap.set(key, value));
Object.entries(projectData.metadata).forEach(([key, value]) => metadataMap.set(key as keyof ProjectMetadata, value));
}

if (projectData.characters) {
Expand All @@ -110,12 +110,12 @@ async function createLocalYjsDocument(projectId: string, projectData: ProjectDat

if (projectData.board) {
const boardMap = ydoc.board();
Object.entries(projectData.board).forEach(([key, value]) => boardMap.set(key, value));
Object.entries(projectData.board).forEach(([key, value]) => boardMap.set(key as keyof BoardData, value));
}

if (projectData.layout) {
const layoutMap = ydoc.layout();
Object.entries(projectData.layout).forEach(([key, value]) => layoutMap.set(key, value));
Object.entries(projectData.layout).forEach(([key, value]) => layoutMap.set(key as keyof LayoutData, value));
}

if (projectData.comments) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/mail/mail.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import nodemailer from "nodemailer";
import * as fs from "fs";
import { BASE_URL } from "../utils/constants";
var hogan = require("hogan.js");
import hogan from "hogan.js";

const transporter = nodemailer.createTransport({
pool: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export class IndexedDBStorageProvider implements StorageProvider {
const req = db.transaction(DICTIONARIES_STORE, "readonly").objectStore(DICTIONARIES_STORE).getAll();
req.onsuccess = () =>
resolve(
(req.result as any[]).map((row) => ({
(req.result as InstalledDictionary[]).map((row) => ({
code: row.code,
size: row.size,
installedAt: row.installedAt,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/persistence/y-local-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type * as Y from "yjs";
export const yjsDbKey = (projectId: string) => `scriptio-${projectId}`;

export interface YjsLocalProvider {
on(event: "synced", callback: (provider: any) => void): void;
on(event: "synced", callback: (provider: YjsLocalProvider) => void): void;
destroy(): void;
/** Clear all stored data for this project (used when server restores a snapshot). */
clearData?(): Promise<void>;
Expand Down
29 changes: 15 additions & 14 deletions src/lib/project/project-repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ScreenplaySchema } from "../screenplay/editor";
import { Comment, CommentReply, Screenplay } from "../utils/types";
import {
LayoutData,
ProjectMetadata,
ProjectState,
ElementStyle,
PageMargin,
Expand Down Expand Up @@ -123,9 +124,9 @@ export class ProjectRepository {
this.ydoc.metadata().set("author", author);
}

observeMetadata(callback: (metadata: Record<string, any>) => void): () => void {
observeMetadata(callback: (metadata: Partial<ProjectMetadata>) => void): () => void {
const map = this.ydoc.metadata();
const observer = () => callback(map.toJSON());
const observer = () => callback(map.toJSON() as Partial<ProjectMetadata>);
map.observe(observer);
return () => map.unobserve(observer);
}
Expand Down Expand Up @@ -335,50 +336,50 @@ export class ProjectRepository {
// -------------------------------- //

/**
* Generic comment operations — work on any Y.Map<any> keyed by comment UUID.
* Generic comment operations — work on any Y.Map<Comment> keyed by comment UUID.
* Use the convenience wrappers below for the main screenplay comments.
*/

getCommentsFromMap(map: Y.Map<any>): Record<string, Comment> {
getCommentsFromMap(map: Y.Map<Comment>): Record<string, Comment> {
return map.toJSON() as Record<string, Comment>;
}

getCommentFromMap(map: Y.Map<any>, commentId: string): Comment | undefined {
return map.get(commentId) as Comment | undefined;
getCommentFromMap(map: Y.Map<Comment>, commentId: string): Comment | undefined {
return map.get(commentId);
}

addCommentToMap(map: Y.Map<any>, comment: Omit<Comment, "id">): string {
addCommentToMap(map: Y.Map<Comment>, comment: Omit<Comment, "id">): string {
const id = uuidv7();
map.set(id, { ...comment, id });
return id;
}

updateCommentInMap(map: Y.Map<any>, commentId: string, data: Partial<Comment>): void {
const existing = map.get(commentId) as Comment | undefined;
updateCommentInMap(map: Y.Map<Comment>, commentId: string, data: Partial<Comment>): void {
const existing = map.get(commentId);
if (!existing) return;
map.set(commentId, { ...existing, ...data });
}

resolveCommentInMap(map: Y.Map<any>, commentId: string): void {
resolveCommentInMap(map: Y.Map<Comment>, commentId: string): void {
this.updateCommentInMap(map, commentId, { resolved: true });
}

addReplyToMap(map: Y.Map<any>, commentId: string, reply: Omit<CommentReply, "id">): string | undefined {
const existing = map.get(commentId) as Comment | undefined;
addReplyToMap(map: Y.Map<Comment>, commentId: string, reply: Omit<CommentReply, "id">): string | undefined {
const existing = map.get(commentId);
if (!existing) return undefined;
const id = uuidv7();
const replies = [...(existing.replies ?? []), { ...reply, id }];
map.set(commentId, { ...existing, replies });
return id;
}

deleteCommentFromMap(map: Y.Map<any>, commentId: string): void {
deleteCommentFromMap(map: Y.Map<Comment>, commentId: string): void {
if (map.has(commentId)) {
map.delete(commentId);
}
}

observeCommentsMap(map: Y.Map<any>, callback: (comments: Record<string, Comment>) => void): () => void {
observeCommentsMap(map: Y.Map<Comment>, callback: (comments: Record<string, Comment>) => void): () => void {
const observer = () => callback(map.toJSON() as Record<string, Comment>);
map.observe(observer);
return () => map.unobserve(observer);
Expand Down
Loading
Loading