From 6941211b79cf254f5eda2375246e58afeb7eb84a Mon Sep 17 00:00:00 2001 From: valyukhov Date: Tue, 22 Oct 2024 03:14:30 +0300 Subject: [PATCH 1/4] feat: hange icons --- components/AboutVersion.js | 8 ++- components/ModalInSideBar.js | 6 +- components/SideBar.js | 118 ++++++++++++++++++++--------------- components/SignOut.js | 19 ++++-- components/ThemeSwitcher.js | 23 +++++-- components/image.png | Bin 3378 -> 0 bytes public/about.svg | 4 +- public/account.svg | 5 +- public/notes.svg | 4 +- public/themes.svg | 4 +- public/version.svg | 5 +- 11 files changed, 126 insertions(+), 70 deletions(-) delete mode 100644 components/image.png diff --git a/components/AboutVersion.js b/components/AboutVersion.js index 301ff719..efb3a31c 100644 --- a/components/AboutVersion.js +++ b/components/AboutVersion.js @@ -83,7 +83,13 @@ function AboutVersion({ isStartPage = false, collapsed }) { return ( <> -
+
{t('Version')} {packageJson.version}
{modalsSidebarState.aboutVersion && ( diff --git a/components/ModalInSideBar.js b/components/ModalInSideBar.js index 6cc104fc..7ab05305 100644 --- a/components/ModalInSideBar.js +++ b/components/ModalInSideBar.js @@ -11,9 +11,9 @@ function ModalInSideBar({ return ( <>
{buttonTitle}
diff --git a/components/SideBar.js b/components/SideBar.js index db65bb67..18d7194e 100644 --- a/components/SideBar.js +++ b/components/SideBar.js @@ -113,7 +113,7 @@ function SideBar({ setIsOpenSideBar, access }) { > e.stopPropagation()} onMouseEnter={() => { @@ -163,9 +163,9 @@ function SideBar({ setIsOpenSideBar, access }) { -
+
{t('Account')} @@ -198,9 +202,9 @@ function SideBar({ setIsOpenSideBar, access }) { -
+
{t('Projects')} @@ -234,11 +242,11 @@ function SideBar({ setIsOpenSideBar, access }) { -
+
{t('CreateProject')} @@ -288,8 +300,8 @@ function SideBar({ setIsOpenSideBar, access }) {
@@ -309,11 +321,11 @@ function SideBar({ setIsOpenSideBar, access }) {
-
+
@@ -352,11 +364,11 @@ function SideBar({ setIsOpenSideBar, access }) {
{t('users:UserManagement')} @@ -396,17 +412,21 @@ function SideBar({ setIsOpenSideBar, access }) {
- + {t('Language')}
@@ -416,9 +436,9 @@ function SideBar({ setIsOpenSideBar, access }) {
-
+
@@ -451,11 +471,11 @@ function SideBar({ setIsOpenSideBar, access }) {
-
+
@@ -480,7 +500,7 @@ function SideBar({ setIsOpenSideBar, access }) { diff --git a/components/SignOut.js b/components/SignOut.js index c3b56e52..2d19f3d2 100644 --- a/components/SignOut.js +++ b/components/SignOut.js @@ -35,12 +35,19 @@ export default function SignOut({ collapsed }) { loading ? 'opacity-70' : '' }`} > -
- -
-

{t('users:SignOut')}

+ + +

+ {t('users:SignOut')} +

) } diff --git a/components/ThemeSwitcher.js b/components/ThemeSwitcher.js index 74677c96..784e9792 100644 --- a/components/ThemeSwitcher.js +++ b/components/ThemeSwitcher.js @@ -66,14 +66,29 @@ const ThemeSwitcher = ({ collapsed }) => { <>
- +
-

{t('ChooseTheme')}

+

+ {t('ChooseTheme')} +

7o9ttzdGIy^1m@H1!ys|8G{;EDP!Tb{dc*Im}MjF|D zM-*coP4Uzs1EzhS3v4THA@zV)%z%NW*MPc_LbfX)G5A&$sIO1?GCa_A|5Vj2A2&z* zh6^iB4?H0rAFru(;J@uO4I}7P@o9_7Sg9@=4;o{np*PqzhGhnrJC?Z+S5F~Q zEA+ou@i|4#6xP>gGV-YFv$C?9TU(2z05P{fF~axXtXxV-O1_54=O+O-={-f}^D(S0YBVf~ zg)`^R($|;dQo(&m9DXYUfSG!aw{lJ0n#o=>wS%E{wlO_Uf|;(uPPt>E`470twBfT~ z5GjxDz9+M%>cUspNu<{SsIjEAq!xI z(lO}7JlDN*!$O^iugt%8IK?pzRrKUN>Gu98F8H{n*EtEmnNuZxI@9F)kwBYJusBjR z+*ksFA}1TH+H&aOfmV)Apx9?*U+4Hl;oq zjPmT<3ubEkoFl2jLOrC90w!!FFB{M#L*X$R0t!b9mKGFf^8h?K4`+0i&KAPYPxi7x zpBdQ@-Hw`x=DkFEW)2Cxw9STiTRb;l8(+!Pwxd&?{Ksh*?am3M#iU7m-j)^@rw!L3 z8Nn1wr)Qp#Eywkt=B>ZD21kCU0h4KpJS0xbLXlRSaw~oWw;yb`l5#Xc>-VQTAaYYv zQBb*C3)xCub3N`{)pvdNc~xmfmJ#z-FF)9{y`mqf_TQeeREZvLR?|rx`;?eOLHkFV z*s%3&g?t3_AS$P-UXuMC<e%3TlN%Y(Gsd8KVCWo+nkD>cba!!xS1Jb^s6mB))lOvcRHul*g$#t6MZIGSzPQmF0 zITho8)aAG_GVwF&XX2pg%N-VlNgD?TnT8{n8a5Vwms72pCz*3{Oh<{ngpFnExg}WX z?p^V64j&F0tK5S08?#Xj;pYKO?`39a%E4I{Jj|*uGDP`RuCs!oEx7Abf!eM0EdN?p zW<>9+pVtYl$fnld z_;p2BXfl_jMpJ-2!|-w{BnLL?XkMmnj9Bo8h2VK0vHdS$ci7HG{0q6*6H7->Mh`1V zjA<17^7+E%M0yeMtHcf08>U3rLQ|7LcA?+a^5d(4iO(tq$blDS%dMu6o{t0Muliab z8A4%g_}D3_fZF(JPM*Bd=p zzxmrILQ2x}?__4b)AvN$cAcXm6Fr0x<xVQwsXeZtb=^;KZk%$_$e9y#Uqt-q z{;iG()$#QR-Vw}6|9wGl;OHvlk_;nV%PD9)yqjA!VN?IpfZ@$2Yy@u+x~55_P>=u zJN^A;6CoID9Cv7kkcq{g?MeL8$Zvti-MBiO|0U7U6Y%ddRTu-I%ZI^-1wDp4X{yjP z_S<3&_=&I~fO>Z``eSN>RzE@v?k3Jk{{8K>1D#*PP-IbI&%b=VZ>z7cxV@7}MJKah z9f=K^``CoupiN-DfJ0UCKW^rQ#dP`pl~iAF3}v_(1HVuj-!)lz35<%;XmrBH9xoXG zy7F1f+i&xhj$#a3WMEWbNAvtXDRT)-9*IxRez)SW#0$jk#{<&0m5+s8DUjNYTXTdl zjdK8N&D;3U{4@PQIb_^WrDPZB*&MnocQc8 zkX8E=9(`>Zy|cP)7$Fr1wUUh6ReOzGQZE#vQ@*IO(d2n(v$!@Z<-mQd{xXJZwD1x~FZN>f4Wbr+0j17~HS0*jY7>fl6p}Myhn>41tS4 zPcG|nr~PjR-4xU-LL{C!xZp_GXz>xT=@NdHf-g##nPU@#gphdyw^4c7IPO-cpc}*Z zrHv(TH7 V-KW0byyhHI8~%e;5qCGT0m=*VTdh@8mK1tRE3};{p$heS$a$al)H!IG98G!s#9YC8-IDI~yfORA?lQ@)Tu<5S$`rv31X+nK z$#?qCFK@T>XVRvugiDX~XFwK}^yYksRiaERJqEeG;tDlpjqqL&b>ajih>7934f{T$ zCxHqqAXd5*N1VI^ao5Coa(S}z3ko~!F51eg;)9dR(Npx5(KW~ch$pY6NX;4YXZ zjR6sFhDQ4p)`3aBFdh+PdPk2Ccb4@dW4e^d*nAjcjG2t*66>4t6Hmo)A>#^^%D7I9 zJlaW~=VxwtX4_znr&)cH(Zz07yxJe9y95p4hh}v=R`QaQ4X%lQm?Id;?q7jK>?GlA zFO#DIy+1*4N`9HnKRQRM?E&U2))#rzgr^4`q7XgS=wjeJLOqmA5aq+tG*34l8wyai>yL rezsd;@OF%`&3iEWzf}RU!YfkVfXfD#)Ryh*o - + + diff --git a/public/account.svg b/public/account.svg index d1c6fe54..862832b2 100644 --- a/public/account.svg +++ b/public/account.svg @@ -1 +1,4 @@ - + + + + diff --git a/public/notes.svg b/public/notes.svg index 47f16fbc..05390123 100644 --- a/public/notes.svg +++ b/public/notes.svg @@ -1 +1,3 @@ - + + + diff --git a/public/themes.svg b/public/themes.svg index 78e53efd..0f16eb87 100644 --- a/public/themes.svg +++ b/public/themes.svg @@ -1,4 +1,4 @@ - - + + diff --git a/public/version.svg b/public/version.svg index 303ec7ac..26fc57d2 100644 --- a/public/version.svg +++ b/public/version.svg @@ -1 +1,4 @@ - + + + + From 5d00d75fe5b312decf694cca1f1adaf4aea31e69 Mon Sep 17 00:00:00 2001 From: valyukhov Date: Tue, 22 Oct 2024 15:26:59 +0300 Subject: [PATCH 2/4] feat: :children_crossing: improve hover menu --- components/AboutVersion.js | 2 +- components/ModalInSideBar.js | 2 +- components/SideBar.js | 72 +++++++++++++++++--------------- components/SignOut.js | 4 +- components/SwitchLocalization.js | 14 ++++--- components/ThemeSwitcher.js | 38 +++++++++-------- components/Workspace.js | 4 +- public/notepad.svg | 1 - public/notes.svg | 2 +- 9 files changed, 76 insertions(+), 63 deletions(-) delete mode 100644 public/notepad.svg diff --git a/components/AboutVersion.js b/components/AboutVersion.js index efb3a31c..9aeed5c5 100644 --- a/components/AboutVersion.js +++ b/components/AboutVersion.js @@ -87,7 +87,7 @@ function AboutVersion({ isStartPage = false, collapsed }) { className={`${collapsed && 'lg:hidden'} ${ modalsSidebarState.aboutVersion ? 'text-th-text-primary' - : 'text-th-secondary-300 group-hover:text-th-text-primary' + : 'text-th-text-primary lg:text-th-secondary-300 group-hover:text-th-text-primary' }`} > {t('Version')} {packageJson.version} diff --git a/components/ModalInSideBar.js b/components/ModalInSideBar.js index 7ab05305..c94a22cd 100644 --- a/components/ModalInSideBar.js +++ b/components/ModalInSideBar.js @@ -12,7 +12,7 @@ function ModalInSideBar({ <>
{buttonTitle} diff --git a/components/SideBar.js b/components/SideBar.js index 18d7194e..aa19f7bc 100644 --- a/components/SideBar.js +++ b/components/SideBar.js @@ -37,6 +37,11 @@ import Users from 'public/users.svg' import About from 'public/about.svg' import { useRouter } from 'next/router' +const activeIconClass = + 'stroke-th-text-primary lg:stroke-th-secondary-300 group-hover:stroke-th-text-primary' +const activeTextClass = + 'text-th-text-primary lg:text-th-secondary-300 group-hover:text-th-text-primary' + function SideBar({ setIsOpenSideBar, access }) { const { user } = useCurrentUser() const { t } = useTranslation(['common', 'projects', 'users', 'start-page']) @@ -44,7 +49,6 @@ function SideBar({ setIsOpenSideBar, access }) { const [collapsed, setCollapsed] = useState(true) const [isLargeScreen, setIsLargeScreen] = useState(false) - const [isOpen, setIsOpen] = useState(false) const [showAbout, setShowAbout] = useState(false) const [showCreate, setShowCreate] = useState(false) @@ -77,10 +81,6 @@ function SideBar({ setIsOpenSideBar, access }) { return () => window.removeEventListener('resize', checkScreenSize) }, []) - useEffect(() => { - setIsOpen(isLargeScreen) - }, [isLargeScreen]) - return ( {({ open, close }) => ( @@ -133,7 +133,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`relative flex flex-col gap-2 cursor-default border shadow-md border-th-secondary-300 bg-th-secondary-10 sm:rounded-2xl lg:h-screen lg:rounded-none`} >
@@ -182,7 +182,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`w-4 ml-0.5 ${ router.query?.tab === '0' ? 'stroke-th-text-primary' - : 'stroke-th-secondary-300 group-hover:stroke-th-text-primary' + : activeIconClass }`} />
@@ -190,7 +190,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`${collapsed && 'lg:hidden'} ${ router.query?.tab === '0' ? 'text-th-text-primary' - : 'text-th-secondary-300 group-hover:text-th-text-primary' + : activeTextClass }`} > {t('Account')} @@ -221,7 +221,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`w-5 ${ router.query?.tab === '1' ? 'stroke-th-text-primary' - : 'stroke-th-secondary-300 group-hover:stroke-th-text-primary' + : activeIconClass }`} />
@@ -229,7 +229,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`${collapsed && 'lg:hidden'} ${ router.query?.tab === '1' ? 'text-th-text-primary' - : 'text-th-secondary-300 group-hover:text-th-text-primary' + : activeTextClass }`} > {t('Projects')} @@ -263,7 +263,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`w-5 h-5 ${ router.query?.tab === '2' ? 'stroke-th-text-primary' - : 'stroke-th-secondary-300 group-hover:stroke-th-text-primary' + : activeIconClass }`} />
@@ -271,7 +271,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`${collapsed && 'lg:hidden'} ${ router.query?.tab === '2' ? 'text-th-text-primary' - : 'text-th-secondary-300 group-hover:text-th-text-primary' + : activeTextClass }`} > {t('CreateProject')} @@ -299,9 +299,7 @@ function SideBar({ setIsOpenSideBar, access }) {
@@ -339,7 +337,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`w-5 h-5 ${ modalsSidebarState.notepad ? 'stroke-th-text-primary' - : 'stroke-th-secondary-300 group-hover:stroke-th-primary-300' + : 'text-th-text-primary lg:text-th-secondary-300 group-hover:text-th-text-primary' }`} />
@@ -385,19 +383,29 @@ function SideBar({ setIsOpenSideBar, access }) { className={`w-5 ${ router.pathname === '/users' ? 'stroke-th-text-primary' - : 'stroke-th-secondary-300 group-hover:stroke-th-primary-300' + : activeIconClass }`} />
- - {t('users:UserManagement')} - + + {t('users:UserManagement')} + +
@@ -412,20 +420,20 @@ function SideBar({ setIsOpenSideBar, access }) {
{t('Language')} @@ -450,9 +458,7 @@ function SideBar({ setIsOpenSideBar, access }) {
@@ -489,7 +495,7 @@ function SideBar({ setIsOpenSideBar, access }) { className={`w-5 h-5 ${ modalsSidebarState.aboutVersion ? 'stroke-th-text-primary' - : 'stroke-th-secondary-300 group-hover:stroke-th-text-primary' + : activeIconClass } ${collapsed && 'opacity-70'}`} />
@@ -500,7 +506,7 @@ function SideBar({ setIsOpenSideBar, access }) { diff --git a/components/SignOut.js b/components/SignOut.js index 2d19f3d2..a59825bd 100644 --- a/components/SignOut.js +++ b/components/SignOut.js @@ -36,13 +36,13 @@ export default function SignOut({ collapsed }) { }`} >

diff --git a/components/SwitchLocalization.js b/components/SwitchLocalization.js index 1ed2bfae..616bda34 100644 --- a/components/SwitchLocalization.js +++ b/components/SwitchLocalization.js @@ -16,17 +16,17 @@ function SwitchLocalization({ collapsed }) {

e.stopPropagation()} > {t(locale.toUpperCase())} @@ -38,9 +38,13 @@ function SwitchLocalization({ collapsed }) { onClick={(e) => { push(asPath, undefined, { locale: loc }) }} - className="cursor-pointer px-4 py-2 hover:bg-th-primary-100-hover-backgroung last:rounded-b-2xl first:rounded-t-2xl hover:opacity-70" + className="cursor-pointer px-4 py-2 last:rounded-b-2xl first:rounded-t-2xl hover:opacity-70" > -
+
{t(loc.toUpperCase())}
diff --git a/components/ThemeSwitcher.js b/components/ThemeSwitcher.js index 784e9792..ddcf652a 100644 --- a/components/ThemeSwitcher.js +++ b/components/ThemeSwitcher.js @@ -65,37 +65,41 @@ const ThemeSwitcher = ({ collapsed }) => { {({ open }) => ( <>

{t('ChooseTheme')}

+ const icons = { - personalNotes: , + personalNotes: , teamNotes: , dictionary: , retelling: , diff --git a/public/notepad.svg b/public/notepad.svg deleted file mode 100644 index b3975273..00000000 --- a/public/notepad.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/public/notes.svg b/public/notes.svg index 05390123..c5f327aa 100644 --- a/public/notes.svg +++ b/public/notes.svg @@ -1,3 +1,3 @@ - + From ec94a0d5e2cb9ddf5c3027184bd38fe65151b78a Mon Sep 17 00:00:00 2001 From: valyukhov Date: Tue, 22 Oct 2024 16:05:42 +0300 Subject: [PATCH 3/4] refactor: :recycle: added hideSidebar option --- components/AppBar.js | 10 ++++++++-- components/Layout.js | 8 ++++++-- pages/404.js | 2 ++ pages/_app.js | 27 ++++++++++++++------------- pages/agreements.js | 1 + pages/confession-steps.js | 1 + pages/user-agreement.js | 2 +- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/components/AppBar.js b/components/AppBar.js index dc12f19b..c80ee7cc 100644 --- a/components/AppBar.js +++ b/components/AppBar.js @@ -17,7 +17,11 @@ import LevelLogo from 'public/level-logo.svg' import Down from 'public/arrow-down.svg' import User from 'public/user.svg' -export default function AppBar({ setIsOpenSideBar, isOpenSideBar }) { +export default function AppBar({ + setIsOpenSideBar, + isOpenSideBar, + isHideSidebar = false, +}) { const [showFullAppbar, setShowFullAppbar] = useState(false) const [isStepPage, setIsStepPage] = useState(false) const [access, setAccess] = useState(false) @@ -53,7 +57,9 @@ export default function AppBar({ setIsOpenSideBar, isOpenSideBar }) {
isOpenSideBar && setIsOpenSideBar(false)}>
- + {!isHideSidebar && ( + + )}
- +
setIsOpenSideBar(false)}> { + if (Component.layoutType === 'empty') { + return + } + + const layoutProps = { + backgroundColor: Component.backgroundColor ?? 'bg-th-secondary-100', + isHideSidebar: Component.layoutType === 'hideSidebar', + } + return ( - - -
- -
- - + + + ) } return ( -
- - - -
+
{renderContent()}
 ) diff --git a/pages/agreements.js b/pages/agreements.js index 30377935..c8b270ec 100644 --- a/pages/agreements.js +++ b/pages/agreements.js @@ -73,6 +73,7 @@ export default function Agreements() {
) } +Agreements.layoutType = 'hideSidebar' Agreements.backgroundColor = 'bg-th-secondary-100' diff --git a/pages/confession-steps.js b/pages/confession-steps.js index 6c2a300e..d0d4e5ec 100644 --- a/pages/confession-steps.js +++ b/pages/confession-steps.js @@ -129,6 +129,7 @@ export default function ConfessionSteps() {
) } +ConfessionSteps.layoutType = 'hideSidebar' export async function getStaticProps({ locale }) { return { diff --git a/pages/user-agreement.js b/pages/user-agreement.js index 70286850..d86c1259 100644 --- a/pages/user-agreement.js +++ b/pages/user-agreement.js @@ -63,7 +63,7 @@ export default function UserAgreement() {
) } - +UserAgreement.layoutType = 'hideSidebar' export async function getStaticProps({ locale }) { return { props: { From 6f6b75c0846bd5245893979aa5fab886066ddf42 Mon Sep 17 00:00:00 2001 From: valyukhov Date: Tue, 22 Oct 2024 16:52:37 +0300 Subject: [PATCH 4/4] refactor: :recycle: delete layout param --- components/Account.js | 1 + components/AppBar.js | 18 ++++++++------- components/Layout.js | 8 ++----- components/ModalInSideBar.js | 6 +++-- components/SideBar.js | 39 ++++++++++++++++---------------- components/SignOut.js | 4 ++-- components/SwitchLocalization.js | 2 +- pages/404.js | 2 -- pages/_app.js | 1 - pages/agreements.js | 1 - pages/confession-steps.js | 1 - pages/user-agreement.js | 1 - 12 files changed, 40 insertions(+), 44 deletions(-) diff --git a/components/Account.js b/components/Account.js index f3185153..6a628d81 100644 --- a/components/Account.js +++ b/components/Account.js @@ -41,6 +41,7 @@ function Account() { useEffect(() => { router.push(`?tab=${selectedTab}`, undefined, { shallow: true }) + // eslint-disable-next-line react-hooks/exhaustive-deps }, [selectedTab]) const tabs = ['Account', 'projects:Projects', 'projects:CreateProject'] diff --git a/components/AppBar.js b/components/AppBar.js index bc351cb0..4d01c933 100644 --- a/components/AppBar.js +++ b/components/AppBar.js @@ -17,11 +17,7 @@ import LevelLogo from 'public/level-logo.svg' import Down from 'public/arrow-down.svg' import User from 'public/user.svg' -export default function AppBar({ - setIsOpenSideBar, - isOpenSideBar, - isHideSidebar = false, -}) { +export default function AppBar({ setIsOpenSideBar, isOpenSideBar }) { const [showFullAppbar, setShowFullAppbar] = useState(false) const [isStepPage, setIsStepPage] = useState(false) const [access, setAccess] = useState(false) @@ -57,9 +53,15 @@ export default function AppBar({
isOpenSideBar && setIsOpenSideBar(false)}>
- {!['/user-agreement', '/confession-steps', 'agreements'].includes( - router.pathname - ) && } + {![ + '/user-agreement', + '/confession-steps', + '/agreements', + '/404', + '/privacy-policy', + ].includes(router.pathname) && ( + + )}
- +
setIsOpenSideBar(false)}>
- {buttonTitle} + {buttonTitle}
{isOpen && ( diff --git a/components/SideBar.js b/components/SideBar.js index 4be7799c..53ef8e2d 100644 --- a/components/SideBar.js +++ b/components/SideBar.js @@ -195,7 +195,7 @@ function SideBar({ setIsOpenSideBar, access }) { />
- - {t('CreateProject')} - + + {t('CreateProject')} + +
@@ -393,22 +401,17 @@ function SideBar({ setIsOpenSideBar, access }) { className={`w-5 ${ router.pathname === '/users' ? 'stroke-th-text-primary' - : activeIconClass }`} />
{t('Language')} diff --git a/components/SignOut.js b/components/SignOut.js index 034e3b03..ec86f7a4 100644 --- a/components/SignOut.js +++ b/components/SignOut.js @@ -37,13 +37,13 @@ export default function SignOut({ collapsed }) { >

{t('users:SignOut')} diff --git a/components/SwitchLocalization.js b/components/SwitchLocalization.js index 8d9eb47a..676c8a00 100644 --- a/components/SwitchLocalization.js +++ b/components/SwitchLocalization.js @@ -15,7 +15,7 @@ function SwitchLocalization({ collapsed }) { return (

diff --git a/pages/404.js b/pages/404.js index 55fca726..d1d374c4 100644 --- a/pages/404.js +++ b/pages/404.js @@ -26,8 +26,6 @@ export default function PageNotFound() { ) } -PageNotFound.layoutType = 'hideSidebar' - PageNotFound.backgroundColor = 'bg-th-primary-100' export async function getStaticProps({ locale }) { diff --git a/pages/_app.js b/pages/_app.js index 6598231a..39fa5f40 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -23,7 +23,6 @@ function MyApp({ Component, pageProps }) { const layoutProps = { backgroundColor: Component.backgroundColor ?? 'bg-th-secondary-100', - isHideSidebar: Component.layoutType === 'hideSidebar', } return ( diff --git a/pages/agreements.js b/pages/agreements.js index e1f6331e..823473e3 100644 --- a/pages/agreements.js +++ b/pages/agreements.js @@ -73,7 +73,6 @@ export default function Agreements() {
) } -Agreements.layoutType = 'hideSidebar' Agreements.backgroundColor = 'bg-th-secondary-100' diff --git a/pages/confession-steps.js b/pages/confession-steps.js index d0d4e5ec..6c2a300e 100644 --- a/pages/confession-steps.js +++ b/pages/confession-steps.js @@ -129,7 +129,6 @@ export default function ConfessionSteps() {
) } -ConfessionSteps.layoutType = 'hideSidebar' export async function getStaticProps({ locale }) { return { diff --git a/pages/user-agreement.js b/pages/user-agreement.js index d86c1259..7331b05d 100644 --- a/pages/user-agreement.js +++ b/pages/user-agreement.js @@ -63,7 +63,6 @@ export default function UserAgreement() {
) } -UserAgreement.layoutType = 'hideSidebar' export async function getStaticProps({ locale }) { return { props: {