X-Git-Url: http://these/git/?a=blobdiff_plain;f=src%2Fserver%2Findex.tsx;h=fe50e00e46793a0b202a4fedcb28109dc59c57d0;hb=2eee93602687180976ad68de3d5f7a2cc4307cb3;hp=f100c979e18ee90aaa293b98e6ed9779828bee8f;hpb=3125477c7b73515639c3da57ea4657653996f4ad;p=lemmy-ui.git
diff --git a/src/server/index.tsx b/src/server/index.tsx
index f100c97..fe50e00 100644
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -1,28 +1,35 @@
import cookieParser = require('cookie-parser');
-import * as serialize from 'serialize-javascript';
-import * as express from 'express';
+import serialize from 'serialize-javascript';
+import express from 'express';
import { StaticRouter } from 'inferno-router';
import { renderToString } from 'inferno-server';
+import { matchPath } from 'inferno-router';
import path = require('path');
-import App from '../client/components/App/App';
+import { App } from '../shared/components/app';
+import { routes } from '../shared/routes';
+import IsomorphicCookie from 'isomorphic-cookie';
const server = express();
const port = 1234;
server.use(express.json());
server.use(express.urlencoded({ extended: false }));
+server.use('/assets', express.static(path.resolve('./dist/assets')));
server.use('/static', express.static(path.resolve('./dist/client')));
server.use(cookieParser());
server.get('/*', (req, res) => {
+ const activeRoute = routes.find(route => matchPath(req.url, route)) || {};
+ console.log(activeRoute);
const context = {} as any;
const isoData = {
name: 'fishing sux',
};
+ let auth: string = IsomorphicCookie.load('jwt', req);
const wrapper = (
-
+
);
if (context.url) {
@@ -30,17 +37,38 @@ server.get('/*', (req, res) => {
}
res.send(`
-
-
-
- My Universal App
-
-
-
- ${renderToString(wrapper)}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${renderToString(wrapper)}
+
+
+
`);
});
let Server = server.listen(port, () => {