Database auth is fully fixed and functional except for outbound firebase.
This commit is contained in:
@@ -18,9 +18,11 @@ class HeaderAppBar extends Component {
|
||||
selectedKeys={selectedNavItem}
|
||||
mode="horizontal"
|
||||
>
|
||||
{navItems.map(navItem => (
|
||||
{
|
||||
navItems.map(navItem => (
|
||||
<Menu.Item key={navItem.title}>{navItem.title}</Menu.Item>
|
||||
))}
|
||||
))
|
||||
}
|
||||
</Menu>
|
||||
|
||||
// <Menu.Item key="mail">
|
||||
|
||||
@@ -3,7 +3,6 @@ import { Query } from "react-apollo";
|
||||
import { gql } from "apollo-boost";
|
||||
|
||||
import { Spin, Alert } from "antd";
|
||||
|
||||
import HeaderAppBar from "./header-app-bar.component";
|
||||
|
||||
const GET_NAV_ITEMS = gql`
|
||||
@@ -23,16 +22,16 @@ const GET_SELECTED_NAV_ITEM = gql`
|
||||
const HeaderAppBarContainer = () => (
|
||||
<Query query={GET_SELECTED_NAV_ITEM}>
|
||||
{({ loading, error, data: { selectedNavItem } }) => {
|
||||
console.log("Selected Nav item", selectedNavItem);
|
||||
return (
|
||||
<Query query={GET_NAV_ITEMS}>
|
||||
{({ loading, error, data }) => {
|
||||
if (loading) return <Spin size="large" />;
|
||||
if (error) return <Alert message={error.message} />;
|
||||
const parsedNavItems = JSON.parse(data.masterdata_by_pk.value)
|
||||
return (
|
||||
<HeaderAppBar
|
||||
selectedNavItem={selectedNavItem}
|
||||
navItems={data.masterdata_by_pk.value}
|
||||
navItems={parsedNavItems}
|
||||
/>
|
||||
);
|
||||
}}
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
import React from "react";
|
||||
|
||||
export default function JobList() {
|
||||
//console.log("JobList props", this.props);
|
||||
return <div>JobList</div>;
|
||||
}
|
||||
export default ({ jobs }) => (
|
||||
<div>
|
||||
<span>Job List</span>
|
||||
<div>
|
||||
{jobs.map(job => (
|
||||
<p key={job.est_number}>{job.est_number}</p>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -8,8 +8,8 @@ import JobList from "./job-list.component";
|
||||
|
||||
const GET_JOBS = gql`
|
||||
query get_jobs {
|
||||
estimates {
|
||||
ro_number
|
||||
jobs {
|
||||
est_number
|
||||
}
|
||||
}
|
||||
`;
|
||||
@@ -20,7 +20,8 @@ const JobListContainer = () => (
|
||||
if (loading) return <Spin size="large" />;
|
||||
if (error) return <Alert message={error.message} />;
|
||||
console.log("JobListContainer Data:", data);
|
||||
return <JobList jobs={data} />;
|
||||
|
||||
return <JobList jobs={data.jobs} />;
|
||||
}}
|
||||
</Query>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user