Refactor project

README.md

@@ -2,7 +2,7 @@
 
 Fork Explorer let's you see the status of a BIP9-style softfork. It relies on bitcoind and its JSON-RPC server.
 
-<img width="1000" src="fork-explorer-screenshot.png" />
+<img width="1000" src="contrib/fork-explorer-screenshot.png" />
 
 # Build and run
 

api/donate.ts → backend/api/donate.ts

@@ -3,8 +3,8 @@ import { exec, OutputMode } from "https://deno.land/x/exec/mod.ts";
 import { ensureFile } from "https://deno.land/std/fs/mod.ts";
 import { sha256 } from "https://denopkg.com/chiefbiiko/sha256/mod.ts";
 
-import config from "../config/config.ts";
-import { bytesToHexString } from "../utils.ts";
+import config from "../../config/config.ts";
+import { bytesToHexString } from "../../common/utils.ts";
 
 await ensureFile("./addinvoice_payload.json");
 

blocks/index.ts → backend/blocks/index.ts

@@ -1,15 +1,9 @@
 import { getblock, getblockcount, getblockhash, getrawtransaction } from "../jsonrpc/index.ts";
 
-import config from "../config/config.ts";
-import miners from "./miners.ts";
-import { hexToAscii } from "../utils.ts";
-
-export interface IBlock {
-  height: number;
-  signals: boolean | undefined;
-  miner: string | undefined;
-  minerWebsite: string | undefined;
-}
+import config from "../../config/config.ts";
+import miners from "../../common/miners.ts";
+import { hexToAscii } from "../../common/utils.ts";
+import { IBlock } from "../../common/interfaces.ts";
 
 let blocks: IBlock[] = [];
 

jsonrpc/utils.ts → backend/jsonrpc/utils.ts

@@ -1,6 +1,6 @@
 import * as base64 from "https://denopkg.com/chiefbiiko/base64/mod.ts";
 
-import config from "../config/config.ts";
+import config from "../../config/config.ts";
 
 const host = config.bitcoinRpc.server;
 const rpcUser = config.bitcoinRpc.user;

pageviews/index.ts → backend/pageviews/index.ts

@@ -11,8 +11,7 @@ const pageViews: IPageViews = JSON.parse((await Deno.readTextFile("./pageviews.j
 const PageviewsMiddleware: Middleware = async function (_, next) {
   try {
     const date = format(new Date(), "yyyy-MM-dd", {});
-    pageViews[date] = pageViews[date] ?? 0;
-    pageViews[date] = pageViews[date] + 1;
+    pageViews[date] = (pageViews[date] ?? 0) + 1;
     await Deno.writeTextFile("./pageviews.json", JSON.stringify(pageViews, null, 2));
   } catch (e) {
     console.log(e.message);

common/interfaces.ts

@@ -0,0 +1,6 @@
+export interface IBlock {
+  height: number;
+  signals: boolean | undefined;
+  miner: string | undefined;
+  minerWebsite: string | undefined;
+}

frontend/components/Donation.tsx

@@ -4,7 +4,7 @@ import { QRCode } from "https://esm.sh/react-qr-svg";
 import { bech32 } from "https://esm.sh/bech32";
 
 import config from "../back/config/config.ts";
-import { bytesToString } from "../back/utils.ts";
+import { bytesToString } from "../back/common/utils.ts";
 
 export const DonateContainer = styled.div`
   margin: 0 auto 100px;

frontend/components/ProgressBar.tsx

@@ -1,7 +1,6 @@
 import React from "https://esm.sh/react@17.0.2";
 import styled from "https://esm.sh/styled-components";
 
-import config from "../back/config/config.ts";
 import { useStoreState } from "../state/index.ts";
 
 export const DonateContainer = styled.div`

frontend/pages/index.tsx

@@ -2,7 +2,6 @@ import React from "https://esm.sh/react@17.0.2";
 import styled from "https://esm.sh/styled-components";
 
 import config from "../back/config/config.ts";
-
 import { Container } from "../components/Container.ts";
 import { Content } from "../components/Content.ts";
 import { BlockContainer, Block } from "../components/Block.tsx";

frontend/pages/miners.tsx

@@ -2,7 +2,6 @@ import React, { useMemo } from "https://esm.sh/react@17.0.2";
 import styled from "https://esm.sh/styled-components";
 
 import config from "../back/config/config.ts";
-
 import { Container } from "../components/Container.ts";
 import { Content } from "../components/Content.ts";
 import SiteTitle from "../components/SiteTitle.tsx";

frontend/state/index.ts

@@ -1,7 +1,7 @@
 import { action, Action, createStore, createTypedHooks, thunk, Thunk } from "https://esm.sh/easy-peasy";
 
-import { IBlock } from "../back/blocks/index.ts";
 import config from "../back/config/config.ts";
+import { IBlock } from "../back/common/interfaces.ts";
 
 export interface IStoreModel {
   getBlocks: Thunk<IStoreModel>;

index.ts

@@ -1,8 +1,8 @@
-import { Application, send } from "https://deno.land/x/oak@v7.3.0/mod.ts";
+import { Application } from "https://deno.land/x/oak@v7.3.0/mod.ts";
 
 import config from "./config/config.ts";
-import router from "./api/index.ts";
-import { bootstrapBlocks } from "./blocks/index.ts";
+import router from "./backend/api/index.ts";
+import { bootstrapBlocks } from "./backend/blocks/index.ts";
 
 bootstrapBlocks();