public folder

benjie · benjie · commit 1987263666fa · 2019-10-28T19:08:40.000Z
diff --git a/@app/client/src/pages/_document.tsx b/@app/client/src/pages/_document.tsx
@@ -0,0 +1,31 @@
+import React from "react";
+import Document, {
+  Html,
+  Head,
+  Main,
+  NextScript,
+  DocumentContext,
+} from "next/document";
+
+class MyDocument extends Document {
+  static async getInitialProps(ctx: DocumentContext) {
+    const initialProps = await Document.getInitialProps(ctx);
+    return { ...initialProps };
+  }
+
+  render() {
+    return (
+      <Html>
+        <Head>
+          <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
+        </Head>
+        <body>
+          <Main />
+          <NextScript />
+        </body>
+      </Html>
+    );
+  }
+}
+
+export default MyDocument;
diff --git a/@app/server/public/favicon.ico b/@app/server/public/favicon.ico
diff --git a/@app/server/src/index.ts b/@app/server/src/index.ts
@@ -56,7 +56,7 @@ async function main() {
   await middleware.installSession(app);
   await middleware.installPassport(app);
   await middleware.installLogging(app);
-  // These are our assets: images/etc; served out of the /client/public folder
+  // These are our assets: images/etc; served out of the /@app/server/public folder (if present)
   await middleware.installSharedStatic(app);
   if (isTest || isDev) {
     await middleware.installCypressServerCommand(app);
diff --git a/@app/server/src/middleware/installSharedStatic.ts b/@app/server/src/middleware/installSharedStatic.ts
@@ -1,5 +1,5 @@
 import { static as staticMiddleware, Application } from "express";
 
 export default (app: Application) => {
-  app.use(staticMiddleware(`${__dirname}/../public`));
+  app.use(staticMiddleware(`${__dirname}/../../public`));
 };
