Merge pull request #12 from blopa/feature/download_docx

Feature/download docx
blopa · Oct 13, 2017 · f24f2ed · f24f2ed
2 parents e5d0c91 + 4b4f8aa
commit f24f2ed
Show file tree

Hide file tree

Showing 21 changed files with 171 additions and 84 deletions.
diff --git a/README.md b/README.md
@@ -45,8 +45,8 @@ First of all you need to create a Google Spreadsheet following the same rules as
 So whenever you want a part of the contract to be only available when certain other part is on the contract, you should use the ``depends`` field. One row can depend of another row that also depends on another and so on. Use your creativity.
 
 ## Libraries
-- For the jQuery version ( < 0.0.4 ) of this project I'm using [jQuery](https://github.com/jquery/jquery), [Sheetrock](https://github.com/chriszarate/sheetrock), [html-docx-js](https://github.com/evidenceprime/html-docx-js) and [Bootstrap](https://github.com/twbs/bootstrap).
-- For the vue.js version ( > 0.0.4 ) of this project I'm using [vue.js](https://github.com/vuejs/vue), [html-docx-js](https://github.com/evidenceprime/html-docx-js) and [Bootstrap](https://github.com/twbs/bootstrap).
+- For the jQuery version ( < 0.0.4 ) of this project I'm using [jQuery](https://github.com/jquery/jquery), [Sheetrock](https://github.com/chriszarate/sheetrock), [html-docx-js](https://github.com/evidenceprime/html-docx-js), [FileSaver](https://github.com/eligrey/FileSaver.js/) and [Bootstrap](https://github.com/twbs/bootstrap).
+- For the vue.js version ( > 0.0.4 ) of this project I'm using [vue.js](https://github.com/vuejs/vue), [html-docx-js](https://github.com/evidenceprime/html-docx-js), [FileSaver](https://github.com/eligrey/FileSaver.js/), [computed-style-to-inline-style](https://github.com/lukehorvat/computed-style-to-inline-style) and [Bootstrap](https://github.com/twbs/bootstrap).
 - Honorable mentions: [babel](https://github.com/babel/babel), [webpack](https://github.com/webpack/webpack), [Vuex](https://github.com/vuejs/vuex), [IntelliJ IDEA](https://github.com/JetBrains/intellij-community) and [Squarespace](https://logo.squarespace.com).
 
 So a big thanks to all the developers that worked really hard on these libs and make our day easier :D and also a big thanks to [cdnjs.com](https://cdnjs.com/) and [jsdelivr.com](https://www.jsdelivr.com/) for hosting those libs for us.
@@ -297,6 +297,9 @@ You can create complex tree decisions using the field ``depends``. The following
 ![ScreenShot](https://raw.githubusercontent.com/blopa/Contract-Builder/master/screenshots/screenshot_3.png)
 
 ## Release Notes
+- **v0.0.6:**
+	- [Bugfix] Fix problem with .docx file style
+	- [Bugfix] Fix some other minor glitches
 - **v0.0.5:**
 	- [Feature] Remade everything using Vue.js
 	- [Feature] Rich Text working with Google Spreadsheet
@@ -328,7 +331,6 @@ A: Thank you! You can help by codding more features, creating pull requests, or
 - Add list of recent used documents
 - Add option to save a built contract
 - Add option to save contract variables
-- Add option to download .docx file for vue.js version
 
 ## License
 MIT License

diff --git a/VueJS/config/index.js b/VueJS/config/index.js
@@ -7,6 +7,7 @@ module.exports = {
     index: path.resolve(__dirname, '../dist/index.html'),
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
+    // assetsPublicPath: '/contract/VueJS/',
     assetsPublicPath: '/',
     productionSourceMap: true,
     // Gzip off by default as many popular static hosts such as

diff --git a/VueJS/dist/index.html b/VueJS/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><title>Contract Builder</title><link rel="shortcut icon" type=image/png href=static/favicon.ico><link rel=stylesheet type=text/css href=https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/css/bootstrap.css><link href=/static/css/app.fed3c273939d32e6a9ce4de66ee8fd37.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.762f71d9d49dbaf6e0e8.js></script><script type=text/javascript src=/static/js/vendor.6ebf0ea9d42f7470b7e0.js></script><script type=text/javascript src=/static/js/app.90d30fc6c47c632f0322.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><title>Contract Builder</title><link rel="shortcut icon" type=image/png href=static/favicon.ico><link rel=stylesheet type=text/css href=https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/css/bootstrap.css><link href=/static/css/app.09b8c9806470720d74cdb2dff59e977b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.65eff6b46b9f4b61fdb4.js></script><script type=text/javascript src=/static/js/vendor.cb604a4789550ccc1f14.js></script><script type=text/javascript src=/static/js/app.dddeeb369c63773c4654.js></script></body></html>
diff --git a/VueJS/dist/static/css/app.09b8c9806470720d74cdb2dff59e977b.css b/VueJS/dist/static/css/app.09b8c9806470720d74cdb2dff59e977b.css
diff --git a/VueJS/dist/static/css/app.09b8c9806470720d74cdb2dff59e977b.css.map b/VueJS/dist/static/css/app.09b8c9806470720d74cdb2dff59e977b.css.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset=utf-8><title>Contract Builder</title><link rel="shortcut icon" type=image/png href=static/favicon.ico><link rel=stylesheet type=text/css href=https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/css/bootstrap.css><link href=/static/css/app.fed3c273939d32e6a9ce4de66ee8fd37.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.762f71d9d49dbaf6e0e8.js></script><script type=text/javascript src=/static/js/vendor.6ebf0ea9d42f7470b7e0.js></script><script type=text/javascript src=/static/js/app.90d30fc6c47c632f0322.js></script></body></html>
		<!DOCTYPE html><html><head><meta charset=utf-8><title>Contract Builder</title><link rel="shortcut icon" type=image/png href=static/favicon.ico><link rel=stylesheet type=text/css href=https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/css/bootstrap.css><link href=/static/css/app.09b8c9806470720d74cdb2dff59e977b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.65eff6b46b9f4b61fdb4.js></script><script type=text/javascript src=/static/js/vendor.cb604a4789550ccc1f14.js></script><script type=text/javascript src=/static/js/app.dddeeb369c63773c4654.js></script></body></html>