Merge pull request #89 from supermurat/develop

fix: a link on README
supermurat · Jan 4, 2021 · 4cfbe5e · 4cfbe5e
2 parents 04c8fef + b7e5834
commit 4cfbe5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ MIT
 [lg-bs]: https://raw.githubusercontent.com/supermurat/super-firebase-angular/master/docs/images/browserstack.png "Browser Stack"
 [lg-t-ci]: https://raw.githubusercontent.com/supermurat/super-firebase-angular/master/docs/images/travis-ci.png "Travis-CI"
 [lg-cdc]: https://raw.githubusercontent.com/supermurat/super-firebase-angular/master/docs/images/codacy.png "Codacy"
-[lg-coveralls]: https://raw.githubusercontent.com/supermurat/super-firebase-angular/master/docs/images/coveralls.png "Coveralls"
+[lg-cvr]: https://raw.githubusercontent.com/supermurat/super-firebase-angular/master/docs/images/coveralls.png "Coveralls"
 
 [st-fb]: https://firebase.google.com
 [st-jb]: https://www.jetbrains.com/?from=SuperFirebaseAngular

diff --git a/functions/src/ssr.ts b/functions/src/ssr.ts
@@ -145,13 +145,10 @@ const getSSR = async (req: express.Request, res: express.Response): Promise<void
     new Promise((resolve, reject): void => {
         const locale = getLocale(req);
         const bundle = serverJS[locale];
-        // try to understand what is going on beta
         console.log(
             'getSSR:locale:', `"${locale}"`,
             Object.keys(serverJS).toString(),
-            Object.keys(indexHtml).toString(),
-            req.url.match(/^\/([a-z]{2}(?:-[A-Z]{2})?)\//).join(';'),
-            req.url.match(/^\/([a-z]{2}(?:-[A-Z]{2})?)\//).toString()
+            Object.keys(indexHtml).toString()
         );
         console.log('getSSR:url:', `"${req.url}"`);
         console.log('getSSR:path:', `"${req.path}"`);
@@ -161,10 +158,10 @@ const getSSR = async (req: express.Request, res: express.Response): Promise<void
         }));
 
         app.set('view engine', 'html');
-        app.set('views', path.join(__dirname, '../dist/browser', locale));
+        app.set('views', path.join(__dirname, '../dist/browser'));
 
         res.render(
-            'index',
+            `${locale}/index`,
             {req, res, url: req.path, providers: [
                         {provide: APP_BASE_HREF, useValue: `/${locale}/`},
                         {provide: REQUEST, useValue: req},