Commit Graph

39 Commits

Author SHA1 Message Date
Bilal Catic
4a030d63e6 add/update models 2019-06-10 06:05:06 +02:00
Bilal Catic
c021b55c26 add migrations for new table, columns and modified column names 2019-06-10 06:05:06 +02:00
Bilal Catic
0a712bf501 update axios, install moment timezone 2019-06-10 06:05:06 +02:00
Bilal Catic
c1e24b92f4 Merge branch 'add-door-lock-charges-screen' into 'master'
fix parsing reports, change tables to use timestamps

See merge request saburly/psihologija!7
2019-06-03 07:44:32 +00:00
Bilal Catic
c5408c1295 fix parsing reports, change tables to use timestamps 2019-06-03 09:41:03 +02:00
Bilal Catic
cae217739a Merge branch 'add-door-lock-charges-screen' into 'master'
fetch and save booking reservations

See merge request saburly/psihologija!6
2019-05-31 04:16:07 +00:00
Bilal Catic
727c6c940f fetch and save booking reservations 2019-05-31 06:15:19 +02:00
Bilal Catic
f2141544af Merge branch 'add-door-lock-charges-screen' into 'master'
display upload errors, unknown members

See merge request saburly/psihologija!5
2019-05-31 03:44:46 +00:00
Bilal Catic
87134e4ede display upload errors, unknown members 2019-05-31 05:42:50 +02:00
Bilal Catic
48503de853 Merge branch 'add-door-lock-charges-screen' into 'master'
upload, parse and store door lock entries

See merge request saburly/psihologija!4
2019-05-30 10:47:03 +00:00
Bilal Catic
79bcf91dc7 upload, parse and store door lock entries 2019-05-30 12:45:55 +02:00
Bilal Catic
d141889c4d Merge branch 'add-door-lock-charges-screen' into 'master'
Add door lock charges screen

See merge request saburly/psihologija!3
2019-05-28 11:38:42 +00:00
Bilal Catic
e5c5a6384a change labels 2019-05-28 13:36:07 +02:00
Bilal Catic
19c08195b4 seperate upload and report screens 2019-05-28 13:04:33 +02:00
Bilal Catic
90b6d7b7e5 remove console logging 2019-05-28 04:45:21 +02:00
Bilal Catic
6cc3643501 install and use redux to fetch data from server 2019-05-28 04:39:50 +02:00
Bilal Catic
0100f15960 add door lock charges controller 2019-05-28 04:38:53 +02:00
Bilal Catic
0f0fc49750 add key to react components 2019-05-28 04:38:14 +02:00
Bilal Catic
64ed758593 add key to react components 2019-05-28 01:28:14 +02:00
Bilal Catic
d3f8810c7c add form for door lock charge report 2019-05-27 19:35:22 +02:00
Bilal Catic
790582ceda fix code style 2019-05-27 19:35:00 +02:00
Bilal Catic
ed457e470f add main menu navigation and door lock charges page 2019-05-27 14:39:22 +02:00
Bilal Catic
c67b203bec Merge branch 'master' of gitlab.com:saburly/psihologija 2019-05-27 10:51:23 +02:00
Bilal Catic
4435a6e47c Merge branch 'use-env-variables' into 'master'
use ENV variables

See merge request saburly/psihologija!2
2019-05-26 12:12:14 +02:00
Bilal Catic
cd6290c8a0 Merge branch 'use-env-variables' into 'master'
use ENV variables

See merge request saburly/psihologija!2
2019-05-24 13:52:22 +00:00
Bilal Catic
304de9bd32 use ENV variables 2019-05-24 15:42:45 +02:00
Bilal Catic
aa3a4d8720 remove console logging on frontend 2019-05-24 14:12:47 +02:00
Bilal Catic
1809b0991d Merge branch 'initial-project-setup' into 'master'
Initial project setup

See merge request saburly/psihologija!1
2019-05-24 12:10:15 +00:00
Bilal Catic
dbc203fa44 add password protection 2019-05-24 10:37:42 +02:00
Bilal Catic
c0788d7a43 add api status check 2019-05-24 10:14:41 +02:00
Bilal Catic
ac6a738749 add script for heroku deploy 2019-05-24 04:06:23 +02:00
Bilal Catic
3203c63a64 server frontend files through express 2019-05-23 19:33:37 +02:00
Bilal Catic
01244c3118 create simple hello world app 2019-05-23 19:19:54 +02:00
Bilal Catic
2ff4e4ae8a change database name 2019-05-23 18:58:17 +02:00
Bilal Catic
c7c7957c8a add npm start command 2019-05-23 18:38:28 +02:00
Bilal Catic
8943dfee0d initial frontend setup 2019-05-23 18:36:24 +02:00
Bilal Catic
e78ac4018e update gitignore 2019-05-23 16:46:10 +02:00
Bilal Catic
604f952a7a initial server side setup 2019-05-23 16:41:50 +02:00
Senad Uka
b140cef88c Initial commit 2019-05-23 09:40:13 +02:00