Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AnyChart/export-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.2.0
Choose a base ref
...
head repository: AnyChart/export-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
7 contributors
Loading
Showing with 10,888 additions and 3,820 deletions.
  1. +5 −1 .gitignore
  2. +28 −0 .travis.yml
  3. BIN .travis/id_rsa.enc
  4. +1 −0 .travis/id_rsa.pub
  5. +3 −0 .travis/known_hosts
  6. +201 −214 LICENSE
  7. +247 −1 README.md
  8. +80 −21 project.clj
  9. +5,297 −3,001 resources/js/anychart-bundle.min.js
  10. BIN resources/public/intents.png
  11. +198 −0 resources/public/tw_dialog.css
  12. +45 −0 src/export_server/browser/core.clj
  13. +138 −0 src/export_server/browser/etaoin/common.clj
  14. +21 −0 src/export_server/browser/etaoin/core.clj
  15. +103 −0 src/export_server/browser/etaoin/html_to_png.clj
  16. +210 −0 src/export_server/browser/etaoin/script_to_png.clj
  17. +114 −0 src/export_server/browser/etaoin/svg_to_png.clj
  18. +26 −0 src/export_server/browser/image_resizer.clj
  19. +163 −0 src/export_server/browser/selenium/common.clj
  20. +21 −0 src/export_server/browser/selenium/core.clj
  21. +100 −0 src/export_server/browser/selenium/html_to_png.clj
  22. +192 −0 src/export_server/browser/selenium/script_to_png.clj
  23. +90 −0 src/export_server/browser/selenium/svg_to_png.clj
  24. +45 −0 src/export_server/browser/templates.clj
  25. +0 −52 src/export_server/cmd_handlers.clj
  26. +227 −117 src/export_server/core.clj
  27. +94 −0 src/export_server/data/config.clj
  28. +112 −0 src/export_server/data/state.clj
  29. +56 −0 src/export_server/db/core.clj
  30. +132 −0 src/export_server/handlers/cmd_handlers.clj
  31. +312 −0 src/export_server/handlers/web_handlers.clj
  32. +1 −1 src/export_server/repl.clj
  33. +17 −0 src/export_server/sharing/core.clj
  34. +121 −0 src/export_server/sharing/storage.clj
  35. +141 −0 src/export_server/sharing/twitter.clj
  36. +51 −0 src/export_server/sharing/twitter_utils.clj
  37. +0 −66 src/export_server/utils/config.clj
  38. +108 −90 src/export_server/utils/rasterizator.clj
  39. +18 −0 src/export_server/utils/util.clj
  40. +13 −0 src/export_server/web/logging.clj
  41. +39 −15 src/export_server/{utils → web}/params_validator.clj
  42. +12 −12 src/export_server/{utils → web}/responce.clj
  43. +0 −229 src/export_server/web_handlers.clj
  44. +13 −0 src/sql/scheme.sql
  45. +73 −0 src/templates/tw_dialog.selmer
  46. +25 −0 src/templates/tw_error.selmer
  47. +19 −0 src/templates/tw_success.selmer
  48. +32 −0 test/js-to-pdf.html
  49. +1 −0 tests/cmd/README.md
  50. +1,943 −0 tests/jmeter-config/export-server.jmx
6 changes: 5 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -5,4 +5,8 @@ out
target
*.iml
.nrepl-port
.lein-repl-history
.lein-repl-history
.lein-failures
log.txt
id_rsa
.travis/id_rsa
28 changes: 28 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
language: clojure
script: lein uberjar
sudo: false
branches:
only:
- staging
cache:
directories:
- $HOME/.m2
before_install:
- openssl aes-256-cbc -K $encrypted_134e2e7eeaf1_key -iv $encrypted_134e2e7eeaf1_iv -in .travis/id_rsa.enc -out id_rsa -d
- mv id_rsa .travis/id_rsa
after_success:
- if [ "$TRAVIS_BRANCH" == "staging" ]; then export APP="export-server-public-stg"; fi
- echo "Deploying to $SERVER"
- cp .travis/known_hosts ~/.ssh/known_hosts
- cp .travis/id_rsa.pub ~/.ssh/id_rsa.pub
- cp .travis/id_rsa ~/.ssh/id_rsa
- chmod 600 ~/.ssh/known_hosts
- chmod 600 ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa.pub
- chmod 600 .travis/id_rsa
- chmod 600 .travis/id_rsa.pub
- ssh-add ~/.ssh/id_rsa
- scp -i .travis/id_rsa target/export-server-standalone.jar root@104.131.77.49:/apps/$APP/export-server-standalone.jar
- ssh -v -v -v root@104.131.77.49 "supervisorctl restart $APP"
notifications:
slack: anychart-team:sJRPhNn8Ur8yVdhvhgp6EbDM
Binary file added .travis/id_rsa.enc
View file
Binary file not shown.
1 change: 1 addition & 0 deletions .travis/id_rsa.pub
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKbmLXxqPVOH12sNbaIlAZbQ6MltjPIMYVrNpdCXQ4bz7UnqdYN2+/NYdgj1DOxZipYF6rfwJCqcCXfaGHJoAxvre0eiDYKzv8ZkmMH1MBw07PMq+2G54AnJBaw952B/BDCe2tUUYoiHMTQS8KQ5gruUQGZp4uByHirPET8mRALtG/+oLP+3NX+zgBGgPD0vt4iy38dP0Q44Nqh9+ifVIe/fy1Wp7awvIEG0E0WdoWoa0i0+mYv5kzyydoGcE3AtJYpTlyKTzoqtAdfNiIH1TbhPfzAjG2ItK7TjYRZ3kstH/UEmDFjdxXKfNBTMvIU8/u0Zz7/HoZaGuAWpWlq9Y6MJRljZwbUaCcX7CncCsF+6j7IHLOdBNoPAmLTO8fxQGydAV/0acTpFr149u7Wd/QZej6Zk3D/KrjI1uWrp/SAdI7Sqm7XsXdJwrnvxPet6abxM/j2OAt3sSptDdd2Y+jKvZ22lMiNcHuUE1qaIbFrm2q0Qwj1OEDLgtZ17dUNechRaohjWI2H/Q0lE9y45K+aM+cMKEtQ4A6dbSvYvUKIm+MGvXdq/35vKiCxJw6oOMAy8BtBFi09Wm3EFmMK0zkP/vUr4A+hrE4LAguGzkiO0e2xkVqCmUoQrWIRkw69k0gHLwJrBBN00JpAXL8Tv3W9xhlgHk2QwWKvoR/f40jYQ== travis_deploy
3 changes: 3 additions & 0 deletions .travis/known_hosts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
104.131.17.78 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDrtZ80jQmfkMKC1SAmsMrkBsACczPKX92XRhPcHKu7OADjS9J9sj0avbyywH/ViVPh/oQKoAkjRcqlWKge8uYuKM1+usZ4vCSWj1911pp0/tHydvdajtijOVVTs1IyWYb0AmJeauFsvaMrANI6QWul3XE7wpUcegXEIloC4se03UbhFnGwqWkpZgM+07f0bGPljiuO6YZdFUlCg0hVibfo58xEfdNKWClrMr/BFMWZzYz7FBcmyYirwRQ7xx44i6jevb4Ocpg7BsPEiaLVrwItANBONmilQhxh7q/7OolCwOX9x5J0C6oaYsGviejw3MNf9/der4Erjf5pTOP/zY6H
104.236.66.244 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrINr29cQcqeVqpaBk36cQBv0tdCZ8SM7RIyW1uUHhxwRRd8RWbjGatLQhXELJGlSMLhrUf1KzfzCmXj/4L/l03TffeSDuGWJpxusTI93knKN+mWT69+IudkvIymQnCjaVio/MDOhwRLfkxE0nFGLdj8MbRJA35w/P6qbzIvwjKkHgw6VkbBS1c/4jEjsshIk+Z4P1GPiSw8lwscB8EjpZbOnhOWDYHaZUEpujdGbeIIKK31T/HSgFznEjZGuJmgLXnIf5+2h+WXrjeMljVVe613PNHrydBaR/7JxmWZIltoXyzL7ZDR9wZUQ47DumyMm07BtpQ+LZRCbeAvK+Smrt
104.131.77.49 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+n77cn8S53vYe7jueOdtLH6u5XV9AcypM5x5fb+4ugZCHz+Y8GmlF3Fik1omjJk9LhB6e9FBOkNT7LdHTvoI/bNPI+962CoRnbVXxtdN0b67HSiszKSU0mQMg8kYL2Y+1FENAa4D2Gtp/CR0X4xnzKa1r6FQ6eB3jgtxNnxnLPves4ALQBJDoqL4gj54JWzgrYuRQtnki2Y1pBac/6YVV1d+HfXvCJp8rr2C6vtkstn0qFmY/3HqBunouiAqOovaWNDv3H+4UhSXvCP8DdEzpWD4Mp21+Kcy1FBA9wxioZYJhb2sFkjpa/XmKOmDXj5qR7YHHrsIOwXE5Idc0HgxV
Loading