merge conflict

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('');

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 })