Skip to content

Commit 1cf1e60

Browse files
nataliyah123joaopapereira
authored andcommitted
123 custom ringloader component (AgileVentures#146)
* A separate react component for spinner * add a separate react component * deleting the duplicate ringloader file from source tree * Changed the color of the spinner in subscription page * pushing the deleted CustomRingLoader.js
1 parent d47fef8 commit 1cf1e60

12 files changed

+55
-55
lines changed

src/components/CustomRingLoader.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import React from 'react'
2+
import { Container } from 'semantic-ui-react'
3+
import { RingLoader } from 'react-spinners'
4+
5+
const CustomRingLoader = props => {
6+
return (
7+
<Container>
8+
<RingLoader sizeUnit={'px'} size={200} color={props.color || '#34495E'} />
9+
</Container>
10+
)
11+
}
12+
13+
export default CustomRingLoader

src/components/EventSummary.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Fragment } from 'react'
22
import { Header, Segment, Grid, Embed, Image, Icon } from 'semantic-ui-react'
3-
import { RingLoader } from 'react-spinners'
3+
import CustomRingLoader from './CustomRingLoader'
44
import ReactHtmlParser from 'react-html-parser'
55
import moment from 'moment-timezone'
66

@@ -79,7 +79,7 @@ const EventSummary = props => {
7979
</Fragment>
8080
)
8181
} else {
82-
return <RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
82+
return <CustomRingLoader />
8383
}
8484
}
8585

src/components/Paginate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { RingLoader } from 'react-spinners'
2+
import CustomRingLoader from './CustomRingLoader'
33

44
const Paginate = ({ items, Component, error }) => {
55
let itemsArray
@@ -8,7 +8,7 @@ const Paginate = ({ items, Component, error }) => {
88
itemsArray = items.map(item => <Component key={item.id} item={item} />)
99
}
1010
return (
11-
itemsArray || error || <RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
11+
itemsArray || error || <CustomRingLoader />
1212
)
1313
}
1414

src/components/ProjectSummary.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Fragment } from 'react'
22
import { Header, Image, Grid, Card, Icon, Segment, Embed } from 'semantic-ui-react'
3-
import { RingLoader } from 'react-spinners'
3+
import CustomRingLoader from './CustomRingLoader'
44
import { Link } from 'react-router-dom'
55
import '../assets/ProjectSummary.css'
66

@@ -131,7 +131,7 @@ const ProjectSummary = props => {
131131
</Grid>
132132
)
133133
} else {
134-
return <RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
134+
return <CustomRingLoader />
135135
}
136136
}
137137

src/components/UserSummary.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Fragment } from 'react'
22
import { Card, Image, Grid, Label, Tab, Embed, Icon } from 'semantic-ui-react'
3-
import { RingLoader } from 'react-spinners'
3+
import CustomRingLoader from './CustomRingLoader'
44
import moment from 'moment'
55
import '../assets/UserSummary.css'
66

@@ -244,7 +244,7 @@ const UserSummary = props => {
244244
</Fragment>
245245
)
246246
} else {
247-
return <RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
247+
return <CustomRingLoader />
248248
}
249249
}
250250

src/containers/About.js

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,30 @@ import React from 'react'
22
import ReactHtmlParser from 'react-html-parser'
33
import axios from 'axios'
44
import { Container } from 'semantic-ui-react'
5-
import { RingLoader } from 'react-spinners'
5+
import CustomRingLoader from '../components/CustomRingLoader'
66
export class About extends React.Component {
7-
constructor (props) {
8-
super(props)
9-
this.state = { about: null }
10-
}
7+
state = { about: null }
118

12-
componentDidMount () {
13-
axios.get('api/v1/static-pages/about-us')
14-
.then(response => {
15-
this.setState({ about: response.data })
16-
})
17-
}
9+
componentDidMount () {
10+
axios.get('api/v1/static-pages/about-us')
11+
.then(response => {
12+
this.setState({ about: response.data })
13+
})
14+
}
1815

19-
render () {
20-
let { about } = this.state
16+
render () {
17+
let { about } = this.state
2118

22-
if (about) {
23-
return (
24-
<Container>
25-
<div id='main'> {ReactHtmlParser(about)} </div>
26-
</Container>)
27-
} else {
28-
return (
29-
<Container>
30-
<RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
31-
</Container>
32-
)
19+
if (about) {
20+
return (
21+
<Container>
22+
<div id='main'>{ ReactHtmlParser(about) }</div>
23+
</Container>)
24+
} else {
25+
return (
26+
<CustomRingLoader />
27+
)
28+
}
3329
}
34-
}
3530
}
3631
export default About

src/containers/GettingStartedPage.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react'
2-
import { RingLoader } from 'react-spinners'
2+
import CustomRingLoader from '../components/CustomRingLoader'
33
import { Container } from 'semantic-ui-react'
44
import axios from 'axios'
55
import ReactHtmlParser from 'react-html-parser'
@@ -26,9 +26,9 @@ export default class GettingStartedPage extends Component {
2626
)
2727
} else {
2828
return (
29-
<Container>
30-
<RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
31-
</Container>
29+
30+
<CustomRingLoader />
31+
3232
)
3333
}
3434
}

src/containers/MembershipPlansPage.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react'
2-
import { RingLoader } from 'react-spinners'
2+
import CustomRingLoader from '../components/CustomRingLoader'
33
import { Container } from 'semantic-ui-react'
44
import axios from 'axios'
55
import ReactHtmlParser from 'react-html-parser'
@@ -21,9 +21,7 @@ export default class MembershipPlansPage extends Component {
2121
)
2222
} else {
2323
return (
24-
<Container>
25-
<RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
26-
</Container>
24+
<CustomRingLoader />
2725
)
2826
}
2927
}

src/containers/PremiumF2FMembershipPage.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react'
2-
import { RingLoader } from 'react-spinners'
2+
import CustomRingLoader from '../components/CustomRingLoader'
33
import { Container } from 'semantic-ui-react'
44
import axios from 'axios'
55
import ReactHtmlParser from 'react-html-parser'
@@ -25,9 +25,7 @@ export default class PremiumF2FMobMembershipPage extends Component {
2525
)
2626
} else {
2727
return (
28-
<Container>
29-
<RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
30-
</Container>
28+
<CustomRingLoader />
3129
)
3230
}
3331
}

src/containers/PremiumMembershipPage.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react'
2-
import { RingLoader } from 'react-spinners'
2+
import CustomRingLoader from '../components/CustomRingLoader'
33
import { Container } from 'semantic-ui-react'
44
import axios from 'axios'
55
import ReactHtmlParser from 'react-html-parser'
@@ -25,9 +25,7 @@ export default class PremiumMembershipPage extends Component {
2525
)
2626
} else {
2727
return (
28-
<Container>
29-
<RingLoader sizeUnit={'px'} size={200} color={'#34495E'} />
30-
</Container>
28+
<CustomRingLoader />
3129
)
3230
}
3331
}

0 commit comments

Comments
 (0)