Skip to content

Feat(web)/extra path to the open notifications and onboarding miniguide #1607

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

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
19 changes: 17 additions & 2 deletions web/src/components/Popup/MiniGuides/MainStructureTemplate.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Dispatch, SetStateAction, useRef } from "react";
import React, { Dispatch, SetStateAction, useCallback, useRef } from "react";
import styled, { css } from "styled-components";

import { useLocation, useNavigate } from "react-router-dom";
import { useClickAway } from "react-use";
import BookOpenIcon from "svgs/icons/book-open.svg";

Expand Down Expand Up @@ -164,9 +165,16 @@ const Template: React.FC<ITemplate> = ({
isVisible,
}) => {
const containerRef = useRef(null);
const location = useLocation();
const navigate = useNavigate();
const removeOnboardingHashPath = useCallback(() => {
if (isOnboarding && location.hash.includes("#onboarding")) navigate("#", { replace: true });
}, [location.hash, navigate, isOnboarding]);

useClickAway(containerRef, () => {
if (canClose) {
onClose();
removeOnboardingHashPath();
}
});

Expand Down Expand Up @@ -196,7 +204,14 @@ const Template: React.FC<ITemplate> = ({
/>
</LeftContainer>
<RightContainer>
<Close onClick={onClose}>Close</Close>
<Close
onClick={() => {
onClose();
removeOnboardingHashPath();
}}
>
Close
</Close>
{RightContent}
</RightContainer>
</Container>
Expand Down
24 changes: 21 additions & 3 deletions web/src/layout/Header/DesktopHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from "react";
import React, { useCallback, useEffect, useState } from "react";
import styled, { css } from "styled-components";

import { useLocation } from "react-router-dom";
import { useToggle } from "react-use";

import KlerosSolutionsIcon from "svgs/menu-icons/kleros-solutions.svg";
Expand All @@ -13,6 +14,7 @@ import { responsiveSize } from "styles/responsiveSize";
import ConnectWallet from "components/ConnectWallet";
import LightButton from "components/LightButton";
import { Overlay } from "components/Overlay";
import Onboarding from "components/Popup/MiniGuides/Onboarding";

import Logo from "./Logo";
import DappList from "./navbar/DappList";
Expand Down Expand Up @@ -86,10 +88,25 @@ const PopupContainer = styled.div`
z-index: 30;
`;

const DesktopHeader = () => {
const DesktopHeader: React.FC = () => {
const [isDappListOpen, toggleIsDappListOpen] = useToggle(false);
const [isHelpOpen, toggleIsHelpOpen] = useToggle(false);
const [isSettingsOpen, toggleIsSettingsOpen] = useToggle(false);
const [isOnboardingMiniGuidesOpen, toggleIsOnboardingMiniGuidesOpen] = useToggle(false);
const [initialTab, setInitialTab] = useState<number>(0);
const location = useLocation();

const initializeFragmentURL = useCallback(() => {
const hash = location.hash;
const hasOnboardingPath = hash.includes("#onboarding");
const hasNotificationsPath = hash.includes("#notifications");
toggleIsOnboardingMiniGuidesOpen(hasOnboardingPath);
toggleIsSettingsOpen(hasNotificationsPath);
setInitialTab(hasNotificationsPath ? 1 : 0);
}, [location.hash, toggleIsSettingsOpen, toggleIsOnboardingMiniGuidesOpen]);

useEffect(initializeFragmentURL, [initializeFragmentURL]);

useLockOverlayScroll(isDappListOpen || isHelpOpen || isSettingsOpen);

return (
Expand Down Expand Up @@ -124,9 +141,10 @@ const DesktopHeader = () => {
<Overlay />
{isDappListOpen && <DappList {...{ toggleIsDappListOpen, isDappListOpen }} />}
{isHelpOpen && <Help {...{ toggleIsHelpOpen, isHelpOpen }} />}
{isSettingsOpen && <Settings {...{ toggleIsSettingsOpen, isSettingsOpen }} />}
{isSettingsOpen && <Settings {...{ toggleIsSettingsOpen, isSettingsOpen, initialTab }} />}
</PopupContainer>
)}
{isOnboardingMiniGuidesOpen && <Onboarding toggleMiniGuide={toggleIsOnboardingMiniGuidesOpen} />}
</>
);
};
Expand Down
12 changes: 9 additions & 3 deletions web/src/layout/Header/navbar/Menu/Settings/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useRef, useState } from "react";
import styled, { css } from "styled-components";

import { useLocation, useNavigate } from "react-router-dom";
import { useClickAway } from "react-use";

import { Tabs } from "@kleros/ui-components-library";
Expand Down Expand Up @@ -73,10 +74,15 @@ const TABS = [
},
];

const Settings: React.FC<ISettings> = ({ toggleIsSettingsOpen }) => {
const [currentTab, setCurrentTab] = useState<number>(0);
const Settings: React.FC<ISettings> = ({ toggleIsSettingsOpen, initialTab }) => {
const [currentTab, setCurrentTab] = useState<number>(initialTab || 0);
const containerRef = useRef(null);
useClickAway(containerRef, () => toggleIsSettingsOpen());
const location = useLocation();
const navigate = useNavigate();
useClickAway(containerRef, () => {
toggleIsSettingsOpen();
if (location.hash.includes("#notifications")) navigate("#", { replace: true });
});

return (
<>
Expand Down
1 change: 1 addition & 0 deletions web/src/layout/Header/navbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ const PopupContainer = styled.div`

export interface ISettings {
toggleIsSettingsOpen: () => void;
initialTab?: number;
}

export interface IHelp {
Expand Down
Loading