From 5f914a980ce398be8c28708b6910944e2beb74c1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 22 Apr 2021 23:34:11 +0200 Subject: integrate SPA --- contrib/.gitignore | 1 + contrib/Makefile.am | 7 +++++++ contrib/merchant-backoffice | 1 + 3 files changed, 9 insertions(+) create mode 100644 contrib/.gitignore create mode 160000 contrib/merchant-backoffice (limited to 'contrib') diff --git a/contrib/.gitignore b/contrib/.gitignore new file mode 100644 index 00000000..863e327b --- /dev/null +++ b/contrib/.gitignore @@ -0,0 +1 @@ +spa.html diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 14826f9e..fa11ebb4 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,5 +1,6 @@ tmplpkgdatadir = $(prefix)/share/taler/merchant/templates/ staticpkgdatadir = $(prefix)/share/taler/merchant/static/ +spapkgdatadir = $(prefix)/share/taler/merchant/spa/ dist_tmplpkgdata_DATA = \ depleted_tip.en.must \ @@ -11,3 +12,9 @@ dist_tmplpkgdata_DATA = \ # Note: if you update pure-min.css, you must also update the MUST templates above! dist_staticpkgdata_DATA = \ pure-min.css + + +# spa.html is the single-page-app generated from the merchant-backoffice.git, +# 'make build-single', during 'bootstrap!' +dist_spapkgdata_DATA = \ + spa.html diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice new file mode 160000 index 00000000..4320467d --- /dev/null +++ b/contrib/merchant-backoffice @@ -0,0 +1 @@ +Subproject commit 4320467db1392e5f48a4acd079f7e2a253cf9984 -- cgit v1.2.3