From ba15340f62a5ddacdb1e094b619c7f54af469cec Mon Sep 17 00:00:00 2001 From: Neretin Artem Date: Tue, 3 Sep 2024 15:39:20 +0500 Subject: [PATCH 1/7] feat: Update --- .../src/components/App.tsx | 71 ++++++++++++------- website/plasma-theme-builder/src/index.tsx | 11 +-- 2 files changed, 52 insertions(+), 30 deletions(-) diff --git a/website/plasma-theme-builder/src/components/App.tsx b/website/plasma-theme-builder/src/components/App.tsx index 6b96c6fc88..e26f09d5cd 100644 --- a/website/plasma-theme-builder/src/components/App.tsx +++ b/website/plasma-theme-builder/src/components/App.tsx @@ -1,5 +1,6 @@ import React, { useCallback, useEffect, useState } from 'react'; import styled, { css } from 'styled-components'; +import { Route, Routes, useNavigate } from 'react-router-dom'; import { Footer } from './Footer/Footer'; import { Main } from './Main/Main'; @@ -12,6 +13,12 @@ import { useDefaultThemeData, useFetchTheme } from '../hooks'; import { multipleMediaQuery } from './mixins'; import { getURLParams, pushHistoryState } from '../utils'; import type { Theme as ThemeType } from '../types'; +// import { useDefaultThemeData, useFetchTheme } from '../hooks'; +// import { multipleMediaQuery } from './mixins'; +// import { getURLParams, pushHistoryState } from '../utils'; +// import type { Theme as ThemeType } from '../types'; +import { TokensEditor } from './_new/TokensEditor'; +import { ToneGenerator } from './ColorGenerator/ToneGenerator'; const StyledRoot = styled.div` min-width: 35rem; @@ -31,20 +38,21 @@ const StyledRoot = styled.div` `; const PAGE_TYPE = { - MAIN: 'MAIN', - GENERATOR: 'GENERATOR', - THEME: 'THEME', - PULL_REQUEST: 'PULL_REQUEST', - ERROR: 'ERROR', + TONE: 'TONE', + GRAYSCALE: 'GRAYSCALE', + FONT_FAMILY: 'FONT_FAMILY', + TOKENS_EDITOR: 'TOKENS_EDITOR', } as const; type PageType = typeof PAGE_TYPE[keyof typeof PAGE_TYPE]; const App = () => { - const [state, setState] = useState(PAGE_TYPE.MAIN); - const [data, setData] = useState(); - const [token, setToken] = useState(); - const defaultData = useDefaultThemeData(); + const [state, setState] = useState(PAGE_TYPE.TOKENS_EDITOR); + const navigate = useNavigate(); + + // const [data, setData] = useState(); + // const [token, setToken] = useState(); + // const defaultData = useDefaultThemeData(); const [themeName, branchName] = getURLParams(['theme', 'branch']); const [themeData, errorMessage] = useFetchTheme(themeName, branchName); @@ -89,24 +97,35 @@ const App = () => { setData(data); }, []); + const onTokensEditor = () => { + setState(PAGE_TYPE.TOKENS_EDITOR); + }; + return ( - - {state === PAGE_TYPE.MAIN &&
} - {state === PAGE_TYPE.GENERATOR && } - {state === PAGE_TYPE.THEME && ( - - )} - {state === PAGE_TYPE.PULL_REQUEST && } - {state === PAGE_TYPE.ERROR && } -