Formatting fixes.

This commit is contained in:
Patrick Fic
2020-10-15 09:57:23 -07:00
parent a4b52e19ac
commit 67cae24b6c
16 changed files with 62 additions and 34 deletions

View File

@@ -21,10 +21,11 @@ export function FilePathsList({ watchedPaths }) {
ipcRenderer.send(ipcTypes.default.fileWatcher.toMain.filepathsGet);
}, []);
console.log("watchedPaths", watchedPaths);
return (
<div>
File Paths
<List dataSource={watchedPaths} renderItem={FilepathItemMolecule} />
<List dataSource={watchedPaths || []} renderItem={FilepathItemMolecule} />
<FilepathAddMolecule />
</div>
);

View File

@@ -8,6 +8,7 @@ import { selectSelectedJobId } from "../../../redux/application/application.sele
import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
import JobsDetailDescriptionMolecule from "../../molecules/jobs-detail-description/jobs-detail-description.molecule";
import JobsLinesTableMolecule from "../../molecules/jobs-lines-table/jobs-lines-table.molecule";
import "./jobs-detail.organism.styles.scss";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
@@ -32,7 +33,7 @@ export function JobsDetailOrganism({ selectedJobId }) {
/>
);
return (
<div>
<div className="jobs-detail-container">
<JobsDetailDescriptionMolecule
loading={loading}
job={data ? data.jobs_by_pk : null}

View File

@@ -0,0 +1,5 @@
.jobs-detail-container {
height: 100%;
overflow-y: auto;
}

View File

@@ -9,7 +9,7 @@ import { setSelectedJobId } from "../../../redux/application/application.actions
import { selectSelectedJobId } from "../../../redux/application/application.selectors";
import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
import TimeAgoFormatter from "../../atoms/time-ago-formatter/time-ago-formatter.atom";
import "./jobs-table.organism.styles.scss";
import "./jobs-list.organism.styles.scss";
const mapStateToProps = createStructuredSelector({
selectedJobId: selectSelectedJobId,
@@ -75,7 +75,7 @@ export function JobsTableOrganism({ selectedJobId, setSelectedJobId }) {
);
return (
<div>
<div className="jobs-list-container">
<div className="jobs-list-infinite-container">
<InfiniteScroll
pageStart={0}

View File

@@ -1,7 +1,11 @@
.jobs-list-container {
height: 100%;
}
.jobs-list-infinite-container {
overflow-y: auto;
overflow-x: hidden;
height: 95vh;
height: 100%;
}
.jobs-list-item {

View File

@@ -2,7 +2,7 @@ import { Col, Row } from "antd";
import React from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import JobsTableOrganism from "../../organisms/jobs-table/jobs-table.organism";
import JobsListOrganism from "../../organisms/jobs-list/jobs-list.organism";
import JobsDetailOrganism from "../../organisms/jobs-detail/jobs-detail.organism";
const mapStateToProps = createStructuredSelector({});
@@ -10,13 +10,13 @@ const mapDispatchToProps = (dispatch) => ({});
export function JobsPage() {
return (
<div>
<Row gutter={[16, 16]}>
<Col span={10}>
<JobsTableOrganism />
<div style={{ height: "100%" }}>
<Row gutter={[16, 16]} style={{ height: "100%" }}>
<Col span={10} style={{ height: "100%" }}>
<JobsListOrganism />
</Col>
<Col span={14}>
<Col span={14} style={{ height: "100%" }}>
<JobsDetailOrganism />
</Col>
</Row>

View File

@@ -12,12 +12,12 @@ const mapDispatchToProps = (dispatch) => ({});
export function RoutesPage() {
return (
<Layout style={{ background: "#fff" }} hasSider>
<Layout style={{ background: "#fff", height: "100vh" }} hasSider>
<Layout.Sider style={{ background: "#fff" }} collapsible>
<SiderMenuOrganism />
</Layout.Sider>
<Layout style={{ background: "#fff" }}>
<Layout.Content style={{ margin: "1rem" }}>
<Layout.Content style={{ margin: "1rem", height: "100%" }}>
<Switch>
<Route exact path="/" component={Jobs} />
<Route exact path="/settings" component={SettingsPage} />

View File

@@ -6,11 +6,15 @@ import { Link } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import ImEXOnlineLogo from "../../../assets/logo192.png";
import { emailSignInStart } from "../../../redux/user/user.actions";
import { selectSignInError } from "../../../redux/user/user.selectors";
import {
selectLoginLoading,
selectSignInError,
} from "../../../redux/user/user.selectors";
import "./sign-in.page.styles.scss";
const mapStateToProps = createStructuredSelector({
signInError: selectSignInError,
loginLoading: selectLoginLoading,
});
const mapDispatchToProps = (dispatch) => ({
@@ -18,7 +22,7 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(emailSignInStart({ email, password })),
});
export function SignInPage({ emailSignInStart, signInError }) {
export function SignInPage({ emailSignInStart, signInError, loginLoading }) {
const handleFinish = (values) => {
const { email, password } = values;
emailSignInStart(email, password);
@@ -45,7 +49,12 @@ export function SignInPage({ emailSignInStart, signInError }) {
{signInError ? (
<Alert type="error" message={signInError.message} />
) : null}
<Button className="login-btn" type="primary" htmlType="submit">
<Button
className="login-btn"
type="primary"
htmlType="submit"
loading={loginLoading}
>
Login
</Button>
</Form>