Commit Graph

334 Commits

Author SHA1 Message Date
Michael
4b16b6a2b1 returns bearbeitet instead of the station now so the frontend is able to see whether the cache is finished or not
added a FinderUtil method for cacheAccesDefinition
2019-04-16 10:17:36 +02:00
Timo Volkmann
377f28a564 first test implementation of qr-code-scanner 2019-04-15 21:45:38 +02:00
Timo Volkmann
03b5476dd2 Merge branch 'frontend/timo' into develop 2019-04-15 18:02:11 +02:00
Timo Volkmann
789c04a8e8 centralized API-URL in quasar.conf.js 2019-04-15 18:00:32 +02:00
Maximilian Leopold
663d3482ee Changed Methods to user FinderUtil 2019-04-15 17:23:34 +02:00
Maximilian Leopold
41c5dc482d Added FinderUtil 2019-04-15 17:06:16 +02:00
Timo Volkmann
8ee93cd9c0 upgraded quasar. removed yarn as package-manager 2019-04-15 17:01:25 +02:00
Timo Volkmann
e1c118fa57 implemented dialog 2019-04-15 16:40:22 +02:00
Maximilian Leopold
81c2b19f09 Merge branch 'backend/michael' into backend/max 2019-04-15 16:25:45 +02:00
Maximilian Leopold
b82bab1f8e Stash 2019-04-15 13:33:29 +02:00
Michael
4f7b8bd4f6 added comments 2019-04-13 22:01:18 +02:00
Michael
d14a4b5d86 modified checkStation 2019-04-13 21:41:24 +02:00
Michael
ff7ddde5ee returns the station as JSON now if everything is OK 2019-04-13 21:34:57 +02:00
Michael
749fcd119a fixed more bugs 2019-04-13 21:24:14 +02:00
Michael
2a5dbd9e72 fixed a bug 2019-04-13 21:18:20 +02:00
Michael
0f856b1ec2 first implementation for checkStation(API method for cache durchführen) 2019-04-13 19:44:47 +02:00
Maximilian Leopold
43caf76471 Implemented public key fetching 2019-04-13 18:08:11 +02:00
Maximilian Leopold
d718446f36 More code cleanup 2019-04-13 14:35:08 +02:00
Maximilian Leopold
0de405167b Merge branch 'develop' into backend/max 2019-04-13 14:28:32 +02:00
Maximilian Leopold
fe0dd478cd Started reorganising backend code 2019-04-13 13:52:42 +02:00
Timo Volkmann
a96e1693ed layout: tabbar scrollable in profile 2019-04-11 12:56:23 +02:00
Timo Volkmann
2fe73aebc9 cleaned repository 2019-04-11 12:17:30 +02:00
Maximilian Leopold
032c4e5d70 Merge branch 'frontend/robin' into develop 2019-04-11 12:01:10 +02:00
Maximilian Leopold
c0d6c1090e Changed iml files 2019-04-11 12:00:56 +02:00
Katharina Will
88505fb038 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-04-11 11:42:05 +02:00
Michael
16cae0ba90 fixed a bug with deleteCache 2019-04-11 03:20:17 +02:00
Michael
9828f88f7b a cache needs atleast 2 stations now(start and endstation) 2019-04-11 02:56:01 +02:00
Michael
1c602c1dab deleteCache deletes all stations related to taht cache now 2019-04-11 02:54:53 +02:00
rchrist
d810d782cb finished user story angefangene und abgeschlossene Caches ansehen 2019-04-11 00:52:27 +02:00
rchrist
46ac72ffa2 error 404 with api/getMyCaches 2019-04-10 16:52:05 +02:00
rchrist
2d024fc884 merge develop 2019-04-10 15:16:33 +02:00
rchrist
98da1b8094 local file structure changed 2019-04-10 15:11:29 +02:00
Timo Volkmann
1c7a34a735 Finished „create Cache/Station“
fixed Login and Frontend Usermanagement,
implemented delete Cache,
fixed some problems with store logic and router
2019-04-10 00:16:28 +02:00
Maximilian Leopold
1cd7e29fc1 Changed HTTP Respnse code 2019-04-09 16:54:19 +02:00
Maximilian Leopold
59103da8ac Changed responeentity json param. 2019-04-09 16:51:01 +02:00
Maximilian Leopold
283f56e02d There cant be two bearbeitet entities in the db featuring the same cache and user 2019-04-09 16:49:17 +02:00
Katharina Will
dc1d74a615 Merge branch 'develop' into frontend/kathy 2019-04-09 16:30:38 +02:00
Katharina Will
842ca6aa56 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-04-09 16:21:53 +02:00
Katharina Will
2bd3d36c14 rankinglist shows data from database 2019-04-09 16:20:07 +02:00
Maximilian Leopold
40661fb689 Build fail fixed 2019-04-09 16:01:48 +02:00
Timo Volkmann
2b6302bf81 Merge branch 'develop' into frontend/timo 2019-04-09 13:49:14 +02:00
Maximilian Leopold
d4a73ab436 Merged 2019-04-09 13:26:35 +02:00
Maximilian Leopold
14049730a4 Changed something, that previously worked without the anotation... 2019-04-09 13:24:33 +02:00
Timo Volkmann
2723c59056 changes in Cache & Station Editpages, worked on cacheCollector store 2019-04-09 03:41:05 +02:00
Katharina Will
7613fee705 Merge branch 'develop' into frontend/kathy 2019-04-08 14:50:27 +02:00
Katharina Will
5e5267afc8 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-04-08 14:50:07 +02:00
Katharina Will
941eba5e3d Added button to create new cache 2019-04-08 14:48:56 +02:00
Timo Volkmann
57e66dcc45 Merge branch 'develop' into frontend/timo 2019-04-08 14:46:46 +02:00
Timo Volkmann
560e90b760 continued work on Cache and Station 2019-04-08 14:46:37 +02:00
Maximilian Leopold
5145b203c4 Chaged format of RankingList JSON 2019-04-08 14:44:13 +02:00