Merge branch 'fix-template-and-adjust'

fluencelabs · Feb 27, 2024 · c626d03 · c626d03
2 parents 97d5706 + 2034d4d
commit c626d03
Show file tree

Hide file tree

Showing 91 changed files with 3,608 additions and 3,229 deletions.
diff --git a/web/.github/workflows/tg-bot.yml b/web/.github/workflows/tg-bot.yml
@@ -1,7 +1,6 @@
 name: telegram message
 on: [push]
 jobs:
-
   build:
     name: Build
     runs-on: ubuntu-latest
@@ -14,7 +13,7 @@ jobs:
           message: |
             ${{ github.actor }} created commit:
             Commit message: ${{ github.event.commits[0].message }}
-            
+
             Repository: ${{ github.repository }}
-            
+
             See changes: https://github.com/${{ github.repository }}/commit/${{github.sha}}
diff --git a/web/.prettierrc b/web/.prettierrc
@@ -0,0 +1 @@
+{}
diff --git a/web/README.md b/web/README.md
@@ -1,14 +1,13 @@
+- Landing - 1 - Route "/fluence"
+- Claiming flow 1 - Route "/"
+- Claiming flow 2 - Route "/wallet"
+- Claiming flow 14 - Route "/proof"
+- Claiming flow 8 - Route "/delegation"
+- Claiming flow 9 - Route "/done"
+- Claiming flow 10 - Route "/finish"
+- Claiming flow 11 - Route "/not-found"
+- Claiming flow 12 - Route "/claimed"
 
-
-* Landing - 1  - Route "/fluence"
-* Claiming flow 1  - Route "/"
-* Claiming flow 2  - Route "/wallet"
-* Claiming flow 14  - Route "/proof"
-* Claiming flow 8 - Route "/delegation"
-* Claiming flow 9  - Route "/done"
-* Claiming flow 10  - Route "/finish"
-* Claiming flow 11  - Route "/not-found"
-* Claiming flow 12 - Route "/claimed"
 #
-Deploy on GH Pages - https://nsvdev.github.io/fluence/#/fluence
 
+Deploy on GH Pages - https://nsvdev.github.io/fluence/#/fluence
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -66,6 +66,7 @@
     "http": "npm:stream-http@^3.2.0",
     "https": "npm:https-browserify@^1.0.0",
     "os": "npm:os-browserify@^0.3.0",
+    "prettier": "^3.2.5",
     "stream": "npm:stream-browserify@^3.0.0",
     "url": "^0.11.3",
     "utils": "^0.3.1"

diff --git a/web/public/index.html b/web/public/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/web/src/App.test.js b/web/src/App.test.js
@@ -1,7 +1,7 @@
-import { render, screen } from '@testing-library/react';
-import App from './App';
+import { render, screen } from "@testing-library/react";
+import App from "./App";
 
-test('renders learn react link', () => {
+test("renders learn react link", () => {
   render(<App />);
   const linkElement = screen.getByText(/learn react/i);
   expect(linkElement).toBeInTheDocument();

diff --git a/web/src/components/App/App.css b/web/src/components/App/App.css
@@ -1,6 +1,2 @@
 .App {
-
-
-
 }
-
diff --git a/web/src/components/App/App.js b/web/src/components/App/App.js
@@ -1,21 +1,27 @@
-import { Navigate, Route, Routes, useLocation, useNavigate } from 'react-router-dom';
-import { useDispatch, useSelector } from 'react-redux';
-import { memo, useEffect, useState } from 'react';
+import {
+  Navigate,
+  Route,
+  Routes,
+  useLocation,
+  useNavigate,
+} from "react-router-dom";
+import { useDispatch, useSelector } from "react-redux";
+import { memo, useEffect, useState } from "react";
 
-import './App.css';
-import 'react-toastify/dist/ReactToastify.css';
+import "./App.css";
+import "react-toastify/dist/ReactToastify.css";
 
-import PageBegin from '../../pages/begin-page/begin-page';
-import FirstStepPage from '../../pages/step1-page/step1-page';
-import ProofPage from '../../pages/proof-page/proof-page';
-import DonePage from '../../pages/done-page/done-page';
-import ClaimedPage from '../../pages/claimed-page/claimed-page';
-import AccountNotFound from '../../pages/not-found-account-page/not-found-account-page';
-import FinishPage from '../../pages/finish-page/finish-page';
-import ConnectWallet from '../ConnectWallet/ConnectWallet';
-import { toast, ToastContainer } from 'react-toastify';
-import { useWeb3Connection } from '../../hooks/useWeb3Connection';
-import { reduxCleanup } from '../../store/actions/common';
+import PageBegin from "../../pages/begin-page/begin-page";
+import FirstStepPage from "../../pages/step1-page/step1-page";
+import ProofPage from "../../pages/proof-page/proof-page";
+import DonePage from "../../pages/done-page/done-page";
+import ClaimedPage from "../../pages/claimed-page/claimed-page";
+import AccountNotFound from "../../pages/not-found-account-page/not-found-account-page";
+import FinishPage from "../../pages/finish-page/finish-page";
+import ConnectWallet from "../ConnectWallet/ConnectWallet";
+import { toast, ToastContainer } from "react-toastify";
+import { useWeb3Connection } from "../../hooks/useWeb3Connection";
+import { reduxCleanup } from "../../store/actions/common";
 import {
   ROUTE_CLAIMED,
   ROUTE_CONNECT,
@@ -24,53 +30,54 @@ import {
   ROUTE_INDEX,
   ROUTE_NOT_FOUND,
   ROUTE_PROOF,
-  ROUTE_WALLET
-} from '../../constants/routes'
-import { catchError } from '../../utils';
-import { setCurrentRoute } from '../../store/actions/routes';
-import { fetchCurrentAward, fetchMerkleRoot, fetchNextHalvePeriod } from '../../store/actions/distributor';
-import { useVh } from '../../hooks/useVh';
+  ROUTE_WALLET,
+} from "../../constants/routes";
+import { catchError } from "../../utils";
+import { setCurrentRoute } from "../../store/actions/routes";
+import {
+  fetchCurrentAward,
+  fetchMerkleRoot,
+  fetchNextHalvePeriod,
+} from "../../store/actions/distributor";
+import { useVh } from "../../hooks/useVh";
 
 function App() {
-  const { network, address } = useWeb3Connection()
+  const { network, address } = useWeb3Connection();
 
-  const dispatch = useDispatch()
-  const navigate = useNavigate()
-  const { error } = useSelector(state => state.error)
+  const dispatch = useDispatch();
+  const navigate = useNavigate();
+  const { error } = useSelector((state) => state.error);
   const [prevAddress, setPrevAddress] = useState(null);
-  const { username } = useSelector(state => state.user)
-  const { currentRoute } = useSelector(state => state.routes)
-  const location = useLocation()
-  const [locationPut, setLocationPut] = useState(false)
-  const [merkleRootFetched, setMerkleRootFetched] = useState(false)
+  const { username } = useSelector((state) => state.user);
+  const { currentRoute } = useSelector((state) => state.routes);
+  const location = useLocation();
+  const [locationPut, setLocationPut] = useState(false);
+  const [merkleRootFetched, setMerkleRootFetched] = useState(false);
 
-  useVh()
+  useVh();
   useEffect(() => {
-    if (currentRoute
-        && !locationPut
-        && currentRoute !== location.pathname
-      ) {
-      navigate(currentRoute)
-      setLocationPut(true)
+    if (currentRoute && !locationPut && currentRoute !== location.pathname) {
+      navigate(currentRoute);
+      setLocationPut(true);
     }
-  }, [currentRoute])
+  }, [currentRoute]);
 
   useEffect(() => {
-    console.log("nerwork: " + network.name)
+    console.log("nerwork: " + network.name);
     if (!merkleRootFetched && network?.name && network.name !== "unknown") {
-      dispatch(fetchMerkleRoot(network.name))
-      dispatch(fetchCurrentAward(network.name))
-      dispatch(fetchNextHalvePeriod(network.name))
-      setMerkleRootFetched(true)
-    } 
-  }, [network])
+      dispatch(fetchMerkleRoot(network.name));
+      dispatch(fetchCurrentAward(network.name));
+      dispatch(fetchNextHalvePeriod(network.name));
+      setMerkleRootFetched(true);
+    }
+  }, [network]);
 
   useEffect(() => {
     if (address) {
       if (prevAddress && address !== prevAddress) {
-        dispatch(reduxCleanup())
-        navigate(ROUTE_INDEX)
-        dispatch(setCurrentRoute(ROUTE_INDEX))
+        dispatch(reduxCleanup());
+        navigate(ROUTE_INDEX);
+        dispatch(setCurrentRoute(ROUTE_INDEX));
       } else if (!address && username) {
         navigate(ROUTE_WALLET);
       } else {
@@ -80,34 +87,31 @@ function App() {
   }, [address, prevAddress]);
 
   useEffect(() => {
-    window.scrollTo(0, 0)
-    dispatch(setCurrentRoute(location.pathname))
+    window.scrollTo(0, 0);
+    dispatch(setCurrentRoute(location.pathname));
   }, [location]);
 
   useEffect(() => {
     if (error) {
-      toast(catchError(error, true))
+      toast(catchError(error, true));
     }
-  }, [error])
+  }, [error]);
 
   return (
-      <div className="App">
-        <ToastContainer autoClose={false}/>
-        <Routes>
-          <Route exact path={ROUTE_INDEX} element={<PageBegin/>}/>
-          <Route exact path={ROUTE_WALLET} element={<FirstStepPage/>}/>
-          <Route exact path={ROUTE_CONNECT} element={<ConnectWallet/>}/>
-          <Route exact path={ROUTE_PROOF} element={<ProofPage/>}/>
-          <Route exact path={ROUTE_DONE} element={<DonePage/>}/>
-          <Route exact path={ROUTE_FINISH} element={<FinishPage/>}/>
-          <Route exact path={ROUTE_NOT_FOUND} element={<AccountNotFound/>}/>
-          <Route exact path={ROUTE_CLAIMED} element={<ClaimedPage/>}/>
-          <Route
-              path="*"
-              element={<Navigate to="/"/>}
-          />
-        </Routes>
-      </div>
+    <div className="App">
+      <ToastContainer autoClose={false} />
+      <Routes>
+        <Route exact path={ROUTE_INDEX} element={<PageBegin />} />
+        <Route exact path={ROUTE_WALLET} element={<FirstStepPage />} />
+        <Route exact path={ROUTE_CONNECT} element={<ConnectWallet />} />
+        <Route exact path={ROUTE_PROOF} element={<ProofPage />} />
+        <Route exact path={ROUTE_DONE} element={<DonePage />} />
+        <Route exact path={ROUTE_FINISH} element={<FinishPage />} />
+        <Route exact path={ROUTE_NOT_FOUND} element={<AccountNotFound />} />
+        <Route exact path={ROUTE_CLAIMED} element={<ClaimedPage />} />
+        <Route path="*" element={<Navigate to="/" />} />
+      </Routes>
+    </div>
   );
 }