From 394a8b5d1263a09785a3d1b4a6f12088b2de8227 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 20 Nov 2020 16:08:49 +0100 Subject: [PATCH] Revised layout of .html pages --- fiori/app/{fiori-apps.html => admin-fiori.html} | 0 fiori/app/bookshop.html | 3 +++ fiori/app/reviews.html | 3 +++ fiori/app/vue/index.html | 1 - fiori/server.js | 7 +++++-- fiori/test/requests.http | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) rename fiori/app/{fiori-apps.html => admin-fiori.html} (100%) create mode 100644 fiori/app/bookshop.html create mode 100644 fiori/app/reviews.html delete mode 100644 fiori/app/vue/index.html diff --git a/fiori/app/fiori-apps.html b/fiori/app/admin-fiori.html similarity index 100% rename from fiori/app/fiori-apps.html rename to fiori/app/admin-fiori.html diff --git a/fiori/app/bookshop.html b/fiori/app/bookshop.html new file mode 100644 index 00000000..13c22ac5 --- /dev/null +++ b/fiori/app/bookshop.html @@ -0,0 +1,3 @@ + + + diff --git a/fiori/app/reviews.html b/fiori/app/reviews.html new file mode 100644 index 00000000..a74f6c74 --- /dev/null +++ b/fiori/app/reviews.html @@ -0,0 +1,3 @@ + + + diff --git a/fiori/app/vue/index.html b/fiori/app/vue/index.html deleted file mode 100644 index de7f5a0f..00000000 --- a/fiori/app/vue/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fiori/server.js b/fiori/server.js index 8f71c3f8..887190f9 100644 --- a/fiori/server.js +++ b/fiori/server.js @@ -7,8 +7,11 @@ cds.once('bootstrap',(app)=>{ const orders_app = dirname (require.resolve('@capire/orders/app/orders/webapp/manifest.json')) app.use ('/orders/webapp', express.static(orders_app)) // serving the vue.js app imported from @capire/bookshop - const vue_app = dirname (require.resolve('@capire/bookshop/app/vue/index.html')) - app.use ('/vue', express.static(vue_app)) + const bookshop_app = dirname (require.resolve('@capire/bookshop/app/vue/index.html')) + app.use ('/vue/bookshop', express.static(bookshop_app)) + // serving the vue.js app imported from @capire/reviews + const reviews_app = dirname (require.resolve('@capire/reviews/app/vue/index.html')) + app.use ('/vue/reviews', express.static(reviews_app)) }) cds.once('served', require('./srv/mashup')) diff --git a/fiori/test/requests.http b/fiori/test/requests.http index d759aedf..873a1533 100644 --- a/fiori/test/requests.http +++ b/fiori/test/requests.http @@ -42,7 +42,7 @@ GET {{bookshop}}/browse/Books(201)? ################################################# # -# Bookshop Services +# Orders Service # GET {{bookshop}}/orders/Orders