LukWebsForge · lukbukkit · May 29, 2021 · May 5, 2021 · May 5, 2021 · May 5, 2021
diff --git a/resources/.gitignore b/resources/.gitignore
@@ -24,3 +24,6 @@ yarn-error.log*
 
 # Custom data.json file for testing
 public/data.json
+
+# Vercel
+.vercel
diff --git a/resources/craco.config.js b/resources/craco.config.js
diff --git a/resources/logo/README.md b/resources/logo/README.md
@@ -0,0 +1,6 @@
+# Favicon
+
+* The SVG image uses the font family [Inter](https://rsms.me/inter/)
+* You can create a `favicon.ico` using [icoconverter.com](https://www.icoconverter.com/)
+
+
diff --git a/resources/logo/favicon.svg b/resources/logo/favicon.svg
diff --git a/resources/package.json b/resources/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "homepage": "./",
   "dependencies": {
-    "@craco/craco": "^6.1.1",
+    "@geist-ui/react": "^2.1.5",
+    "@geist-ui/react-icons": "^1.0.1",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
@@ -13,25 +14,20 @@
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.2",
     "install": "^0.13.0",
+    "inter-ui": "^3.18.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-scripts": "4.0.3",
     "typescript": "^4.2.3",
     "web-vitals": "^1.0.1"
   },
-  "devDependencies": {
-    "@tailwindcss/postcss7-compat": "npm:@tailwindcss/postcss7-compat",
-    "autoprefixer": "^9",
-    "postcss": "^7",
-    "tailwindcss": "npm:@tailwindcss/postcss7-compat"
-  },
   "resolutions": {
     "is-svg": "^4.2.2"
   },
   "scripts": {
-    "start": "craco start",
-    "build": "craco build",
-    "test": "craco test",
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {

diff --git a/resources/public/favicon.ico b/resources/public/favicon.ico
diff --git a/resources/public/favicon192.png b/resources/public/favicon192.png
diff --git a/resources/public/favicon512.png b/resources/public/favicon512.png
diff --git a/resources/public/index.html b/resources/public/index.html
@@ -2,12 +2,19 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="View the translation progress of the tldr project"
     />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

diff --git a/resources/public/manifest.json b/resources/public/manifest.json
@@ -0,0 +1,25 @@
+{
+  "short_name": "tldr i18n",
+  "name": "tldr translation progress",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "favicon192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "favicon512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/resources/src/App.css b/resources/src/App.css
@@ -0,0 +1,15 @@
+body {
+    font-family: 'Inter', sans-serif;
+}
+
+.cursor-pointer {
+    cursor: pointer;
+}
+
+.small-font {
+    font-size: 80%;
+}
+
+.vertical-algin-icons {
+    vertical-align: middle;
+}
diff --git a/resources/src/App.tsx b/resources/src/App.tsx
@@ -1,57 +1,30 @@
-import {DataFetcher, ErrorMessageContext} from "./Data";
-import {DataTable, Footer, JumpList} from "./Table";
 import * as React from "react";
+import {GeistProvider, Page, Text} from "@geist-ui/react";
+import {DataFetcher} from "./Data";
+import {DataTable} from "./Table";
+import {AppLoader} from "./AppLoader";
+import {ErrorMessage} from "./ErrorMessage";
+import {AppFooter} from "./AppFooter";
+import {IconActions} from "./IconActions"
+import 'inter-ui/inter.css'
+import './App.css'
 
 const App = () =>
-    <div className="container mx-auto text-center">
-        <h1 className="font-bold text-4xl m-10">tldr translation progress</h1>
-        <DataFetcher loading={<Loading/>} error={<ErrorMessage/>}>
-            <Legend/>
-            <JumpList/>
-            <DataTable/>
-            <Footer/>
-        </DataFetcher>
-    </div>;
-
-const Legend = () =>
-    <div className="mt-2">
-        <h3 className="text-2xl p-5">Legend</h3>
-        <table className="border-collapse mx-auto">
-            <tbody>
-            <tr>
-                <td className="border-b border-gray-400 px-4 py-2">✔</td>
-                <td className="border-b border-gray-400 px-4 py-2">
-                    translated & same number of entries as the english version
-                </td>
-            </tr>
-            <tr>
-                <td className="border-b border-gray-400 px-4 py-2">⚠</td>
-                <td className="border-b border-gray-400 px-4 py-2">
-                    not up-to-date (different number of entries than the english version)
-                </td>
-            </tr>
-            <tr>
-                <td className="px-4 py-2">✖</td>
-                <td className="px-4 py-2">not translated</td>
-            </tr>
-            </tbody>
-        </table>
-    </div>;
-
-const Loading = () =>
-    <div className="text-3xl text-blue-400">
-        Loading ...
-    </div>;
-
-const ErrorMessage = () => {
-    const error = React.useContext(ErrorMessageContext);
-
-    return (
-        <div className="text-2xl text-red-400">
-            Unable to load the data ): <br/>
-            <div className="text-lg">{error}</div>
-        </div>
-    );
-}
+    <GeistProvider>
+        <Page size='large' style={{minHeight: '1px'}}>
+            <Page.Header>
+                <Text h1>tldr translation progress</Text>
+            </Page.Header>
+            <Page.Content>
+                <DataFetcher loading={<AppLoader/>} error={<ErrorMessage/>}>
+                    <IconActions/>
+                    <DataTable/>
+                </DataFetcher>
+            </Page.Content>
+            <Page.Footer style={{position: 'static'}}>
+                <AppFooter/>
+            </Page.Footer>
+        </Page>
+    </GeistProvider>;
 
 export {App}
diff --git a/resources/src/AppFooter.tsx b/resources/src/AppFooter.tsx
@@ -0,0 +1,11 @@
+import * as React from "react";
+import {Link, Text} from "@geist-ui/react";
+
+const AppFooter = () => {
+    return <Text p>
+        Generated by <Link href="https://github.com/LukWebsForge/TldrProgress" icon> tldr-translation-progress</Link>
+        • Thanks for using this site
+    </Text>;
+}
+
+export {AppFooter}
diff --git a/resources/src/AppLoader.tsx b/resources/src/AppLoader.tsx
@@ -0,0 +1,9 @@
+import * as React from "react";
+import {Loading, Row} from "@geist-ui/react";
+
+const AppLoader = () =>
+    <Row style={{padding: '10px 0'}}>
+        <Loading>Loading</Loading>
+    </Row>;
+
+export {AppLoader}
diff --git a/resources/src/Data.tsx b/resources/src/Data.tsx
@@ -27,8 +27,8 @@ interface TranslationPage {
     status: Record<Language, TranslationStatus>,
 }
 
-const DataContext = React.createContext<TranslationData | null>(null);
-const ErrorMessageContext = React.createContext<string | null>(null);
+const DataContext = React.createContext<{ data: TranslationData | null, error: string | null }>(
+    {data: null, error: null});
 
 // We're using React.ReactElement & React.ReactNode instead of JSX.Element: https://stackoverflow.com/a/47899926/4106848
 type DataFetcherProps = { error: React.ReactElement, loading: React.ReactElement, children: React.ReactNode };
@@ -59,17 +59,17 @@ const DataFetcher = (props: DataFetcherProps) => {
     }, []);
 
     if (error) {
-        return <ErrorMessageContext.Provider value={error}>
+        return <DataContext.Provider value={{data: null, error: error}}>
             {props.error}
-        </ErrorMessageContext.Provider>
+        </DataContext.Provider>
     } else if (!isLoaded) {
         return props.loading
     } else {
-        return <DataContext.Provider value={data}>
+        return <DataContext.Provider value={{data: data, error: null}}>
             {props.children}
         </DataContext.Provider>
     }
 }
 
-export {DataFetcher, DataContext, TranslationStatus, ErrorMessageContext};
-export type {OperatingSystem, Language, PageName};
+export {DataFetcher, DataContext, TranslationStatus};
+export type {TranslationData, OperatingSystem, Language, PageName};