Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit a3a962d

Browse files
GimleuxGimleux
authored
Merge pull request #171 from FileFighter/feature/scroll-files
Feature/scroll files
2 parents f23b664 + c589a9f commit a3a962d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+762
-594
lines changed

‎cypress/integration/register_spec.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ describe('The register Page', () => {
3636
cy.get(".btn.btn-primary").contains("Submit").click()
3737
cy.get("span.navbar-link-description").contains("Main").click()
3838

39-
40-
41-
cy.get(".btn.btn-primary").contains("Logout").click()
42-
39+
cy.logout()
4340

4441
cy.get('input[id=formBasicUsername]').type(username)
4542

‎cypress/support/commands.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//
1212
// -- This is a parent command --
1313
Cypress.Commands.add('loginWithUrl', (path) => {
14-
const user = {username:"admin",password:"admin"}
14+
const user = {username:"Admin",password:"admin"}
1515

1616
cy.visit(path)
1717
cy.get('input[id=formBasicUsername]')
@@ -21,6 +21,13 @@ Cypress.Commands.add('loginWithUrl', (path) => {
2121
.type(`${user.password}{enter}`)
2222
})
2323

24+
Cypress.Commands.add('logout', () => {
25+
const user = {username:"Admin",password:"admin"}
26+
27+
cy.get("#basic-nav-dropdown").contains(user.username).click()
28+
cy.get(".dropdown-item").contains("Logout").click()
29+
})
30+
2431
//
2532
//
2633
// -- This is a child command --

‎src/__tests__/__snapshots__/storybook.test.ts.snap‎

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

3+
exports[`Storyshots Banner BottomBanner 1`] = `
4+
<div
5+
className="d-flex justify-content-center bg-dark queer-banner p-0"
6+
>
7+
Queer Lives Matter
8+
</div>
9+
`;
10+
11+
exports[`Storyshots Banner TopBanner 1`] = `
12+
<div
13+
className="d-flex justify-content-center bg-dark text-yellow p-0"
14+
>
15+
Black Lives Matter
16+
</div>
17+
`;
18+
319
exports[`Storyshots Error404 default 1`] = `
420
<div
521
className="container"
@@ -17,7 +33,7 @@ exports[`Storyshots Error404 default 1`] = `
1733
</div>
1834
`;
1935

20-
exports[`Storyshots Filesystem Context Menu default 1`] = `
36+
exports[`Storyshots Filesystem FilesystemContextMenu 1`] = `
2137
<div
2238
className="fileListItemDropdownButton dropdown"
2339
id="fileListItemDropdownButton-34"
@@ -175,141 +191,220 @@ exports[`Storyshots Filesystem default 1`] = `
175191
<div
176192
className="d-flex flex-column align-content-between justify-content-between h-100"
177193
>
178-
<div>
179-
<div
180-
className="py-1 border d-flex justify-content-between container-fluid"
181-
>
182-
<span />
183-
<span>
194+
<div
195+
className="py-1 border d-flex justify-content-between flex-shrink-0 container-fluid"
196+
id="fileToolbar"
197+
>
198+
<span />
199+
<span>
200+
<button
201+
className="fade btn btn-primary"
202+
disabled={true}
203+
type="button"
204+
>
205+
Rename
206+
</button>
207+
<span
208+
className="fade"
209+
>
184210
<button
185-
className="fade btn btn-primary"
211+
className="btn btn-primary"
186212
disabled={true}
213+
onClick={[Function]}
187214
type="button"
188215
>
189-
Rename
216+
Delete
190217
</button>
191-
<span
192-
className="fade"
193-
>
194-
<button
195-
className="btn btn-primary"
196-
disabled={true}
197-
onClick={[Function]}
198-
type="button"
199-
>
200-
Delete
201-
</button>
202-
<a
203-
aria-disabled={true}
204-
className="btn btn-primary disabled"
205-
href="http://localhost/data/download?ids="
206-
onClick={[Function]}
207-
onKeyDown={[Function]}
208-
tabIndex={-1}
209-
>
210-
Download
211-
</a>
212-
</span>
213-
<button
214-
className="btn btn-primary"
215-
disabled={false}
216-
type="button"
218+
<a
219+
aria-disabled={true}
220+
className="btn btn-primary disabled"
221+
href="http://localhost/data/download?ids="
222+
onClick={[Function]}
223+
onKeyDown={[Function]}
224+
tabIndex={-1}
217225
>
218-
New Folder
219-
</button>
226+
Download
227+
</a>
220228
</span>
221-
</div>
229+
<button
230+
className="btn btn-primary"
231+
disabled={false}
232+
type="button"
233+
>
234+
New Folder
235+
</button>
236+
</span>
237+
</div>
238+
<div
239+
className="flex-grow-1 overflow-auto d-flex h-100 flex-column"
240+
id="fileView"
241+
>
222242
<div
223-
className="container-fluid"
243+
className="flex-grow-1 overflow-auto"
244+
id="fileList"
224245
>
225-
<nav
226-
aria-label="breadcrumb"
227-
>
228-
<ol
229-
className="breadcrumb"
230-
>
231-
<a
232-
className="breadcrumb-item active"
233-
href="/file"
234-
onClick={[Function]}
235-
>
236-
Home
237-
</a>
238-
</ol>
239-
</nav>
240246
<div
241-
className="row"
247+
className="d-flex flex-column h-100 container-fluid"
242248
>
243249
<div
244-
className="col-md-1 col-2"
250+
className="flex-shrink-0"
245251
>
252+
<nav
253+
aria-label="breadcrumb"
254+
>
255+
<ol
256+
className="breadcrumb"
257+
>
258+
<a
259+
className="breadcrumb-item active"
260+
href="/file"
261+
onClick={[Function]}
262+
>
263+
Home
264+
</a>
265+
</ol>
266+
</nav>
246267
<div
247-
className="form-group"
268+
className="row"
248269
>
249270
<div
250-
className="form-check"
271+
className="col-md-1 col-2"
251272
>
252-
<input
253-
checked={false}
254-
className="form-check-input position-static"
255-
disabled={false}
256-
id="formBasicCheckbox"
257-
onChange={[Function]}
258-
type="checkbox"
259-
/>
273+
<div
274+
className="form-group"
275+
>
276+
<div
277+
className="form-check"
278+
>
279+
<input
280+
checked={false}
281+
className="form-check-input position-static"
282+
disabled={false}
283+
id="formBasicCheckbox"
284+
onChange={[Function]}
285+
type="checkbox"
286+
/>
287+
</div>
288+
</div>
289+
</div>
290+
<div
291+
className="text-center col-md-1 col-2"
292+
onClick={[Function]}
293+
>
294+
Type
295+
</div>
296+
<div
297+
className="col-md-1 col-2"
298+
>
299+
Interact
300+
</div>
301+
<div
302+
className="col-md-4 col-6"
303+
onClick={[Function]}
304+
>
305+
Name
306+
</div>
307+
<div
308+
className="col-md-3 col-6"
309+
onClick={[Function]}
310+
>
311+
Last updated by
312+
</div>
313+
<div
314+
className="col-md-1 col-3"
315+
onClick={[Function]}
316+
>
317+
Last changes
318+
</div>
319+
<div
320+
className="col-md-1 col-3"
321+
onClick={[Function]}
322+
>
323+
Size
260324
</div>
261325
</div>
262326
</div>
263327
<div
264-
className="text-center col-md-1 col-2"
265-
onClick={[Function]}
328+
className="overflow-auto flex-grow-1"
266329
>
267-
Type
268-
</div>
269-
<div
270-
className="col-md-1 col-2"
271-
>
272-
Interact
273-
</div>
274-
<div
275-
className="col-md-4 col-6"
276-
onClick={[Function]}
277-
>
278-
Name
279-
</div>
280-
<div
281-
className="col-md-3 col-6"
282-
onClick={[Function]}
283-
>
284-
Last updated by
285-
</div>
286-
<div
287-
className="col-md-1 col-3"
288-
onClick={[Function]}
289-
>
290-
Last changes
291-
</div>
292-
<div
293-
className="col-md-1 col-3"
294-
onClick={[Function]}
295-
>
296-
Size
330+
<div
331+
className="m-0 row"
332+
>
333+
<div
334+
className="text-center col"
335+
>
336+
337+
Nothing to see here.
338+
</div>
339+
</div>
297340
</div>
298341
</div>
299-
<hr />
300-
<div
301-
className="row"
342+
</div>
343+
<div
344+
className="flex-shrink-0"
345+
id="uploadInformation"
346+
/>
347+
</div>
348+
<div
349+
className="flex-shrink-0"
350+
id="uploadZone"
351+
/>
352+
</div>
353+
`;
354+
355+
exports[`Storyshots Footer default 1`] = `
356+
<footer
357+
className="footer mt-autotext-white bg-primary"
358+
>
359+
<div
360+
className="d-flex flex-column justify-content-center p-0 container"
361+
>
362+
<span
363+
className="align-self-center mt-2"
364+
>
365+
<a
366+
className="text-white"
367+
href="https://github.com/filefighter"
302368
>
303-
<div
304-
className="text-center col"
369+
FileFighter 
370+
<img
371+
alt="github logo"
372+
height="16px"
373+
src="github.svg"
374+
/>
375+
</a>
376+
is made with &lt;3 by
377+
</span>
378+
<div
379+
className="d-flex justify-content-around"
380+
>
381+
<span>
382+
<a
383+
className="text-white"
384+
href="https://github.com/Gimleux"
305385
>
306-
Nothing to see here.
307-
</div>
308-
</div>
386+
Gimleux
387+
</a>
388+
</span>
389+
<span>
390+
<a
391+
className="text-white"
392+
href="https://github.com/open-schnick"
393+
>
394+
Open-Schnick
395+
</a>
396+
</span>
397+
<span>
398+
<a
399+
className="text-white"
400+
href="https://github.com/qvalentin"
401+
>
402+
qvalentin
403+
</a>
404+
</span>
309405
</div>
310-
<div />
311406
</div>
312-
</div>
407+
</footer>
313408
`;
314409

315410
exports[`Storyshots Health default 1`] = `

‎src/background/methods/arrays.ts‎ renamed to ‎src/background/methods/dataTypes/arrays.ts‎

File renamed without changes.

‎src/background/methods/bytes.ts‎ renamed to ‎src/background/methods/dataTypes/bytes.ts‎

File renamed without changes.

‎src/background/methods/ObjectKeysTS.ts‎ renamed to ‎src/background/methods/dataTypes/objects/ObjectKeysTS.ts‎

File renamed without changes.

‎src/background/methods/objectEquals.ts‎ renamed to ‎src/background/methods/dataTypes/objects/objectEquals.ts‎

File renamed without changes.

‎src/background/methods/strings.ts‎ renamed to ‎src/background/methods/dataTypes/strings.ts‎

File renamed without changes.

0 commit comments

Comments
 (0)