diff --git a/src/containers/DefaultLayout/DefaultLayout.js b/src/containers/DefaultLayout/DefaultLayout.js
index e2e7f66..17045f1 100644
--- a/src/containers/DefaultLayout/DefaultLayout.js
+++ b/src/containers/DefaultLayout/DefaultLayout.js
@@ -269,7 +269,7 @@ class DefaultLayout extends Component {
)} />
) : (null);
})}
-
+
diff --git a/src/views/Dashboard/DashboardCustomer.js b/src/views/Dashboard/DashboardCustomer.js
index ce3045e..6b7e3b4 100644
--- a/src/views/Dashboard/DashboardCustomer.js
+++ b/src/views/Dashboard/DashboardCustomer.js
@@ -34,10 +34,7 @@ const DashboardCustomer = () => {
}
}
const { PROJECT_ID, GANTT_ID } = useParams();
- // const URL_GANTT = `http://103.73.125.81:8446/index.html?base_url=http://103.73.125.81:8444/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`;
- // const URL_GANTT = `https://adw-gantt.ospro.id/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`;
- // const URL_GANTT = '';
- const URL_GANTT = `http://192.168.1.104:8446/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`;
+ const URL_GANTT = `https://adw-gantt.ospro.id/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`;
const mapRef = useRef()
const [projectName, setProjectName] = useState("");
const [projectManagerName, setProjectManagerName] = useState('');
@@ -64,7 +61,7 @@ const DashboardCustomer = () => {
const [healthBySchedule, setHealthBySchedule] = useState('-');
const [healthByBudget, setHealthByBudget] = useState('-');
const [reportDistribution, setReportDistribution] = useState([]);
-
+
useEffect(() => {
getProjectDetail();
getSCurve()
@@ -316,7 +313,7 @@ const DashboardCustomer = () => {
if (reportDistribution.length > 0) {
reportDistribution.map((item, idx) => {
L.marker([item.lat, item.lon]).addTo(mymap).bindPopup(PopupContent(item))
- });
+ });
}
}
}, [mymap, reportDistribution])
@@ -347,7 +344,7 @@ const DashboardCustomer = () => {
{!isReadyComments &&
}
{isReadyComments && comments && comments.length < 1 &&
No comments found.
}
- {comments && comments.length > 0 && comments.map((item, idx) =>
+ {comments && comments.length > 0 && comments.map((item, idx) =>
)}
@@ -497,13 +494,13 @@ const DashboardCustomer = () => {
{isReadySCurve ?
:
-
+
}
{isReadySCurve ?
:
-
+
}
diff --git a/src/views/Pages/Login/Login.js b/src/views/Pages/Login/Login.js
index 98bb45d..9b1dc91 100644
--- a/src/views/Pages/Login/Login.js
+++ b/src/views/Pages/Login/Login.js
@@ -110,12 +110,11 @@ class Login extends Component {
this.setState({ loader: false })
// custom redirect home after login
if (role_id == 28) {
- this.props.history.push(`/dashboard-customer/37/48`);
+ this.props.history.push("/dashboard-customer/48/50");
}
else {
this.props.history.push("/dashboard");
}
-
} else {
NotificationManager.error('Login Failed', 'Failed');
this.setState({ loader: false })