From 73c6dc3ee8a6ccd9f3e01a2ad7fa4eeb241328fe Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 24 Aug 2019 20:18:49 -0500
Subject: [PATCH] add routing

---
 src/FilterLists.Web.V2/package-lock.json      | Bin 557772 -> 562449 bytes
 src/FilterLists.Web.V2/package.json           |   2 +
 src/FilterLists.Web.V2/src/App.tsx            |  41 +++++++++++-------
 .../allListsTable/AllListsTable.tsx           |   1 -
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/FilterLists.Web.V2/package-lock.json b/src/FilterLists.Web.V2/package-lock.json
index 6105aad3b263092c1dec64a119a368c21c84bf12..1f6d43ece995aaf730ab3f40acbce16fb81f4419 100644
GIT binary patch
delta 2365
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
Xy`yjwrEoqT4UNn#+eth!b-nW+aVHxi

delta 103
zcmV-t0GR)gsv^vVBCrbjll{>cmu@)(7?<C(1u~Ox_6L)l{0)=e{s@=NIRqWEru%XX
zhZqY1hZqY2w-^fpq{@e$*8{hn*944Mht4qtx6UyJD5kfa-Ubstx4s?+qr<mr<OelE
Jx1T2na&3PwEj0iD

diff --git a/src/FilterLists.Web.V2/package.json b/src/FilterLists.Web.V2/package.json
index d7d16ac3d..b5f9fb383 100644
--- a/src/FilterLists.Web.V2/package.json
+++ b/src/FilterLists.Web.V2/package.json
@@ -7,12 +7,14 @@
     "@types/node": "^12.7.2",
     "@types/react": "^16.9.2",
     "@types/react-dom": "^16.9.0",
+    "@types/react-router-dom": "^4.3.5",
     "antd": "^3.22.0",
     "babel-plugin-import": "^1.12.0",
     "customize-cra": "^0.5.0",
     "react": "^16.9.0",
     "react-app-rewired": "^2.1.3",
     "react-dom": "^16.9.0",
+    "react-router-dom": "^5.0.1",
     "react-scripts": "^3.1.1",
     "typescript": "3.5.3"
   },
diff --git a/src/FilterLists.Web.V2/src/App.tsx b/src/FilterLists.Web.V2/src/App.tsx
index dbd1fff01..335b8162c 100644
--- a/src/FilterLists.Web.V2/src/App.tsx
+++ b/src/FilterLists.Web.V2/src/App.tsx
@@ -1,25 +1,31 @@
 import { Layout, Menu } from 'antd';
 import React from 'react';
+import { BrowserRouter, Route, RouteComponentProps, Switch } from 'react-router-dom';
 
 import { AllListsTable } from './components';
 
 const { Header, Content, Footer } = Layout;
 
 export const App: React.FC = () =>
-  <Layout>
-    <Header>
-      <Logo />
-      <Menu theme="dark" mode="horizontal" style={{ lineHeight: '64px' }} />
-    </Header>
-    <Content>
-      <div style={{ background: '#fff', paddingLeft: 12, paddingTop: 12, paddingRight: 12, minHeight: 280 }}>
-        <AllListsTable />
-      </div>
-    </Content>
-    <Footer style={{ textAlign: 'center' }}>
-      <CopyrightAuthor /> | <Community /> | <GitHub /> | <Api /> | <Donate />
-    </Footer>
-  </Layout>;
+  <BrowserRouter>
+    <Layout>
+      <Header>
+        <Logo />
+        <Menu theme="dark" mode="horizontal" style={{ lineHeight: '64px' }} />
+      </Header>
+      <Content>
+        <div style={{ background: '#fff', paddingLeft: 12, paddingTop: 12, paddingRight: 12, minHeight: 280 }}>
+          <Switch>
+            <Route path="/" exact component={AllListsTable} />
+            <Route component={NotFound} />
+          </Switch>
+        </div>
+      </Content>
+      <Footer style={{ textAlign: 'center' }}>
+        <CopyrightAuthor /> | <Community /> | <GitHub /> | <Api /> | <Donate />
+      </Footer>
+    </Layout>
+  </BrowserRouter>;
 
 const Logo = (): JSX.Element =>
   <img src="logo_filterlists.png"
@@ -62,4 +68,9 @@ const Donate = (): JSX.Element =>
     title="Donate to FilterLists with Beerpay"
     target="_blank" rel="noopener noreferrer">
     Donate
-    </a>;
\ No newline at end of file
+    </a>;
+
+const NotFound = (props: RouteComponentProps) =>
+  <h2>
+    404 Not Found: <code>{props.location.pathname}</code>
+  </h2>;
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.tsx b/src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.tsx
index 17017b9d6..5e8ef4b0e 100644
--- a/src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.tsx
+++ b/src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.tsx
@@ -118,7 +118,6 @@ export class AllListsTable extends React.Component<{}, State> {
               : null} />
         <Table.Column<List> title="Details"
           dataIndex={nameof<List>("viewUrl")}
-          width={123}
           className={styles.nogrow}
           fixed={this.state.isNarrowWindow ? undefined : "right"}
           render={(_text: string, record: List) => <ListDetails list={record} />} />