diff --git a/.vscode/settings.json b/.vscode/settings.json index 16ca466..ab156f0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,12 @@ { - "cSpell.words": ["clsx", "formik", "Shihab", "signup", "tailwindcss"], + "cSpell.words": [ + "clsx", + "formik", + "newsfeed", + "Shihab", + "signup", + "tailwindcss" + ], "css.lint.unknownAtRules": "ignore", "editor.codeActionsOnSave": { "source.organizeImports": "always" diff --git a/src/components/layouts/HomePageLayout.tsx b/src/components/layouts/HomePageLayout.tsx deleted file mode 100644 index 225988a..0000000 --- a/src/components/layouts/HomePageLayout.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import React, { PropsWithChildren } from 'react'; -import Navbar from '../atoms/navbar'; -import MainContentContainer from '../common'; - -const HomePageLayout: React.FC = (props) => { - const { children } = props; - return ( -
- - {children} -
- ); -}; - -export default HomePageLayout; diff --git a/src/components/layouts/NewsFeedLayout.tsx b/src/components/layouts/NewsFeedLayout.tsx new file mode 100644 index 0000000..57123b6 --- /dev/null +++ b/src/components/layouts/NewsFeedLayout.tsx @@ -0,0 +1,23 @@ +import React, { PropsWithChildren } from 'react'; +import Navbar from '../atoms/navbar'; +import MainContentContainer from '../common'; +import LeftSidebar from '../organisms/newsfeed/LeftSidebar'; +import RightSidebar from '../organisms/newsfeed/RightSidebar'; + +const NewsFeedLayout: React.FC = (props) => { + const { children } = props; + return ( +
+ + +
+ +
{children}
+ +
+
+
+ ); +}; + +export default NewsFeedLayout; diff --git a/src/components/pages/home/LeftSidebar.tsx b/src/components/organisms/newsfeed/LeftSidebar.tsx similarity index 98% rename from src/components/pages/home/LeftSidebar.tsx rename to src/components/organisms/newsfeed/LeftSidebar.tsx index 78eaabc..4604a2c 100644 --- a/src/components/pages/home/LeftSidebar.tsx +++ b/src/components/organisms/newsfeed/LeftSidebar.tsx @@ -2,7 +2,7 @@ import React from 'react'; const LeftSidebar: React.FC = () => { return ( -
+
  • diff --git a/src/components/pages/home/RightSidebar.tsx b/src/components/organisms/newsfeed/RightSidebar.tsx similarity index 98% rename from src/components/pages/home/RightSidebar.tsx rename to src/components/organisms/newsfeed/RightSidebar.tsx index 4e93320..d26c007 100644 --- a/src/components/pages/home/RightSidebar.tsx +++ b/src/components/organisms/newsfeed/RightSidebar.tsx @@ -2,7 +2,7 @@ import React from 'react'; const RightSidebar: React.FC = () => { return ( -
    +

    Your Pages

  • diff --git a/src/components/pages/home/index.tsx b/src/components/pages/home/index.tsx deleted file mode 100644 index 2b62dfa..0000000 --- a/src/components/pages/home/index.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import React from 'react'; -import LeftSidebar from './LeftSidebar'; -import NewsFeedScreen from './NewsFeed'; -import RightSidebar from './RightSidebar'; - -const HomePage: React.FC = () => { - return ( -
    -
    - -
    -
    - -
    -
    - -
    -
    - ); -}; - -export default HomePage; diff --git a/src/components/pages/home/NewsFeed.tsx b/src/components/pages/newsfeed/NewsFeed.tsx similarity index 100% rename from src/components/pages/home/NewsFeed.tsx rename to src/components/pages/newsfeed/NewsFeed.tsx diff --git a/src/components/pages/newsfeed/index.tsx b/src/components/pages/newsfeed/index.tsx new file mode 100644 index 0000000..cb435db --- /dev/null +++ b/src/components/pages/newsfeed/index.tsx @@ -0,0 +1,12 @@ +import React from 'react'; +import NewsFeed from './NewsFeed'; + +const NewsFeedPage: React.FC = () => { + return ( +
    + +
    + ); +}; + +export default NewsFeedPage; diff --git a/src/routes/Router.tsx b/src/routes/Router.tsx index b790cc7..575110f 100644 --- a/src/routes/Router.tsx +++ b/src/routes/Router.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { Route, Routes } from 'react-router-dom'; import GamingPageLayout from '../components/layouts/GamingPageLayout'; -import HomePageLayout from '../components/layouts/HomePageLayout'; import MarketplacePageLayout from '../components/layouts/MarketplacePage'; +import NewsFeedLayout from '../components/layouts/NewsFeedLayout'; import ProfilePageLayout from '../components/layouts/ProfilePageLayout'; import WatchPageLayout from '../components/layouts/WatchPageLayout'; import GamingPage from '../components/pages/gaming'; -import HomePage from '../components/pages/home'; import LoginPage from '../components/pages/login'; import MarketplacePage from '../components/pages/marketplace'; +import NewsFeedPage from '../components/pages/newsfeed'; import PageNotFound from '../components/pages/notfound'; import ProfilePage from '../components/pages/profile'; import RegisterPage from '../components/pages/signup'; @@ -33,8 +33,8 @@ const Routers: React.FC = () => { - + + } />