feat(cli): use app.static for default home page

See #1988
loopbackio · Nov 8, 2018 · 1dcf169 · 1dcf169
1 parent a6ed72f
commit 1dcf169
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 138 deletions.
diff --git a/examples/soap-calculator/src/application.ts b/examples/soap-calculator/src/application.ts
@@ -4,6 +4,7 @@ import {RepositoryMixin} from '@loopback/repository';
 import {RestApplication} from '@loopback/rest';
 import {ServiceMixin} from '@loopback/service-proxy';
 import {MySequence} from './sequence';
+import * as path from 'path';
 
 export class SoapCalculatorApplication extends BootMixin(
   ServiceMixin(RepositoryMixin(RestApplication)),
@@ -14,6 +15,9 @@ export class SoapCalculatorApplication extends BootMixin(
     // Set up the custom sequence
     this.sequence(MySequence);
 
+    // Set up default home page
+    this.static('/', path.join(__dirname, '../../public'));
+
     this.projectRoot = __dirname;
     // Customize @loopback/boot Booter Conventions here
     this.bootOptions = {

diff --git a/examples/soap-calculator/src/controllers/home-page.controller.ts b/examples/soap-calculator/src/controllers/home-page.controller.ts
diff --git a/...ptance/home-page.controller.acceptance.ts → ...r/test/acceptance/home-page.acceptance.ts b/...ptance/home-page.controller.acceptance.ts → ...r/test/acceptance/home-page.acceptance.ts
@@ -7,7 +7,7 @@ import {Client} from '@loopback/testlab';
 import {SoapCalculatorApplication} from '../..';
 import {setupApplication} from './test-helper';
 
-describe('HomePageController', () => {
+describe('HomePage', () => {
   let app: SoapCalculatorApplication;
   let client: Client;
 

diff --git a/examples/todo-list/src/application.ts b/examples/todo-list/src/application.ts
@@ -8,6 +8,7 @@ import {ApplicationConfig} from '@loopback/core';
 import {RepositoryMixin} from '@loopback/repository';
 import {RestApplication} from '@loopback/rest';
 import {MySequence} from './sequence';
+import * as path from 'path';
 
 export class TodoListApplication extends BootMixin(
   RepositoryMixin(RestApplication),
@@ -18,6 +19,9 @@ export class TodoListApplication extends BootMixin(
     // Set up the custom sequence
     this.sequence(MySequence);
 
+    // Set up default home page
+    this.static('/', path.join(__dirname, '../../public'));
+
     this.projectRoot = __dirname;
     // Customize @loopback/boot Booter Conventions here
     this.bootOptions = {

diff --git a/examples/todo-list/src/controllers/home-page.controller.ts b/examples/todo-list/src/controllers/home-page.controller.ts
diff --git a/...ptance/home-page.controller.acceptance.ts → ...t/test/acceptance/home-page.acceptance.ts b/...ptance/home-page.controller.acceptance.ts → ...t/test/acceptance/home-page.acceptance.ts
@@ -7,7 +7,7 @@ import {Client} from '@loopback/testlab';
 import {TodoListApplication} from '../..';
 import {setupApplication} from './test-helper';
 
-describe('HomePageController', () => {
+describe('HomePage', () => {
   let app: TodoListApplication;
   let client: Client;
 

diff --git a/examples/todo/src/application.ts b/examples/todo/src/application.ts
@@ -9,6 +9,7 @@ import {RepositoryMixin} from '@loopback/repository';
 import {RestApplication} from '@loopback/rest';
 import {ServiceMixin} from '@loopback/service-proxy';
 import {MySequence} from './sequence';
+import * as path from 'path';
 
 export class TodoListApplication extends BootMixin(
   ServiceMixin(RepositoryMixin(RestApplication)),
@@ -19,6 +20,9 @@ export class TodoListApplication extends BootMixin(
     // Set up the custom sequence
     this.sequence(MySequence);
 
+    // Set up default home page
+    this.static('/', path.join(__dirname, '../../public'));
+
     this.projectRoot = __dirname;
     // Customize @loopback/boot Booter Conventions here
     this.bootOptions = {

diff --git a/examples/todo/src/controllers/home-page.controller.ts b/examples/todo/src/controllers/home-page.controller.ts
diff --git a/...ptance/home-page.controller.acceptance.ts → ...o/test/acceptance/home-page.acceptance.ts b/...ptance/home-page.controller.acceptance.ts → ...o/test/acceptance/home-page.acceptance.ts
@@ -7,7 +7,7 @@ import {Client} from '@loopback/testlab';
 import {TodoListApplication} from '../..';
 import {setupApplication} from './test-helper';
 
-describe('HomePageController', () => {
+describe('HomePage', () => {
   let app: TodoListApplication;
   let client: Client;
 

diff --git a/packages/cli/generators/app/templates/src/application.ts.ejs b/packages/cli/generators/app/templates/src/application.ts.ejs
@@ -8,6 +8,7 @@ import {RestApplication} from '@loopback/rest';
 import {ServiceMixin} from '@loopback/service-proxy';
 <% } -%>
 import {MySequence} from './sequence';
+import * as path from 'path';
 
 <% if (project.appClassWithMixins) { -%>
 export class <%= project.applicationName %> extends BootMixin(
@@ -24,6 +25,9 @@ export class <%= project.applicationName %> extends BootMixin(RestApplication) {
     // Set up the custom sequence
     this.sequence(MySequence);
 
+    // Set up default home page
+    this.static('/', path.join(__dirname, '../../public'));
+
     this.projectRoot = __dirname;
     // Customize @loopback/boot Booter Conventions here
     this.bootOptions = {

diff --git a/packages/cli/generators/app/templates/src/controllers/home-page.controller.ts.ejs b/packages/cli/generators/app/templates/src/controllers/home-page.controller.ts.ejs
diff --git a/...ce/home-page.controller.acceptance.ts.ejs → ...st/acceptance/home-page.acceptance.ts.ejs b/...ce/home-page.controller.acceptance.ts.ejs → ...st/acceptance/home-page.acceptance.ts.ejs
@@ -7,7 +7,7 @@ import {Client} from '@loopback/testlab';
 import {<%= project.applicationName %>} from '../..';
 import {setupApplication} from './test-helper';
 
-describe('HomePageController', () => {
+describe('HomePage', () => {
   let app: <%= project.applicationName %>;
   let client: Client;
 

diff --git a/packages/cli/test/integration/generators/app.integration.js b/packages/cli/test/integration/generators/app.integration.js
@@ -68,16 +68,8 @@ describe('app-generator specific files', () => {
       /describe\('PingController'/,
     );
     assert.fileContent(
-      'src/controllers/home-page.controller.ts',
-      /export class HomePageController/,
-    );
-    assert.fileContent(
-      'src/controllers/home-page.controller.ts',
-      /homePage\(\)/,
-    );
-    assert.fileContent(
-      'test/acceptance/home-page.controller.acceptance.ts',
-      /describe\('HomePageController'/,
+      'test/acceptance/home-page.acceptance.ts',
+      /describe\('HomePage'/,
     );
     assert.fileContent(
       'test/acceptance/test-helper.ts',