Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/dark mode #354 #357

Merged
merged 8 commits into from
Aug 25, 2020
Merged

Feature/dark mode #354 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
94544cb
Update dataview styling for darkmode #354
tswinb Aug 6, 2020
9a791f1
Fix dataview background colours #354
tswinb Aug 6, 2020
6a9ba26
Update search styling for darkmode #354
tswinb Aug 6, 2020
f005ff3
Update download styling for darkmode #354
tswinb Aug 6, 2020
7f9ce28
Add preloader styles for darkmode #354
tswinb Aug 7, 2020
ac11b3b
Update preloader tests to mount #354
tswinb Aug 10, 2020
e92772a
Fix contrast issue on download tabs #354
tswinb Aug 21, 2020
fa20bf3
Update snapshot #354
tswinb Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
330 changes: 171 additions & 159 deletions packages/datagateway-common/src/preloader/__snapshots__/preloader.component.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,172 +1,184 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Preloader component does not render when the site is not loading 1`] = `<div />`;
exports[`Preloader component does not render when the site is not loading 1`] = `
<WithStyles(Preloader)
loading={false}
>
<Preloader
classes={
Object {
"container": "Preloader-container-3",
"spinner": "Preloader-spinner-1",
"text": "Preloader-text-4",
"wrapper": "Preloader-wrapper-2",
}
}
loading={false}
>
<div />
</Preloader>
</WithStyles(Preloader)>
`;

exports[`Preloader component renders when the site is loading 1`] = `
<div>
<div
style={
<WithStyles(Preloader)
loading={true}
>
<Preloader
classes={
Object {
"alignItems": "center",
"backgroundColor": "rgba(255,255,255,1)",
"display": "flex",
"flexDirection": "column",
"height": "100%",
"justifyContent": "center",
"width": "100%",
"zIndex": 1000,
"container": "Preloader-container-3",
"spinner": "Preloader-spinner-1",
"text": "Preloader-text-4",
"wrapper": "Preloader-wrapper-2",
}
}
loading={true}
>
<div
style={
Object {
"boxSizing": "border-box",
"padding": "10px 0",
}
}
>
<div>
<div
style={
Object {
"animation": "rotate 10s infinite linear",
"display": "block",
"height": 230,
"margin": "auto",
"width": 230,
}
}
className="Preloader-container-3"
>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 0, 0, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#8C4799",
"borderTopLeftRadius": 140,
"borderTopRightRadius": 140,
"boxSizing": "border-box",
"display": "inline-block",
"height": 70,
"left": "50%",
"marginLeft": -70,
"marginTop": -70,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 140,
}
}
/>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 0.3, 0.12, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#1D4F91",
"borderTopLeftRadius": 148,
"borderTopRightRadius": 148,
"boxSizing": "border-box",
"display": "inline-block",
"height": 79,
"left": "50%",
"marginLeft": -79,
"marginTop": -79,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 158,
}
}
/>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 0.6, 0.24, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#C34613",
"borderTopLeftRadius": 156,
"borderTopRightRadius": 156,
"boxSizing": "border-box",
"display": "inline-block",
"height": 88,
"left": "50%",
"marginLeft": -88,
"marginTop": -88,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 176,
}
}
/>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 0.8999999999999999, 0.36, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#008275",
"borderTopLeftRadius": 164,
"borderTopRightRadius": 164,
"boxSizing": "border-box",
"display": "inline-block",
"height": 97,
"left": "50%",
"marginLeft": -97,
"marginTop": -97,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 194,
}
}
/>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 1.2, 0.48, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#63666A",
"borderTopLeftRadius": 172,
"borderTopRightRadius": 172,
"boxSizing": "border-box",
"display": "inline-block",
"height": 106,
"left": "50%",
"marginLeft": -106,
"marginTop": -106,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 212,
}
}
/>
<div
className="Preloader-wrapper-2"
>
<div
className="Preloader-spinner-1"
>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 0, 0, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#8C4799",
"borderTopLeftRadius": 140,
"borderTopRightRadius": 140,
"boxSizing": "border-box",
"display": "inline-block",
"height": 70,
"left": "50%",
"marginLeft": -70,
"marginTop": -70,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 140,
}
}
/>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 0.3, 0.12, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#1D4F91",
"borderTopLeftRadius": 148,
"borderTopRightRadius": 148,
"boxSizing": "border-box",
"display": "inline-block",
"height": 79,
"left": "50%",
"marginLeft": -79,
"marginTop": -79,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 158,
}
}
/>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 0.6, 0.24, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#C34613",
"borderTopLeftRadius": 156,
"borderTopRightRadius": 156,
"boxSizing": "border-box",
"display": "inline-block",
"height": 88,
"left": "50%",
"marginLeft": -88,
"marginTop": -88,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 176,
}
}
/>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 0.8999999999999999, 0.36, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#008275",
"borderTopLeftRadius": 164,
"borderTopRightRadius": 164,
"boxSizing": "border-box",
"display": "inline-block",
"height": 97,
"left": "50%",
"marginLeft": -97,
"marginTop": -97,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 194,
}
}
/>
<i
style={
Object {
"animationDuration": "3s",
"animationIterationCount": "infinite",
"animationName": "rotate",
"animationTimingFunction": "cubic-bezier(.09, 1.2, 0.48, .03)",
"border": "solid 8px transparent",
"borderBottom": "none",
"borderColor": "#63666A",
"borderTopLeftRadius": 172,
"borderTopRightRadius": 172,
"boxSizing": "border-box",
"display": "inline-block",
"height": 106,
"left": "50%",
"marginLeft": -106,
"marginTop": -106,
"position": "absolute",
"top": "50%",
"transformOrigin": "50% 100% 0",
"width": 212,
}
}
/>
</div>
</div>
<div
className="Preloader-text-4"
>
Loading...
</div>
</div>
</div>
<div>
Loading...
</div>
</div>
</div>
</Preloader>
</WithStyles(Preloader)>
`;
10 changes: 5 additions & 5 deletions packages/datagateway-common/src/preloader/preloader.component.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import React from 'react';
import Preloader from './preloader.component';
import { createShallow } from '@material-ui/core/test-utils';
import { createMount } from '@material-ui/core/test-utils';

describe('Preloader component', () => {
let shallow;
let mount;

beforeEach(() => {
shallow = createShallow({});
mount = createMount();
});

it('renders when the site is loading', () => {
const wrapper = shallow(<Preloader loading={true} />);
const wrapper = mount(<Preloader loading={true} />);
expect(wrapper).toMatchSnapshot();
});

it('does not render when the site is not loading', () => {
const wrapper = shallow(<Preloader loading={false} />);
const wrapper = mount(<Preloader loading={false} />);
expect(wrapper).toMatchSnapshot();
});
});
Loading