diff --git a/client/src/App/App.js b/client/src/App/App.js index ab5968bb8..e901802b9 100644 --- a/client/src/App/App.js +++ b/client/src/App/App.js @@ -48,7 +48,7 @@ class App extends React.Component { }); }); } - +console.log('###Debug (app.js)| Token', token) //add the bearer token to the headers. localStorage.setItem("token", token); } else { @@ -67,7 +67,7 @@ class App extends React.Component { } render() { - console.log("this.props.currentUser", this.props.currentUser.email); + console.log("###Debug (App.js) | Props Current User: ", this.props.currentUser.email); return (
diff --git a/client/src/App/App.js.bak b/client/src/App/App.js.bak deleted file mode 100644 index 0d808c328..000000000 --- a/client/src/App/App.js.bak +++ /dev/null @@ -1,71 +0,0 @@ -import React from "react"; -import { Switch, Route, Redirect } from "react-router"; -import { ApolloProvider } from "react-apollo"; -import { HttpLink } from "apollo-link-http"; -import ApolloClient from "apollo-client"; -import { InMemoryCache } from "apollo-cache-inmemory"; -import { resolvers, typeDefs } from "../graphql/resolvers"; -import initialState from "../graphql/initial-state"; -import { gql } from "apollo-boost"; -//Styling imports -import "./App.css"; - -//Component Imports -import LandingPage from "../pages/landing/landing.page"; -import Manage from "../pages/manage/manage.page"; - -import PrivateRoute from "../utils/private-route"; -import SignInContainer from "../pages/sign-in/sign-in.container"; -import Unauthorized from "../pages/unauthorized/unauthorized.component"; - -const graphqlEndpoint = process.env.REACT_APP_GRAPHQL_ENDPOINT; - -export default function App({ authState }) { - const isIn = authState.status === "in"; - const headers = isIn ? { Authorization: `Bearer ${authState.token}` } : {}; - const httpLink = new HttpLink({ - uri: graphqlEndpoint, - headers - }); - const client = new ApolloClient({ - link: httpLink, - cache: new InMemoryCache(), - resolvers, - typeDefs - }); - - //Init local state. - client.writeData({ - data: { - ...initialState, - currentUser: { - __typename: null, - email: authState.user ? authState.user.email : null, - displayName: authState.user ? authState.user.displayName : null - } - } - }); - - return ( - -
{authState.status}
- - - - - authState.status == "in" ? ( - - ) : ( - - ) - } - /> - {/* */} - - - - ); -} diff --git a/client/src/assets/ImEX Logo.png b/client/src/assets/ImEX Logo.png new file mode 100644 index 000000000..737ab8baf Binary files /dev/null and b/client/src/assets/ImEX Logo.png differ diff --git a/client/src/assets/logo1024.png b/client/src/assets/logo1024.png new file mode 100644 index 000000000..ad7634169 Binary files /dev/null and b/client/src/assets/logo1024.png differ diff --git a/client/src/assets/logo192.png b/client/src/assets/logo192.png new file mode 100644 index 000000000..fa313abf5 Binary files /dev/null and b/client/src/assets/logo192.png differ diff --git a/client/src/assets/logo240.png b/client/src/assets/logo240.png new file mode 100644 index 000000000..07fffbeee Binary files /dev/null and b/client/src/assets/logo240.png differ diff --git a/client/src/components/footer/footer.component.jsx b/client/src/components/footer/footer.component.jsx index df609eec5..36532e88d 100644 --- a/client/src/components/footer/footer.component.jsx +++ b/client/src/components/footer/footer.component.jsx @@ -1,9 +1,12 @@ -import React from 'react' +import React from "react"; +import { Row, Col } from "antd"; export default function FooterComponent() { - return ( -
- Copyright Snapt Software 2019. All rights reserved. -
- ) + return ( + + + Copyright Snapt Software 2019. All rights reserved. + + + ); } diff --git a/client/src/components/sign-in-form/sign-in-form.container.jsx b/client/src/components/sign-in-form/sign-in-form.container.jsx index a177606e3..87a6a21be 100644 --- a/client/src/components/sign-in-form/sign-in-form.container.jsx +++ b/client/src/components/sign-in-form/sign-in-form.container.jsx @@ -1,12 +1,45 @@ import React from "react"; import { ApolloConsumer } from "react-apollo"; import SignInFormComponent from "./sign-in-form.component"; +import { Row, Col, Layout, Typography } from "antd"; +import FooterComponent from "../footer/footer.component"; +import Logo from "../../assets/logo240.png"; + +const { Content, Footer } = Layout; export default function SignInFormContainer() { return ( {client => { - return ; + return ( + + + + +
+ Bodyshop.app +
+ + + Bodyshop.app + + + + + + + + +
+ +
+ + ); }} ); diff --git a/client/src/graphql/client.js b/client/src/graphql/client.js index f95d7b645..1a2761d52 100644 --- a/client/src/graphql/client.js +++ b/client/src/graphql/client.js @@ -1,40 +1,40 @@ -import ApolloClient from "apollo-client"; -import { InMemoryCache } from "apollo-cache-inmemory"; -import { HttpLink } from "apollo-link-http"; -import { setContext } from "apollo-link-context"; -import { resolvers, typeDefs } from "./resolvers"; -import apolloLogger from "apollo-link-logger"; -import { ApolloLink } from "apollo-boost"; +// import ApolloClient from "apollo-client"; +// import { InMemoryCache } from "apollo-cache-inmemory"; +// import { HttpLink } from "apollo-link-http"; +// import { setContext } from "apollo-link-context"; +// import { resolvers, typeDefs } from "./resolvers"; +// import apolloLogger from "apollo-link-logger"; +// import { ApolloLink } from "apollo-boost"; -const httpLink = new HttpLink({ - uri: process.env.REACT_APP_GRAPHQL_ENDPOINT -}); +// const httpLink = new HttpLink({ +// uri: process.env.REACT_APP_GRAPHQL_ENDPOINT +// }); -const authLink = setContext((_, { headers }) => { - // get the authentication token from local storage if it exists - const token = localStorage.getItem("token"); - // return the headers to the context so httpLink can read them - if (token) { - return { - headers: { - ...headers, - authorization: token ? `Bearer ${token}` : "" - } - }; - } else { - return { headers }; - } -}); +// const authLink = setContext((_, { headers }) => { +// // get the authentication token from local storage if it exists +// const token = localStorage.getItem("token"); +// // return the headers to the context so httpLink can read them +// if (token) { +// return { +// headers: { +// ...headers, +// authorization: token ? `Bearer ${token}` : "" +// } +// }; +// } else { +// return { headers }; +// } +// }); -const middlewares = []; -if (process.env.NODE_ENV === "development") { - middlewares.push(apolloLogger); -} -middlewares.push(authLink.concat(httpLink)); +// const middlewares = []; +// if (process.env.NODE_ENV === "development") { +// middlewares.push(apolloLogger); +// } +// middlewares.push(authLink.concat(httpLink)); -export const client = new ApolloClient({ - link: ApolloLink.from(middlewares), - cache: new InMemoryCache({ addTypename: false }), - typeDefs, - resolvers -}); +// export const client = new ApolloClient({ +// link: ApolloLink.from(middlewares), +// cache: new InMemoryCache({ addTypename: false }), +// typeDefs, +// resolvers +// }); diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 7e8497588..bac31d898 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -1,19 +1,24 @@ import gql from "graphql-tag"; export const GET_ALL_OPEN_JOBS = gql` -{ - jobs { - id - ro_number - status - scheduled_completion - scheduled_delivery - vehicle { - v_model_yr - v_model_desc - v_make_desc - plate_no + { + jobs { + id + est_number + ro_number + status + scheduled_completion + scheduled_delivery + vehicle { + v_model_yr + v_make_desc + v_model_desc + plate_no + } + owner { + first_name + last_name + } } } -} `; diff --git a/client/src/pages/jobs/jobs.page.container.jsx b/client/src/pages/jobs/jobs.page.container.jsx deleted file mode 100644 index 0a614b5ab..000000000 --- a/client/src/pages/jobs/jobs.page.container.jsx +++ /dev/null @@ -1,6 +0,0 @@ -import React from "react"; -import JobsPage from "./jobs.pages"; - -export default function JobsPageContainer() { - return ; -} diff --git a/client/src/pages/jobs/jobs.page.jsx b/client/src/pages/jobs/jobs.page.jsx new file mode 100644 index 000000000..7a9e53005 --- /dev/null +++ b/client/src/pages/jobs/jobs.page.jsx @@ -0,0 +1,82 @@ +import React from "react"; +import { useQuery } from "@apollo/react-hooks"; +//import { GET_ALL_OPEN_JOBS } from "../../graphql/jobs.queries"; +import { Table, Divider, Icon } from "antd"; + +import { GET_ALL_OPEN_JOBS } from "../../graphql/jobs.queries"; + +export default function JobsPage() { + const { + loading, + error, + data: { jobs } + } = useQuery(GET_ALL_OPEN_JOBS); + + const columns = [ + { + title: "RO #", + dataIndex: "ro_number", + key: "ro_number" + }, + { + title: "Est. #", + dataIndex: "est_number", + key: "est_number" + }, + { + title: "Status", + dataIndex: "status", + key: "status" + }, + { + title: "Customer", + dataIndex: "customer", + key: "customer", + render: (text, record) => { + return record.owner ? ( +
{record.owner.first_name + " " + record.owner.last_name}
+ ) : ( + "No Customer" + ); + } + }, + { + title: "Vehicle", + dataIndex: "vehicle", + key: "vehicle", + render: (text, record) => { + return record.vehicle ? record.vehicle.v_make_desc : "No Vehicle"; + } + }, + { + title: "Action", + key: "action", + render: (text, record) => ( + + Action δΈ€ {record.ro_number} + + Delete + + + More actions + + + ) + } + ]; + + // if (loading) return ; + if (error) return `Error! ${error.message}`; + console.log("$$$Develop (jobs.page.jsx) | jobs", jobs); + return ( +
+ ({ ...item }))} + rowKey="id" + dataSource={jobs ? jobs : null} + /> + + ); +} diff --git a/client/src/pages/jobs/jobs.pages.jsx b/client/src/pages/jobs/jobs.pages.jsx deleted file mode 100644 index 34bbff3b7..000000000 --- a/client/src/pages/jobs/jobs.pages.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from "react"; -import { useQuery } from "@apollo/react-hooks"; -//import { GET_ALL_OPEN_JOBS } from "../../graphql/jobs.queries"; -import { gql } from "apollo-boost"; -import Spin from "../../components/loading-spinner/loading-spinner.component"; - -const g = gql` - { - associations { - id - shopid - useremail - active - } - } -`; - -export default function JobsPage() { - const { loading, error, data } = useQuery(g); - - if (loading) return ; - if (error) return `Error! ${error.message}`; - console.log(data); - return
Hi
; -} diff --git a/client/src/pages/manage/manage.page.jsx b/client/src/pages/manage/manage.page.jsx index 370013eea..7b7a90ad3 100644 --- a/client/src/pages/manage/manage.page.jsx +++ b/client/src/pages/manage/manage.page.jsx @@ -2,8 +2,8 @@ import React from "react"; import { Route } from "react-router"; //Component Imports -import WhiteBoardPageContainer from "../white-board/white-board.page.container"; -import JobsPageContainer from "../jobs/jobs.page.container"; +import WhiteBoardPage from "../white-board/white-board.page"; +import JobsPage from "../jobs/jobs.page"; import JobsDetailPageContainer from "../jobs-detail/jobs-detail.page.container"; import HeaderComponentContainer from "../../components/header/header.container"; import FooterComponent from "../../components/footer/footer.component"; @@ -20,17 +20,9 @@ export default function Manage({ match }) { - + - + ; -} diff --git a/client/src/pages/white-board/white-board.page.jsx b/client/src/pages/white-board/white-board.page.jsx index aef48c235..d9f74df5a 100644 --- a/client/src/pages/white-board/white-board.page.jsx +++ b/client/src/pages/white-board/white-board.page.jsx @@ -40,6 +40,7 @@ export default function WhiteBoardPage({ whiteBoardLeftSiderVisible }) { return ( { diff --git a/client/yarn.lock b/client/yarn.lock index e283ef6f5..68064a1a4 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -9962,7 +9962,7 @@ react-app-polyfill@^1.0.4: regenerator-runtime "^0.13.3" whatwg-fetch "^3.0.0" -"react-click-outside@github:tj/react-click-outside": +react-click-outside@tj/react-click-outside: version "1.1.1" resolved "https://codeload.github.com/tj/react-click-outside/tar.gz/a833ddc5be47490307f9fcc6ed09d8c353108510" @@ -10980,9 +10980,9 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -"smooth-dnd@git+https://github.com/rcdexta/smooth-dnd.git": +"smooth-dnd@https://github.com/rcdexta/smooth-dnd": version "0.6.3" - resolved "git+https://github.com/rcdexta/smooth-dnd.git#f13924c67bf6ffe4613d97bb1ee83f11d364eb1e" + resolved "https://github.com/rcdexta/smooth-dnd#f13924c67bf6ffe4613d97bb1ee83f11d364eb1e" snapdragon-node@^2.0.1: version "2.1.1" diff --git a/package.json b/package.json index 36cff93ff..e75888b1c 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "npm": "6.11.3" }, "scripts": { + "setup": "yarn && cd firebase && yarn && cd .. && cd client && yarn ", "client": "cd client && yarn start", "server": "nodemon server.js", "build": "cd client && npm run build",