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.

Sign up for GitHub

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

feat: responsive account settings + settings page #2958

Merged
merged 8 commits into from
Feb 29, 2024
Merged

feat: responsive account settings + settings page #2958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad0ce41
feat: make account settings and settings component responsive
pavanjoshi914 Dec 22, 2023
25e4d65
feat: responsive settings page
pavanjoshi914 Jan 30, 2024
398bc75
Merge remote-tracking branch 'upstream/master' into feat/settings-page
pavanjoshi914 Feb 12, 2024
acac148
Merge branch 'master' into feat/settings-page
pavanjoshi914 Feb 23, 2024
a023ba0
Merge branch 'master' into feat/settings-page
pavanjoshi914 Feb 26, 2024
2afe652
Merge branch 'master' into feat/settings-page
reneaaron Feb 27, 2024
fde79e2
chore: design fixes
im-adithya Feb 27, 2024
7f31a3c
Merge branch 'master' into feat/settings-page
reneaaron Feb 29, 2024
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
14 changes: 11 additions & 3 deletions src/app/components/Setting/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
import { classNames } from "~/app/utils";

type Props = {
title: string;
subtitle: string | React.ReactNode;
children: React.ReactNode;
inline?: boolean;
pavanjoshi914 marked this conversation as resolved.
Show resolved Hide resolved
};

function Setting({ title, subtitle, children }: Props) {
function Setting({ title, subtitle, children, inline }: Props) {
return (
<div className="py-4 flex justify-between items-center">
<div
className={classNames(
inline ? "" : "flex-col sm:flex-row",
"flex justify-between py-4"
)}
>
<div>
<span className="text-black dark:text-white font-medium">{title}</span>
<p className="text-gray-600 mr-1 dark:text-neutral-400 text-sm">
{subtitle}
</p>
</div>
{children}
<div className="flex items-center">{children}</div>
</div>
);
}
Expand Down
42 changes: 21 additions & 21 deletions src/app/screens/Accounts/Detail/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ function AccountDetail() {
updatedAccount.name = accountName;
setAccount(updatedAccount);
}}
className="flex justify-between items-end"
className="flex flex-col sm:flex-row justify-between items-center"
>
<div className="w-7/12">
<div className="sm:w-7/12 w-full">
<TextField
id="name"
label={t("name.title")}
Expand All @@ -206,7 +206,7 @@ function AccountDetail() {
/>
</div>
<div className="w-1/5 flex-none mx-4 d-none"></div>
<div className="w-1/5 flex-none">
<div className="flex-none sm:w-1/5 w-full pt-4 sm:pt-0">
<Button
type="submit"
label={tCommon("actions.save")}
Expand All @@ -219,8 +219,8 @@ function AccountDetail() {
{account.connectorType == "lndhub" && (
<>
<MenuDivider />
<div className="flex justify-between items-end">
<div className="w-9/12">
<div className="flex flex-col sm:flex-row justify-between items-center">
<div className="sm:w-9/12 w-full">
<p className="text-black dark:text-white font-medium">
{t("export.title")}
</p>
Expand All @@ -246,7 +246,7 @@ function AccountDetail() {
</p>
</div>

<div className="w-1/5 flex-none">
<div className="flex-none sm:w-1/5 w-full pt-4 sm:pt-0">
{exportAccount && account.connectorType === "lndhub" && (
<>
<Button
Expand Down Expand Up @@ -318,8 +318,8 @@ function AccountDetail() {
<Alert type="warn">{t("mnemonic.backup.warning")}</Alert>
)}

<div className="flex justify-between items-end">
<div className="w-9/12">
<div className="flex flex-col sm:flex-row justify-between items-center">
<div className="sm:w-9/12 w-full">
<p className="text-black dark:text-white font-medium">
{t(
hasMnemonic
Expand All @@ -336,7 +336,7 @@ function AccountDetail() {
</p>
</div>

<div className="w-1/5 flex-none">
<div className="flex-none sm:w-1/5 w-full pt-4 sm:pt-0">
<Link to={`secret-key/${hasMnemonic ? "backup" : "new"}`}>
<Button
label={t(
Expand All @@ -353,8 +353,8 @@ function AccountDetail() {
{!hasMnemonic && (
<>
<MenuDivider />
<div className="flex justify-between items-end">
<div className="w-7/12">
<div className="flex flex-col sm:flex-row justify-between items-center">
<div className="sm:w-7/12 w-full">
<p className="text-black dark:text-white font-medium">
{t("mnemonic.import.title")}
</p>
Expand All @@ -363,7 +363,7 @@ function AccountDetail() {
</p>
</div>

<div className="w-1/5 flex-none">
<div className="flex-none sm:w-1/5 w-full pt-4 sm:pt-0">
<Link to="secret-key/import">
<Button
label={t("mnemonic.import.button")}
Expand All @@ -376,8 +376,8 @@ function AccountDetail() {
</>
)}
<MenuDivider />
<div className="flex justify-between items-center">
<div className="w-7/12">
<div className="flex flex-col sm:flex-row justify-between items-center">
<div className="sm:w-7/12 w-full">
<div className="flex flex-col">
<TextField
id="nostrPublicKey"
Expand All @@ -402,7 +402,7 @@ function AccountDetail() {
</div>
)}
</div>
<div className="w-1/5 flex-none">
<div className="flex-none sm:w-1/5 w-full pt-4 sm:pt-0">
<Link to="nostr/settings">
<Button label={t("nostr.settings.label")} primary fullWidth />
</Link>
Expand Down Expand Up @@ -432,8 +432,8 @@ function AccountDetail() {
!hasMnemonic && "opacity-30"
)}
>
<div className="flex justify-between items-end">
<div className="w-7/12 flex flex-col gap-2">
<div className="flex flex-col sm:flex-row justify-between items-center">
<div className="sm:w-7/12 w-full flex flex-col gap-2">
<p className="text-black dark:text-white font-medium">
{t("network.title")}
</p>
Expand All @@ -442,7 +442,7 @@ function AccountDetail() {
</p>
</div>

<div className="w-1/5 flex-none">
<div className="flex-none sm:w-1/5 w-full pt-4 sm:pt-0">
<Select
name="network"
value={account.bitcoinNetwork}
Expand Down Expand Up @@ -472,7 +472,7 @@ function AccountDetail() {
</div>
</div>
<MenuDivider />
<div className="flex justify-between items-end">
<div className="flex justify-between items-center">
<div className="w-7/12 flex flex-col gap-2">
<p className="text-black dark:text-white font-medium">
{t("mnemonic.lnurl.title")}
Expand Down Expand Up @@ -517,7 +517,7 @@ function AccountDetail() {
title={t("remove_secretkey.title")}
subtitle={t("remove_secretkey.subtitle")}
>
<div className="w-64">
<div className="sm:w-64 flex-none w-full pt-4 sm:pt-0">
<Button
onClick={() => {
removeMnemonic({
Expand All @@ -532,7 +532,7 @@ function AccountDetail() {
</Setting>
)}
<Setting title={t("remove.title")} subtitle={t("remove.subtitle")}>
<div className="w-64">
<div className="sm:w-64 flex-none w-full pt-4 sm:pt-0">
<Button
onClick={() => {
removeAccount({
Expand Down
24 changes: 15 additions & 9 deletions src/app/screens/Settings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ function Settings() {
<Setting
title={t("browser_notifications.title")}
subtitle={t("browser_notifications.subtitle")}
inline={true}
>
{!isLoading && (
<Toggle
Expand All @@ -83,6 +84,7 @@ function Settings() {
<Setting
title={t("website_enhancements.title")}
subtitle={t("website_enhancements.subtitle")}
inline={true}
>
{!isLoading && (
<Toggle
Expand All @@ -102,6 +104,7 @@ function Settings() {
{!cameraPermissionsGranted ? (
<Button
label={t("camera_access.allow")}
className="sm:w-64 flex-none w-full mt-4 sm:mt-0"
onClick={async () => {
try {
await Html5Qrcode.getCameras();
Expand All @@ -112,7 +115,7 @@ function Settings() {
}}
/>
) : (
<p className="text-green-500 font-medium">
<p className="text-green-500 font-medium pt-2 sm:pt-0">
{t("camera_access.granted")}
</p>
)}
Expand All @@ -135,13 +138,13 @@ function Settings() {
/>
}
>
<div className="w-64">
<div className="sm:w-64 w-full pt-4 sm:pt-0">
<LocaleSwitcher className="w-full border-gray-300 rounded-md shadow-sm text-gray-700 bg-white dark:bg-surface-00dp dark:text-neutral-200 dark:border-neutral-800" />
</div>
</Setting>
<Setting title={t("theme.title")} subtitle={t("theme.subtitle")}>
{!isLoading && (
<div className="w-64">
<div className="sm:w-64 flex-none w-full pt-4 sm:pt-0">
<Select
name="theme"
value={settings.theme}
Expand All @@ -164,7 +167,7 @@ function Settings() {
subtitle={t("change_password.subtitle")}
>
{!isLoading && (
<div className="w-64">
<div className="sm:w-64 w-full pt-4 sm:pt-0">
<Button
onClick={() => {
setModalIsOpen(true);
Expand All @@ -182,6 +185,7 @@ function Settings() {
<Setting
title={t("show_fiat.title")}
subtitle={t("show_fiat.subtitle")}
inline={true}
>
{!isLoading && (
<Toggle
Expand All @@ -202,7 +206,7 @@ function Settings() {
subtitle={t("currency.subtitle")}
>
{!isLoading && (
<div className="w-64">
<div className="sm:w-64 w-full pt-4 sm:pt-0">
<Select
name="currency"
value={settings.currency}
Expand All @@ -227,7 +231,7 @@ function Settings() {
subtitle={t("exchange.subtitle")}
>
{!isLoading && (
<div className="w-64">
<div className="sm:w-64 w-full pt-4 sm:pt-0">
<Select
name="exchange"
value={settings.exchange}
Expand Down Expand Up @@ -260,7 +264,7 @@ function Settings() {
<div className="shadow bg-white rounded-md sm:overflow-hidden px-6 py-2 divide-y divide-black/10 dark:divide-white/10 dark:bg-surface-02dp">
<Setting title={t("name.title")} subtitle={t("name.subtitle")}>
{!isLoading && (
<div className="w-64">
<div className="sm:w-64 w-full mt-1 sm:mt-0">
<Input
placeholder={t("name.placeholder")}
value={settings.userName}
Expand All @@ -276,7 +280,7 @@ function Settings() {

<Setting title={t("email.title")} subtitle={t("email.subtitle")}>
{!isLoading && (
<div className="w-64">
<div className="sm:w-64 w-full mt-1 sm:mt-0">
<Input
placeholder={t("email.placeholder")}
type="email"
Expand Down Expand Up @@ -343,7 +347,7 @@ function Settings() {
title={t("nostr.private_key.title")}
subtitle={t("nostr.private_key.subtitle")}
>
<div className="w-64">
<div className="sm:w-64 w-full pt-4 sm:pt-0">
<Button
label={t("nostr.private_key.go_to")}
primary
Expand Down Expand Up @@ -383,6 +387,7 @@ function Settings() {
<Setting
title={t("lnurl_auth.legacy_lnurl_auth_202207.title")}
subtitle={t("lnurl_auth.legacy_lnurl_auth_202207.subtitle")}
inline={true}
>
{!isLoading && (
<Toggle
Expand All @@ -400,6 +405,7 @@ function Settings() {
<Setting
title={t("lnurl_auth.legacy_lnurl_auth.title")}
subtitle={t("lnurl_auth.legacy_lnurl_auth.subtitle")}
inline={true}
>
{!isLoading && (
<Toggle
Expand Down
Loading