routes.api: fix get_captcha endpoint (#1135)

[lemmy.git] / ui / src / index.tsx

diff --git a/ui/src/index.tsx b/ui/src/index.tsx
index 677d7678863b57173e11cea72967ca8b0e0b94fa..aa373de4a302bf4dc847677e32339d0307d05ddd 100644 (file)
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -1,64 +1,105 @@
 import { render, Component } from 'inferno';
-import { HashRouter, Route, Switch } from 'inferno-router';
-
+import { BrowserRouter, Route, Switch } from 'inferno-router';
+import { Provider } from 'inferno-i18next';
+import { Main } from './components/main';
 import { Navbar } from './components/navbar';
 import { Footer } from './components/footer';
-import { Home } from './components/home';
 import { Login } from './components/login';
 import { CreatePost } from './components/create-post';
 import { CreateCommunity } from './components/create-community';
+import { CreatePrivateMessage } from './components/create-private-message';
+import { PasswordChange } from './components/password_change';
 import { Post } from './components/post';
 import { Community } from './components/community';
 import { Communities } from './components/communities';
 import { User } from './components/user';
 import { Modlog } from './components/modlog';
 import { Setup } from './components/setup';
+import { AdminSettings } from './components/admin-settings';
 import { Inbox } from './components/inbox';
+import { Search } from './components/search';
+import { Sponsors } from './components/sponsors';
+import { Instances } from './components/instances';
 import { Symbols } from './components/symbols';
-
-import './css/bootstrap.min.css';
-import './css/main.css';
-
-import { WebSocketService, UserService } from './services';
+import { i18n } from './i18next';
 
 const container = document.getElementById('app');
 
 class Index extends Component<any, any> {
-
   constructor(props: any, context: any) {
     super(props, context);
-    WebSocketService.Instance;
-    UserService.Instance;
   }
 
   render() {
     return (
-      <HashRouter>
-        <Navbar />
-        <div class="mt-3 p-0">
-          <Switch>
-            <Route exact path="/" component={Home} />
-            <Route path={`/login`} component={Login} />
-            <Route path={`/create_post`} component={CreatePost} />
-            <Route path={`/create_community`} component={CreateCommunity} />
-            <Route path={`/communities`} component={Communities} />
-            <Route path={`/post/:id/comment/:comment_id`} component={Post} />
-            <Route path={`/post/:id`} component={Post} />
-            <Route path={`/community/:id`} component={Community} />
-            <Route path={`/user/:id/:heading`} component={User} />
-            <Route path={`/user/:id`} component={User} />
-            <Route path={`/inbox`} component={Inbox} />
-            <Route path={`/modlog/community/:community_id`} component={Modlog} />
-            <Route path={`/modlog`} component={Modlog} />
-            <Route path={`/setup`} component={Setup} />
-          </Switch>
-          <Symbols />
-        </div>
-        <Footer />
-      </HashRouter>
+      <Provider i18next={i18n}>
+        <BrowserRouter>
+          <div>
+            <Navbar />
+            <div class="mt-4 p-0 fl-1">
+              <Switch>
+                <Route exact path={`/`} component={Main} />
+                <Route
+                  path={`/home/data_type/:data_type/listing_type/:listing_type/sort/:sort/page/:page`}
+                  component={Main}
+                />
+                <Route path={`/login`} component={Login} />
+                <Route path={`/create_post`} component={CreatePost} />
+                <Route path={`/create_community`} component={CreateCommunity} />
+                <Route
+                  path={`/create_private_message`}
+                  component={CreatePrivateMessage}
+                />
+                <Route
+                  path={`/communities/page/:page`}
+                  component={Communities}
+                />
+                <Route path={`/communities`} component={Communities} />
+                <Route
+                  path={`/post/:id/comment/:comment_id`}
+                  component={Post}
+                />
+                <Route path={`/post/:id`} component={Post} />
+                <Route
+                  path={`/c/:name/data_type/:data_type/sort/:sort/page/:page`}
+                  component={Community}
+                />
+                <Route path={`/community/:id`} component={Community} />
+                <Route path={`/c/:name`} component={Community} />
+                <Route
+                  path={`/u/:username/view/:view/sort/:sort/page/:page`}
+                  component={User}
+                />
+                <Route path={`/user/:id`} component={User} />
+                <Route path={`/u/:username`} component={User} />
+                <Route path={`/inbox`} component={Inbox} />
+                <Route
+                  path={`/modlog/community/:community_id`}
+                  component={Modlog}
+                />
+                <Route path={`/modlog`} component={Modlog} />
+                <Route path={`/setup`} component={Setup} />
+                <Route path={`/admin`} component={AdminSettings} />
+                <Route
+                  path={`/search/q/:q/type/:type/sort/:sort/page/:page`}
+                  component={Search}
+                />
+                <Route path={`/search`} component={Search} />
+                <Route path={`/sponsors`} component={Sponsors} />
+                <Route
+                  path={`/password_change/:token`}
+                  component={PasswordChange}
+                />
+                <Route path={`/instances`} component={Instances} />
+              </Switch>
+              <Symbols />
+            </div>
+            <Footer />
+          </div>
+        </BrowserRouter>
+      </Provider>
     );
   }
-
 }
 
 render(<Index />, container);