diff --git a/.github/workflows/swarm.yml b/.github/workflows/swarm.yml index 0c0d1dbf..eaba9066 100644 --- a/.github/workflows/swarm.yml +++ b/.github/workflows/swarm.yml @@ -4,8 +4,6 @@ on: push: branches: - master - - development - - staging jobs: build: @@ -15,15 +13,20 @@ jobs: working-directory: . strategy: matrix: - node-version: [18.x] + node-version: [16.x] steps: + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + - name: checkout uses: actions/checkout@v3 - name: Set environment specific variables uses: jnus/json-variables@v1.0 with: - scope: ${{ github.ref_name }} + scope: "swarm" configFile: '.github/workflows/variables.json' secrets: '${{ toJson(secrets.github_token) }}' @@ -62,6 +65,7 @@ jobs: bee-url: ${{ env.SWARM_URL }} dir: ./out index-document: index.html + pin: true timeout: 200000 - name: update feed id: swarm-feed @@ -71,7 +75,7 @@ jobs: with: bee-url: ${{ env.SWARM_URL }} reference: ${{ steps.swarm-upload.outputs.reference }} - topic: consents + topic: theapp signer: ${{ secrets[env.SIGNER] }} - name: get CID id: swarm-cid @@ -88,4 +92,4 @@ jobs: env: TOKEN: '${{ secrets.purge_token }}' run: | - curl -s ${{ env.PURGE_URL }}/deploy/purge?token=${{ secrets.purge_token }} -H "site: app.fairdrive${{ env.DEPLOYMENT }}fairdatasociety.org" -H "uri: " + curl -s ${{ env.PURGE_URL }}/deploy/purge?token=${{ secrets.purge_token }} -H "site: app.fairdrive${{ env.DEPLOYMENT }}io" -H "uri: /" diff --git a/.github/workflows/variables.json b/.github/workflows/variables.json index 672404bd..e1cc6871 100644 --- a/.github/workflows/variables.json +++ b/.github/workflows/variables.json @@ -6,7 +6,8 @@ "Scope": { "Environment": [ "master", - "main" + "main", + "swarm" ] } }, @@ -74,6 +75,15 @@ ] } }, + { + "Name": "NEXT_PUBLIC_FAIRDRIVEHOST", + "Value": "https://app.fairdrive.io", + "Scope": { + "Environment": [ + "swarm" + ] + } + }, { "Name": "NEXT_PUBLIC_FAIRDRIVEHOST", "Value": "https://fairdrive#{DEPLOYMENT}fairdatasociety.org", @@ -91,7 +101,8 @@ "main", "master", "staging", - "development" + "development", + "swarm" ] } }, @@ -103,17 +114,65 @@ { "Name": "NEXT_PUBLIC_CREATE_ACCOUNT_REDIRECT", "Value": "https://create#{DEPLOYMENT}fairdatasociety.org", - "Scope": {} + "Scope": { + "Environment": [ + "main", + "master", + "staging", + "development" + ] + } + }, + { + "Name": "NEXT_PUBLIC_CREATE_ACCOUNT_REDIRECT", + "Value": "https://create.fairdrive.io", + "Scope": { + "Environment": [ + "swarm" + ] + } }, { "Name": "NEXT_PUBLIC_NFT_GENERATOR_URL", "Value": "https://nft#{DEPLOYMENT}fairdatasociety.org", - "Scope": {} + "Scope": { + "Environment": [ + "main", + "master", + "staging", + "development" + ] + } + }, + { + "Name": "NEXT_PUBLIC_NFT_GENERATOR_URL", + "Value": "https://nft.fairdrive.io", + "Scope": { + "Environment": [ + "swarm" + ] + } }, { "Name": "NEXT_PUBLIC_CONSENT_VIEWER", "Value": "https://app.crviewer#{DEPLOYMENT}fairdatasociety.org", - "Scope": {} + "Scope": { + "Environment": [ + "main", + "master", + "staging", + "development" + ] + } + }, + { + "Name": "NEXT_PUBLIC_CONSENT_VIEWER", + "Value": "https://crviewer.fairdrive.org", + "Scope": { + "Environment": [ + "swarm" + ] + } }, { "Name": "NEXT_PUBLIC_BLOCKCHAIN_INFO", diff --git a/docs/CONTACT.md b/docs/CONTACT.md index f33c498e..cd74bcc9 100644 --- a/docs/CONTACT.md +++ b/docs/CONTACT.md @@ -1,11 +1,10 @@ - # Contact Us If you have any questions, concerns, or feedback about Fairdrive, we'd love to hear from you! Here's how you can reach us: ## Discussions -You can join discussions on [GitHub](https://github.com/orgs/fairDataSociety/discussions) +You can join discussions on [GitHub](https://github.com/orgs/fairDataSociety/discussions) ## Social Media @@ -15,11 +14,8 @@ You can also reach out to us on social media: - [GitHub](https://github.com/fairDataSociety) - [Discord](https://discord.com/invite/vw3PmWf2rE) - ## Getting Help -If you need help using Fairdrive, check out our [User Guide](USER-GUIDE.md) and [FAQ](FAQ.md). -Start [here](GETTING-STARTED.md) or see [Design](DESIGN.md), [Functionality](FUNCTIONALITY.md) or [Architecture](ARCHITECTURE.md). +If you need help using Fairdrive, check out our [User Guide](USER-GUIDE.md) and [FAQ](FAQ.md). +Start [here](GETTING-STARTED.md) or see [Design](DESIGN.md), [Functionality](FUNCTIONALITY.md) or [Architecture](ARCHITECTURE.md). Developers can check [Development Instructions](DEVELOPMENT.md). - -If you can't find the answer to your question, feel free to [contact us](CONTACT.md). \ No newline at end of file diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md index 24b15af5..33224430 100644 --- a/docs/GETTING-STARTED.md +++ b/docs/GETTING-STARTED.md @@ -15,13 +15,25 @@ Fairdrive is a web application, so there's no need to install anything on your c ## Creating an Account -To use Fairdrive, you'll need to create an account. Here's how: +To use Fairdrive, you'll need to create an account, or migrate through Metamask. + +Follow these steps to create an account: 1. Go to the Fairdrive website. 2. Click on the "Sign Up" button. 3. Fill out the registration form with your details. 4. Click "Submit" to create your account. +Follow these steps to login with Metamask + +1. Install Metamask extension to Chrome. +2. Go to the Fairdrive website. +3. Click on the connect button in the right header corner. +4. Select Metamask, if you are not logged in currently, please login. +5. Provide a one-time-only password for athentication. +6. Send the neccessary gas fee. +7. When the funding is done, you are able to see the Fairdrive overview section. In this page you will see the migrate button above, to proceed with user credentials for interoperability. + ## Logging In Once you've created your account, you can log in to Fairdrive: @@ -41,8 +53,8 @@ Once you're logged in, you can start using Fairdrive to manage your pods, files, ## Getting Help -If you need help using Fairdrive, check out our [User Guide](USER-GUIDE.md) and [FAQ](FAQ.md). -Start [here](GETTING-STARTED.md) or see [Design](DESIGN.md), [Functionality](FUNCTIONALITY.md) or [Architecture](ARCHITECTURE.md). +If you need help using Fairdrive, check out our [User Guide](USER-GUIDE.md) and [FAQ](FAQ.md). +Start [here](GETTING-STARTED.md) or see [Design](DESIGN.md), [Functionality](FUNCTIONALITY.md) or [Architecture](ARCHITECTURE.md). Developers can check [Development Instructions](DEVELOPMENT.md). If you can't find the answer to your question, feel free to [contact us](CONTACT.md). diff --git a/docs/USER-GUIDE.md b/docs/USER-GUIDE.md index 0a3163fa..917e1c4f 100644 --- a/docs/USER-GUIDE.md +++ b/docs/USER-GUIDE.md @@ -34,13 +34,6 @@ To use Fairdrive, you'll need to create an account using any of below options. H 4. When you finish procedure your FDP account will be ready 5. Login into Fairdrive using your username/password -#### 3. Using Bloosom extension - -1. Make sure you are logged in inside Blossom extension -2. Click Connect -3. Select Blossom -4. Allow Fairdrive full access of your personal storage - ## Logging In **Metamask** account: @@ -49,7 +42,7 @@ To use Fairdrive, you'll need to create an account using any of below options. H 2. Enter passphrase 3. Sign message -**FDP Portable account** to log in to Fairdrive: +**FDP Portable account** (development only) to log in to Fairdrive: 1. Go to the Fairdrive website. 2. Click on the "Log In" button. diff --git a/src/components/Connect/Metamask/MetamaskConnect.tsx b/src/components/Connect/Metamask/MetamaskConnect.tsx index 4a9eef7f..191f85a0 100644 --- a/src/components/Connect/Metamask/MetamaskConnect.tsx +++ b/src/components/Connect/Metamask/MetamaskConnect.tsx @@ -74,7 +74,7 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => { setAddress(wallet.address); setMnemonic(mnemonic); - router.push('/overview'); + router.push('/drive'); } catch (error) { console.error(error); setErrorMessage(String(error.message || error)); diff --git a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx index fcf8f147..18e2fc4a 100644 --- a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx +++ b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx @@ -98,7 +98,7 @@ export default function MetamaskCreateAccount({ await fdpClientRef.current.account.register(request); const wallet = new Wallet(fdpClientRef.current.account.wallet.privateKey); setWallet(wallet); - setFdpStorageType('native'); + setFdpStorageType('native', undefined, undefined, false); setIsLoggedIn(true); setLoginType('username'); setUser(username); diff --git a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx index 997c187d..b0791063 100644 --- a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx +++ b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx @@ -55,7 +55,9 @@ const MetamaskMigrationDialog = ({ if (clickOutside) { return; } - setMetamaskMigrationNotification('closed'); + setMetamaskMigrationNotification( + step === Step.COMPLETE ? 'completed' : 'closed' + ); onClose(); }; diff --git a/src/components/Footers/MainFooter/MainFooter.tsx b/src/components/Footers/MainFooter/MainFooter.tsx index cf1f91ce..ed9d04be 100644 --- a/src/components/Footers/MainFooter/MainFooter.tsx +++ b/src/components/Footers/MainFooter/MainFooter.tsx @@ -27,7 +27,7 @@ const MainFooter: FC = () => { const { intl } = useLocales(); return ( -
+
{ } = useFdpStorage(); const router = useRouter(); const { intl } = useLocales(); + const fdsLoginEnabled = router?.query['fdsLogin'] === 'true'; const onSubmit = async (data: { user_name: string; password: string }) => { try { @@ -68,7 +70,7 @@ const LoginForm: FC = () => { setLoginType('username'); setUser(user_name); setDefaultNetwork(String(network.id)); - router.push('/overview'); + router.push('/drive'); } catch (error) { setErrorMessage(error.message); } finally { @@ -116,10 +118,12 @@ const LoginForm: FC = () => { return (
- +
+ +
{
-
- - - - - - - - - {intl.get('ALLOW_TRACKING')} - - -
-
-
- - {intl.get('REGISTER_NEW_ACCOUNT')} - + {intl.get('ALLOW_TRACKING')} + + +
+
+ + + + ) : ( +
+ + {/* eslint-disable-next-line @typescript-eslint/no-empty-function */} + {}} onError={() => {}} /> +
- + )}
); diff --git a/src/components/Layouts/MainLayout/MainLayout.tsx b/src/components/Layouts/MainLayout/MainLayout.tsx index 54a802f2..3aa7fb29 100644 --- a/src/components/Layouts/MainLayout/MainLayout.tsx +++ b/src/components/Layouts/MainLayout/MainLayout.tsx @@ -49,7 +49,8 @@ const MainLayout: FC = ({
-
+ {/* sm:w-28 */} +
= ({
-
+
diff --git a/src/components/NavigationBars/AuthenticationNavbar/AuthenticationNavbar.tsx b/src/components/NavigationBars/AuthenticationNavbar/AuthenticationNavbar.tsx index ed42efa6..83e35f11 100644 --- a/src/components/NavigationBars/AuthenticationNavbar/AuthenticationNavbar.tsx +++ b/src/components/NavigationBars/AuthenticationNavbar/AuthenticationNavbar.tsx @@ -9,9 +9,12 @@ import ConnectDropdown from '@components/Dropdowns/ConnectDropdown/ConnectDropdo import classes from './AuthenticationNavbar.module.scss'; import { useLocales } from '@context/LocalesContext'; import LanguageDropdown from '@components/Dropdowns/LanguageDropdown/LanguageDropdown'; +import { useRouter } from 'next/router'; const AuthenticationNavbar: FC = () => { const { intl } = useLocales(); + const router = useRouter(); + const fdsLoginEnabled = router?.query['fdsLogin'] === 'true'; return (
{
- - - + {fdsLoginEnabled && ( + + + + )} diff --git a/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.module.scss b/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.module.scss new file mode 100644 index 00000000..4d2c85d3 --- /dev/null +++ b/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.module.scss @@ -0,0 +1,6 @@ +@media (max-width: 440px) { + .DriveActionBarItem { + width: 80px; + font-size: 12px; + } +} diff --git a/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.tsx b/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.tsx index 9bbecf76..c7f9670b 100644 --- a/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.tsx +++ b/src/components/NavigationBars/DriveActionBar/DriveActionBarMobile.tsx @@ -25,6 +25,8 @@ import { useLocales } from '@context/LocalesContext'; import PodContext from '@context/PodContext'; import { getPodName, isSharedPod } from '@utils/pod'; +import classes from './DriveActionBarMobile.module.scss'; + export interface DriveActionBarMobileProps extends UpdateDriveProps { refreshPods?: () => void; } @@ -39,7 +41,7 @@ const DriveActionBarItem = ( ) => { return (
diff --git a/src/components/NavigationBars/MainNavigationBar/MainNavigationBar.tsx b/src/components/NavigationBars/MainNavigationBar/MainNavigationBar.tsx index e7f344e0..1adc50ff 100644 --- a/src/components/NavigationBars/MainNavigationBar/MainNavigationBar.tsx +++ b/src/components/NavigationBars/MainNavigationBar/MainNavigationBar.tsx @@ -33,7 +33,7 @@ const MainNavigationBar: FC> = () => {
- {metamaskMigrationNotification === 'closed' && ( + {/* {metamaskMigrationNotification === 'closed' && (
= ({ {intl.get('MIGRATE_ACCOUNT')}
- )} + )} */}
= ({ setRenderDriveMenu(Boolean(router.pathname === '/drive' && updateDrive)); }, [updateDrive]); + // Moved from NavigationItems, should be removed when the NavigationItems is enabled + useEffect(() => { + if (router.pathname === '/drive') { + driveSideBarToggle(); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + return (
- + /> */} {renderDriveMenu && ( void; fileOnClick: (data: FileItem) => void; } @@ -18,24 +19,44 @@ interface DriveListViewProps extends UpdateDriveProps { const DriveListView: FC = ({ directories, files, + driveSort, directoryOnClick, fileOnClick, updateDrive, }) => { const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(10); - const startIndex = page * rowsPerPage; - const endIndex = startIndex + rowsPerPage; + + const folderLength = directories.length; + const folderStartIndex = Math.min(page * rowsPerPage, folderLength); + const folderEndIndex = Math.min(folderStartIndex + rowsPerPage, folderLength); + + const someFoldersAreDisplayed = folderEndIndex - folderStartIndex > 0; + const fileStartIndex = someFoldersAreDisplayed + ? 0 + : page * rowsPerPage - folderLength; + const fileEndIndex = someFoldersAreDisplayed + ? rowsPerPage - (folderEndIndex - folderStartIndex) + : fileStartIndex + rowsPerPage; const { pageDirectories, pageFiles } = useMemo( () => ({ - pageDirectories: (directories || []).slice(startIndex, endIndex), - pageFiles: (files || []).slice( - startIndex - directories.length, - endIndex - directories.length + pageDirectories: (directories || []).slice( + folderStartIndex, + folderEndIndex ), + pageFiles: (files || []).slice(fileStartIndex, fileEndIndex), }), - [directories, files, startIndex, endIndex] + // eslint-disable-next-line react-hooks/exhaustive-deps + [ + directories, + files, + driveSort, + folderStartIndex, + folderEndIndex, + fileStartIndex, + fileEndIndex, + ] ); const handlePageUp = () => { diff --git a/src/context/FdpStorageContext.tsx b/src/context/FdpStorageContext.tsx index 905244a4..41ef18d3 100644 --- a/src/context/FdpStorageContext.tsx +++ b/src/context/FdpStorageContext.tsx @@ -73,10 +73,11 @@ interface FdpStorageContext { setFdpStorageType: ( type: FDP_STORAGE_TYPE, ensConfig?: FdpContracts.EnsEnvironment, - datahubConfig?: FdpContracts.DataHubEnvironment + datahubConfig?: FdpContracts.DataHubEnvironment, + create?: boolean ) => void; setFdpStorageConfig: ( - config: FdpContracts.EnsEnvironment, + ensConfig: FdpContracts.EnsEnvironment, datahubConfig: FdpContracts.DataHubEnvironment ) => void; setUsername: (username: string) => void; @@ -161,16 +162,20 @@ function FdpStorageProvider(props: FdpStorageContextProps) { const setFdpStorageType = ( type: FDP_STORAGE_TYPE, ensConfig?: FdpContracts.EnsEnvironment, - datahubConfig?: FdpContracts.DataHubEnvironment + datahubConfig?: FdpContracts.DataHubEnvironment, + create = true ) => { - if (type === 'native') { - fdpClientRef.current = createFdpStorage(ensConfig, datahubConfig); - } else if (type === 'blossom') { - // TODO Blossom doesn't support dataHub - fdpClientRef.current = blossom.fdpStorage as unknown as FdpStorage; - } else { - throw new Error('Unknown FDP storage type'); + if (create) { + if (type === 'native') { + fdpClientRef.current = createFdpStorage(ensConfig, datahubConfig); + } else if (type === 'blossom') { + // TODO Blossom doesn't support dataHub + fdpClientRef.current = blossom.fdpStorage as unknown as FdpStorage; + } else { + throw new Error('Unknown FDP storage type'); + } } + setIsLoggedIn(false); setStorageType(type); }; diff --git a/src/data/networks.ts b/src/data/networks.ts index 69c1927e..491ce408 100644 --- a/src/data/networks.ts +++ b/src/data/networks.ts @@ -43,6 +43,12 @@ export const networks: Network[] = [ ensConfig: getEnsEnvironmentConfig(Environments.ARBITRUM_GOERLI), datahubConfig: getDataHubEnvironmentConfig(Environments.ARBITRUM_GOERLI), }, + { + name: 'zkEVM Testnet', + id: Environments.ZKEVM_TESTNET, + chainId: 1442, + config: getEnsEnvironmentConfig(Environments.ZKEVM_TESTNET), + }, ]; if (process.env.NEXT_PUBLIC_ENVIRONMENT !== 'PRODUCTION') { diff --git a/src/locales/de-DE.json b/src/locales/de-DE.json index 67e7cc0d..f81dd918 100644 --- a/src/locales/de-DE.json +++ b/src/locales/de-DE.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Klicken, um die Einladung zu kopieren", "URL_COPIED": "URL kopiert", "URL_HAS_BEEN_COPIED": "Die Einladungs-URL wurde in die Zwischenablage kopiert", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Um die Einrichtung Ihres Kontos abzuschließen, müssen Sie sich für ein FDS-Konto registrieren.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive befindet sich immer noch in der Beta-Phase. Benutzung auf eigene Gefahr.", "COPIED": "Kopiert!", "COPY_ALL": "Alles kopieren", "DOWNLOADED": "Heruntergeladen!", diff --git a/src/locales/en-US.json b/src/locales/en-US.json index 423dfe06..6dba813b 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Click to copy the invite", "URL_COPIED": "URL copied", "URL_HAS_BEEN_COPIED": "The invite URL has been copied to the clipboard", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "To finish setting up your account, you need to sign up for an FDS account.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive is still in Beta. Use at own risk.", "COPIED": "Copied!", "COPY_ALL": "Copy all", "DOWNLOADED": "Downloaded!", diff --git a/src/locales/es-ES.json b/src/locales/es-ES.json index 4a7b88b3..9b2fb76e 100644 --- a/src/locales/es-ES.json +++ b/src/locales/es-ES.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Haga clic para copiar la invitación", "URL_COPIED": "URL copiada", "URL_HAS_BEEN_COPIED": "La URL de la invitación ha sido copiada al portapapeles", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Para terminar de configurar su cuenta, debe registrarse en una cuenta FDS.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive aún está en Beta. Úsalo bajo tu propio riesgo.", "COPIED": "¡Copiado!", "COPY_ALL": "Copiar todo", "DOWNLOADED": "¡Descargado!", diff --git a/src/locales/fr-FR.json b/src/locales/fr-FR.json index e2c36b86..47667eff 100644 --- a/src/locales/fr-FR.json +++ b/src/locales/fr-FR.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Cliquez pour copier l'invitation", "URL_COPIED": "URL copiée", "URL_HAS_BEEN_COPIED": "L'URL de l'invitation a été copiée dans le presse-papiers", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Pour finaliser la configuration de votre compte, vous devez vous inscrire à un compte FDS.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive est toujours en version bêta. Utilisez-le à vos risques et périls.", "COPIED": "Copié !", "COPY_ALL": "Tout copier", "DOWNLOADED": "Téléchargé !", diff --git a/src/locales/hu-HU.json b/src/locales/hu-HU.json index f6436283..863e7f44 100644 --- a/src/locales/hu-HU.json +++ b/src/locales/hu-HU.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Kattints a meghívó másolásához", "URL_COPIED": "URL másolva", "URL_HAS_BEEN_COPIED": "A meghívó URL-je átmásolva a vágólapra", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Ahhoz, hogy befejezd a fiók beállítását, regisztrálnod kell egy FDS fiókot.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "A Fairdrive még mindig béta verzióban van. Használja saját felelősségére.", "COPIED": "Másolva!", "COPY_ALL": "Mindent másol", "DOWNLOADED": "Letöltve!", diff --git a/src/locales/it-IT.json b/src/locales/it-IT.json index a498689a..e03bb202 100644 --- a/src/locales/it-IT.json +++ b/src/locales/it-IT.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Fai clic per copiare l'invito", "URL_COPIED": "URL copiato", "URL_HAS_BEEN_COPIED": "L'URL dell'invito è stato copiato negli appunti", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Per completare la configurazione del tuo account, devi registrarti per un account FDS.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive è ancora in fase Beta. Usare a proprio rischio.", "COPIED": "Copiato!", "COPY_ALL": "Copia tutto", "DOWNLOADED": "Scaricato!", diff --git a/src/locales/ja-JP.json b/src/locales/ja-JP.json index e82ecd3a..9f531625 100644 --- a/src/locales/ja-JP.json +++ b/src/locales/ja-JP.json @@ -101,7 +101,7 @@ "COPY_INVITE": "クリックして招待をコピー", "URL_COPIED": "コピーしました！", "URL_HAS_BEEN_COPIED": "招待URLがクリップボードにコピーされました", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "アカウントの設定を完了するには、FDSアカウントにサインアップする必要があります。", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdriveはまだベータ版です。ご自身のリスクでご利用ください。", "COPIED": "コピーしました！", "COPY_ALL": "すべてをコピー", "DOWNLOADED": "ダウンロードしました！", diff --git a/src/locales/pt-PT.json b/src/locales/pt-PT.json index 31273517..3905d299 100644 --- a/src/locales/pt-PT.json +++ b/src/locales/pt-PT.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Clique para copiar o convite", "URL_COPIED": "URL copiada", "URL_HAS_BEEN_COPIED": "A URL do convite foi copiada para a área de transferência", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Para finalizar a configuração da sua conta, você precisa se inscrever para uma conta FDS.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive ainda está em Beta. Use por sua própria conta e risco.", "COPIED": "Copiado!", "COPY_ALL": "Copiar tudo", "DOWNLOADED": "Baixado!", diff --git a/src/locales/sl-SI.json b/src/locales/sl-SI.json index dd28b9f5..d6cacf8b 100644 --- a/src/locales/sl-SI.json +++ b/src/locales/sl-SI.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Kliknite za kopiranje povabila", "URL_COPIED": "URL kopiran", "URL_HAS_BEEN_COPIED": "URL povabila je bil kopiran v odložišče", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Za dokončanje nastavitve računa se morate prijaviti v račun FDS.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive je še vedno v beta različici. Uporabljajte na lastno odgovornost.", "COPIED": "Kopirano!", "COPY_ALL": "Kopiraj vse", "DOWNLOADED": "Preneseno!", diff --git a/src/locales/sr-LATN.json b/src/locales/sr-LATN.json index cfbdf4ce..5a138be6 100644 --- a/src/locales/sr-LATN.json +++ b/src/locales/sr-LATN.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Kliknite da kopirate pozivnicu", "URL_COPIED": "URL kopiran", "URL_HAS_BEEN_COPIED": "URL pozivnice je kopiran u privremenu memoriju", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Da biste završili podešavanje svog naloga, morate se prijaviti na FDS nalog.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive je i dalje u Beta fazi. Koristite na sopstveni rizik.", "COPIED": "Kopirano!", "COPY_ALL": "Kopiraj sve", "DOWNLOADED": "Preuzeto!", diff --git a/src/locales/tr-TR.json b/src/locales/tr-TR.json index b2058bb1..b3aabc17 100644 --- a/src/locales/tr-TR.json +++ b/src/locales/tr-TR.json @@ -101,7 +101,7 @@ "COPY_INVITE": "Daveti kopyalamak için tıklayın", "URL_COPIED": "Kopyalandı!", "URL_HAS_BEEN_COPIED": "Davet URL'si panoya kopyalandı", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Hesabınızı tamamlamak için bir FDS hesabına kaydolmanız gerekiyor.", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive hala Beta aşamasında. Kullanım kendi sorumluluğunuzdadır.", "COPIED": "Kopyalandı!", "COPY_ALL": "Hepsini kopyala", "DOWNLOADED": "İndirildi!", diff --git a/src/locales/zh.json b/src/locales/zh.json index 9f6757af..11e25df6 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -100,7 +100,7 @@ "COPY_INVITE": "点击复制邀请", "URL_COPIED": "URL 已复制", "URL_HAS_BEEN_COPIED": "邀请 URL 已复制到剪贴板", - "SIGN_UP_FOR_AN_FDS_ACCOUNT": "要完成账户设置，请注册 FDS 账户。", + "SIGN_UP_FOR_AN_FDS_ACCOUNT": "Fairdrive 仍然处于测试阶段。请自行决定使用的风险。", "COPIED": "已复制！", "COPY_ALL": "全部复制", "DOWNLOADED": "已下载！", diff --git a/src/pages/drive/index.tsx b/src/pages/drive/index.tsx index 42fd842c..ce4913e9 100644 --- a/src/pages/drive/index.tsx +++ b/src/pages/drive/index.tsx @@ -420,6 +420,7 @@ const Drive: FC = () => {