404 Page

src/ui/component/router/view.jsx

@@ -22,6 +22,7 @@ import NavigationHistory from 'page/navigationHistory';
 import TagsPage from 'page/tags';
 import FollowingPage from 'page/following';
 import ListBlocked from 'page/listBlocked';
+import FourOhFourPage from 'page/fourOhFour';
 
 // Tell the browser we are handling scroll restoration
 if ('scrollRestoration' in history) {
@@ -69,6 +70,8 @@ function AppRouter(props: Props) {
       {/* Below need to go at the end to make sure we don't match any of our pages first */}
       <Route path="/:claimName" exact component={ShowPage} />
       <Route path="/:claimName/:streamName" exact component={ShowPage} />
+      <Route path="/*" component={FourOhFourPage} />
+
 
       {/* Route not found. Mostly for people typing crazy urls into the url */}
       <Route render={() => <Redirect to="/" />} />

src/ui/page/fourOhFour/index.js

@@ -0,0 +1,9 @@
+import { connect } from 'react-redux';
+import FourOhFourPage from './view';
+
+const select = state => ({});
+
+export default connect(
+  select,
+  null
+)(FourOhFourPage);

src/ui/page/fourOhFour/view.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import Page from 'component/page';
+import Yrbl from 'component/yrbl';
+
+const FourOhFourPage = () => (
+  <Page notcontained>
+    <div className="main main--empty">
+      <Yrbl type="sad" title={__('404')} subtitle={<p>{__('Page Not Found')}</p>} />
+      <p>{__('Four-Oh-Four-Oh-Four-Oh-Four! Four-Oh-Four!')}</p>
+      <p>{__('Four-Oh-Four, Oh, Four...')}</p>
+      <p>{__('Four-Oh-Four-Oh-Four-Oh-Four, Oh-Four, Oh-Four...')}</p>
+    </div>
+  </Page>
+);
+
+export default FourOhFourPage;

static/locales/en.json

@@ -672,6 +672,7 @@
   "Hindi": "Hindi",
   "Greek": "Greek",
   "Hide": "Hide",
+<<<<<<< HEAD
   "'contentName' should no longer be used. Use 'streamName' instead": "'contentName' should no longer be used. Use 'streamName' instead",
   "Sorry, we can't preview this file.": "Sorry, we can't preview this file.",
   "View File": "View File",
@@ -680,4 +681,30 @@
   "Blocked": "Blocked",
   "Unblock": "Unblock",
   "You have blocked this channel content.": "You have blocked this channel content."
-}
+}
+=======
+  "Network and Data Settings": "Network and Data Settings",
+  "Save all viewed content to your downloads directory": "Save all viewed content to your downloads directory",
+  "Paid content and some file types are saved by default. Changing this setting will not affect previously downloaded content.": "Paid content and some file types are saved by default. Changing this setting will not affect previously downloaded content.",
+  "Save hosting data to help the LBRY network": "Save hosting data to help the LBRY network",
+  "If disabled, LBRY will be very sad and you won't be helping improve the network.": "If disabled, LBRY will be very sad and you won't be helping improve the network.",
+  "Floating video player": "Floating video player",
+  "Keep content playing in the corner when navigating to a different page.": "Keep content playing in the corner when navigating to a different page.",
+  "Blocked Channels": "Blocked Channels",
+  "blocked": "blocked",
+  "channels": "channels",
+  "Manage": "Manage",
+  "Automatic dark mode": "Automatic dark mode",
+  "Hide wallet balance in header": "Hide wallet balance in header",
+  "Max Connections": "Max Connections",
+  "For users with good bandwidth, try a higher value to improve streaming and download speeds. Low bandwidth users may benefit from a lower setting. Default is 4.": "For users with good bandwidth, try a higher value to improve streaming and download speeds. Low bandwidth users may benefit from a lower setting. Default is 4.",
+  "This will clear the application cache. Your wallet will not be affected. Currently, followed tags and blocked channels will be cleared.": "This will clear the application cache. Your wallet will not be affected. Currently, followed tags and blocked channels will be cleared.",
+  "'contentName' should no longer be used. Use 'streamName' instead": "'contentName' should no longer be used. Use 'streamName' instead",
+  "LBRY Download Complete": "LBRY Download Complete",
+  "Sorry, we can't preview this file.": "Sorry, we can't preview this file.",
+  "View File": "View File",
+  "Close": "Close",
+  "Catching up...": "Catching up...",
+  "%s blocks behind": "%s blocks behind"
+}
+>>>>>>> 404 Page