Commit graph

396 commits

Author SHA1 Message Date
piratefinn
e1dfa37f63 removed unnecessary console logs 2018-03-14 16:49:01 +00:00
piratefinn
f3c6370394 Amended purchase validation and submission 2018-03-13 12:49:30 +00:00
piratefinn
40b0a0088c applied new category style to fixed category view 2018-03-12 17:43:15 +00:00
piratefinn
dc27b286cf Placeholder recurring transaction box 2018-03-12 17:41:01 +00:00
piratefinn
c8c52d33c4 emergency fix for category viewing on purchase 2018-03-12 17:35:18 +00:00
piratefinn
f7697178fd emergency fix to upload for category 2018-03-08 15:09:35 +00:00
piratefinn
f6ef50f686 added fixes to category viewing 2018-03-07 12:58:01 +00:00
piratefinn
450b63620f added fixes for input 2018-03-06 15:19:35 +00:00
piratefinn
6e9f4133d2 amended upload for recurring 2018-03-05 15:35:26 +00:00
piratefinn
f5c0a76032 amended if code and validation 2018-03-05 13:42:28 +00:00
piratefinn
45d016c897 added recurring purchase inputs 2018-03-05 13:33:26 +00:00
piratefinn
8b7b5e50be fixed display with essential and categories 2018-03-02 16:31:14 +00:00
piratefinn
5762b35fbe removed unnecessary console logs and cleaned essential input 2018-03-01 17:07:25 +00:00
piratefinn
f6dd18bfc8 added initial essential branch checkbox 2018-02-28 12:02:01 +00:00
piratefinn
bf965448c5 made input two columns if wide enough 2018-01-25 16:19:02 +00:00
piratefinn
d11fbcb4e6 removed unnecessary console logging 2018-01-25 15:56:23 +00:00
piratefinn
5d112ff4a6 Changed percentages on budget view screen 2018-01-25 11:18:31 +00:00
piratefinn
ec1aef6627 Changed to radio buttons on transaction category input 2018-01-25 11:18:13 +00:00
piratefinn
d674c5b59b list fully finished 2018-01-24 13:18:51 +00:00
piratefinn
ca2cf0fdab No longer throwing errors and proper limit & slice 2018-01-24 12:51:03 +00:00
piratefinn
9446ef11d4 properly viewing category list 2018-01-24 12:38:58 +00:00
piratefinn
5f2eee81ba Placeholder and date math 2018-01-22 17:23:56 +00:00
piratefinn
6cca97cc68 changed category list size 2018-01-19 13:22:18 +00:00
piratefinn
004c30cc28 Changed transaction category input 2018-01-18 12:16:37 +00:00
piratefinn
45eb7cb7a1 added new category transaction listing page 2018-01-17 17:36:28 +00:00
piratefinn
b18943c268 removed unused button on pie 2018-01-17 15:02:32 +00:00
piratefinn
511969656e Fixed app, added ability for non category transaction changed reset form 2018-01-16 15:57:38 +00:00
piratefinn
d17a686490 functional receiving, choosing and upload of transaction category 2018-01-15 16:20:51 +00:00
piratefinn
59efe7a650 Retrieving categories from API 2018-01-15 15:33:38 +00:00
piratefinn
e64b6057e8 added category list endpoint 2018-01-15 14:19:16 +00:00
piratefinn
71eee8f06b updated pie css 2017-12-21 17:20:56 +00:00
piratefinn
95a918076a snippet circles fixed 2017-12-20 16:46:25 +00:00
piratefinn
2784387b12 added varying colors based on sector 2017-12-20 13:41:13 +00:00
piratefinn
2d4a64cef4 clarified a TODO in css 2017-12-20 12:33:04 +00:00
piratefinn
30919e6eb2 added circles to snippets
WARNING: They are a fixed size, therefore will spill content on larger numbers
2017-12-20 12:32:23 +00:00
piratefinn
d8fab7c4df frontpage sectors and week stats amended 2017-12-19 18:01:29 +00:00
piratefinn
f4c9724097 added initial looping 2017-12-18 17:20:38 +00:00
piratefinn
13d84905b8 added new sector 2017-12-18 16:20:31 +00:00
piratefinn
b8f5687ac2 changed customer dashboard endpoint 2017-12-18 12:57:40 +00:00
piratefinn
46d99d11f9 fixed variable definition 2017-12-15 17:44:50 +00:00
piratefinn
728f9e3d47 fixed es5 compatibility 2017-12-15 17:38:59 +00:00
piratefinn
e16cf3e801 sector list code fully working 2017-12-15 17:20:18 +00:00
piratefinn
7e7bb4ccf3 percent per week data viewing done 2017-12-14 20:14:47 +00:00
piratefinn
93f15ae6de improved doughnut header layout 2017-12-14 17:51:00 +00:00
piratefinn
9545601d01 working graph widgets and local doughnut chart 2017-12-14 16:44:23 +00:00
piratefinn
32bebd7c24 Added working snippets and placeholder pie chart 2017-12-13 12:37:11 +00:00
piratefinn
6eb6425fb8 More placeholder code for customer dashboard 2017-12-12 15:10:44 +00:00
piratefinn
44740d5dd4 Changed from dropdown to modal 2017-12-08 20:34:58 +00:00
piratefinn
e104b2c4d2 changelog, esta pin and naming updated 2017-12-08 15:30:16 +00:00
piratefinn
644c097f0b image url naming sanitised 2017-12-08 14:13:47 +00:00
piratefinn
100a3c71a8 renamed LIS to trail and added esta logo 2017-12-08 14:01:46 +00:00
piratefinn
0cc3a473cf changed code for trail map 2017-12-08 13:26:18 +00:00
piratefinn
03ec811c6c Merge branch 'development' into finn/alignmentfix 2017-11-29 18:10:39 +00:00
piratefinn
830b4b3c4f fixed navbar alignment 2017-11-29 18:07:37 +00:00
Thomas Bloor
d9b8ebfc50
Travis can only manage one file for decryption it seems 2017-11-29 17:24:16 +00:00
Thomas Bloor
0ce452233d
Setup Travis to auto build releases when a tag is created 2017-11-29 17:12:18 +00:00
piratefinn
16ef46972e fixed typo 2017-11-29 16:19:38 +00:00
Tom Bloor
bf191a7c06
Merge pull request #35 from Pear-Trading/master
Master merge for v0.0.4
2017-11-29 15:32:14 +00:00
piratefinn
2af4cd8adf Renamed some text for Lancaster Independent Story 2017-11-29 15:23:03 +00:00
Thomas Bloor
7968493fe3 Fixed error on building 2017-11-28 18:14:15 +00:00
piratefinn
4670e10c2f fixed logo on main map 2017-11-28 12:44:53 +00:00
piratefinn
961d8eafe3 fix made to modaldirective import 2017-11-27 17:20:22 +00:00
piratefinn
0fb3f51748 Fixes made and info window usage revamped with modals 2017-11-27 16:56:09 +00:00
piratefinn
4a331a3475 fixed modals to use new endpoint and scrapped old pages 2017-11-23 17:16:46 +00:00
piratefinn
7843a87fd6 working modals added 2017-11-15 15:36:45 +00:00
piratefinn
5ed6bfe7f3 fixed HTTP posts 2017-11-15 14:46:04 +00:00
piratefinn
b8775e2e45 fixed packaging and rewrote http 2017-11-15 14:16:05 +00:00
piratefinn
d34fdb58ca removed unused imports and packages 2017-11-15 14:12:28 +00:00
piratefinn
840d0aabb1 currencyPipe fixed 2017-11-15 13:46:34 +00:00
piratefinn
a411a0e7fb got clicks logging 2017-11-14 18:31:05 +00:00
piratefinn
4c5074c5fc map page html layout fix 2017-11-14 17:13:34 +00:00
piratefinn
83bc98ece5 test page added 2017-11-14 17:12:19 +00:00
piratefinn
c85602f6e8 snazzy info added, logo added 2017-11-14 17:12:07 +00:00
piratefinn
5af0e1e35c Initial commit with modules and routing 2017-11-14 12:47:28 +00:00
piratefinn
52834af3fc Fixed and working zoom level change 2017-11-14 11:03:19 +00:00
Finn
0286887ead Initial agmcluster commit with broken maxZoom 2017-11-13 22:21:59 +00:00
piratefinn
0688685676 changed login username input to email and changed test 2017-11-13 15:49:17 +00:00
piratefinn
a5b73c7e59 Transaction fix added 2017-11-13 13:05:42 +00:00
piratefinn
3009365682 Map changed and made available to customers 2017-11-13 12:39:31 +00:00
piratefinn
8f725b93af Fixed authguard 2017-11-13 12:26:24 +00:00
piratefinn
c4a9790eb8 Web app leaderboard done 2017-11-10 18:41:35 +00:00
piratefinn
faea82d2cc route fix 2017-11-10 17:17:04 +00:00
piratefinn
8a5236ad3a Leaderboard pages added and routing sorted 2017-11-10 17:15:11 +00:00
piratefinn
f5239a3822 Added password reset placeholder 2017-11-10 15:20:48 +00:00
piratefinn
0b2c9c20f8 Unusable password reset button disabled 2017-11-10 14:14:11 +00:00
piratefinn
0a54cdc091 fixed register name in place 2017-11-10 14:13:28 +00:00
piratefinn
0a9e80fc97 Fixed transaction submission 2017-10-20 13:21:49 +01:00
Tom Bloor
cea000b90c Added ci specific e2e and test scripts 2017-09-28 14:12:25 +01:00
Tom Bloor
ed738b287a Added placeholder for mapApiKey 2017-09-28 13:28:57 +01:00
Tom Bloor
1eb8d71b4a Removed prod environment file from repo 2017-09-28 13:21:28 +01:00
Tom Bloor
2ffe32c6f5 Change to a map icon for the Supplier Map 2017-09-28 12:55:48 +01:00
Tom Bloor
a622b0d871 Fix issue with supplier location api url 2017-09-28 12:47:09 +01:00
piratefinn
f402d46db8 Added API changes 2017-09-27 17:46:25 +01:00
piratefinn
b59351addf made looping markers 2017-09-27 14:34:46 +01:00
piratefinn
1eb79aa047 Added API and fixes 2017-09-27 13:54:10 +01:00
piratefinn
64e028f0c5 Added default zoom 2017-09-27 12:02:46 +01:00
piratefinn
5d3283171c styling improved 2017-09-26 17:51:14 +01:00
piratefinn
40bd7459b5 Map page added with map 2017-09-26 17:31:40 +01:00
piratefinn
089e7f7a97 Functionality fully added 2017-09-19 17:22:19 +01:00
piratefinn
7b03f6adff Initial addition of API for payroll log 2017-09-19 15:38:35 +01:00
Tom Bloor
e62a46c312 Ignore linter error in transaction-result component 2017-09-19 15:21:03 +01:00
Tom Bloor
8f164ca94a ignore linter errors in org-result items 2017-09-19 15:19:50 +01:00
Tom Bloor
a5b786a749 Linter errors in dashboard-customer component 2017-09-19 15:04:49 +01:00
Tom Bloor
0907134ff7 Fix linter errors for transaction-log component 2017-09-19 15:02:48 +01:00
Tom Bloor
662d6be5c9 Linter error fixes for feedback component 2017-09-19 14:59:19 +01:00
Tom Bloor
921b25718d Linter error fixes for account-edit component 2017-09-19 14:56:07 +01:00
Tom Bloor
f6c0583481 Fix linter errors in add-data component 2017-09-19 14:53:25 +01:00
Tom Bloor
61ac856cc2 fix linter errors on register component 2017-09-19 14:48:22 +01:00
Tom Bloor
dec53b4630 Fix linter errors in full-layout 2017-09-19 11:10:56 +01:00
Tom Bloor
8807ba6cc9 linter errors in auth.guard.ts 2017-09-19 11:09:30 +01:00
Tom Bloor
baf64ff4b7 whitespace changes for linter in pages 500 2017-09-19 11:06:41 +01:00
Tom Bloor
49be004bbc whitespace changes for pages 404 2017-09-19 11:05:21 +01:00
piratefinn
d1eb79b394 Fixed Transaction Validation 2017-09-18 13:58:38 +01:00
piratefinn
7f3e9f4fd0 Added better error messaging 2017-09-15 17:33:34 +01:00
piratefinn
f34c558d41 Fixes to receipt form 2017-09-15 16:50:53 +01:00
piratefinn
7b1771b45f Fixed Register View on mobile 2017-09-15 16:35:04 +01:00
Tom Bloor
3623e4162f Updated logos and changelog 2017-09-15 15:35:41 +01:00
Tom Bloor
34465afc8d Merge pull request #15 from Pear-Trading/TBSliver/Testing
Minor testing fixes
2017-09-15 12:43:00 +01:00
Tom Bloor
a5f5945428 Change to block comment as css is stupid 2017-09-14 17:02:44 +01:00
Tom Bloor
56c5b5dd2f Added loading spinner 2017-09-14 17:01:55 +01:00
Tom Bloor
d418988e84 Added basic title etc for LocalLoop 2017-09-14 17:01:44 +01:00
Tom Bloor
7531347565 Change footer to have Pear trading on the bottom 2017-09-14 16:47:57 +01:00
Tom Bloor
e218e50349 Fix logo url 2017-09-14 16:44:49 +01:00
Tom Bloor
22b61623e0 Added new favicon and logo 2017-09-14 16:40:00 +01:00
Tom Bloor
c2609b949a Initial framework for org-graphs tests 2017-09-14 13:01:09 +01:00
Tom Bloor
8548cc7cae Disabled and removed unused forms 2017-09-08 15:48:20 +01:00
Tom Bloor
cf1980d768 Stop using multiple apiService instances 2017-09-08 15:22:15 +01:00
Tom Bloor
7d637e84e4 Fix race condition in login 2017-09-08 14:59:31 +01:00
Tom Bloor
b1c2f531bb Fixed linter errors and removed inneeded api call 2017-09-08 14:49:57 +01:00
Tom Bloor
5279dfae10 Merge pull request #10 from Pear-Trading/TBSliver/Widget-Graph-Improvements
Refactored large graph
2017-09-08 13:25:20 +01:00
piratefinn
3915a49e12 Replaced some template text 2017-09-08 13:22:34 +01:00
Tom Bloor
732526322f Move large graph into graph-panel component and show real data 2017-09-08 13:09:23 +01:00
piratefinn
085220d5b5 Sanitised names 2017-09-08 12:55:42 +01:00
piratefinn
2c23b8a64d added required to data submissions 2017-09-08 12:16:43 +01:00
piratefinn
1982ce6790 Added Org submission API and transaction fixes 2017-09-08 11:54:34 +01:00
piratefinn
a378ab4b28 headers for tables changed 2017-09-07 17:45:20 +01:00
Tom Bloor
b8e0df3906 Remove footer from graph panel 2017-09-07 17:14:35 +01:00
Tom Bloor
f0ed1e9369 Update snippets to use new snippets api and dataset 2017-09-07 16:02:29 +01:00
Tom Bloor
a0e077852d Change to using new api for snippets 2017-09-07 15:36:19 +01:00
Tom Bloor
20da5f1e92 Made data optional on api post 2017-09-07 15:35:55 +01:00
Tom Bloor
cfb131b800 Refactored snippet bar into seperate component 2017-09-07 15:12:49 +01:00
Tom Bloor
e301a063ed Remove unneeded code from dashboard ts 2017-09-07 13:58:51 +01:00
Tom Bloor
9bc9e34c51 Remove if blocks from snippets 2017-09-07 13:58:25 +01:00
Tom Bloor
e19db92a20 Removed unused graphs from display 2017-09-07 13:45:14 +01:00
Tom Bloor
1b075cdff6 Merge branch 'development' into TBSliver/Widget-Graph-Improvements 2017-09-07 13:37:49 +01:00
Tom Bloor
555675c313 Add update to dashboard for widget graph types 2017-09-07 13:32:59 +01:00
Tom Bloor
dd735e517e Give graph ability to support different datatypes 2017-09-07 13:32:42 +01:00
Tom Bloor
44e6ba4c8b Added data-type enum package 2017-09-07 13:32:06 +01:00
piratefinn
a661ceba02 Changed table CSS 2017-09-07 11:49:19 +01:00
piratefinn
6c52c09e43 Added in pagination for transaction list 2017-09-06 17:51:56 +01:00
piratefinn
2e27e7a43b Added ability to read Transactions from server 2017-09-06 16:05:35 +01:00
Tom Bloor
ec49bff840 Added extra widgets and fixed api issue 2017-09-05 12:04:36 +01:00
Tom Bloor
f29cf1eba5 Made guards less likely to give infinite loop 2017-09-05 11:40:51 +01:00
piratefinn
098b93f837 Fixed account updating and display name for org 2017-09-04 17:26:01 +01:00
piratefinn
b6b1b3414c Fixed account editing 2017-09-04 16:30:56 +01:00
piratefinn
1eb85cc7f6 Commented out currently unusable code 2017-09-04 16:15:32 +01:00
piratefinn
0aa6340454 Made it load email on feedback form load 2017-09-01 17:33:23 +01:00
piratefinn
68cef62bde Help texts edited 2017-09-01 16:26:47 +01:00
piratefinn
95653e2a11 Finished Feedback form code to working and added routing 2017-09-01 15:02:05 +01:00
piratefinn
506e3b36da help texts edited, customer dashboard finished and feedback form added 2017-09-01 14:36:31 +01:00
piratefinn
24037e0454 Lots of refactor with auth guards and functional customer routing 2017-08-31 18:44:17 +01:00
piratefinn
52fbda7157 Removed redundant code and started abiliyt for customer entry 2017-08-31 16:06:47 +01:00
piratefinn
ccb743ec43 Merge remote-tracking branch 'origin/TBSliver/CoreUI' into finn/MoreCoreUI 2017-08-31 11:11:14 +01:00
piratefinn
52de477cc2 Fully working table org search and better error 2017-08-30 16:09:57 +01:00
Tom Bloor
4731ed9a22 Fix various linter errors in dashboard 2017-08-30 12:41:28 +01:00
Tom Bloor
cd0dd73c1c Fixed dashboard to use new graph widget, and a widget list 2017-08-30 12:35:43 +01:00
Tom Bloor
8a509e5051 Renamed customers widget to graph widget 2017-08-30 12:35:25 +01:00
piratefinn
f040a26794 Adding Stuff for submit transaction 2017-08-29 18:15:47 +01:00
Tom Bloor
5e2471aebf Refactor customer graph to use new service for org graphs 2017-08-29 17:39:27 +01:00
Tom Bloor
7342db0713 First pass on factoring out graph widgets to seperate classes 2017-08-29 16:42:32 +01:00
piratefinn
d3c0e9ec57 Typo fix 2017-08-25 15:52:29 +01:00
Tom Bloor
dfff1695ba Removed uneccessary components from dashboard 2017-08-25 14:00:39 +01:00
Tom Bloor
dd0151e18c Added roboto font 2017-08-25 14:00:29 +01:00
piratefinn
529461870f Fix to required entry data 2017-08-25 13:00:58 +01:00
piratefinn
4fd1b60369 Merge branch 'TBSliver/CoreUI' into finn/MoreCoreUI 2017-08-25 12:20:44 +01:00
piratefinn
c1381b812c More errors added 2017-08-25 12:18:14 +01:00
Tom Bloor
2d0633a393 Added id's to login form 2017-08-25 12:17:06 +01:00
Tom Bloor
371f019595 Moved assignments out of beforeEach as per test guidelines 2017-08-24 17:20:46 +01:00
piratefinn
b45bc19ba7 Basic Error messages and some correct valid added to login & register 2017-08-24 17:09:01 +01:00
Tom Bloor
d7bb20870e Change from attaching directly to body tag for app 2017-08-24 16:38:41 +01:00
piratefinn
c9b994a11e Fixed routing on login page 2017-08-24 16:30:34 +01:00
Tom Bloor
9934f618b5 Got initial spec file passing 2017-08-24 16:25:23 +01:00
Tom Bloor
c46e91e795 Fix linter errors on account-edit 2017-08-24 16:20:55 +01:00
Tom Bloor
346ea2c6fd Fixed indentation in app.module.ts 2017-08-24 16:03:45 +01:00
Tom Bloor
ddadae9a07 Fix indentation in api-service 2017-08-16 16:12:40 +01:00
Tom Bloor
59693df214 Fix indentation on login component 2017-08-16 16:10:32 +01:00
Tom Bloor
ee7b81ad3c Remove widgets module as unused 2017-08-16 16:05:47 +01:00
Tom Bloor
eee8f8e949 Router redirect to login instead of window reload 2017-08-16 15:58:31 +01:00
Tom Bloor
49e2532434 reorganise imports in dashboard module 2017-08-16 15:55:12 +01:00
Tom Bloor
e0c976c8cf Move dashboard redirect into dashboard routing module 2017-08-16 15:54:36 +01:00
Tom Bloor
cec88d1cb5 Fixed links to Add Transaction and Edit Account 2017-08-16 15:48:42 +01:00
Tom Bloor
e1d44c52ae Remove components module as no longer needed 2017-08-16 15:38:31 +01:00
Tom Bloor
10dbea0ba6 Move account edit and add data pages into dashboard set 2017-08-16 15:38:12 +01:00
Tom Bloor
574b159f5e Removed Charts pages entirely 2017-08-16 15:36:18 +01:00
Tom Bloor
48b0e0c81f Rearrange leaderboards, dashboard, etc files 2017-08-15 17:41:27 +01:00
Tom Bloor
8939c18335 Redid 404 and 500 routing, and redid authguard to point to /login 2017-08-15 16:12:55 +01:00
Tom Bloor
20330bc220 Create new auth module for login and register components 2017-08-15 15:59:43 +01:00
Tom Bloor
398cfc764a Remove unused icons modules 2017-08-15 15:35:25 +01:00
Tom Bloor
f92aaff2ff Retab full-layout.component 2017-08-15 13:51:02 +01:00
Tom Bloor
356a25fc36 Removed loads of useless links from front page 2017-08-15 13:43:26 +01:00