-
-
Notifications
You must be signed in to change notification settings - Fork 118
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #842 from Ignitus/develop
Master > Develop
- Loading branch information
Showing
42 changed files
with
2,377 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...DesignSystem/ignitus-Layout/ignitus-NotFound/Components/__snapshots__/index.test.tsx.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`<Notfound /> should render 1`] = ` | ||
| <Router | ||
| history={ | ||
| Object { | ||
| "action": "POP", | ||
| "block": [Function], | ||
| "createHref": [Function], | ||
| "go": [Function], | ||
| "goBack": [Function], | ||
| "goForward": [Function], | ||
| "length": 1, | ||
| "listen": [Function], | ||
| "location": Object { | ||
| "hash": "", | ||
| "pathname": "/", | ||
| "search": "", | ||
| "state": undefined, | ||
| }, | ||
| "push": [Function], | ||
| "replace": [Function], | ||
| } | ||
| } | ||
| > | ||
| <Notfound /> | ||
| </Router> | ||
| `; |
18 changes: 18 additions & 0 deletions
18
...tus-Shared/ignitus-DesignSystem/ignitus-Layout/ignitus-NotFound/Components/index.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import React from 'react'; | ||
| import { shallow } from 'enzyme'; | ||
| import { BrowserRouter as Router } from 'react-router-dom'; | ||
| import emotionSerializer from 'jest-emotion'; | ||
| import { Notfound } from './index'; | ||
|
|
||
| expect.addSnapshotSerializer(emotionSerializer); | ||
|
|
||
| describe('<Notfound />', () => { | ||
| it('should render', () => { | ||
| const wrapper = shallow( | ||
| <Router> | ||
| <Notfound /> | ||
| </Router>, | ||
| ); | ||
| expect(wrapper).toMatchSnapshot(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
...stem/ignitus-Layout/ignitus-UnderContruction/Components/__snapshots__/index.test.tsx.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`<WebsiteUnderConstruction /> should render 1`] = ` | ||
| .emotion-5 { | ||
| display: -webkit-box; | ||
| display: -webkit-flex; | ||
| display: -ms-flexbox; | ||
| display: flex; | ||
| -webkit-flex-direction: column; | ||
| -ms-flex-direction: column; | ||
| flex-direction: column; | ||
| -webkit-align-items: center; | ||
| -webkit-box-align: center; | ||
| -ms-flex-align: center; | ||
| align-items: center; | ||
| -webkit-box-pack: center; | ||
| -webkit-justify-content: center; | ||
| -ms-flex-pack: center; | ||
| justify-content: center; | ||
| margin-top: 6rem; | ||
| margin-bottom: 6rem; | ||
| } | ||
| .emotion-4 { | ||
| display: -webkit-box; | ||
| display: -webkit-flex; | ||
| display: -ms-flexbox; | ||
| display: flex; | ||
| -webkit-flex-direction: column; | ||
| -ms-flex-direction: column; | ||
| flex-direction: column; | ||
| -webkit-align-items: center; | ||
| -webkit-box-align: center; | ||
| -ms-flex-align: center; | ||
| align-items: center; | ||
| -webkit-box-pack: center; | ||
| -webkit-justify-content: center; | ||
| -ms-flex-pack: center; | ||
| justify-content: center; | ||
| margin-top: 2rem; | ||
| } | ||
| .emotion-1 { | ||
| font-weight: 500; | ||
| font-size: 22px; | ||
| color: #000066; | ||
| } | ||
| .emotion-2 { | ||
| font-size: 16px; | ||
| font-weight: 400; | ||
| color: #2D2D2D; | ||
| margin: 0; | ||
| } | ||
| <div | ||
| class="emotion-5" | ||
| > | ||
| <img | ||
| alt="Site Under Build" | ||
| class="emotion-0" | ||
| src="https://storage.googleapis.com/ignitus_assets/ig-assets/underContruction.png" | ||
| /> | ||
| <div | ||
| class="emotion-4" | ||
| > | ||
| <h3 | ||
| class="emotion-1" | ||
| > | ||
| Our site is under maintenance | ||
| </h3> | ||
| <p | ||
| class="emotion-2" | ||
| > | ||
| We are working on making better experiences for you. | ||
| <span | ||
| aria-label="hammer" | ||
| role="img" | ||
| > | ||
| 🔨 | ||
| </span> | ||
| </p> | ||
| <p | ||
| class="emotion-2" | ||
| > | ||
| We should be back shortly, Thank you for the patience. | ||
| <span | ||
| aria-label="flake" | ||
| role="img" | ||
| > | ||
| ☘️ | ||
| </span> | ||
| </p> | ||
| </div> | ||
| </div> | ||
| `; |
13 changes: 13 additions & 0 deletions
13
...ed/ignitus-DesignSystem/ignitus-Layout/ignitus-UnderContruction/Components/index.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import React from 'react'; | ||
| import { render } from 'enzyme'; | ||
| import emotionSerializer from 'jest-emotion'; | ||
| import { WebsiteUnderConstruction } from './index'; | ||
|
|
||
| expect.addSnapshotSerializer(emotionSerializer); | ||
|
|
||
| describe('<WebsiteUnderConstruction />', () => { | ||
| it('should render', () => { | ||
| const wrapper = render(<WebsiteUnderConstruction />); | ||
| expect(wrapper).toMatchSnapshot(); | ||
| }); | ||
| }); |
41 changes: 41 additions & 0 deletions
41
...gnSystem/ignitus-Molecules/ignitus-ScrollBar/Components/__snapshots__/index.test.tsx.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`<ScrollBar /> should render 1`] = ` | ||
| .emotion-1 { | ||
| margin: 30px; | ||
| float: left; | ||
| height: 300px; | ||
| width: 65px; | ||
| background: #f5f5f5; | ||
| overflow-y: scroll; | ||
| margin-bottom: 25px; | ||
| } | ||
| .emotion-1::-webkit-scrollbar { | ||
| width: 12px; | ||
| background: #f5f5f5; | ||
| } | ||
| .emotion-1::-webkit-scrollbar-track { | ||
| box-shadow: inset 0 0 6px rgba(0,0,0,0.3); | ||
| border-radius: 10px; | ||
| background-color: #f5f5f5; | ||
| } | ||
| .emotion-1::-webkit-scrollbar-thumb { | ||
| border-radius: 10px; | ||
| background-color: #f90; | ||
| } | ||
| .emotion-0 { | ||
| min-height: 450px; | ||
| } | ||
| <div | ||
| class="emotion-1" | ||
| > | ||
| <div | ||
| class="emotion-0" | ||
| /> | ||
| </div> | ||
| `; |
13 changes: 13 additions & 0 deletions
13
...Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-ScrollBar/Components/index.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import React from 'react'; | ||
| import { render } from 'enzyme'; | ||
| import emotionSerializer from 'jest-emotion'; | ||
| import ScrollBar from './index'; | ||
|
|
||
| expect.addSnapshotSerializer(emotionSerializer); | ||
|
|
||
| describe('<ScrollBar />', () => { | ||
| it('should render', () => { | ||
| const wrapper = render(<ScrollBar />); | ||
| expect(wrapper).toMatchSnapshot(); | ||
| }); | ||
| }); |
12 changes: 12 additions & 0 deletions
12
...itus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-ScrollBar/Components/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import React from 'react'; | ||
| import * as S from '../styles'; | ||
|
|
||
| const ScrollBar = () => ( | ||
| <React.Fragment> | ||
| <S.Scroll> | ||
| <S.Overflow /> | ||
| </S.Scroll> | ||
| </React.Fragment> | ||
| ); | ||
|
|
||
| export default ScrollBar; |
31 changes: 31 additions & 0 deletions
31
src/ignitus-Shared/ignitus-DesignSystem/ignitus-Molecules/ignitus-ScrollBar/styles.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import styled from '@emotion/styled'; | ||
|
|
||
| export const Scroll = styled.div` | ||
| margin: 30px; | ||
| float: left; | ||
| height: 300px; | ||
| width: 65px; | ||
| background: #f5f5f5; | ||
| overflow-y: scroll; | ||
| margin-bottom: 25px; | ||
| ::-webkit-scrollbar { | ||
| width: 12px; | ||
| background: #f5f5f5; | ||
| } | ||
| ::-webkit-scrollbar-track { | ||
| box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); | ||
| border-radius: 10px; | ||
| background-color: #f5f5f5; | ||
| } | ||
| ::-webkit-scrollbar-thumb { | ||
| border-radius: 10px; | ||
| background-color: #f90; | ||
| } | ||
| `; | ||
|
|
||
| export const Overflow = styled.div` | ||
| min-height: 450px; | ||
| `; |
Oops, something went wrong.