your personal website on atproto - mirror
blento.app
Merge pull request #208 from flo-bit/germ
Germ
+175
-23
+3
-1
src/lib/cards/index.ts
+3
-1
src/lib/cards/index.ts
···
49
49
import { PlyrFMCardDefinition, PlyrFMCollectionCardDefinition } from './media/PlyrFMCard';
50
50
import { MarginCardDefinition } from './social/MarginCard';
51
51
import { SembleCollectionCardDefinition } from './social/SembleCollectionCard';
52
+
import { GermDMCardDefinition } from './social/GermDMCard';
52
53
// import { Model3DCardDefinition } from './visual/Model3DCard';
53
54
54
55
export const AllCardDefinitions = [
···
103
104
PlyrFMCardDefinition,
104
105
PlyrFMCollectionCardDefinition,
105
106
MarginCardDefinition,
106
-
SembleCollectionCardDefinition
107
+
SembleCollectionCardDefinition,
108
+
GermDMCardDefinition
107
109
] as const;
108
110
109
111
export const CardDefinitionsByType = AllCardDefinitions.reduce(
+1
src/lib/cards/media/TealFMPlaysCard/index.ts
+1
src/lib/cards/media/TealFMPlaysCard/index.ts
+2
src/lib/cards/types.ts
+2
src/lib/cards/types.ts
+40
-18
src/lib/components/card-command/CardCommand.svelte
+40
-18
src/lib/components/card-command/CardCommand.svelte
···
3
3
import type { CardDefinition } from '$lib/cards/types';
4
4
import { Command, Dialog } from 'bits-ui';
5
5
import { isTyping } from '$lib/helper';
6
-
7
-
const CardDefGroups = [
8
-
'Core',
9
-
...Array.from(
10
-
new Set(
11
-
AllCardDefinitions.map((cardDef) => cardDef.groups)
12
-
.flat()
13
-
.filter((g) => g)
14
-
)
15
-
)
16
-
.sort()
17
-
.filter((g) => g !== 'Core')
18
-
];
6
+
import { describeRepo, user } from '$lib/atproto';
19
7
20
8
let {
21
9
open = $bindable(false),
···
27
15
onlink?: (url: string, cardDef: CardDefinition) => void;
28
16
} = $props();
29
17
18
+
let collections = $state<string[]>([]);
19
+
let fetchedForDid = $state<string | undefined>(undefined);
20
+
21
+
$effect(() => {
22
+
if (open && user.did && fetchedForDid !== user.did) {
23
+
const did = user.did;
24
+
describeRepo({ did }).then((result) => {
25
+
if (result?.collections) {
26
+
collections = result.collections;
27
+
}
28
+
fetchedForDid = did;
29
+
});
30
+
}
31
+
});
32
+
33
+
let filteredCardDefs = $derived(
34
+
AllCardDefinitions.filter((d) => !d.canAdd || d.canAdd({ collections }))
35
+
);
36
+
37
+
let cardDefGroups = $derived([
38
+
'Core',
39
+
...Array.from(
40
+
new Set(
41
+
filteredCardDefs
42
+
.map((cardDef) => cardDef.groups)
43
+
.flat()
44
+
.filter((g) => g)
45
+
)
46
+
)
47
+
.sort()
48
+
.filter((g) => g !== 'Core')
49
+
]);
50
+
30
51
let searchValue = $state('');
31
52
32
53
let normalizedUrl = $derived.by(() => {
···
44
65
45
66
let urlMatchingCards = $derived.by(() => {
46
67
if (!normalizedUrl) return [];
47
-
return AllCardDefinitions.filter((d) => d.onUrlHandler)
68
+
return filteredCardDefs
69
+
.filter((d) => d.onUrlHandler)
48
70
.filter((d) => {
49
71
try {
50
72
const testItem = { cardData: {} };
···
150
172
<Command.Separator class="bg-base-900/5 dark:bg-base-50/5 my-1 h-px w-full" />
151
173
{/if}
152
174
153
-
{#each CardDefGroups as group, index (group)}
154
-
{#if group && AllCardDefinitions.some((cardDef) => cardDef.groups?.includes(group))}
175
+
{#each cardDefGroups as group, index (group)}
176
+
{#if group && filteredCardDefs.some((cardDef) => cardDef.groups?.includes(group))}
155
177
<Command.Group>
156
178
<Command.GroupHeading
157
179
class="text-base-600 dark:text-base-400 px-3 pt-4 pb-2 text-xs"
···
159
181
{group}
160
182
</Command.GroupHeading>
161
183
<Command.GroupItems>
162
-
{#each AllCardDefinitions.filter( (cardDef) => cardDef.groups?.includes(group) ) as cardDef (cardDef.type)}
184
+
{#each filteredCardDefs.filter( (cardDef) => cardDef.groups?.includes(group) ) as cardDef (cardDef.type)}
163
185
<Command.Item
164
186
onSelect={() => {
165
187
open = false;
···
179
201
{/each}
180
202
</Command.GroupItems>
181
203
</Command.Group>
182
-
{#if index < CardDefGroups.length - 1}
204
+
{#if index < cardDefGroups.length - 1}
183
205
<Command.Separator class="bg-base-900/5 dark:bg-base-50/5 my-1 h-px w-full" />
184
206
{/if}
185
207
{/if}
+3
-1
src/lib/website/Context.svelte
+3
-1
src/lib/website/Context.svelte
···
20
20
setAdditionalUserData(data.additionalData);
21
21
22
22
setCanEdit(
23
-
() => (dev && isEditing === true) || (user.isLoggedIn && user.profile?.did === data.did && isEditing === true)
23
+
() =>
24
+
(dev && isEditing === true) ||
25
+
(user.isLoggedIn && user.profile?.did === data.did && isEditing === true)
24
26
);
25
27
26
28
// svelte-ignore state_referenced_locally
+8
-3
src/routes/(auth)/oauth/callback/+page.svelte
+8
-3
src/routes/(auth)/oauth/callback/+page.svelte
···
13
13
if (user.profile) {
14
14
if (hasRedirected) return;
15
15
16
-
const redirect = localStorage.getItem('login-redirect');
16
+
let redirect = localStorage.getItem('login-redirect');
17
17
localStorage.removeItem('login-redirect');
18
-
console.log('redirect', redirect);
19
-
goto(redirect || '/' + getHandleOrDid(user.profile) + '/edit', {});
18
+
19
+
const editPath = '/' + getHandleOrDid(user.profile) + '/edit';
20
+
if (!redirect || redirect === '/' || redirect === 'https://blento.app' || redirect === 'https://blento.app/') {
21
+
redirect = editPath;
22
+
}
23
+
24
+
goto(redirect, {});
20
25
21
26
hasRedirected = true;
22
27
}