Skip to content

Commit

Permalink
Merge dev to epic/files-billing (#1525)
Browse files Browse the repository at this point in the history
* [Storage] Copy cid functionality (#1437)

* Copy features added, overflow issue still present

* Swapped to button

* lingui extract

* Updated button

* lingui extract

* Apply suggestions from code review

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Fixed size

* lingui extract

* minmax

* lingui extract

* revert unrelated changes

* lingui extract

* Apply suggestions from code review

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>
Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>
Co-authored-by: Thibaut Sardan <github@thib.top>

* [STORAGE] Rename file in bucket (#1471)

* formik submit not firing

* fix mobile

* lingui extract

* Update packages/storage-ui/src/Components/Modules/FileSystemItem/FileSystemTableItem.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* make eslint :)

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* 10min timeout for everyone (#1472)

* Translated using Weblate (French) (#1478)

Currently translated at 100.0% (262 of 262 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>

* add ui tests for search (#1479)

* bump cypress to v8.3.1 (#1480)

* Sharing feature explainer (#1477)

* refactor modal

* steps logic

* image centered

* lingui extract

* lingui extract

* typo

* refactor with hook, change icon, ad to share menu

* nits

* fix storage building

Co-authored-by: GitHub Actions <actions@github.com>

* Adding multi selects on mobile view with long press (#1470)

* using long press

* dragg preview problems

* typos

* events almost ready

* resets

* long press options

* long press updates

* formats

* dark mode colors

* added hover with breakpoints

* lingui extract

* Apply suggestions from code review

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* curly spacing

* borders

* clicks proper placement

* reverted linting

* removed preview on mobile

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* bump to 1.18.5 (#1493)

* [Files] - New survey - Discord link and tiny fix (#1487)

* a nice mix of things

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>

* Translations update from Weblate (#1496)

* Translated using Weblate (French)

Currently translated at 100.0% (266 of 266 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/

* Translated using Weblate (German)

Currently translated at 73.3% (195 of 266 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/de/

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>

* update axios (#1498)

* Added docs link (#1497)

* Added doc link

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>

* upgrade (#1501)

* Published (#1503)

Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>

* Add ui tests for file preview (#1489)

* Toasts refactor (#1495)

* Toast content ready

* toast animations

* toasts before relative positioning

* component ready, start integration

* normal notifications ready

* downloads ready

* toasts ready

* toasts inn storage

* Toasts refactor okk

* lingui extract

* minor changes

* Update packages/common-components/src/index.ts

Co-authored-by: Ryan Noble <ryanjnoble@gmail.com>

* translates

* post merge updates

* translates update

* progress and overrides

* updates in lock file

* updates ready

* lingui extract

* removing dark theme from storage and gaming

* Update packages/common-components/src/Toasts/types.ts

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/common-components/src/stories/Toasts.stories.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/common-components/src/stories/Toasts.stories.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* toasts types

* missed type updates

* update element identifier for toast

* Update packages/common-components/src/stories/Toasts.stories.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContent.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* download error messages

* Update packages/common-components/src/Toasts/types.ts

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/files-ui/src/Components/Modules/FileBrowsers/CSFFileBrowser.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/files-ui/src/Components/Modules/FileBrowsers/SharedFileBrowser.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* lingui extract

* Update packages/files-ui/src/App.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* storybooks update

* using usref (#1513)

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Ryan Noble <ryanjnoble@gmail.com>
Co-authored-by: Michael Yankelev <myankelev@gmail.com>
Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>
Co-authored-by: Andrew Snaith <andrew@chainsafe.io>
Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Progress cancellations (#1500)

* Toast content ready

* toast animations

* toasts before relative positioning

* component ready, start integration

* normal notifications ready

* downloads ready

* toasts ready

* toasts inn storage

* Toasts refactor okk

* lingui extract

* minor changes

* Update packages/common-components/src/index.ts

Co-authored-by: Ryan Noble <ryanjnoble@gmail.com>

* translates

* post merge updates

* translates update

* progress and overrides

* updates in lock file

* updates ready

* lingui extract

* removing dark theme from storage and gaming

* Update packages/common-components/src/Toasts/types.ts

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/common-components/src/stories/Toasts.stories.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/common-components/src/stories/Toasts.stories.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>

* toasts types

* missed type updates

* uploads ready

* uploads ready

* lingui extract

* update element identifier for toast

* cancel source tokens

* toasts added

* Update packages/common-components/src/stories/Toasts.stories.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContent.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/common-components/src/Toasts/ToastContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* download error messages

* Update packages/common-components/src/Toasts/types.ts

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/files-ui/src/Components/Modules/FileBrowsers/CSFFileBrowser.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/files-ui/src/Components/Modules/FileBrowsers/SharedFileBrowser.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* lingui extract

* resolved errors and lints

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* Update packages/files-ui/src/Contexts/FilesContext.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* added closabble states

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Ryan Noble <ryanjnoble@gmail.com>
Co-authored-by: Michael Yankelev <myankelev@gmail.com>
Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>
Co-authored-by: Andrew Snaith <andrew@chainsafe.io>
Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* survey banner on safari fix (#1512)

* banner fix

* Update packages/files-ui/src/Components/SurveyBanner.tsx

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>

* fix what I broke (#1518)

Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>

* Change the survey to a call for a user interview (#1517)

* change fore a user interview call

* lingui extract

* Apply suggestions from code review

Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com>

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com>

* bump cypress to v8.4 (#1521)

* Translations update from Weblate (#1522)

* Translated using Weblate (French)

Currently translated at 100.0% (271 of 271 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/

* Translated using Weblate (German)

Currently translated at 71.9% (195 of 271 strings)

Translation: ChainSafe Files/Chainsafe Files user interface
Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/de/

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>

* Adjusting login screen sizes. (#1519)

* login screen sizes

* check for instanceof Error

Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Co-authored-by: Thibaut Sardan <github@thib.top>

* merge dev and fix conflicts

* Revert "merge dev and fix conflicts"

This reverts commit 6d7c91c.

Co-authored-by: Ryan Noble <ryanjnoble@gmail.com>
Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>
Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com>
Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com>
Co-authored-by: Michael Yankelev <myankelev@gmail.com>
Co-authored-by: Andrew Snaith <andrew@chainsafe.io>
  • Loading branch information
10 people committed Sep 15, 2021
1 parent 44458cb commit 0339e57
Show file tree
Hide file tree
Showing 68 changed files with 2,257 additions and 1,884 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ storybook-static
.DS_Store

# test artifacts
packages/files-ui/cypress/downloads/*
packages/files-ui/cypress/screenshots/*
packages/files-ui/cypress/videos/*
packages/files-ui/cypress/fixtures/storage
packages/storage-ui/cypress/downloads/*
packages/storage-ui/cypress/screenshots/*
packages/storage-ui/cypress/videos/*
packages/storage-ui/cypress/fixtures/storage
18 changes: 13 additions & 5 deletions packages/common-components/.storybook/contexts.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createTheme, ThemeProvider } from "@chainsafe/common-theme"
import { createTheme, ThemeSwitcher } from "@chainsafe/common-theme"

const lightTheme = createTheme()
const darkTheme = createTheme()
Expand All @@ -7,11 +7,19 @@ export const contexts = [
{
icon: "box", // a icon displayed in the Storybook toolbar to control contextual props
title: "Themes", // an unique name of a contextual environment
components: [ThemeProvider],
components: [ThemeSwitcher],
params: [
// an array of params contains a set of predefined `props` for `components`
{ name: "Light Theme", props: { theme: lightTheme } },
{ name: "Dark Theme", props: { theme: darkTheme } },
{ name: "Light Theme",
props: {
themes: [lightTheme]
}
},
{ name: "Dark Theme",
props: {
themes: [darkTheme]
}
},
],
options: {
deep: true,
Expand All @@ -20,4 +28,4 @@ export const contexts = [
},
},
/* ... */ // multiple contexts setups are supported
]
]
2 changes: 1 addition & 1 deletion packages/common-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@chainsafe/common-components",
"version": "1.0.30",
"version": "1.0.31",
"description": "Chainsafe Common React Components",
"author": "Chainsafe Products Team",
"license": "GPL-3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/common-components/src/Icons/svgs/close-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/common-components/src/Icons/svgs/cross.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 0 additions & 58 deletions packages/common-components/src/Toaster/ToastContainer.tsx

This file was deleted.

146 changes: 0 additions & 146 deletions packages/common-components/src/Toaster/Toaster.tsx

This file was deleted.

51 changes: 0 additions & 51 deletions packages/common-components/src/Toaster/ToasterContent.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions packages/common-components/src/Toaster/ToasterProvider.tsx

This file was deleted.

35 changes: 0 additions & 35 deletions packages/common-components/src/Toaster/ToasterWrapper.tsx

This file was deleted.

5 changes: 0 additions & 5 deletions packages/common-components/src/Toaster/index.ts

This file was deleted.

Loading

0 comments on commit 0339e57

Please sign in to comment.