Skip to content
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.

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

Merge dev branch #561

Closed
wants to merge 116 commits into from
Closed
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
278c947
fix: removed .bzz links, changed medium logo
IgorShadurin Sep 8, 2023
602521d
Merge branch 'development' into fix/blog-url
IgorShadurin Sep 8, 2023
0b97672
fix: drive dropdown z-index
tomicvladan Sep 8, 2023
8f74db4
Merge branch 'development' into fix/dropdown-z-index
tomicvladan Sep 8, 2023
91d07f5
fix: layout padding
tomicvladan Sep 8, 2023
b65b0fe
Merge pull request #490 from fairDataSociety/fix/blog-url
IgorShadurin Sep 11, 2023
ea38518
fix: sidebar (#395)
tomicvladan Sep 11, 2023
04936df
feat: new gas estimation
tomicvladan Sep 11, 2023
53a9c32
fix: spinner for pods (#494)
tomicvladan Sep 11, 2023
e7db669
Merge branch 'development' into fix/dropdown-z-index
tomicvladan Sep 11, 2023
4d320be
Merge pull request #493 from fairDataSociety/fix/layout-padding
tomicvladan Sep 11, 2023
8fcac0d
Merge branch 'development' into fix/395
tomicvladan Sep 11, 2023
13c12dd
Merge branch 'development' into fix/494
tomicvladan Sep 11, 2023
5ef4234
Merge branch 'development' into fix/dropdown-z-index
IgorShadurin Sep 13, 2023
99498ae
feat: file path redesign for mobile
tomicvladan Sep 13, 2023
9880399
fix: dropdown z-index
tomicvladan Sep 13, 2023
5719dc5
Merge remote-tracking branch 'origin/fix/dropdown-z-index' into fix/d…
tomicvladan Sep 13, 2023
4fa2938
Merge pull request #495 from fairDataSociety/fix/395
tomicvladan Sep 13, 2023
269f7d0
Merge pull request #496 from fairDataSociety/fix/494
tomicvladan Sep 13, 2023
0722955
Merge pull request #500 from fairDataSociety/feat/folder-path-mobile
tfius Sep 13, 2023
1e99825
Merge pull request #492 from fairDataSociety/fix/dropdown-z-index
tfius Sep 13, 2023
bc341c2
docs: typos and refactor, readme update w/ logo
tamas6 Sep 14, 2023
f007cca
fix: pod dropdown
tomicvladan Sep 14, 2023
a48f07c
Merge remote-tracking branch 'origin/development' into feat/new-gas-e…
tomicvladan Sep 14, 2023
024b93c
chore: new fdp-storage
tomicvladan Sep 14, 2023
4dcec8c
fix: metamask dialog layout
tomicvladan Sep 14, 2023
aaaacaf
feat: new mobile drive layout
tomicvladan Sep 15, 2023
74b7314
feat: navigation reorganization
tomicvladan Sep 15, 2023
d4a63fa
fix: caching issue (#507)
tomicvladan Sep 18, 2023
755819d
fix: pod dropdown (#502)
tomicvladan Sep 18, 2023
158ce8e
Merge pull request #511 from fairDataSociety/fix/507
tfius Sep 19, 2023
4e690db
Merge pull request #512 from fairDataSociety/feat/pod-dropdown-fix
tfius Sep 19, 2023
9ae2193
Merge branch 'development' into feat/mobile-view-improvements
tomicvladan Sep 19, 2023
b9a7eab
Merge pull request #510 from fairDataSociety/feat/mobile-view-improve…
tfius Sep 19, 2023
2c06e5f
Merge branch 'development' into feat/new-gas-estimation
tomicvladan Sep 19, 2023
d26f3f9
fix: lint error
tomicvladan Sep 19, 2023
5ea69b1
feat: multiple file upload (#499)
tomicvladan Sep 19, 2023
eff1cb4
Merge pull request #513 from fairDataSociety/fix/lint-error
tfius Sep 19, 2023
170c298
fix: change login label (#509)
tomicvladan Sep 19, 2023
9040d21
feat: new file preview
tomicvladan Sep 19, 2023
9e73b0a
Merge branch 'development' into feat/new-gas-estimation
IgorShadurin Sep 19, 2023
48ff9ad
fix: file preview
tomicvladan Sep 20, 2023
232914b
Merge branch 'development' into feat/file-preview
tomicvladan Sep 20, 2023
bc3850b
Merge branch 'development' into fix/login-label
tomicvladan Sep 20, 2023
42a73c5
Merge pull request #505 from fairDataSociety/feat/new-gas-estimation
tomicvladan Sep 20, 2023
3941bcd
feat: import button removed
tomicvladan Sep 20, 2023
e86642a
fix: disable upload button when pod not selected
tomicvladan Sep 20, 2023
9e66e2d
Merge pull request #518 from fairDataSociety/feat/remove-import-button
tomicvladan Sep 20, 2023
cb8e25d
Merge pull request #515 from fairDataSociety/fix/login-label
tomicvladan Sep 20, 2023
6cef18c
fix: file preview
tomicvladan Sep 20, 2023
e590af8
Merge remote-tracking branch 'origin/feat/file-preview' into feat/fil…
tomicvladan Sep 20, 2023
b044bac
Merge branch 'development' into feat/file-preview
tomicvladan Sep 20, 2023
d1ef24e
Merge pull request #519 from fairDataSociety/fix/upload-button-disabled
tfius Sep 20, 2023
afdcfb2
Merge pull request #516 from fairDataSociety/feat/file-preview
tfius Sep 20, 2023
56f77ef
fix: folder label
tomicvladan Sep 20, 2023
954c0c1
Merge remote-tracking branch 'origin/development' into feat/multiple-…
tomicvladan Sep 20, 2023
a26ebdf
feat: multiple file upload
tomicvladan Sep 21, 2023
910bf8b
fix: file upload
tomicvladan Sep 21, 2023
9450c44
Merge branch 'development' into fix/folder-label
tomicvladan Sep 21, 2023
1274c90
feat: various ui improvements
tomicvladan Sep 22, 2023
5fb946a
Merge pull request #520 from fairDataSociety/fix/folder-label
tfius Sep 25, 2023
c7a0624
Merge pull request #514 from fairDataSociety/feat/multiple-file-upload
tfius Sep 25, 2023
1c03e65
Merge pull request #521 from fairDataSociety/feat/ui-improvements
tfius Sep 25, 2023
bb7d2dd
feat: passphrase explanation
tomicvladan Sep 25, 2023
9ece6cb
feat: invites description
tomicvladan Sep 25, 2023
e76c406
chore: comment search bar
tomicvladan Sep 25, 2023
9a45e4f
Merge remote-tracking branch 'origin/development' into feat/ui-improv…
tomicvladan Sep 25, 2023
4b4cc90
fix: upgraded mobile UI for invite section
IgorShadurin Sep 25, 2023
1d49966
Merge pull request #525 from fairDataSociety/fix/invite-buttons
IgorShadurin Sep 25, 2023
935a0e1
fix: passphrase modal info
tomicvladan Sep 27, 2023
29b98fd
fix: passphrase modal layout
tomicvladan Sep 27, 2023
a1a0a80
fix: metamask logout (#526)
tomicvladan Sep 27, 2023
ece84dc
Merge pull request #524 from fairDataSociety/feat/ui-improvements
tfius Sep 27, 2023
15a33da
Merge branch 'development' into fix/526
tomicvladan Sep 27, 2023
e0fffdf
fix: error message (#517)
tomicvladan Sep 28, 2023
a6d1149
Merge pull request #528 from fairDataSociety/fix/517
tomicvladan Sep 28, 2023
698abfe
Merge pull request #527 from fairDataSociety/fix/526
tomicvladan Sep 28, 2023
4021c4b
Merge branch 'fairDataSociety:development' into development
tamas6 Sep 29, 2023
1d5575a
Merge pull request #503 from tamas6/development
tfius Sep 29, 2023
57217e9
fix: drive error (#325)
tomicvladan Oct 2, 2023
ef4b480
fix: spinner margin (#322)
tomicvladan Oct 3, 2023
acbddf1
feat: upload progress bar (#536)
tomicvladan Oct 3, 2023
c630b7b
fix: wrong pod content (#538)
tomicvladan Oct 4, 2023
fb0ed35
fix: file upload
tomicvladan Oct 4, 2023
d095dd2
Merge pull request #535 from fairDataSociety/fix/322
tomicvladan Oct 4, 2023
4aad43d
Merge branch 'development' into fix/538
tomicvladan Oct 4, 2023
804f7d8
Merge branch 'development' into fix/325
tomicvladan Oct 5, 2023
ab62e1d
Merge pull request #532 from fairDataSociety/fix/325
tomicvladan Oct 6, 2023
550d6a6
Merge pull request #537 from fairDataSociety/feat/upload-progress
tomicvladan Oct 6, 2023
266d134
Merge pull request #540 from fairDataSociety/fix/538
tomicvladan Oct 6, 2023
a8a69a4
feat: mobile file list view (#541)
tomicvladan Oct 9, 2023
db3a1c2
fix: list view pagination
tomicvladan Oct 10, 2023
0c04bc2
feat: pod search (#542)
tomicvladan Oct 12, 2023
e35514a
fix: file preview text
tomicvladan Oct 13, 2023
95edce1
Merge pull request #544 from fairDataSociety/feat/search
tomicvladan Oct 13, 2023
13a161f
Merge pull request #543 from fairDataSociety/feat/mobile-list-view
tomicvladan Oct 13, 2023
d6be94d
Merge branch 'development' into fix/file-review-text
tomicvladan Oct 16, 2023
5470370
fix: search
tomicvladan Oct 16, 2023
f4dab0e
fix: search
tomicvladan Oct 16, 2023
d31efe8
Merge pull request #545 from fairDataSociety/fix/file-review-text
tfius Oct 16, 2023
fe376b2
fix: search
tomicvladan Oct 16, 2023
8a0c2ad
Merge pull request #546 from fairDataSociety/fix/search
tfius Oct 16, 2023
4d4c387
feat: add testnet disclaimer to login form in multiple languages
IgorShadurin Oct 18, 2023
6198270
Merge pull request #548 from fairDataSociety/feat/20-disclaimer-notic…
IgorShadurin Oct 20, 2023
2c737f6
feat: only Metamask to Connect, Blossom hidden
tamas6 Oct 20, 2023
8c5b27c
fix: error handling (#551)
tomicvladan Oct 20, 2023
a472f8e
fix: sort and view button on mobile (#550)
tomicvladan Oct 20, 2023
9e764b6
fix: searchbar appearing (#549)
tomicvladan Oct 20, 2023
2361f74
Merge pull request #553 from fairDataSociety/fix/551
tfius Oct 23, 2023
c615a79
Merge pull request #554 from fairDataSociety/fix/550
tfius Oct 23, 2023
30e3640
Merge pull request #555 from fairDataSociety/fix/449
tfius Oct 23, 2023
8b8ef22
feat: optional matomo
tomicvladan Oct 25, 2023
934d452
feat: add matomo translations
tomicvladan Oct 25, 2023
e09ca31
Merge pull request #558 from fairDataSociety/feat/optional-matomo
tomicvladan Oct 27, 2023
5672139
Merge pull request #552 from tamas6/development
tomicvladan Oct 30, 2023
3d1569b
Merge remote-tracking branch 'origin/development'
darkobas2 Nov 26, 2023
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
5 changes: 4 additions & 1 deletion src/api/directory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ export async function createDirectory(
directory = '';
}

await fdp.directory.create(podName, combine(directory, directoryName));
await fdp.directory.create(
podName,
combine(...directory.split('/'), directoryName)
);
const time = getUnixTimestamp();
return {
name: directoryName,
Expand Down
36 changes: 19 additions & 17 deletions src/components/Buttons/MainSideBarItem/MainSideBarItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ interface MainSideBarItemProps {
driveSideBarToggle: any;
}

const DRIVE_PATH = '/drive';

const MainSideBarItem: FC<MainSideBarItemProps> = ({
icons,
label,
Expand All @@ -39,26 +41,26 @@ const MainSideBarItem: FC<MainSideBarItemProps> = ({
}, [link]);

useEffect(() => {
if (router.pathname === '/drive') {
if (router.pathname === DRIVE_PATH) {
driveSideBarToggle();
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

return (
<div
className={`${
isActive
? 'border-r-0 border-b-4 sm:border-r-4 sm:border-b-0 border-color-accents-purple-heavy'
: ''
} w-24 sm:w-full py-1 md:py-4 flex-shrink-0 shadow cursor-pointer hover:bg-color-shade-dark-4-day dark:hover:bg-color-shade-dark-2-night`}
onClick={() => {
if (router.pathname === '/drive') {
setTimeout(() => driveSideBarToggle(), 100);
}
}}
>
<Link href={link}>
<Link href={link}>
<div
className={`${
isActive
? 'border-r-0 border-b-4 sm:border-r-4 sm:border-b-0 border-color-accents-purple-heavy'
: ''
} w-24 sm:w-full py-1 md:py-4 flex-shrink-0 shadow cursor-pointer hover:bg-color-shade-dark-4-day dark:hover:bg-color-shade-dark-2-night`}
onClick={() => {
if (router.pathname === DRIVE_PATH && link === DRIVE_PATH) {
setTimeout(() => driveSideBarToggle(), 100);
}
}}
>
<a className="flex flex-col justify-center items-center">
{theme === 'light'
? isActive
Expand All @@ -69,7 +71,7 @@ const MainSideBarItem: FC<MainSideBarItemProps> = ({
: icons.dark.inactive}

<span
className={`inline-block mt-2 ${
className={`inline-block mt-2 select-none ${
isActive
? 'text-color-accents-purple-heavy dark:text-color-accents-grey-lavendar'
: 'text-color-accents-plum-black dark:text-color-shade-light-2-night'
Expand All @@ -78,8 +80,8 @@ const MainSideBarItem: FC<MainSideBarItemProps> = ({
{label}
</span>
</a>
</Link>
</div>
</div>
</Link>
);
};

Expand Down
4 changes: 3 additions & 1 deletion src/components/DirectoryPath/DirectoryPath.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ interface DirectoryPathProps {
directory: string;
onDirectorySelect: (newDirectory: string) => void;
onBackToDrive: () => void;
className?: string;
}

const MAX_FOLDERS = 3;
Expand All @@ -21,6 +22,7 @@ const DirectoryPath = ({
directory,
onDirectorySelect,
onBackToDrive,
className,
}: DirectoryPathProps) => {
const { theme } = useContext(ThemeContext);
const [folders, displayedFolders] = useMemo(() => {
Expand All @@ -35,7 +37,7 @@ const DirectoryPath = ({
};

return (
<div className="md:ml-0 ml-2 flex items-center">
<div className={`flex items-center overflow-hidden ${className}`}>
{podName && (
<Button
variant="tertiary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const DriveItemMenu: FC<DriveItemMenuProps> = ({
return (
<>
<DropdownTransition>
<Menu.Items className="absolute -left-32 w-48 p-5 bg-color-shade-dark-1-day dark:bg-color-shade-dark-3-night text-left rounded-md shadow">
<Menu.Items className="absolute -left-32 w-48 p-5 z-10 bg-color-shade-dark-1-day dark:bg-color-shade-dark-3-night text-left rounded-md shadow">
<Menu.Item
as="h4"
className="mb-3 pb-3 font-semibold text-color-shade-white-day dark:text-color-shade-white-night text-base border-b-2 border-color-shade-light-1-day dark:border-color-shade-light-1-night cursor-pointer"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dropdowns/PodDropdown/PodDropdownToggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const PodDropdownToggele = () => {
/>
)}
<Menu.Button className="flex items-center w-full cursor-pointer">
<div className="py-2 px-4 ">
<div className="py-2 px-4 hidden sm:block">
{theme === 'light' ? (
<DropdownMenuIconLight />
) : (
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layouts/MainLayout/MainLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const MainLayout: FC<MainLayoutProps> = ({
>
<div className="flex justify-start items-stretch w-full h-full">
{showDriveSideBar ? <DriveSideBar /> : null}
<div className="w-full pt-5 mb-24 sm:mb-0 md:px-8 px-5 overflow-scroll no-scroll-bar">
<div className="w-full pt-5 pb-20 sm:mb-0 md:px-8 px-5 overflow-scroll no-scroll-bar">
{loginType === 'metamask' && inviteKey && (
<DisclaimerMessage
text={intl.get('SIGN_UP_FOR_AN_FDS_ACCOUNT')}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
import DirectoryPath from '@components/DirectoryPath/DirectoryPath';
import PodDropdown from '@components/Dropdowns/PodDropdown/PodDropdown';

const DriveActionHeaderMobile = () => {
return <PodDropdown />;
interface DriveActionHeaderMobileProps {
podName: string;
directory: string;
onDirectorySelect: (newDirectory: string) => void;
onBackToDrive: () => void;
}

const DriveActionHeaderMobile = ({
podName,
directory,
onDirectorySelect,
onBackToDrive,
}: DriveActionHeaderMobileProps) => {
return (
<>
<PodDropdown />
<DirectoryPath
className="flex sm:hidden"
podName={podName}
directory={directory}
onDirectorySelect={onDirectorySelect}
onBackToDrive={onBackToDrive}
/>
</>
);
};

export default DriveActionHeaderMobile;
13 changes: 9 additions & 4 deletions src/pages/drive/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import SearchResultsDarkIcon from '@media/UI/search-results-dark.svg';
import Spinner from '@components/Spinner/Spinner';
import DriveActionHeaderMobile from '@components/NavigationBars/DriveActionBar/DriveActionHeaderMobile';
import { DirectoryItem, FileItem } from '@fairdatasociety/fdp-storage';
import SelectPodCard from '@components/Cards/SelectPodCard/SelectPodCard';
import {
CacheType,
getCache,
Expand Down Expand Up @@ -227,12 +226,18 @@ const Drive: FC = () => {
return (
<MainLayout updateDrive={handleUpdateDrive} refreshPods={handleFetchPods}>
<div className="flex flex-col">
<div className="block md:hidden">
<DriveActionHeaderMobile />
<div className="flex md:hidden">
<DriveActionHeaderMobile
podName={activePod}
directory={directoryName}
onDirectorySelect={handleDirectoryPathChange}
onBackToDrive={onBackToDrive}
/>
</div>
<MainHeader
title={
<DirectoryPath
className="hidden sm:flex"
podName={activePod}
directory={directoryName}
onDirectorySelect={handleDirectoryPathChange}
Expand Down Expand Up @@ -263,7 +268,7 @@ const Drive: FC = () => {
</span>
</div>
) : null}
<Spinner isLoading={loading} />
<Spinner isLoading={loading || !pods} />

{!loading &&
(activePod ? (
Expand Down