Skip to content

Commit 302f5ef

Browse files
dewanshDTdewanshDT
committed
new nav and the test
2 parents ca8296a + b22cc0a commit 302f5ef

18 files changed

+40
-717
lines changed

‎client/components/Nav.jsx

Lines changed: 0 additions & 417 deletions
This file was deleted.

‎client/components/Nav.unit.test.jsx

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎client/modules/IDE/components/Header/Nav.unit.test.jsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import React from 'react';
2+
import { reduxRender } from '../../../../test-utils';
3+
4+
import Nav from './Nav';
5+
6+
// jest.mock('../i18n');
7+
8+
describe('Nav', () => {
9+
it('renders editor version', () => {
10+
const { asFragment } = reduxRender(<Nav />);
11+
expect(asFragment()).toMatchSnapshot();
12+
});
13+
14+
it('renders dashboard version', () => {
15+
const { asFragment } = reduxRender(<Nav layout="dashboard" />);
16+
expect(asFragment()).toMatchSnapshot();
17+
});
18+
});

‎client/modules/IDE/components/Toolbar.jsx renamed to ‎client/modules/IDE/components/Header/Toolbar.jsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import { connect } from 'react-redux';
44
import { Link } from 'react-router-dom';
55
import classNames from 'classnames';
66
import { withTranslation } from 'react-i18next';
7-
import * as IDEActions from '../actions/ide';
8-
import * as preferenceActions from '../actions/preferences';
9-
import * as projectActions from '../actions/project';
10-
11-
import PlayIcon from '../../../images/play.svg';
12-
import StopIcon from '../../../images/stop.svg';
13-
import PreferencesIcon from '../../../images/preferences.svg';
14-
import EditProjectNameIcon from '../../../images/pencil.svg';
7+
import * as IDEActions from '../../actions/ide';
8+
import * as preferenceActions from '../../actions/preferences';
9+
import * as projectActions from '../../actions/project';
10+
11+
import PlayIcon from '../../../../images/play.svg';
12+
import StopIcon from '../../../../images/stop.svg';
13+
import PreferencesIcon from '../../../../images/preferences.svg';
14+
import EditProjectNameIcon from '../../../../images/pencil.svg';
1515

1616
class Toolbar extends React.Component {
1717
constructor(props) {

‎client/modules/IDE/components/Toolbar.unit.test.jsx renamed to ‎client/modules/IDE/components/Header/Toolbar.unit.test.jsx

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

4-
import { fireEvent, render, screen, waitFor } from '../../../test-utils';
4+
import { fireEvent, render, screen, waitFor } from '../../../../test-utils';
55
import { ToolbarComponent } from './Toolbar';
66

77
const renderComponent = (extraProps = {}) => {

‎client/components/__snapshots__/Nav.unit.test.jsx.snap renamed to ‎client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap

Lines changed: 0 additions & 209 deletions
Original file line numberDiff line numberDiff line change
@@ -1,214 +1,5 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`Nav renders correctly 1`] = `
4-
<DocumentFragment>
5-
<header>
6-
<nav
7-
class="nav"
8-
>
9-
<ul
10-
class="nav__items-left"
11-
>
12-
<li
13-
class="nav__item-logo"
14-
>
15-
<test-file-stub
16-
classname="svg__logo"
17-
focusable="false"
18-
role="img"
19-
/>
20-
</li>
21-
<li
22-
class="nav__item"
23-
>
24-
<button>
25-
<span
26-
class="nav__item-header"
27-
/>
28-
<test-file-stub
29-
aria-hidden="true"
30-
classname="nav__item-header-triangle"
31-
focusable="false"
32-
/>
33-
</button>
34-
<ul
35-
class="nav__dropdown"
36-
>
37-
<li
38-
class="nav__dropdown-item"
39-
>
40-
<button />
41-
</li>
42-
<li
43-
class="nav__dropdown-item"
44-
>
45-
<button />
46-
</li>
47-
<li
48-
class="nav__dropdown-item"
49-
>
50-
<button />
51-
</li>
52-
<li
53-
class="nav__dropdown-item"
54-
>
55-
<button />
56-
</li>
57-
<li
58-
class="nav__dropdown-item"
59-
>
60-
<a
61-
href="/new-user/sketches"
62-
/>
63-
</li>
64-
</ul>
65-
</li>
66-
<li
67-
class="nav__item"
68-
>
69-
<button>
70-
<span
71-
class="nav__item-header"
72-
/>
73-
<test-file-stub
74-
aria-hidden="true"
75-
classname="nav__item-header-triangle"
76-
focusable="false"
77-
/>
78-
</button>
79-
<ul
80-
class="nav__dropdown"
81-
>
82-
<li
83-
class="nav__dropdown-item"
84-
>
85-
<button>
86-
<span
87-
class="nav__keyboard-shortcut"
88-
>
89-
⌃+⇧+F
90-
</span>
91-
</button>
92-
</li>
93-
<li
94-
class="nav__dropdown-item"
95-
>
96-
<button>
97-
<span
98-
class="nav__keyboard-shortcut"
99-
>
100-
⌃+F
101-
</span>
102-
</button>
103-
</li>
104-
<li
105-
class="nav__dropdown-item"
106-
>
107-
<button>
108-
<span
109-
class="nav__keyboard-shortcut"
110-
>
111-
⌃+H
112-
</span>
113-
</button>
114-
</li>
115-
</ul>
116-
</li>
117-
<li
118-
class="nav__item"
119-
>
120-
<button>
121-
<span
122-
class="nav__item-header"
123-
/>
124-
<test-file-stub
125-
aria-hidden="true"
126-
classname="nav__item-header-triangle"
127-
focusable="false"
128-
/>
129-
</button>
130-
<ul
131-
class="nav__dropdown"
132-
>
133-
<li
134-
class="nav__dropdown-item"
135-
>
136-
<button />
137-
</li>
138-
<li
139-
class="nav__dropdown-item"
140-
>
141-
<button />
142-
</li>
143-
<li
144-
class="nav__dropdown-item"
145-
>
146-
<button>
147-
<span
148-
class="nav__keyboard-shortcut"
149-
>
150-
⌃+Enter
151-
</span>
152-
</button>
153-
</li>
154-
<li
155-
class="nav__dropdown-item"
156-
>
157-
<button>
158-
<span
159-
class="nav__keyboard-shortcut"
160-
>
161-
⇧+⌃+Enter
162-
</span>
163-
</button>
164-
</li>
165-
</ul>
166-
</li>
167-
<li
168-
class="nav__item"
169-
>
170-
<button>
171-
<span
172-
class="nav__item-header"
173-
/>
174-
<test-file-stub
175-
aria-hidden="true"
176-
classname="nav__item-header-triangle"
177-
focusable="false"
178-
/>
179-
</button>
180-
<ul
181-
class="nav__dropdown"
182-
>
183-
<li
184-
class="nav__dropdown-item"
185-
>
186-
<button />
187-
</li>
188-
<li
189-
class="nav__dropdown-item"
190-
>
191-
<a
192-
href="https://p5js.org/reference/"
193-
rel="noopener noreferrer"
194-
target="_blank"
195-
/>
196-
</li>
197-
<li
198-
class="nav__dropdown-item"
199-
>
200-
<a
201-
href="/about"
202-
/>
203-
</li>
204-
</ul>
205-
</li>
206-
</ul>
207-
</nav>
208-
</header>
209-
</DocumentFragment>
210-
`;
211-
2123
exports[`Nav renders dashboard version 1`] = `
2134
<DocumentFragment>
2145
<header>

‎client/modules/IDE/components/Header/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { useSelector } from 'react-redux';
44
import MediaQuery from 'react-responsive';
5-
import Toolbar from '../Toolbar';
65
import Nav from './Nav';
6+
import Toolbar from './Toolbar';
77

88
const Header = (props) => {
99
const project = useSelector((state) => state.project);

‎client/modules/IDE/pages/IDEView.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ import SplitPane from 'react-split-pane';
99
import Editor from '../components/Editor';
1010
import Sidebar from '../components/Sidebar';
1111
import PreviewFrame from '../components/PreviewFrame';
12-
import Toolbar from '../components/Toolbar';
12+
import Toolbar from '../components/Header/Toolbar';
1313
import Preferences from '../components/Preferences/index';
1414
import NewFileModal from '../components/NewFileModal';
1515
import NewFolderModal from '../components/NewFolderModal';
1616
import UploadFileModal from '../components/UploadFileModal';
1717
import ShareModal from '../components/ShareModal';
1818
import KeyboardShortcutModal from '../components/KeyboardShortcutModal';
1919
import ErrorModal from '../components/ErrorModal';
20+
import Nav from '../components/Header/Nav';
2021
import Console from '../components/Console';
2122
import Toast from '../components/Toast';
2223
import * as FileActions from '../actions/files';
@@ -34,7 +35,6 @@ import Feedback from '../components/Feedback';
3435
import { CollectionSearchbar } from '../components/Searchbar';
3536
import { getIsUserOwner } from '../selectors/users';
3637
import RootPage from '../../../components/RootPage';
37-
import Nav from '../components/Header/Nav';
3838

3939
function getTitle(props) {
4040
const { id } = props.project;

‎client/modules/IDE/pages/Legal.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import PrivacyPolicy from './PrivacyPolicy';
77
import TermsOfUse from './TermsOfUse';
88
import CodeOfConduct from './CodeOfConduct';
99
import RootPage from '../../../components/RootPage';
10-
import Nav from '../../../components/Nav';
10+
import Nav from '../../IDE/components/Header/Nav';
1111
import { remSize, prop } from '../../../theme';
1212

1313
const StyledTabList = styled(TabList)`

‎client/modules/User/pages/AccountView.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { createApiKey, removeApiKey } from '../actions';
99
import AccountForm from '../components/AccountForm';
1010
import SocialAuthButton from '../components/SocialAuthButton';
1111
import APIKeyForm from '../components/APIKeyForm';
12-
import Nav from '../../../components/Nav';
12+
import Nav from '../../IDE/components/Header/Nav';
1313
import ErrorModal from '../../IDE/components/ErrorModal';
1414
import Overlay from '../../App/components/Overlay';
1515
import Toast from '../../IDE/components/Toast';

0 commit comments

Comments
 (0)