Skip to content

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@thedanielforum
thedanielforum committed Oct 27, 2021
1 parent a6a6f7f commit bb5018b
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 34 deletions.
4 changes: 2 additions & 2 deletions pages/settings/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const Settings: NextPage = () => {
return (
<div className="container">
<div className="row justify-content-center">
<div className="col-12 col-lg-10 col-xl-8">
<div className="col-12 col-lg-10 col-xl-8 mb-4">
<div className="header">
<div className="header-body">
<div className="row align-items-center">
Expand Down Expand Up @@ -173,7 +173,7 @@ const Settings: NextPage = () => {
<GeneralSettingsForm
onSubmit={onPersonalInfoSubmit}
initialValues={{
...data.getUser,
...(data?.getUser || {}),
email: user?.email,
}}
/>
Expand Down
93 changes: 61 additions & 32 deletions pages/settings/notifications.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,73 @@
import type { NextPage } from "next";
import { Fragment } from "react";
import { useIntl } from "react-intl";
import Link from "next/link";
import { withAuthUser, AuthAction } from "next-firebase-auth";
import loadIntlMessages from "../../helpers/loadIntlMessages";

const SettingsNotifications: NextPage = () => {
const intl = useIntl();

return (
<Fragment>
<div className="header">
<div className="container">
<div className="header-body">
<div className="row align-items-center">
<div className="col">
<h6 className="header-pretitle">Overview</h6>
<h1 className="header-title">Settings</h1>
<div className="container">
<div className="row justify-content-center">
<div className="col-12 col-lg-10 col-xl-8">
<div className="header">
<div className="header-body">
<div className="row align-items-center">
<div className="col">
<h6 className="header-pretitle">Overview</h6>
<h1 className="header-title">
{intl.formatMessage({
defaultMessage: "Settings",
description: "settings page-header settings",
})}
</h1>
</div>
</div>
</div>
<div className="row align-items-center">
<div className="col">
<ul className="nav nav-tabs nav-overflow header-tabs">
<li className="nav-item">
<Link href="/settings">
<a className="nav-link">General</a>
</Link>
</li>
<li className="nav-item">
<Link href="/settings/categories">
<a className="nav-link">Categories</a>
</Link>
</li>
<li className="nav-item">
<Link href="/settings/notifications">
<a className="nav-link active">Notifications</a>
</Link>
</li>
</ul>
<div className="row align-items-center">
<div className="col">
<ul className="nav nav-tabs nav-overflow header-tabs">
<li className="nav-item">
<Link href="/settings">
<a className="nav-link">
{intl.formatMessage({
defaultMessage: "General",
description: "settings menu general",
})}
</a>
</Link>
</li>
<li className="nav-item">
<Link href="/settings/categories">
<a className="nav-link">
{intl.formatMessage({
defaultMessage: "Categories",
description: "settings menu categories",
})}
</a>
</Link>
</li>
<li className="nav-item">
<Link href="/settings/notifications">
<a className="nav-link active">
{intl.formatMessage({
defaultMessage: "Notifications",
description: "settings menu notifications",
})}
</a>
</Link>
</li>
</ul>
</div>
</div>
</div>
</div>
<div className="text-center">
<p>Coming soon</p>
</div>
</div>
</div>
<div className="container"></div>
</Fragment>
</div>
);
};

Expand All @@ -52,4 +79,6 @@ export async function getStaticProps(ctx: any) {
};
}

export default SettingsNotifications;
export default withAuthUser({
whenUnauthedAfterInit: AuthAction.REDIRECT_TO_LOGIN,
})(SettingsNotifications);

1 comment on commit bb5018b

@vercel
Copy link

@vercel vercel bot commented on bb5018b Oct 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

Please sign in to comment.