Merge branch 'Release-v0.1.13'

Author: TBSliver

.angular-cli.json

@@ -15,3 +15,9 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# ensures font files are loaded as binary not text
+*.ttf binary
+*.eot binary
+*.woff binary
+*.woff2 binary

.gitattributes

@@ -22,7 +22,6 @@ $RECYCLE.BIN/
 /bower_components
 
 # IDEs and editors
-/.idea
 .project
 .classpath
 *.launch
@@ -41,11 +40,15 @@ testem.log
 /e2e/*.js
 /e2e/*.map
 
+# build 
+/dist
+
 # local env variable
 /src/environments/environment.local.ts
 /src/environments/environment.prod.ts
 /src/environments/environment.dev.ts
 /src/environments/environment.ci.ts
+/src/environments/environments.tar
 
 # =========================
 # Operating System Files

.gitignore

@@ -2,14 +2,24 @@ addons:
   chrome: stable
 language: node_js
 node_js:
-  - 8
+  - node
 before_install:
-  -  openssl aes-256-cbc -K $encrypted_9d2af3734b6c_key -iv $encrypted_9d2af3734b6c_iv -in src/environments/environment.ci.ts.enc -out src/environments/environment.ci.ts -d
+  - openssl aes-256-cbc -K $encrypted_17157b34afc7_key -iv $encrypted_17157b34afc7_iv -in src/environments/environments.tar.enc -out src/environments/environments.tar -d
+  - tar xf src/environments/environments.tar -C src/environments
 before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
   - npm config set spin false
 install:
-    - npm install
+  - npm install
 script:
-    - npm run ci
+  - npm run ci
+before_deploy:
+  - ./bin/build-releases
+deploy:
+  provider: releases
+  api_key:
+    secure: "Ke27Qm16uRgfX+ZVAq92Suu0ZpLOG9TGXDD8ndKNQZ4zl80DOmePoKvVpk/5Ip3H57Me2seqtCwgjeUCfW0dX3KayPoNmGVxWXCsZCH3MZWuaMnGk/Zc1Ef8P3L1sTEG4LD6+59RaOiMwIrMtLPjSlzvV2gc+002O7MHoudx/qZl47L+T01B0Ovh1AueSVN224Q79NrBnbgTtMqaS3x2avLkJmdZpneafqeO5OusOFcvsHvBr7ca0qKv5yIpn4eotK2bo6TFuaC9e9i7gUgPKHb1/GXAK1DcteUDF3AzK/b7T+dqTS+1vowuNKjMZ+ecyB8VDXQlWnBcv/IGn/C3nBmtp2oN97BFQtHguCY42Qk9LZxIu9o0mpOt6aMRiIsfbWstgONKaLzgt4Ce3DFlJ7YR5BFRaoKDdGHoCW+tcucQ/o9vFCbBVZ8sol2aYJOiNHYxlC8A7NLs6YEjyckVAa3q1l6CddnSjrFA5oe9fsLdzUDGhJ57Nv7kF9v6jjsTlZtucrzf8ix9+vNKNfWLQ6K86UIeBT40pPYHLBmWEsiGai+s4IWrYjTscT4zQDHcfQCMuQbbb3NTEfy9Fwv0VQdIR/cKsQgUCZwwlv3RBImryuDFqY2pNOqvnGIcr/OJ/MmY9bbCYEp55dxrZ50dNBbtR4O8IyUDte/ycU4OKbE="
+  file_glob: true
+  file: "../WebApp-Releases/*"
+  skip_cleanup: true
+  on:
+    tags: true

.idea/.gitignore

@@ -2,6 +2,109 @@
 
 # Next Release
 
+# 0.1.13
+
+* Added new graphs for organisation view, for better breakdown of spending
+* Added Suppliers spend search page
+* Updated and fixes numerous graphs on dashboard
+
+## Minor
+
+* *Dev Fixes* Updated Travis config
+
+
+# 0.1.12
+
+* Fixed accidentally added app-root
+
+# 0.1.11
+
+* Bumped Angular to version 6 and upgraded packages to match
+* Converted RxJS 5 syntax to RxJS 6
+* Removed extraneous console logs
+* Changed dashboard sector list to category all time list & tweaked layout
+
+# 0.1.10
+
+* Allowed for creation of yearly recurring transactions
+* Added google analytics
+
+# 0.1.9
+
+* Made layout change to make it neater when chart doesn't show
+* Made hotfix
+
+# 0.1.8
+
+* Amended how category is pulled from server
+* Added chart on essential purchase numbers as a whole
+* Added bar chart of category purchases in the month
+* Added pie chart of purchases by category in the week
+* Added hint for closing the burger menu while in mobile view
+
+# v0.1.7
+
+* Fixed category on upload highlighting
+
+# v0.1.6
+
+* Changed layout of category choosing on upload
+* Added ability to edit and remove recurring transactions
+* Fixed HttpClient error log viewing
+* Made transaction validation more lenient
+
+# v0.1.5
+
+* Fixed category viewing on purchase
+* Changed category view from radio buttons to full label buttons
+* Amended local validation of submit
+* Changed recurring purchase selection view
+
+# v0.1.4
+
+* Amended category list on transaction submission
+* Added budget view for weekly breakdown of spend by category
+* Added flag to make purchases essential
+* Fixed budget view issues and amended it to show essential purchases that week
+* Added ability to make purchases recurring
+* Updated Moment dependency due to security issue
+* Fixed category uploading in upload
+
+# v0.1.3
+
+* Made fix to Travis config
+
+# v0.1.2
+
+* Removed unused button
+* Added ability to choose category for transaction
+* Added version bump on Angular
+
+# v0.1.1
+
+* Redid layout on circle customer view
+* Renamed customer dashboard headers
+
+# v0.1.0
+
+* Changed Story Trail choosing to modals
+* Revamped snippets and graph widgets on customer dashboard
+* Added local purchase pie chart for customer dashboard
+* Added week by week purchase list for customer dashboard
+* Added sector purchase amount list for customer dashboard
+* Added sector U to available ones
+* Fixed snippet layout
+
+# v0.0.7
+
+* Added ESTA to Story Trail
+* Reverted Story Trail naming to LIS
+* Changed Trail map code to make it flexible based on association
+
+# v0.0.6
+
+* Fix typo in Map Titles
+
 # v0.0.5
 
 * Change page name from Story Trail to Lancaster Independent Story

.idea/misc.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>