Merge pull request #9 from neonexus/master

neonexus · web-flow · commit d447b4424699 · 2020-08-26T15:50:48.000-05:00
Removed need for use of EJS when serving React apps.
diff --git a/.idea/runConfigurations/Build.xml b/.idea/runConfigurations/Build.xml
diff --git a/.idea/runConfigurations/Build_DEV.xml b/.idea/runConfigurations/Build_DEV.xml
diff --git a/assets/entry_template.html b/assets/entry_template.html
@@ -11,7 +11,7 @@
     <body>
         <div id="root">
             <div style="text-align: center; margin-top: 100px;">
-                Please wait...
+                LOADING...
             </div>
         </div>
     </body>
diff --git a/assets/src/Main/Main.jsx b/assets/src/Main/Main.jsx
@@ -1,9 +1,13 @@
 import React from 'react';
 import {Button, Container} from 'react-bootstrap';
+import img from '../../images/sails-logo.png';
 
 function Main() {
     return (
         <Container id="main-wrapper" style={{paddingTop: '50px'}}>
+            <div className="text-center">
+                <img src={img} alt="Sails Logo" />
+            </div>
             <h1>Main "application"</h1>
             <div>The marketing site, if you will.</div>
             <br />
diff --git a/assets/webapp_entry_template.html b/assets/webapp_entry_template.html
@@ -11,7 +11,7 @@
     <body>
         <div id="root">
             <div style="text-align: center; margin-top: 100px;">
-                Please wait...
+                LOADING...
             </div>
         </div>
     </body>
diff --git a/config/routes.js b/config/routes.js
@@ -38,7 +38,7 @@ module.exports.routes = {
                 if (fs.existsSync(pathToCheck)) {
                     await sails.helpers.finalizeRequestLog(req, res, {body: 'view'});
 
-                    return res.view('pages/homepage', {appToLoad: parts[1]});
+                    return res.type('html').send(fs.readFileSync(pathToCheck));
                 }
 
                 res.status(404);
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sails-react-bootstrap-webpack",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "description": "An opinionated base configuration of Sails, with Webpack for React support, and Bootstrap for styling.",
     "keywords": [
         "sails",
diff --git a/views/pages/homepage.ejs b/views/pages/homepage.ejs
@@ -1 +1,3 @@
-<%- partial('../../.tmp/public/' + appToLoad + '/index.html') %>
+This is not being used. It is kept here as a placeholder, and to preserve folder structure.
+
+EJS is still being used by Sails, and can be used to build things like emails.

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ module.exports.routes = {`
`38`	`38`	`if (fs.existsSync(pathToCheck)) {`
`39`	`39`	`await sails.helpers.finalizeRequestLog(req, res, {body: 'view'});`
`40`	`40`
`41`		`- return res.view('pages/homepage', {appToLoad: parts[1]});`
	`41`	`+ return res.type('html').send(fs.readFileSync(pathToCheck));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`res.status(404);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sails-react-bootstrap-webpack",`
`3`		`- "version": "1.7.0",`
	`3`	`+ "version": "1.8.0",`
`4`	`4`	`"description": "An opinionated base configuration of Sails, with Webpack for React support, and Bootstrap for styling.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"sails",`