diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-04-22 23:34:11 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-04-22 23:34:11 +0200 |
| commit | 5f914a980ce398be8c28708b6910944e2beb74c1 (patch) | |
| tree | 2a1b3c58448c73070a21ef6704151fcb796b4531 /contrib | |
| parent | 873f0ac8448a7f4d2efaef4e9ab9840e90a3b867 (diff) | |
| download | merchant-5f914a980ce398be8c28708b6910944e2beb74c1.tar.gz merchant-5f914a980ce398be8c28708b6910944e2beb74c1.tar.bz2 merchant-5f914a980ce398be8c28708b6910944e2beb74c1.zip | |
integrate SPA
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/.gitignore | 1 | ||||
| -rw-r--r-- | contrib/Makefile.am | 7 | ||||
| m--------- | contrib/merchant-backoffice | 0 |
3 files changed, 8 insertions, 0 deletions
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 +Subproject 4320467db1392e5f48a4acd079f7e2a253cf998 |