diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 431c88e5..8149acd3 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import FullLayout from '@layouts/fullLayout';
+import BaseLayout from '@layouts/base';
+import FullscreenLayout from '@layouts/fullscreen';
import LumeSymbol from '@assets/icons/Lume';
import { useLocalStorage } from '@rehooks/local-storage';
@@ -22,7 +22,7 @@ export default function Page() {
} else {
setTimeout(() => {
setLoading(false);
- router.push('/feed/following');
+ router.push('/newsfeed/following');
}, 1500);
}
}, [currentUser, router]);
@@ -106,7 +106,7 @@ Page.getLayout = function getLayout(
) {
return (
- {page}
+ {page}
);
};
diff --git a/src/pages/newsfeed/circle.tsx b/src/pages/newsfeed/circle.tsx
new file mode 100644
index 00000000..d6749316
--- /dev/null
+++ b/src/pages/newsfeed/circle.tsx
@@ -0,0 +1,28 @@
+import BaseLayout from '@layouts/base';
+import NewsFeedLayout from '@layouts/newsfeed';
+
+import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
+
+export default function Page() {
+ return (
+
+ );
+}
+
+Page.getLayout = function getLayout(
+ page:
+ | string
+ | number
+ | boolean
+ | ReactElement
>
+ | ReactFragment
+ | ReactPortal
+) {
+ return (
+
+ {page}
+
+ );
+};
diff --git a/src/pages/feed/following.tsx b/src/pages/newsfeed/following.tsx
similarity index 97%
rename from src/pages/feed/following.tsx
rename to src/pages/newsfeed/following.tsx
index f4dd1dd7..71b5bddc 100644
--- a/src/pages/feed/following.tsx
+++ b/src/pages/newsfeed/following.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import NewsFeedLayout from '@layouts/newsfeedLayout';
+import BaseLayout from '@layouts/base';
+import NewsFeedLayout from '@layouts/newsfeed';
import { DatabaseContext } from '@components/contexts/database';
import { NoteConnector } from '@components/note/connector';
diff --git a/src/pages/feed/global.tsx b/src/pages/newsfeed/global.tsx
similarity index 83%
rename from src/pages/feed/global.tsx
rename to src/pages/newsfeed/global.tsx
index 6155bef1..d6749316 100644
--- a/src/pages/feed/global.tsx
+++ b/src/pages/newsfeed/global.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import NewsFeedLayout from '@layouts/newsfeedLayout';
+import BaseLayout from '@layouts/base';
+import NewsFeedLayout from '@layouts/newsfeed';
import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
diff --git a/src/pages/onboarding/create/index.tsx b/src/pages/onboarding/create/index.tsx
index 770bad0b..90f8189f 100644
--- a/src/pages/onboarding/create/index.tsx
+++ b/src/pages/onboarding/create/index.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import OnboardingLayout from '@layouts/onboardingLayout';
+import BaseLayout from '@layouts/base';
+import OnboardingLayout from '@layouts/onboarding';
import { DatabaseContext } from '@components/contexts/database';
import { RelayContext } from '@components/contexts/relay';
diff --git a/src/pages/onboarding/create/pre-follows.tsx b/src/pages/onboarding/create/pre-follows.tsx
index e034eaa3..af097746 100644
--- a/src/pages/onboarding/create/pre-follows.tsx
+++ b/src/pages/onboarding/create/pre-follows.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import OnboardingLayout from '@layouts/onboardingLayout';
+import BaseLayout from '@layouts/base';
+import OnboardingLayout from '@layouts/onboarding';
import { DatabaseContext } from '@components/contexts/database';
diff --git a/src/pages/onboarding/index.tsx b/src/pages/onboarding/index.tsx
index fd7f5b29..521d78fa 100644
--- a/src/pages/onboarding/index.tsx
+++ b/src/pages/onboarding/index.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import OnboardingLayout from '@layouts/onboardingLayout';
+import BaseLayout from '@layouts/base';
+import OnboardingLayout from '@layouts/onboarding';
import { motion } from 'framer-motion';
import Link from 'next/link';
diff --git a/src/pages/onboarding/login/fetch.tsx b/src/pages/onboarding/login/fetch.tsx
index 2943b4fc..9b1bca29 100644
--- a/src/pages/onboarding/login/fetch.tsx
+++ b/src/pages/onboarding/login/fetch.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import OnboardingLayout from '@layouts/onboardingLayout';
+import BaseLayout from '@layouts/base';
+import OnboardingLayout from '@layouts/onboarding';
import { DatabaseContext } from '@components/contexts/database';
import { RelayContext } from '@components/contexts/relay';
diff --git a/src/pages/onboarding/login/index.tsx b/src/pages/onboarding/login/index.tsx
index b6c68e65..47ca3354 100644
--- a/src/pages/onboarding/login/index.tsx
+++ b/src/pages/onboarding/login/index.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import OnboardingLayout from '@layouts/onboardingLayout';
+import BaseLayout from '@layouts/base';
+import OnboardingLayout from '@layouts/onboarding';
import { motion } from 'framer-motion';
import { useRouter } from 'next/router';
diff --git a/src/pages/profile/personal.tsx b/src/pages/profile/personal.tsx
index a9d517ba..d97e5c03 100644
--- a/src/pages/profile/personal.tsx
+++ b/src/pages/profile/personal.tsx
@@ -1,4 +1,4 @@
-import BaseLayout from '@layouts/baseLayout';
+import BaseLayout from '@layouts/base';
import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
diff --git a/src/pages/profile/update.tsx b/src/pages/profile/update.tsx
index 6ae6a609..9cb99915 100644
--- a/src/pages/profile/update.tsx
+++ b/src/pages/profile/update.tsx
@@ -1,5 +1,5 @@
-import BaseLayout from '@layouts/baseLayout';
-import UserLayout from '@layouts/userLayout';
+import BaseLayout from '@layouts/base';
+import UserLayout from '@layouts/user';
import { RelayContext } from '@components/contexts/relay';
diff --git a/src/utils/getDate.tsx b/src/utils/getDate.tsx
index 66a165e9..2915fbcc 100644
--- a/src/utils/getDate.tsx
+++ b/src/utils/getDate.tsx
@@ -1,3 +1,4 @@
+// get X days ago with user provided date
export const daysAgo = (numOfDays, date = new Date()) => {
const daysAgo = new Date(date.getTime());
daysAgo.setDate(date.getDate() - numOfDays);
@@ -5,6 +6,7 @@ export const daysAgo = (numOfDays, date = new Date()) => {
return daysAgo;
};
+// get X hours ago with user provided date
export const hoursAgo = (numOfHours, date = new Date()) => {
const hoursAgo = new Date(date.getTime());
hoursAgo.setHours(date.getHours() - numOfHours);
@@ -12,6 +14,7 @@ export const hoursAgo = (numOfHours, date = new Date()) => {
return hoursAgo;
};
+// convert date to unix timestamp
export const dateToUnix = (_date?: Date) => {
const date = _date || new Date();