From 60819e315ab25b648714e22a68f8d2df15c93444 Mon Sep 17 00:00:00 2001
From: ChrisAchinga <achinga.chris@gmail.com>
Date: Fri, 15 Oct 2021 17:46:01 +0300
Subject: [PATCH 1/3] layout directory

---
 src/App.js             | 79 +++++++++++++++++++-----------------------
 src/components/Meta.js |  9 ++---
 src/layout/Footer.js   | 16 +++++++++
 src/layout/Header.js   | 72 ++++++++++++++++++++++++++++++++++++++
 src/layout/Layout.js   | 21 +++++++++++
 src/layout/Meta.js     | 20 +++++++++++
 6 files changed, 169 insertions(+), 48 deletions(-)
 create mode 100644 src/layout/Footer.js
 create mode 100644 src/layout/Header.js
 create mode 100644 src/layout/Layout.js
 create mode 100644 src/layout/Meta.js

diff --git a/src/App.js b/src/App.js
index be591f8..030f847 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,8 +1,9 @@
-import React from 'react'
-import { BrowserRouter as Router, Route } from 'react-router-dom'
-import { Container } from 'react-bootstrap'
-import Header from './components/Header'
-import Footer from './components/Footer'
+import { Route } from 'react-router-dom'
+
+// layout
+import Layout from './layout/Layout'
+
+// Pages
 import HomeScreen from './screens/HomeScreen'
 import ProductScreen from './screens/ProductScreen'
 import CartScreen from './screens/CartScreen'
@@ -21,45 +22,35 @@ import OrderListScreen from './screens/OrderListScreen'
 
 const App = () => {
   return (
-    <Router>
-      <Header />
-      <main className='py-3'>
-        <Container>
-          <Route path='/order/:id' component={OrderScreen} />
-          <Route path='/shipping' component={ShippingScreen} />
-          <Route path='/payment' component={PaymentScreen} />
-          <Route path='/placeorder' component={PlaceOrderScreen} />
-          <Route path='/login' component={LoginScreen} />
-          <Route path='/register' component={RegisterScreen} />
-          <Route path='/profile' component={ProfileScreen} />
-          <Route path='/product/:id' component={ProductScreen} />
-          <Route path='/cart/:id?' component={CartScreen} />
-          <Route path='/admin/userlist' component={UserListScreen} />
-          <Route path='/admin/user/:id/edit' component={UserEditScreen} />
-          <Route
-            path='/admin/productlist'
-            component={ProductListScreen}
-            exact
-          />
-          <Route
-            path='/admin/productlist/:pageNumber'
-            component={ProductListScreen}
-            exact
-          />
-          <Route path='/admin/product/:id/edit' component={ProductEditScreen} />
-          <Route path='/admin/orderlist' component={OrderListScreen} />
-          <Route path='/search/:keyword' component={HomeScreen} exact />
-          <Route path='/page/:pageNumber' component={HomeScreen} exact />
-          <Route
-            path='/search/:keyword/page/:pageNumber'
-            component={HomeScreen}
-            exact
-          />
-          <Route path='/' component={HomeScreen} exact />
-        </Container>
-      </main>
-      <Footer />
-    </Router>
+    <Layout>
+      <Route path='/order/:id' component={OrderScreen} />
+      <Route path='/shipping' component={ShippingScreen} />
+      <Route path='/payment' component={PaymentScreen} />
+      <Route path='/placeorder' component={PlaceOrderScreen} />
+      <Route path='/login' component={LoginScreen} />
+      <Route path='/register' component={RegisterScreen} />
+      <Route path='/profile' component={ProfileScreen} />
+      <Route path='/product/:id' component={ProductScreen} />
+      <Route path='/cart/:id?' component={CartScreen} />
+      <Route path='/admin/userlist' component={UserListScreen} />
+      <Route path='/admin/user/:id/edit' component={UserEditScreen} />
+      <Route path='/admin/productlist' component={ProductListScreen} exact />
+      <Route
+        path='/admin/productlist/:pageNumber'
+        component={ProductListScreen}
+        exact
+      />
+      <Route path='/admin/product/:id/edit' component={ProductEditScreen} />
+      <Route path='/admin/orderlist' component={OrderListScreen} />
+      <Route path='/search/:keyword' component={HomeScreen} exact />
+      <Route path='/page/:pageNumber' component={HomeScreen} exact />
+      <Route
+        path='/search/:keyword/page/:pageNumber'
+        component={HomeScreen}
+        exact
+      />
+      <Route path='/' component={HomeScreen} exact />
+    </Layout>
   )
 }
 
diff --git a/src/components/Meta.js b/src/components/Meta.js
index 32fb439..8d54479 100644
--- a/src/components/Meta.js
+++ b/src/components/Meta.js
@@ -1,10 +1,10 @@
 import React from 'react'
 import { Helmet } from 'react-helmet'
 
-const Meta = ({ title, description, keywords }) => {
+const Meta = ({ title, description, keywords, pageName }) => {
   return (
     <Helmet>
-      <title>{title}</title>
+      <title>{title} | {pageName}</title>
       <meta name='description' content={description} />
       <meta name='keyword' content={keywords} />
     </Helmet>
@@ -12,8 +12,9 @@ const Meta = ({ title, description, keywords }) => {
 }
 
 Meta.defaultProps = {
-  title: 'Welcome To ProShop',
-  description: 'We sell the best products for cheap',
+  title: 'The Shop',
+  pageName: 'All Products For Sale and Preview',
+  description: 'Get The Real Deal Plan',
   keywords: 'electronics, buy electronics, cheap electroincs',
 }
 
diff --git a/src/layout/Footer.js b/src/layout/Footer.js
new file mode 100644
index 0000000..f2fedf0
--- /dev/null
+++ b/src/layout/Footer.js
@@ -0,0 +1,16 @@
+import React from 'react'
+import { Container, Row, Col } from 'react-bootstrap'
+
+const Footer = () => {
+  return (
+    <footer>
+      <Container>
+        <Row>
+          <Col className='text-center py-3'>Copyright &copy; The Shop</Col>
+        </Row>
+      </Container>
+    </footer>
+  )
+}
+
+export default Footer
diff --git a/src/layout/Header.js b/src/layout/Header.js
new file mode 100644
index 0000000..92f9e64
--- /dev/null
+++ b/src/layout/Header.js
@@ -0,0 +1,72 @@
+import React from 'react'
+import { Route } from 'react-router-dom'
+import { useDispatch, useSelector } from 'react-redux'
+import { LinkContainer } from 'react-router-bootstrap'
+import { Navbar, Nav, Container, NavDropdown } from 'react-bootstrap'
+import SearchBox from '../components/SearchBox'
+import { logout } from '../actions/userActions'
+
+const Header = () => {
+  const dispatch = useDispatch()
+
+  const userLogin = useSelector((state) => state.userLogin)
+  const { userInfo } = userLogin
+
+  const logoutHandler = () => {
+    dispatch(logout())
+  }
+
+  return (
+    <header>
+      <Navbar bg='dark' variant='dark' expand='lg' collapseOnSelect>
+        <Container>
+          <LinkContainer to='/'>
+            <Navbar.Brand>The Shop</Navbar.Brand>
+          </LinkContainer>
+          <Navbar.Toggle aria-controls='basic-navbar-nav' />
+          <Navbar.Collapse id='basic-navbar-nav'>
+            <Route render={({ history }) => <SearchBox history={history} />} />
+            <Nav className='ml-auto'>
+              <LinkContainer to='/cart'>
+                <Nav.Link>
+                  <i className='fas fa-shopping-cart'></i> Cart
+                </Nav.Link>
+              </LinkContainer>
+              {userInfo ? (
+                <NavDropdown title={userInfo.name} id='username'>
+                  <LinkContainer to='/profile'>
+                    <NavDropdown.Item>Profile</NavDropdown.Item>
+                  </LinkContainer>
+                  <NavDropdown.Item onClick={logoutHandler}>
+                    Logout
+                  </NavDropdown.Item>
+                </NavDropdown>
+              ) : (
+                <LinkContainer to='/login'>
+                  <Nav.Link>
+                    <i className='fas fa-user'></i> Sign In
+                  </Nav.Link>
+                </LinkContainer>
+              )}
+              {userInfo && userInfo.isAdmin && (
+                <NavDropdown title='Admin' id='adminmenu'>
+                  <LinkContainer to='/admin/userlist'>
+                    <NavDropdown.Item>Users</NavDropdown.Item>
+                  </LinkContainer>
+                  <LinkContainer to='/admin/productlist'>
+                    <NavDropdown.Item>Products</NavDropdown.Item>
+                  </LinkContainer>
+                  <LinkContainer to='/admin/orderlist'>
+                    <NavDropdown.Item>Orders</NavDropdown.Item>
+                  </LinkContainer>
+                </NavDropdown>
+              )}
+            </Nav>
+          </Navbar.Collapse>
+        </Container>
+      </Navbar>
+    </header>
+  )
+}
+
+export default Header
diff --git a/src/layout/Layout.js b/src/layout/Layout.js
new file mode 100644
index 0000000..3452e2b
--- /dev/null
+++ b/src/layout/Layout.js
@@ -0,0 +1,21 @@
+import { BrowserRouter as Router } from 'react-router-dom'
+import { Container } from 'react-bootstrap'
+
+import Meta from './Meta'
+import Header from './Header'
+import Footer from '../components/Footer'
+
+const Layout = ({ children, title, description, pageName }) => {
+  return (
+    <Router>
+      <Meta title={title} pageName={pageName} />
+      <Header />
+      <Container>
+        <main className='py-3'>{children}</main>
+      </Container>
+      <Footer />
+    </Router>
+  )
+}
+
+export default Layout
diff --git a/src/layout/Meta.js b/src/layout/Meta.js
new file mode 100644
index 0000000..32fb439
--- /dev/null
+++ b/src/layout/Meta.js
@@ -0,0 +1,20 @@
+import React from 'react'
+import { Helmet } from 'react-helmet'
+
+const Meta = ({ title, description, keywords }) => {
+  return (
+    <Helmet>
+      <title>{title}</title>
+      <meta name='description' content={description} />
+      <meta name='keyword' content={keywords} />
+    </Helmet>
+  )
+}
+
+Meta.defaultProps = {
+  title: 'Welcome To ProShop',
+  description: 'We sell the best products for cheap',
+  keywords: 'electronics, buy electronics, cheap electroincs',
+}
+
+export default Meta

From 10579342aec7ad922cbff28bc5940e50b3931f04 Mon Sep 17 00:00:00 2001
From: ChrisAchinga <achinga.chris@gmail.com>
Date: Fri, 15 Oct 2021 17:59:50 +0300
Subject: [PATCH 2/3] renamed screens to pages

---
 src/App.js                                  | 30 ++++-----
 src/components/Footer.js                    | 16 -----
 src/components/Header.js                    | 72 ---------------------
 src/components/Meta.js                      | 21 ------
 src/layout/Footer.js                        |  3 +-
 src/layout/Layout.js                        |  4 +-
 src/layout/Meta.js                          |  9 +--
 src/{screens => pages}/CartScreen.js        |  0
 src/{screens => pages}/HomeScreen.js        |  2 -
 src/{screens => pages}/LoginScreen.js       |  0
 src/{screens => pages}/OrderListScreen.js   |  0
 src/{screens => pages}/OrderScreen.js       |  0
 src/{screens => pages}/PaymentScreen.js     |  0
 src/{screens => pages}/PlaceOrderScreen.js  |  0
 src/{screens => pages}/ProductEditScreen.js |  0
 src/{screens => pages}/ProductListScreen.js |  0
 src/{screens => pages}/ProductScreen.js     |  6 +-
 src/{screens => pages}/ProfileScreen.js     |  0
 src/{screens => pages}/RegisterScreen.js    |  0
 src/{screens => pages}/ShippingScreen.js    |  0
 src/{screens => pages}/UserEditScreen.js    |  0
 src/{screens => pages}/UserListScreen.js    |  0
 22 files changed, 28 insertions(+), 135 deletions(-)
 delete mode 100644 src/components/Footer.js
 delete mode 100644 src/components/Header.js
 delete mode 100644 src/components/Meta.js
 rename src/{screens => pages}/CartScreen.js (100%)
 rename src/{screens => pages}/HomeScreen.js (96%)
 rename src/{screens => pages}/LoginScreen.js (100%)
 rename src/{screens => pages}/OrderListScreen.js (100%)
 rename src/{screens => pages}/OrderScreen.js (100%)
 rename src/{screens => pages}/PaymentScreen.js (100%)
 rename src/{screens => pages}/PlaceOrderScreen.js (100%)
 rename src/{screens => pages}/ProductEditScreen.js (100%)
 rename src/{screens => pages}/ProductListScreen.js (100%)
 rename src/{screens => pages}/ProductScreen.js (99%)
 rename src/{screens => pages}/ProfileScreen.js (100%)
 rename src/{screens => pages}/RegisterScreen.js (100%)
 rename src/{screens => pages}/ShippingScreen.js (100%)
 rename src/{screens => pages}/UserEditScreen.js (100%)
 rename src/{screens => pages}/UserListScreen.js (100%)

diff --git a/src/App.js b/src/App.js
index 030f847..3c40537 100644
--- a/src/App.js
+++ b/src/App.js
@@ -4,21 +4,21 @@ import { Route } from 'react-router-dom'
 import Layout from './layout/Layout'
 
 // Pages
-import HomeScreen from './screens/HomeScreen'
-import ProductScreen from './screens/ProductScreen'
-import CartScreen from './screens/CartScreen'
-import LoginScreen from './screens/LoginScreen'
-import RegisterScreen from './screens/RegisterScreen'
-import ProfileScreen from './screens/ProfileScreen'
-import ShippingScreen from './screens/ShippingScreen'
-import PaymentScreen from './screens/PaymentScreen'
-import PlaceOrderScreen from './screens/PlaceOrderScreen'
-import OrderScreen from './screens/OrderScreen'
-import UserListScreen from './screens/UserListScreen'
-import UserEditScreen from './screens/UserEditScreen'
-import ProductListScreen from './screens/ProductListScreen'
-import ProductEditScreen from './screens/ProductEditScreen'
-import OrderListScreen from './screens/OrderListScreen'
+import HomeScreen from './pages/HomeScreen'
+import ProductScreen from './pages/ProductScreen'
+import CartScreen from './pages/CartScreen'
+import LoginScreen from './pages/LoginScreen'
+import RegisterScreen from './pages/RegisterScreen'
+import ProfileScreen from './pages/ProfileScreen'
+import ShippingScreen from './pages/ShippingScreen'
+import PaymentScreen from './pages/PaymentScreen'
+import PlaceOrderScreen from './pages/PlaceOrderScreen'
+import OrderScreen from './pages/OrderScreen'
+import UserListScreen from './pages/UserListScreen'
+import UserEditScreen from './pages/UserEditScreen'
+import ProductListScreen from './pages/ProductListScreen'
+import ProductEditScreen from './pages/ProductEditScreen'
+import OrderListScreen from './pages/OrderListScreen'
 
 const App = () => {
   return (
diff --git a/src/components/Footer.js b/src/components/Footer.js
deleted file mode 100644
index 04f6577..0000000
--- a/src/components/Footer.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react'
-import { Container, Row, Col } from 'react-bootstrap'
-
-const Footer = () => {
-  return (
-    <footer>
-      <Container>
-        <Row>
-          <Col className='text-center py-3'>Copyright &copy; ProShop</Col>
-        </Row>
-      </Container>
-    </footer>
-  )
-}
-
-export default Footer
diff --git a/src/components/Header.js b/src/components/Header.js
deleted file mode 100644
index 158b840..0000000
--- a/src/components/Header.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import React from 'react'
-import { Route } from 'react-router-dom'
-import { useDispatch, useSelector } from 'react-redux'
-import { LinkContainer } from 'react-router-bootstrap'
-import { Navbar, Nav, Container, NavDropdown } from 'react-bootstrap'
-import SearchBox from './SearchBox'
-import { logout } from '../actions/userActions'
-
-const Header = () => {
-  const dispatch = useDispatch()
-
-  const userLogin = useSelector((state) => state.userLogin)
-  const { userInfo } = userLogin
-
-  const logoutHandler = () => {
-    dispatch(logout())
-  }
-
-  return (
-    <header>
-      <Navbar bg='dark' variant='dark' expand='lg' collapseOnSelect>
-        <Container>
-          <LinkContainer to='/'>
-            <Navbar.Brand>ProShop</Navbar.Brand>
-          </LinkContainer>
-          <Navbar.Toggle aria-controls='basic-navbar-nav' />
-          <Navbar.Collapse id='basic-navbar-nav'>
-            <Route render={({ history }) => <SearchBox history={history} />} />
-            <Nav className='ml-auto'>
-              <LinkContainer to='/cart'>
-                <Nav.Link>
-                  <i className='fas fa-shopping-cart'></i> Cart
-                </Nav.Link>
-              </LinkContainer>
-              {userInfo ? (
-                <NavDropdown title={userInfo.name} id='username'>
-                  <LinkContainer to='/profile'>
-                    <NavDropdown.Item>Profile</NavDropdown.Item>
-                  </LinkContainer>
-                  <NavDropdown.Item onClick={logoutHandler}>
-                    Logout
-                  </NavDropdown.Item>
-                </NavDropdown>
-              ) : (
-                <LinkContainer to='/login'>
-                  <Nav.Link>
-                    <i className='fas fa-user'></i> Sign In
-                  </Nav.Link>
-                </LinkContainer>
-              )}
-              {userInfo && userInfo.isAdmin && (
-                <NavDropdown title='Admin' id='adminmenu'>
-                  <LinkContainer to='/admin/userlist'>
-                    <NavDropdown.Item>Users</NavDropdown.Item>
-                  </LinkContainer>
-                  <LinkContainer to='/admin/productlist'>
-                    <NavDropdown.Item>Products</NavDropdown.Item>
-                  </LinkContainer>
-                  <LinkContainer to='/admin/orderlist'>
-                    <NavDropdown.Item>Orders</NavDropdown.Item>
-                  </LinkContainer>
-                </NavDropdown>
-              )}
-            </Nav>
-          </Navbar.Collapse>
-        </Container>
-      </Navbar>
-    </header>
-  )
-}
-
-export default Header
diff --git a/src/components/Meta.js b/src/components/Meta.js
deleted file mode 100644
index 8d54479..0000000
--- a/src/components/Meta.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react'
-import { Helmet } from 'react-helmet'
-
-const Meta = ({ title, description, keywords, pageName }) => {
-  return (
-    <Helmet>
-      <title>{title} | {pageName}</title>
-      <meta name='description' content={description} />
-      <meta name='keyword' content={keywords} />
-    </Helmet>
-  )
-}
-
-Meta.defaultProps = {
-  title: 'The Shop',
-  pageName: 'All Products For Sale and Preview',
-  description: 'Get The Real Deal Plan',
-  keywords: 'electronics, buy electronics, cheap electroincs',
-}
-
-export default Meta
diff --git a/src/layout/Footer.js b/src/layout/Footer.js
index f2fedf0..0be2b9c 100644
--- a/src/layout/Footer.js
+++ b/src/layout/Footer.js
@@ -2,11 +2,12 @@ import React from 'react'
 import { Container, Row, Col } from 'react-bootstrap'
 
 const Footer = () => {
+  const year = new Date().getFullYear()
   return (
     <footer>
       <Container>
         <Row>
-          <Col className='text-center py-3'>Copyright &copy; The Shop</Col>
+          <Col className='text-center py-3'>Copyright &copy; {year} The Shop</Col>
         </Row>
       </Container>
     </footer>
diff --git a/src/layout/Layout.js b/src/layout/Layout.js
index 3452e2b..a5dd9bf 100644
--- a/src/layout/Layout.js
+++ b/src/layout/Layout.js
@@ -3,12 +3,12 @@ import { Container } from 'react-bootstrap'
 
 import Meta from './Meta'
 import Header from './Header'
-import Footer from '../components/Footer'
+import Footer from './Footer'
 
 const Layout = ({ children, title, description, pageName }) => {
   return (
     <Router>
-      <Meta title={title} pageName={pageName} />
+      <Meta title={title} pageName={pageName} description={description} />
       <Header />
       <Container>
         <main className='py-3'>{children}</main>
diff --git a/src/layout/Meta.js b/src/layout/Meta.js
index 32fb439..873132c 100644
--- a/src/layout/Meta.js
+++ b/src/layout/Meta.js
@@ -1,10 +1,10 @@
 import React from 'react'
 import { Helmet } from 'react-helmet'
 
-const Meta = ({ title, description, keywords }) => {
+const Meta = ({ title, description, keywords, pageName }) => {
   return (
     <Helmet>
-      <title>{title}</title>
+      <title>{title} | {pageName}</title>
       <meta name='description' content={description} />
       <meta name='keyword' content={keywords} />
     </Helmet>
@@ -12,8 +12,9 @@ const Meta = ({ title, description, keywords }) => {
 }
 
 Meta.defaultProps = {
-  title: 'Welcome To ProShop',
-  description: 'We sell the best products for cheap',
+  title: 'The Shop',
+  pageName: 'All Products',
+  description: 'Get The Real Deal',
   keywords: 'electronics, buy electronics, cheap electroincs',
 }
 
diff --git a/src/screens/CartScreen.js b/src/pages/CartScreen.js
similarity index 100%
rename from src/screens/CartScreen.js
rename to src/pages/CartScreen.js
diff --git a/src/screens/HomeScreen.js b/src/pages/HomeScreen.js
similarity index 96%
rename from src/screens/HomeScreen.js
rename to src/pages/HomeScreen.js
index 966e042..54a0fb8 100644
--- a/src/screens/HomeScreen.js
+++ b/src/pages/HomeScreen.js
@@ -7,7 +7,6 @@ import Message from '../components/Message'
 import Loader from '../components/Loader'
 import Paginate from '../components/Paginate'
 import ProductCarousel from '../components/ProductCarousel'
-import Meta from '../components/Meta'
 import { listProducts } from '../actions/productActions'
 
 const HomeScreen = ({ match }) => {
@@ -26,7 +25,6 @@ const HomeScreen = ({ match }) => {
 
   return (
     <>
-      <Meta />
       {!keyword ? (
         <ProductCarousel />
       ) : (
diff --git a/src/screens/LoginScreen.js b/src/pages/LoginScreen.js
similarity index 100%
rename from src/screens/LoginScreen.js
rename to src/pages/LoginScreen.js
diff --git a/src/screens/OrderListScreen.js b/src/pages/OrderListScreen.js
similarity index 100%
rename from src/screens/OrderListScreen.js
rename to src/pages/OrderListScreen.js
diff --git a/src/screens/OrderScreen.js b/src/pages/OrderScreen.js
similarity index 100%
rename from src/screens/OrderScreen.js
rename to src/pages/OrderScreen.js
diff --git a/src/screens/PaymentScreen.js b/src/pages/PaymentScreen.js
similarity index 100%
rename from src/screens/PaymentScreen.js
rename to src/pages/PaymentScreen.js
diff --git a/src/screens/PlaceOrderScreen.js b/src/pages/PlaceOrderScreen.js
similarity index 100%
rename from src/screens/PlaceOrderScreen.js
rename to src/pages/PlaceOrderScreen.js
diff --git a/src/screens/ProductEditScreen.js b/src/pages/ProductEditScreen.js
similarity index 100%
rename from src/screens/ProductEditScreen.js
rename to src/pages/ProductEditScreen.js
diff --git a/src/screens/ProductListScreen.js b/src/pages/ProductListScreen.js
similarity index 100%
rename from src/screens/ProductListScreen.js
rename to src/pages/ProductListScreen.js
diff --git a/src/screens/ProductScreen.js b/src/pages/ProductScreen.js
similarity index 99%
rename from src/screens/ProductScreen.js
rename to src/pages/ProductScreen.js
index 3141a10..9b72c87 100644
--- a/src/screens/ProductScreen.js
+++ b/src/pages/ProductScreen.js
@@ -5,7 +5,6 @@ import { Row, Col, Image, ListGroup, Card, Button, Form } from 'react-bootstrap'
 import Rating from '../components/Rating'
 import Message from '../components/Message'
 import Loader from '../components/Loader'
-import Meta from '../components/Meta'
 import {
   listProductDetails,
   createProductReview,
@@ -69,7 +68,6 @@ const ProductScreen = ({ history, match }) => {
         <Message variant='danger'>{error}</Message>
       ) : (
         <>
-          <Meta title={product.name} />
           <Row>
             <Col md={6}>
               <Image src={product.image} alt={product.name} fluid />
@@ -223,3 +221,7 @@ const ProductScreen = ({ history, match }) => {
 }
 
 export default ProductScreen
+
+
+{/* <Meta title={product.name} /> */}
+// 
diff --git a/src/screens/ProfileScreen.js b/src/pages/ProfileScreen.js
similarity index 100%
rename from src/screens/ProfileScreen.js
rename to src/pages/ProfileScreen.js
diff --git a/src/screens/RegisterScreen.js b/src/pages/RegisterScreen.js
similarity index 100%
rename from src/screens/RegisterScreen.js
rename to src/pages/RegisterScreen.js
diff --git a/src/screens/ShippingScreen.js b/src/pages/ShippingScreen.js
similarity index 100%
rename from src/screens/ShippingScreen.js
rename to src/pages/ShippingScreen.js
diff --git a/src/screens/UserEditScreen.js b/src/pages/UserEditScreen.js
similarity index 100%
rename from src/screens/UserEditScreen.js
rename to src/pages/UserEditScreen.js
diff --git a/src/screens/UserListScreen.js b/src/pages/UserListScreen.js
similarity index 100%
rename from src/screens/UserListScreen.js
rename to src/pages/UserListScreen.js

From 24fe759074f47300385c73d90f327345a26d8d52 Mon Sep 17 00:00:00 2001
From: ChrisAchinga <achinga.chris@gmail.com>
Date: Fri, 15 Oct 2021 18:04:26 +0300
Subject: [PATCH 3/3] meta tag

---
 src/pages/ProductScreen.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/ProductScreen.js b/src/pages/ProductScreen.js
index 9b72c87..81cf2b8 100644
--- a/src/pages/ProductScreen.js
+++ b/src/pages/ProductScreen.js
@@ -5,6 +5,7 @@ import { Row, Col, Image, ListGroup, Card, Button, Form } from 'react-bootstrap'
 import Rating from '../components/Rating'
 import Message from '../components/Message'
 import Loader from '../components/Loader'
+import Meta from '../layout/Meta'
 import {
   listProductDetails,
   createProductReview,
@@ -59,6 +60,7 @@ const ProductScreen = ({ history, match }) => {
 
   return (
     <>
+      <Meta pageName={product.name} />
       <Link className='btn btn-light my-3' to='/'>
         Go Back
       </Link>
@@ -221,7 +223,3 @@ const ProductScreen = ({ history, match }) => {
 }
 
 export default ProductScreen
-
-
-{/* <Meta title={product.name} /> */}
-//