Merge branch 'AFP-97' into 'dev'

Add image to header See merge request !22

Merge branch 'AFP-97' into 'dev'
Add image to header See merge request !22
4ff94ac3 · Vishal Vaddadhi · 592cb41f · b5faa8a4 · 4ff94ac3 · 4ff94ac3
Commit 4ff94ac3 authored May 14, 2021 by Vishal Vaddadhi
Showing with 108 additions and 7 deletions

package.json package.json +3 -0

Nav.tsx src/components/Nav.tsx +11 -3

nisum.jpeg src/img/nisum.jpeg +0 -0

OrderService.ts src/services/OrderService.ts +20 -1

yarn.lock yarn.lock +74 -3

No files found.
--- a/package.json
+++ b/package.json
@@ -19,13 +19,16 @@
    "@types/jest": "^26.0.15",
    "@types/node": "^12.0.0",
    "@types/react": "^17.0.0",
+    "@types/react-datepicker": "^3.1.8",
    "@types/react-dom": "^17.0.0",
    "@types/react-router-dom": "^5.1.7",
    "axios": "^0.21.1",
    "bootstrap": "^4.6.0",
    "framer-motion": "^4",
+    "moment": "^2.29.1",
    "react": "^17.0.2",
    "react-bootstrap": "^1.5.2",
+    "react-datepicker": "^3.8.0",
    "react-dom": "^17.0.2",
    "react-google-login": "^5.2.2",
    "react-hook-form": "^7.4.0",

--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -5,7 +5,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser } from '@fortawesome/free-solid-svg-icons'
 import { AccountPage } from 'pages'
 import { Box, Heading, Flex, Spacer, Button, Image, Avatar, HStack, Input } from "@chakra-ui/react"
-import Logo from '../img/logo.png'
+import AppLogo from '../img/logo.png'
+import NisumLogo from '../img/nisum.jpeg'
 import {
    Drawer,
    DrawerBody,
@@ -49,11 +50,18 @@ const Nav = () => {
    return (
        <Flex className="header" justifyContent="space-between">
            <Box >
-                <h1 className="header-title">Ascend Final Project</h1>
+                <Image 
+                    mt="-4px"
+                    src={NisumLogo} 
+                    alt="Nisum - Celebrating 20+ years logo"
+                    height="45px"
+                    // width="950px"
+                />
            </Box>
            <Box className="center-nav" display="-ms-inline-flexbox">
                <HStack>
-                    <Link to="/"><Image src={Logo} alt="project logo" className="logoImg"/></Link>
+                    <Link to="/"><Image src={AppLogo} alt="Order Management Console PRO logo" className="logoImg"/></Link>
+                   
                    <h1>Order Management</h1>
                    {/* <Link to="/"><h1>Order Management</h1></Link> */}
                </HStack>

--- a/src/img/nisum.jpeg
+++ b/src/img/nisum.jpeg
--- a/src/services/OrderService.ts
+++ b/src/services/OrderService.ts
 import orderList from './mock-order-data'
 import { Order } from 'Order';
+import { OrdersRequestBody } from 'ManagerRequests'
+import Axios, { AxiosError } from 'axios'
+import { sleep } from 'utils'
+const BASE_PATH = '/api/orders'

 export const allOrders = () => {
    const apiUrl = 'http://localhost:8084/api/orders';
@@ -10,8 +14,23 @@ export const orderById = (apiUrl: string) => {
    return fetch(apiUrl).then((response) => response.json())
 }

+export const orders = async (body: OrdersRequestBody): Promise<Order[]> => {
+    try {
+        console.log(JSON.stringify(body, null, 3))
+        debugger
+        await sleep(1000)
+        const response = await Axios.post(`${BASE_PATH}/filtered`, body)
+        console.log(response.data)
+        return response.data;
+    } catch (error) {
+        const { response } = error as AxiosError;
+        console.error('`OrderService#orders` FAILED TO FETCH ORDERS: ', response)
+        return [];
+    }
+}

 export default {
    allOrders,
-    orderById
+    orderById,
+    orders
 }
\ No newline at end of file
--- a/yarn.lock
+++ b/yarn.lock
@@ -1895,6 +1895,14 @@
  resolved "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.4.0.tgz"
  integrity sha512-KiHc7Uwd2IJMvPTMQ9vQxfss2ulq2gRYL/HYZ90qiTs+07UgGWCikiIvE2pKjjGVltEYjq5eR8x0ITmoyEjGxQ==

+"@hypnosphi/create-react-context@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz#f8bfebdc7665f5d426cba3753e0e9c7d3154d7c6"
+  integrity sha512-V1klUed202XahrWJLLOT3EXNeCpFHCcJntdFGI15ntCwau+jfT386w7OFTMaCqOgXUH1fa0w/I1oZs+i/Rfr0A==
+  dependencies:
+    gud "^1.0.0"
+    warning "^4.0.3"
+
 "@istanbuljs/load-nyc-config@^1.0.0":
  version "1.1.0"
  resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"
@@ -2569,6 +2577,15 @@
  resolved "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"
  integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==

+"@types/react-datepicker@^3.1.8":
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/@types/react-datepicker/-/react-datepicker-3.1.8.tgz#642b0d5f2c30f53d7940b1771d5fb11b646bb7fb"
+  integrity sha512-RFEg7++xhosMq02i2lsuaUPEbZGn66U3dxtvw9LU/ZRqLkBGr9Ft2LTz6vbeYYVtaBdOr0NcQatOLnlfUaS8kw==
+  dependencies:
+    "@types/react" "*"
+    date-fns "^2.0.1"
+    popper.js "^1.14.1"
+
 "@types/react-dom@^17.0.0":
  version "17.0.3"
  resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.3.tgz"
@@ -4754,6 +4771,11 @@ data-urls@^2.0.0:
    whatwg-mimetype "^2.3.0"
    whatwg-url "^8.0.0"

+date-fns@^2.0.1:
+  version "2.21.3"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.21.3.tgz#8f5f6889d7a96bbcc1f0ea50239b397a83357f9b"
+  integrity sha512-HeYdzCaFflc1i4tGbj7JKMjM4cKGYoyxwcIIkHzNgCkX8xXDNJDZXgDDVchIWpN4eQc3lH37WarduXFZJOtxfw==
+
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
  version "2.6.9"
  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
@@ -4800,7 +4822,7 @@ deep-diff@^0.3.5:
  resolved "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz"
  integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=

-deep-equal@^1.0.1:
+deep-equal@^1.0.1, deep-equal@^1.1.1:
  version "1.1.1"
  resolved "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"
  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
@@ -6227,6 +6249,11 @@ growly@^1.3.0:
  resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"
  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=

+gud@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
+  integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==
+
 gzip-size@5.1.1:
  version "5.1.1"
  resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz"
@@ -8221,6 +8248,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

+moment@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
 move-concurrently@^1.0.1:
  version "1.0.1"
  resolved "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"
@@ -8990,6 +9022,11 @@ popmotion@9.3.5:
    style-value-types "4.1.4"
    tslib "^2.1.0"

+popper.js@^1.14.1, popper.js@^1.14.4:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
+  integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
+
 portfinder@^1.0.26:
  version "1.0.28"
  resolved "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz"
@@ -9756,7 +9793,7 @@ prop-types-extra@^1.1.0:
    react-is "^16.3.2"
    warning "^4.0.0"

-prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
  version "15.7.2"
  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -9968,6 +10005,17 @@ react-clientside-effect@^1.2.2:
  dependencies:
    "@babel/runtime" "^7.12.13"

+react-datepicker@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-3.8.0.tgz#c3bccd3e3f47aa66864a2fa75651be097414430b"
+  integrity sha512-iFVNEp8DJoX5yEvEiciM7sJKmLGrvE70U38KhpG13XrulNSijeHw1RZkhd/0UmuXR71dcZB/kdfjiidifstZjw==
+  dependencies:
+    classnames "^2.2.6"
+    date-fns "^2.0.1"
+    prop-types "^15.7.2"
+    react-onclickoutside "^6.10.0"
+    react-popper "^1.3.8"
+
 react-dev-utils@^11.0.3:
  version "11.0.4"
  resolved "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz"
@@ -10057,6 +10105,11 @@ react-lifecycles-compat@^3.0.4:
  resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"
  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==

+react-onclickoutside@^6.10.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.10.0.tgz#05abb592575b08b4d129003494056b9dff46eeeb"
+  integrity sha512-7i2L3ef+0ILXpL6P+Hg304eCQswh4jl3ynwR71BSlMU49PE2uk31k8B2GkP6yE9s2D4jTGKnzuSpzWxu4YxfQQ==
+
 react-overlays@^5.0.0:
  version "5.0.1"
  resolved "https://registry.npmjs.org/react-overlays/-/react-overlays-5.0.1.tgz"
@@ -10071,6 +10124,19 @@ react-overlays@^5.0.0:
    uncontrollable "^7.2.1"
    warning "^4.0.3"

+react-popper@^1.3.8:
+  version "1.3.11"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.11.tgz#a2cc3f0a67b75b66cfa62d2c409f9dd1fcc71ffd"
+  integrity sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    "@hypnosphi/create-react-context" "^0.3.1"
+    deep-equal "^1.1.1"
+    popper.js "^1.14.4"
+    prop-types "^15.6.1"
+    typed-styles "^0.0.7"
+    warning "^4.0.2"
+
 react-redux@^7.2.4:
  version "7.2.4"
  resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.4.tgz"
@@ -11868,6 +11934,11 @@ type@^2.0.0:
  resolved "https://registry.npmjs.org/type/-/type-2.3.0.tgz"
  integrity sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg==

+typed-styles@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
+  integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
+
 typedarray-to-buffer@^3.1.5:
  version "3.1.5"
  resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"
@@ -12166,7 +12237,7 @@ walker@^1.0.7, walker@~1.0.5:
  dependencies:
    makeerror "1.0.x"

-warning@^4.0.0, warning@^4.0.3:
+warning@^4.0.0, warning@^4.0.2, warning@^4.0.3:
  version "4.0.3"
  resolved "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz"
  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==