From 047336f0ba7b4dd40d33f6ce2f0c118c70c1f46c Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Wed, 21 Feb 2024 13:50:09 -0300 Subject: [PATCH 01/10] chore: add deprecated anymore. --- .../Core/components/DeprecatedAlert.tsx | 24 +++++++++++++++++++ .../src/systems/Core/components/Layout.tsx | 2 ++ .../app/src/systems/Core/styles/scrollbar.css | 20 ++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 packages/app/src/systems/Core/components/DeprecatedAlert.tsx create mode 100644 packages/app/src/systems/Core/styles/scrollbar.css diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx new file mode 100644 index 00000000..52cf41c9 --- /dev/null +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -0,0 +1,24 @@ +import { Alert, Link } from '@fuel-ui/react'; + +export function DeprecatedAlert() { + return ( + + + This Portal website is not functional anymore. +
+ It has been migrated to:  + + https://app.fuel.network + + + + ); +} diff --git a/packages/app/src/systems/Core/components/Layout.tsx b/packages/app/src/systems/Core/components/Layout.tsx index cfdeda76..b69e55a0 100644 --- a/packages/app/src/systems/Core/components/Layout.tsx +++ b/packages/app/src/systems/Core/components/Layout.tsx @@ -8,6 +8,7 @@ import { OverlayDialog } from '~/systems/Overlay'; import { coreStyles } from '../styles'; +import { DeprecatedAlert } from './DeprecatedAlert'; import { Header } from './Header'; type ContentProps = { @@ -57,6 +58,7 @@ export const Layout: LayoutComponent = ({ title, children }: LayoutProps) => {
+ {children} diff --git a/packages/app/src/systems/Core/styles/scrollbar.css b/packages/app/src/systems/Core/styles/scrollbar.css new file mode 100644 index 00000000..ad5beb20 --- /dev/null +++ b/packages/app/src/systems/Core/styles/scrollbar.css @@ -0,0 +1,20 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer base { + .custom-scrollbar { + &::-webkit-scrollbar { + @apply w-[14px] bg-transparent; + } + &::-webkit-scrollbar-track { + @apply bg-transparent; + } + &::-webkit-scrollbar-thumb { + @apply bg-gray-8 opacity-50 border-4 border-transparent rounded-3xl bg-clip-content-box; + } + &::-webkit-scrollbar-thumb:hover { + @apply bg-gray-10; + } + } +} From df29d6ddf14beda3c04fdef0bb717ee50d26a5df Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Wed, 21 Feb 2024 13:52:08 -0300 Subject: [PATCH 02/10] chore --- .../app/src/systems/Core/components/DeprecatedAlert.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx index 52cf41c9..e547d9a3 100644 --- a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -12,9 +12,11 @@ export function DeprecatedAlert() { }} > - This Portal website is not functional anymore. + This Portal website is not functional anymore and will be shut down + completely soon.
- It has been migrated to:  +
+ Check the new version of Fuel Portal here:   https://app.fuel.network From 32eb8f659d335c47125d8f390bff56e16a034e2e Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Wed, 21 Feb 2024 13:55:21 -0300 Subject: [PATCH 03/10] chore: update PR tests --- .github/workflows/pr-tests.yml | 50 +++++++++++++++++----------------- .github/workflows/pr.yaml | 50 +++++++++++++++++----------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 6b3a8a5f..0d8759e2 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -11,39 +11,39 @@ concurrency: jobs: tests-e2e: - name: E2E Tests + name: E2E Tests (Disabled) runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup Node - uses: FuelLabs/github-actions/setups/node@master + # - name: Setup Node + # uses: FuelLabs/github-actions/setups/node@master - - name: Setup Docker - uses: FuelLabs/github-actions/setups/docker@master - with: - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + # - name: Setup Docker + # uses: FuelLabs/github-actions/setups/docker@master + # with: + # username: ${{ github.repository_owner }} + # password: ${{ secrets.GITHUB_TOKEN }} - - name: Start Test Node - run: pnpm node:start + # - name: Start Test Node + # run: pnpm node:start - # E2E tests running with Playwright - - name: Install Playwright Browsers - run: pnpm exec playwright install --with-deps chromium + # # E2E tests running with Playwright + # - name: Install Playwright Browsers + # run: pnpm exec playwright install --with-deps chromium - - name: Run E2E Tests - run: xvfb-run --auto-servernum -- pnpm test:all - env: - NODE_ENV: test + # - name: Run E2E Tests + # run: xvfb-run --auto-servernum -- pnpm test:all + # env: + # NODE_ENV: test - - uses: actions/upload-artifact@v2 - if: always() - with: - name: playwright-report - path: packages/app/playwright-report/ - retention-days: 30 + # - uses: actions/upload-artifact@v2 + # if: always() + # with: + # name: playwright-report + # path: packages/app/playwright-report/ + # retention-days: 30 - - name: Stop Test Node - run: pnpm node:stop + # - name: Stop Test Node + # run: pnpm node:stop diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index fc177224..7f30e4d3 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,34 +17,34 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - audit: - name: Audit - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: FuelLabs/github-actions/setups/node@master - env: - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - - run: pnpm audit --prod + # audit: + # name: Audit + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - uses: FuelLabs/github-actions/setups/node@master + # env: + # PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 + # - run: pnpm audit --prod - lint: - name: Lint - runs-on: ubuntu-latest - permissions: - checks: write - pull-requests: write - contents: write - steps: - - name: Checkout - uses: actions/checkout@v3 + # lint: + # name: Lint + # runs-on: ubuntu-latest + # permissions: + # checks: write + # pull-requests: write + # contents: write + # steps: + # - name: Checkout + # uses: actions/checkout@v3 - - name: Setup Node - uses: FuelLabs/github-actions/setups/node@master + # - name: Setup Node + # uses: FuelLabs/github-actions/setups/node@master - - name: Run lint - run: | - pnpm ts:check - pnpm lint + # - name: Run lint + # run: | + # pnpm ts:check + # pnpm lint build: name: Build From 5880ef09bc0637e2a1b9cbfce16122e4ada9bb6e Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Wed, 21 Feb 2024 14:00:31 -0300 Subject: [PATCH 04/10] chore --- packages/app/src/systems/Core/components/DeprecatedAlert.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx index e547d9a3..9e8ccc8c 100644 --- a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -15,7 +15,6 @@ export function DeprecatedAlert() { This Portal website is not functional anymore and will be shut down completely soon.
-
Check the new version of Fuel Portal here:   https://app.fuel.network From 2208e873937c9ae0bd41baf2b74ec71fa4740901 Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Wed, 21 Feb 2024 14:49:56 -0300 Subject: [PATCH 05/10] chore: up0date ui --- .../Core/components/DeprecatedAlert.tsx | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx index 9e8ccc8c..f11c1d15 100644 --- a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -2,23 +2,16 @@ import { Alert, Link } from '@fuel-ui/react'; export function DeprecatedAlert() { return ( - + - This Portal website is not functional anymore and will be shut down - completely soon. -
- Check the new version of Fuel Portal here:   + This app is compatible only with the beta-4 network and Fuel Wallet + version 0.13.2. For newer versions access:   https://app.fuel.network +
+
+ This app will be shutdown in on March 1st. ); From f10dc6b0b2190f6fbafe150e57cf1b2a7b77e02f Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Wed, 21 Feb 2024 20:22:59 -0300 Subject: [PATCH 06/10] chore --- .../app/src/systems/Core/components/DeprecatedAlert.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx index f11c1d15..30843edd 100644 --- a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -2,7 +2,13 @@ import { Alert, Link } from '@fuel-ui/react'; export function DeprecatedAlert() { return ( - + This app is compatible only with the beta-4 network and Fuel Wallet version 0.13.2. For newer versions access:   From bcc26deeced3776fb82081b173f8020ae0689c4d Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Thu, 22 Feb 2024 01:58:09 -0300 Subject: [PATCH 07/10] chore: link --- .../Core/components/DeprecatedAlert.tsx | 66 +++++++++++++------ 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx index 30843edd..dc45884a 100644 --- a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -1,24 +1,52 @@ -import { Alert, Link } from '@fuel-ui/react'; +import { Box, Flex, Icon, Link, Text } from '@fuel-ui/react'; export function DeprecatedAlert() { return ( - - - This app is compatible only with the beta-4 network and Fuel Wallet - version 0.13.2. For newer versions access:   - - https://app.fuel.network - -
-
- This app will be shutdown in on March 1st. - - + <> + + + + + + + + This app is compatible only with the beta-4 network and Fuel + Wallet version 0.13.2. For newer versions access:   + + https://app.fuel.network + +
+
+ This app will be shutdown in on March 1st. + + + + + ); } From 35ad31f0f153e62623fd4af1cc75544a0f7d36ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luiz=20Est=C3=A1cio=20=7C=20stacio=2Eeth?= Date: Thu, 22 Feb 2024 02:17:45 -0300 Subject: [PATCH 08/10] Update packages/app/src/systems/Core/components/DeprecatedAlert.tsx --- packages/app/src/systems/Core/components/DeprecatedAlert.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx index dc45884a..ad95fc4d 100644 --- a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -40,8 +40,6 @@ export function DeprecatedAlert() { > https://app.fuel.network -
-
This app will be shutdown in on March 1st. From 5c6bd784029357dbafb64ae3e755cee032594bc6 Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Thu, 22 Feb 2024 02:19:40 -0300 Subject: [PATCH 09/10] chore --- packages/app/src/systems/Core/components/DeprecatedAlert.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx index dc45884a..4ea7bde1 100644 --- a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -41,7 +41,6 @@ export function DeprecatedAlert() { https://app.fuel.network
-
This app will be shutdown in on March 1st. From 89b18d9d275f58f01283bd7f993f888deb9d3fea Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Thu, 22 Feb 2024 02:59:22 -0300 Subject: [PATCH 10/10] chore: colors --- .../app/src/systems/Core/components/DeprecatedAlert.tsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx index e41e4604..8a501ac1 100644 --- a/packages/app/src/systems/Core/components/DeprecatedAlert.tsx +++ b/packages/app/src/systems/Core/components/DeprecatedAlert.tsx @@ -1,11 +1,9 @@ import { Box, Flex, Icon, Link, Text } from '@fuel-ui/react'; -import { useTheme } from '~/systems/Settings'; export function DeprecatedAlert() { - const theme = useTheme(); const colors = { - backgroundColor: theme.theme === 'dark' ? '#2a2008' : '#fffab8', - color: theme.theme === 'dark' ? '#f5e147' : '#a06e00', + backgroundColor: '#fffab8', + color: '#a06e00', }; return ( @@ -43,7 +41,7 @@ export function DeprecatedAlert() { https://app.fuel.network