From c2fe1b94afe39dae8bd9c5a769a9c8318fc2925d Mon Sep 17 00:00:00 2001 From: Joseph David Date: Tue, 8 Oct 2024 23:27:09 +0300 Subject: [PATCH 1/3] settings layout --- unlock-app/app/settings/layout.tsx | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 unlock-app/app/settings/layout.tsx diff --git a/unlock-app/app/settings/layout.tsx b/unlock-app/app/settings/layout.tsx new file mode 100644 index 00000000000..7c2d3693279 --- /dev/null +++ b/unlock-app/app/settings/layout.tsx @@ -0,0 +1,24 @@ +import { ReactNode } from 'react' + +import DashboardHeader from '~/components/interface/layouts/index/DashboardHeader' +import DashboardFooter from '~/components/interface/layouts/index/DashboardFooter' +import TermsOfServiceModal from '~/components/interface/layouts/index/TermsOfServiceModal' +import { Container } from '~/components/interface/Container' +import { ConnectModal } from '~/components/interface/connect/ConnectModal' + +export default function SettingsLayout({ children }: { children: ReactNode }) { + return ( +
+ + + + + + +
{children}
+ + + +
+ ) +} From 20763667ff7aa176b3c90cb81e098d3a8929c189 Mon Sep 17 00:00:00 2001 From: Joseph David Date: Tue, 8 Oct 2024 23:27:22 +0300 Subject: [PATCH 2/3] migrate settings content --- .../src/components/content/SettingsContent.tsx | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/unlock-app/src/components/content/SettingsContent.tsx b/unlock-app/src/components/content/SettingsContent.tsx index 1aaac257151..d60a7a2e797 100644 --- a/unlock-app/src/components/content/SettingsContent.tsx +++ b/unlock-app/src/components/content/SettingsContent.tsx @@ -1,7 +1,6 @@ -import React from 'react' +'use client' + import { useState } from 'react' -import Head from 'next/head' -import { pageTitle } from '../../constants' import AccountInfo from '../interface/user-account/AccountInfo' import EjectAccount from '../interface/user-account/EjectAccount' import { loadStripe } from '@stripe/stripe-js' @@ -9,7 +8,6 @@ import { useConfig } from '~/utils/withConfig' import { Card } from '../interface/checkout/Card' import { SetupForm } from '../interface/checkout/main/CardPayment' import { Button } from '@unlock-protocol/ui' -import { AppLayout } from '../interface/layouts/AppLayout' import { usePaymentMethodList, useRemovePaymentMethods, @@ -22,7 +20,7 @@ export const PaymentSettings = () => { const { mutateAsync: removePaymentMethods } = useRemovePaymentMethods() const { data: methods, - isInitialLoading: isMethodLoading, + isLoading: isMethodLoading, refetch: refetchPaymentMethodList, } = usePaymentMethodList() @@ -86,14 +84,11 @@ export const PaymentSettings = () => { export const SettingsContent = () => { return ( - - - {pageTitle('Account Settings')} - + <> - + ) } From dbdb091ef509b7c3c1b7a1eefdf22b99cdf50511 Mon Sep 17 00:00:00 2001 From: Joseph David Date: Tue, 8 Oct 2024 23:27:45 +0300 Subject: [PATCH 3/3] migrate settings page --- unlock-app/app/settings/page.tsx | 15 +++++++++++++++ unlock-app/src/pages/settings.tsx | 6 ------ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 unlock-app/app/settings/page.tsx delete mode 100644 unlock-app/src/pages/settings.tsx diff --git a/unlock-app/app/settings/page.tsx b/unlock-app/app/settings/page.tsx new file mode 100644 index 00000000000..67280bfeba6 --- /dev/null +++ b/unlock-app/app/settings/page.tsx @@ -0,0 +1,15 @@ +import React from 'react' +import { Metadata } from 'next' +import SettingsContent from '~/components/content/SettingsContent' + +export const metadata: Metadata = { + title: 'Account Settings | Unlock Protocol', + description: + 'Manage your account settings and payment methods for Unlock Protocol.', +} + +const SettingsPage: React.FC = () => { + return +} + +export default SettingsPage diff --git a/unlock-app/src/pages/settings.tsx b/unlock-app/src/pages/settings.tsx deleted file mode 100644 index afa9c4bcb08..00000000000 --- a/unlock-app/src/pages/settings.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react' -import SettingsContent from '../components/content/SettingsContent' - -const Settings = () => - -export default Settings