Skip to content

Commit 7d06682

Browse files
Aaryan8751Aaryan8751
authored
Merge pull request #28 from My-Help/Aaryan
Aaryan
2 parents 51e960f + 9ecb4b9 commit 7d06682

File tree

4 files changed

+67
-59
lines changed

4 files changed

+67
-59
lines changed

‎src/Components/CustomerMainComponent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class CustomerMainComponent extends Component{
195195
</div>
196196
<div className="col-md-9">
197197
<Switch>
198-
<Route path="/Customer/Profile" component={()=><CustomerProfile customer={this.state.customer} />}/>
198+
<Route path="/Customer/Profile" component={()=><CustomerProfile customer={this.state.customer} isLoading={this.props.customers.isLoading} />}/>
199199
<Route path="/Customer/UpdateProfile" component={()=><CustomerUpdateProfile customer={this.state.customer} updateCustomerInfo ={this.props.updateCustomerInfo}/>} />
200200
<Route path="/Customer/services" component={()=><Services/>} />
201201
<Route path="/Customer/Plumbers" component={()=><CustomerPlumbers plumbers={this.state.Plumbers.sort((a,b)=>b.Feedback_count-a.Feedback_count)}/>}/>

‎src/Components/CustomerProfile.js

Lines changed: 58 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import { Component } from 'react';
3-
3+
import Loading from './Loading';
44
class CustomerProfile extends Component {
55
constructor(props) {
66
super(props);
@@ -10,65 +10,72 @@ class CustomerProfile extends Component {
1010
if (this.props.customer != null) {
1111
Customer = this.props.customer
1212
}
13-
14-
return (
13+
if(this.props.isLoading===true){
14+
return(
15+
<Loading/>
16+
);
17+
}
18+
else{
19+
return (
1520

16-
<div className="container-fluid">
17-
<div className="row">
18-
<div className="col-12 container-fluid">
19-
<h2 className="feature-heading container-fluid">Profile</h2>
20-
<hr className="feature-line" />
21+
<div className="container-fluid">
22+
<div className="row">
23+
<div className="col-12 container-fluid">
24+
<h2 className="feature-heading container-fluid">Profile</h2>
25+
<hr className="feature-line" />
26+
</div>
2127
</div>
22-
</div>
23-
<div className="row mb-4">
24-
<div className="col-12">
25-
<div className="card">
26-
<div className="card-header color text-white">
27-
<h2>
28-
{Customer !== null && Customer.Customer_Username}'s Profile
29-
</h2>
30-
</div>
31-
<div className="card-body">
32-
<div className="row d-flex justify-content-start">
33-
34-
<h5 className="card-title col-sm-3 ">Name:</h5>
35-
<h5 className="card-title col-sm-3 ">{Customer !== null && Customer.Name}</h5>
36-
37-
<h5 className="card-title col-sm-3 ">Mobile Number:</h5>
38-
<h5 className="card-title col-sm-3">{Customer !== null && Customer.mobileNo}</h5>
39-
40-
</div>
41-
42-
<div className="row d-flex justify-content-start">
43-
44-
<h5 className="card-title col-sm-3 ">City:</h5>
45-
<h5 className="card-title col-sm-3">{Customer !== null && Customer.City}</h5>
46-
47-
<h5 className="card-title col-sm-3 ">Gender:</h5>
48-
<h5 className="card-title col-sm-3">{Customer !== null && Customer.Gender}</h5>
49-
50-
</div>
51-
52-
53-
<div className="row d-flex justify-content-start">
54-
55-
<h5 className="card-title col-sm-3">Email:</h5>
56-
<h5 className="card-title col-sm">{Customer !== null && Customer.email}</h5>
57-
28+
<div className="row mb-4">
29+
<div className="col-12">
30+
<div className="card">
31+
<div className="card-header color text-white">
32+
<h2>
33+
{Customer !== null && Customer.Customer_Username}'s Profile
34+
</h2>
5835
</div>
59-
60-
<div className="row d-flex justify-content-start">
36+
<div className="card-body">
37+
<div className="row d-flex justify-content-start">
38+
39+
<h5 className="card-title col-sm-3 ">Name:</h5>
40+
<h5 className="card-title col-sm-3 ">{Customer !== null && Customer.Name}</h5>
41+
42+
<h5 className="card-title col-sm-3 ">Mobile Number:</h5>
43+
<h5 className="card-title col-sm-3">{Customer !== null && Customer.mobileNo}</h5>
44+
45+
</div>
46+
47+
<div className="row d-flex justify-content-start">
48+
49+
<h5 className="card-title col-sm-3 ">City:</h5>
50+
<h5 className="card-title col-sm-3">{Customer !== null && Customer.City}</h5>
51+
52+
<h5 className="card-title col-sm-3 ">Gender:</h5>
53+
<h5 className="card-title col-sm-3">{Customer !== null && Customer.Gender}</h5>
54+
55+
</div>
6156

62-
<h5 className="card-title col-sm-3">Address:</h5>
63-
<h5 className="card-title col-sm-3">{Customer !== null && Customer.Address}</h5>
57+
58+
<div className="row d-flex justify-content-start">
59+
60+
<h5 className="card-title col-sm-3">Email:</h5>
61+
<h5 className="card-title col-sm">{Customer !== null && Customer.email}</h5>
62+
63+
</div>
64+
65+
<div className="row d-flex justify-content-start">
66+
67+
<h5 className="card-title col-sm-3">Address:</h5>
68+
<h5 className="card-title col-sm-3">{Customer !== null && Customer.Address}</h5>
69+
</div>
70+
6471
</div>
65-
6672
</div>
6773
</div>
6874
</div>
6975
</div>
70-
</div>
71-
)
76+
);
77+
}
78+
7279
}
7380
}
7481

‎src/Components/Home.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React,{Component} from 'react';
22
import {Jumbotron} from 'reactstrap';
33
import Header from './Header'
4+
import {Link} from 'react-router-dom';
45
class Home extends Component{
56

67
render(){
@@ -23,7 +24,7 @@ class Home extends Component{
2324
<h5 className="card-title col-6 mb-5" >Plumber</h5>
2425
</div>
2526

26-
<a href="/PlumberView" className="card-link">Details</ a>
27+
<Link to="/PlumberView" className="card-link">Details</ Link>
2728
</div>
2829
</div>
2930
</div>
@@ -33,7 +34,7 @@ class Home extends Component{
3334
<div className="card-body">
3435
<h5 className="card-title mb-5">Carpenter</h5>
3536

36-
<a href="/CarpenterView" className="card-link">Details</ a>
37+
<Link to="/CarpenterView" className="card-link">Details</ Link>
3738
</div>
3839
</div>
3940
</div>
@@ -43,7 +44,7 @@ class Home extends Component{
4344
<div className="card-body">
4445
<h5 className="card-title mb-5">Electrician</h5>
4546

46-
<a href="/ElectricianView" className="card-link">Details</ a>
47+
<Link to="/ElectricianView" className="card-link">Details</ Link>
4748
</div>
4849
</div>
4950

@@ -56,7 +57,7 @@ class Home extends Component{
5657
<div className="card-body">
5758
<h5 className="card-title mb-5">AC Service/Repair</h5>
5859

59-
<a href="/ACView" className="card-link">Details</ a>
60+
<Link to="/ACView" className="card-link">Details</ Link>
6061
</div>
6162
</div>
6263
</div>
@@ -66,7 +67,7 @@ class Home extends Component{
6667
<div className="card-body">
6768
<h5 className="card-title mb-5">Barber</h5>
6869

69-
<a href="/BarberView" className="card-link">Details</ a>
70+
<Link to="/BarberView" className="card-link">Details</ Link>
7071
</div>
7172
</div>
7273
</div>
@@ -76,7 +77,7 @@ class Home extends Component{
7677
<div className="card-body">
7778
<h5 className="card-title mb-5">Appliance Repair</h5>
7879

79-
<a href="/ApplianceView" className="card-link">Details</ a>
80+
<Link to="/ApplianceView" className="card-link">Details</ Link>
8081
</div>
8182
</div>
8283

‎src/Components/Loading.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import ReactLoading from 'react-loading';
33

44
const Loading = () => (
5-
<ReactLoading type={'spinningBubbles'} color={"#14274e"} height={'10%'} width={'10%'} />
5+
<ReactLoading className="container-fluid mt-5" type={'spinningBubbles'} color={"#14274e"} height={'10%'} width={'10%'} />
66
);
77

88
export default Loading;

0 commit comments

Comments
 (0)