Skip to content

Commit 3762f4f

Browse files
YousefEDYousefED
committed
small fixes
1 parent fc539cd commit 3762f4f

10 files changed

Lines changed: 175 additions & 133 deletions

File tree

‎package-lock.json‎

Lines changed: 117 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/editor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@atlaskit/textfield": "^5.6.3",
2626
"@atlaskit/tree": "^8.8.5",
2727
"@tiptap/core": "^2.0.4",
28-
"@blocknote/core": "^0.9.2",
28+
"@blocknote/core": "^0.9.3",
2929
"@emotion/react": "^11.4.0",
3030
"@supabase/auth-ui-react": "^0.4.5",
3131
"@supabase/auth-ui-shared": "^0.1.7",

‎packages/editor/src/app/documentRenderers/profile/ProfileRenderer.tsx‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const ProfileRenderer: React.FC<Props> = observer((props) => {
2626
}
2727
const options = { year: "numeric", month: "long", day: "numeric" } as const;
2828
const date = new Intl.DateTimeFormat("en-US", options).format(
29-
props.profile.joinedDate
29+
props.profile.joinedDate,
3030
);
3131
return date;
3232
}, [props.profile.joinedDate]);
@@ -43,7 +43,7 @@ const ProfileRenderer: React.FC<Props> = observer((props) => {
4343

4444
const forkedDocs = useResource(() => {
4545
const forkedDocs = forks.map((f) =>
46-
DocConnection.load(f, props.sessionStore)
46+
DocConnection.load(f, props.sessionStore),
4747
);
4848

4949
return [
@@ -71,7 +71,7 @@ const ProfileRenderer: React.FC<Props> = observer((props) => {
7171
<div className={styles.userInfo}>Joined {joinedDate}</div>
7272
)}
7373
</div>
74-
{forkedDocs?.length && <h2>Workspaces</h2>}
74+
{!!forkedDocs?.length && <h2>Workspaces</h2>}
7575
<div className={styles.workspaces}>
7676
<Button
7777
onClick={() => {
@@ -80,24 +80,28 @@ const ProfileRenderer: React.FC<Props> = observer((props) => {
8080
Public workspace by {props.profile.title}
8181
</Button>
8282
</div>
83-
{forkedDocs?.length && <h2>Forked documents</h2>}
84-
<div className={styles.forks}>
85-
{forkedDocs.map((f) => (
86-
<>
87-
<Button
88-
key={f.identifier.toString()}
89-
onClick={() => {
90-
navigate("/" + identifiersToPath(f.identifier));
91-
}}>
92-
{f.tryDoc
93-
? f.tryDoc.type === "!richtext"
94-
? f.tryDoc.doc.title
95-
: f.tryDoc.title
96-
: "..."}
97-
</Button>
98-
</>
99-
))}
100-
</div>
83+
{!!forkedDocs?.length && (
84+
<>
85+
<h2>Forked documents</h2>
86+
<div className={styles.forks}>
87+
{forkedDocs.map((f) => (
88+
<>
89+
<Button
90+
key={f.identifier.toString()}
91+
onClick={() => {
92+
navigate("/" + identifiersToPath(f.identifier));
93+
}}>
94+
{f.tryDoc
95+
? f.tryDoc.type === "!richtext"
96+
? f.tryDoc.doc.title
97+
: f.tryDoc.title
98+
: "..."}
99+
</Button>
100+
</>
101+
))}
102+
</div>
103+
</>
104+
)}
101105
</div>
102106
</>
103107
);

‎packages/editor/src/app/main/components/ProfilePopup.tsx‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,29 @@ import { useNavigate } from "react-router-dom";
99
import { SessionStore } from "../../../store/local/SessionStore";
1010
import { toProfilePage } from "../../routes/routes";
1111

12+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
13+
const Trigger = observer((props: any) => {
14+
const { triggerRef, isSelected, testId, ...passProps } = props;
15+
return (
16+
<Profile
17+
testId="profile-button"
18+
icon={
19+
<Avatar
20+
name={props.sessionStore.loggedInUserId}
21+
src={props.sessionStore.profile?.avatar_url || undefined}
22+
size="32"
23+
round={true}
24+
textSizeRatio={2}
25+
/>
26+
}
27+
ref={triggerRef}
28+
{...passProps}
29+
// icon={<img alt="" style={imgCSS} src={""} />}
30+
tooltip=""
31+
/>
32+
);
33+
});
34+
1235
export const ProfilePopup = observer(
1336
(props: { sessionStore: SessionStore }) => {
1437
const navigate = useNavigate();
@@ -17,27 +40,9 @@ export const ProfilePopup = observer(
1740
return (
1841
<DropdownMenu
1942
spacing="compact"
20-
trigger={(innerProps) => {
21-
const { triggerRef, isSelected, testId, ...passProps } = innerProps;
22-
return (
23-
<Profile
24-
testId="profile-button"
25-
icon={
26-
<Avatar
27-
name={props.sessionStore.loggedInUserId}
28-
src={props.sessionStore.profile?.avatar_url || undefined}
29-
size="32"
30-
round={true}
31-
textSizeRatio={2}
32-
/>
33-
}
34-
ref={triggerRef}
35-
{...passProps}
36-
// icon={<img alt="" style={imgCSS} src={""} />}
37-
tooltip=""
38-
/>
39-
);
40-
}}
43+
trigger={(innerProps) => (
44+
<Trigger {...innerProps} sessionStore={props.sessionStore} />
45+
)}
4146
placement="bottom-end">
4247
{/* <DropdownItem onClick={() => OpenNewPageDialog(navigate)}>
4348
New page
@@ -58,5 +63,5 @@ export const ProfilePopup = observer(
5863
</DropdownItemGroup>
5964
</DropdownMenu>
6065
);
61-
}
66+
},
6267
);

‎packages/frame/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"version": "0.0.3",
44
"private": true,
55
"dependencies": {
6-
"@blocknote/core": "^0.9.2",
7-
"@blocknote/react": "^0.9.2",
6+
"@blocknote/core": "^0.9.3",
7+
"@blocknote/react": "^0.9.3",
88
"@typecell-org/util": "^0.0.3",
99
"@typecell-org/shared": "^0.0.3",
1010
"@typecell-org/engine": "^0.0.3",

‎packages/server/supabase/config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ enable_signup = true
5656
# addresses. If disabled, only the new email is required to confirm.
5757
double_confirm_changes = true
5858
# If enabled, users need to confirm their email address before signing in.
59-
enable_confirmations = false
59+
enable_confirmations = true
6060

6161
# Use an external OAuth provider. The full list of providers are: `apple`, `azure`, `bitbucket`,
6262
# `discord`, `facebook`, `github`, `gitlab`, `google`, `keycloak`, `linkedin`, `notion`, `twitch`,

0 commit comments

Comments
 (0)