Skip to content

Commit d5d72ce

Browse files
Merge pull request #14 from solid/feat/my-storages
Feat/my storages
2 parents 8683c25 + 888bf36 commit d5d72ce

14 files changed

Lines changed: 405 additions & 142 deletions

app/components/AuthWrapper.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
"use client";
22

33
import { useEffect, useState } from "react";
4-
import {
5-
getDefaultSession,
6-
handleIncomingRedirect,
7-
} from "@inrupt/solid-client-authn-browser";
4+
import { handleIncomingRedirect } from "@inrupt/solid-client-authn-browser";
5+
import { getSession } from "../lib/helpers";
86
import LoginPage from "./LoginPage";
97
import LoadingSpinner from "./shared/LoadingSpinner";
108
import ErrorDisplay from "./shared/ErrorDisplay";
@@ -29,7 +27,7 @@ export default function AuthWrapper({ children }: AuthWrapperProps) {
2927
});
3028

3129
// Get the session instance after handling redirect
32-
const session = getDefaultSession();
30+
const session = getSession();
3331

3432
let isLoggedIn = session.info.isLoggedIn && !!session.info.webId;
3533

@@ -66,7 +64,7 @@ export default function AuthWrapper({ children }: AuthWrapperProps) {
6664
const redirectInfo = await handleIncomingRedirect({
6765
restorePreviousSession: true,
6866
});
69-
const session = getDefaultSession();
67+
const session = getSession();
7068
if (session.info.isLoggedIn) {
7169
setIsAuthenticated(true);
7270
setError(null);
@@ -87,7 +85,7 @@ export default function AuthWrapper({ children }: AuthWrapperProps) {
8785

8886
handleIncomingRedirect({ restorePreviousSession: true })
8987
.then(() => {
90-
const session = getDefaultSession();
88+
const session = getSession();
9189
setIsAuthenticated(session.info.isLoggedIn);
9290
})
9391
.catch((err) => {

app/components/FileItem.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ interface FileItemProps {
2323
onDoubleClick: (file: FileItemData) => void;
2424
onRename?: (file: FileItemData) => void;
2525
onPreview?: (file: FileItemData) => void;
26+
onCopy?: (file: FileItemData) => void;
2627
isSelected?: boolean;
2728
}
2829

@@ -33,6 +34,7 @@ export default function FileItem({
3334
onDoubleClick,
3435
onRename,
3536
onPreview,
37+
onCopy,
3638
isSelected = false,
3739
}: FileItemProps) {
3840
const [isHovered, setIsHovered] = useState(false);
@@ -128,7 +130,7 @@ export default function FileItem({
128130
onRename={onRename}
129131
onPreview={onPreview}
130132
onDownload={(f) => console.log("Download:", f.name)}
131-
onCopy={(f) => console.log("Copy:", f.name)}
133+
onCopy={onCopy}
132134
onMove={(f) => console.log("Move:", f.name)}
133135
onDelete={(f) => console.log("Delete:", f.name)}
134136
/>
@@ -176,7 +178,7 @@ export default function FileItem({
176178
onRename={onRename}
177179
onPreview={onPreview}
178180
onDownload={(f) => console.log("Download:", f.name)}
179-
onCopy={(f) => console.log("Copy:", f.name)}
181+
onCopy={onCopy}
180182
onMove={(f) => console.log("Move:", f.name)}
181183
onDelete={(f) => console.log("Delete:", f.name)}
182184
/>

app/components/FileList.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ interface FileListProps {
1212
onFileDoubleClick: (file: FileItemData) => void;
1313
onFileRename?: (file: FileItemData) => void;
1414
onFilePreview?: (file: FileItemData) => void;
15+
onFileCopy?: (file: FileItemData) => void;
1516
selectedFileIds: string[];
1617
}
1718

@@ -24,6 +25,7 @@ export default function FileList({
2425
onFileDoubleClick,
2526
onFileRename,
2627
onFilePreview,
28+
onFileCopy,
2729
selectedFileIds,
2830
}: FileListProps) {
2931
const [view, setView] = useState<"grid" | "list">(() => {
@@ -59,6 +61,7 @@ export default function FileList({
5961
onDoubleClick={onFileDoubleClick}
6062
onRename={onFileRename}
6163
onPreview={onFilePreview}
64+
onCopy={onFileCopy}
6265
isSelected={selectedFileIds.includes(file.id)}
6366
/>
6467
))}
@@ -74,6 +77,7 @@ export default function FileList({
7477
onDoubleClick={onFileDoubleClick}
7578
onRename={onFileRename}
7679
onPreview={onFilePreview}
80+
onCopy={onFileCopy}
7781
isSelected={selectedFileIds.includes(file.id)}
7882
/>
7983
))}

0 commit comments

Comments
 (0)