diff --git a/client/package.json b/client/package.json
index 9853f1465..46275f81a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -18,6 +18,7 @@
"react-apollo": "^3.1.3",
"react-dom": "^16.12.0",
"react-i18next": "^11.2.7",
+ "react-icons": "^3.8.0",
"react-moment": "^0.9.7",
"react-number-format": "^4.3.1",
"react-router-dom": "^5.1.2",
diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx
index bffef01c2..c91f582e0 100644
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -72,7 +72,6 @@ class AppContainer extends Component {
const token = localStorage.getItem("token");
// return the headers to the context so httpLink can read them
if (token) {
- console.log("checking if token should refresh.");
if (shouldRefreshToken) {
refreshToken();
}
diff --git a/client/src/App/App.js b/client/src/App/App.js
index 5f000622c..36c1a3956 100644
--- a/client/src/App/App.js
+++ b/client/src/App/App.js
@@ -94,15 +94,15 @@ export default () => {
- Suspended Loading...
}>
-
-
+ TODO: Suspense Loading}>
+
+
HookCurrentUser.data.currentUser ? (
-
+
) : (
)
@@ -110,7 +110,7 @@ export default () => {
/>
diff --git a/client/src/assets/car.svg b/client/src/assets/car.svg
new file mode 100644
index 000000000..761be63c9
--- /dev/null
+++ b/client/src/assets/car.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/client/src/components/job-tombstone/job-tombstone.component.jsx b/client/src/components/job-tombstone/job-tombstone.component.jsx
index 368591854..64732411f 100644
--- a/client/src/components/job-tombstone/job-tombstone.component.jsx
+++ b/client/src/components/job-tombstone/job-tombstone.component.jsx
@@ -1,4 +1,5 @@
import React, { useState } from "react";
+import { Link } from "react-router-dom";
import AlertComponent from "../alert/alert.component";
import {
Form,
@@ -9,12 +10,15 @@ import {
Typography,
PageHeader,
Descriptions,
- Tag
+ Tag,
+ notification,
+ Avatar
} from "antd";
import { UPDATE_JOB } from "../../graphql/jobs.queries";
import { useMutation } from "@apollo/react-hooks";
import FormItemPhone from "../form-items-formatted/phone-form-item.component";
import { useTranslation } from "react-i18next";
+import CarImage from "../../assets/car.svg";
const formItemLayout = {
labelCol: {
@@ -33,22 +37,27 @@ function JobTombstone({ job, ...otherProps }) {
const { t } = useTranslation();
if (!job) {
- return (
-
- );
+ return ;
}
const handleSubmit = e => {
e.preventDefault();
otherProps.form.validateFieldsAndScroll((err, values) => {
+ if (err) {
+ notification["error"]({
+ message: t("jobs.errors.validationtitle"),
+ description: t("jobs.errors.validation")
+ });
+ }
if (!err) {
mutationUpdateJob({
variables: { jobId: jobContext.id, job: values }
- }).then(r => console.log("result", r));
+ }).then(r =>
+ notification["success"]({
+ message: t("jobs.successes.savetitle")
+ })
+ );
}
});
};
@@ -59,13 +68,21 @@ function JobTombstone({ job, ...otherProps }) {
};
const { getFieldDecorator } = otherProps.form;
+
+ const tombstoneTitle = (
+
+
+ {t("jobs.fields.ro_number") + " " + jobContext.ro_number ?? "0"}
+
+ );
+
return (