Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
laboite
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Daniel Dehennin
laboite
Commits
f9173f4f
Commit
f9173f4f
authored
5 years ago
by
Lionel Morin
Browse files
Options
Downloads
Patches
Plain Diff
Fix lint on spinner component
parent
6aa2acc8
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/imports/ui/components/Spinner.jsx
+1
-1
1 addition, 1 deletion
app/imports/ui/components/Spinner.jsx
app/imports/ui/pages/ServicesPage.jsx
+2
-3
2 additions, 3 deletions
app/imports/ui/pages/ServicesPage.jsx
with
3 additions
and
4 deletions
app/imports/ui/components/Spinner.jsx
+
1
−
1
View file @
f9173f4f
...
@@ -7,7 +7,7 @@ const divStyle = {
...
@@ -7,7 +7,7 @@ const divStyle = {
marginTop
:
50
,
marginTop
:
50
,
};
};
export
cons
t
Spinner
=
()
=>
(
export
defaul
t
Spinner
=
()
=>
(
<
div
style
=
{
divStyle
}
>
<
div
style
=
{
divStyle
}
>
<
CircularProgress
/>
<
CircularProgress
/>
</
div
>
</
div
>
...
...
This diff is collapsed.
Click to expand it.
app/imports/ui/pages/ServicesPage.jsx
+
2
−
3
View file @
f9173f4f
...
@@ -11,13 +11,12 @@ import SwipeableViews from 'react-swipeable-views';
...
@@ -11,13 +11,12 @@ import SwipeableViews from 'react-swipeable-views';
import
Tabs
from
'
@material-ui/core/Tabs
'
;
import
Tabs
from
'
@material-ui/core/Tabs
'
;
import
Tab
from
'
@material-ui/core/Tab
'
;
import
Tab
from
'
@material-ui/core/Tab
'
;
import
Box
from
'
@material-ui/core/Box
'
;
import
Box
from
'
@material-ui/core/Box
'
;
import
{
CircularProgress
}
from
'
@material-ui/core
'
;
import
i18n
from
'
meteor/universe:i18n
'
;
import
i18n
from
'
meteor/universe:i18n
'
;
import
ServiceDetails
from
'
../components/ServiceDetails
'
;
import
ServiceDetails
from
'
../components/ServiceDetails
'
;
import
Services
from
'
../../api/services/services
'
;
import
Services
from
'
../../api/services/services
'
;
import
UserContext
from
'
../contexts/UserContext
'
;
import
UserContext
from
'
../contexts/UserContext
'
;
import
{
Spinner
}
from
'
../components/Spinner
'
;
import
Spinner
from
'
../components/Spinner
'
;
const
useStyles
=
makeStyles
((
theme
)
=>
({
const
useStyles
=
makeStyles
((
theme
)
=>
({
AppChoice
:
{
AppChoice
:
{
...
@@ -121,7 +120,7 @@ function ServicesPage({ services, loading, searchString }) {
...
@@ -121,7 +120,7 @@ function ServicesPage({ services, loading, searchString }) {
</
Tabs
>
</
Tabs
>
</
AppBar
>
</
AppBar
>
{
loading
?
(
{
loading
?
(
<
Spinner
/>
<
Spinner
/>
)
:
(
)
:
(
<
SwipeableViews
<
SwipeableViews
axis
=
{
theme
.
direction
===
'
rtl
'
?
'
x-reverse
'
:
'
x
'
}
axis
=
{
theme
.
direction
===
'
rtl
'
?
'
x-reverse
'
:
'
x
'
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment