tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
477 Commits 1 Branch 0 Tags 17 MiB
59acf0a79f
Commit Graph

177 Commits

Author SHA1 Message Date
Maximilian Leopold
08e30ca5b5 Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop 2019-05-09 13:06:46 +02:00
Maximilian Leopold
525e705bf9 Fixed Create Team 2019-05-09 13:06:41 +02:00
Katharina Will
20bf3bfd51 Applied final changes to team rankinglist view 2019-05-08 20:39:36 +02:00
Katharina Will
ebdea962ae Merge branch 'develop' into frontend/kathy 2019-05-08 20:23:08 +02:00
Katharina Will
2e315c6125 Started implementation of map view in Overview 2019-05-08 20:14:37 +02:00
rchrist
a56d2f3c22 finished getPersonalRanking() 2019-05-08 16:55:43 +02:00
rchrist
2a16638278 fixed merge conflicts 2019-05-08 16:34:24 +02:00
rchrist
54b98e5f6a fixed merge conflicts 2019-05-08 16:20:57 +02:00
rchrist
80459cd793 implementation of some api calls finished 2019-05-08 16:15:44 +02:00
Maximilian Leopold
99499feb12 Spring application fixed 2019-05-08 13:13:31 +02:00
Timo Volkmann
b5ba5230ab improvements: profile, qr-scanner, layout 2019-05-08 12:17:47 +02:00
Timo Volkmann
b6a9cdcb07 added qr-generator and fixed some bugs 2019-05-08 00:40:10 +02:00
Timo Volkmann
21fc559a4b bugfixes 2019-05-07 22:57:30 +02:00
Timo Volkmann
14fe441e80 moved QR-Scanner to Component 2019-05-07 15:07:57 +02:00
Katharina Will
7512c2e49e Added map to CacheStart view 2019-05-07 14:36:43 +02:00
Timo Volkmann
41d0cb028a improve qr-code-scanner 2019-05-07 14:20:08 +02:00
Timo Volkmann
3c884dcd90 bugfixes 2019-05-07 13:19:11 +02:00
Timo Volkmann
c0845f835f bugfixes 2019-05-07 12:56:04 +02:00
rchrist
20dfcd6ceb some work on api calls of profile and team 2019-05-06 20:19:45 +02:00
rchrist
52b04a90a2 some work at profile component 2019-05-06 17:46:26 +02:00
rchrist
6fb8cd8f91 Merge branch 'develop' into frontend/robin 2019-05-03 15:21:46 +02:00
rchrist
0ea9a293a7 using token instead of name for getRanking API now 2019-05-03 15:20:51 +02:00
Maximilian Leopold
742d2b5d66 Startes Swagger Documentation 2019-05-02 19:31:16 +02:00
Timo Volkmann
ea006b3915 cachers can now access their rewards at mycaches page 2019-05-01 21:40:13 +02:00
Timo Volkmann
e660a7bba7 continue cache works 2019-05-01 21:31:14 +02:00
Timo Volkmann
1f2ee957e8 cacheview now properly loads new data 2019-05-01 21:23:59 +02:00
Timo Volkmann
57c62d421d changed registration process 2019-04-30 19:17:18 +02:00
Timo Volkmann
44086c630d fixed register & continue cache 2019-04-30 19:07:18 +02:00
Timo Volkmann
a97b3f1c91 USER_API in quasar.conf 2019-04-30 17:59:13 +02:00
Timo Volkmann
a9450d448f fixed delete cache 2019-04-30 17:49:58 +02:00
Timo Volkmann
8c647b0b09 changed some configurations for https 2019-04-30 17:09:51 +02:00
Timo Volkmann
6f4789fff0 fixed login & separated profile from mycaches 2019-04-30 16:45:27 +02:00
Timo Volkmann
9e132b21ef Merge branch 'develop' into frontend/timo; weird merge conflicts 
# Conflicts:
#	.idea/modules.xml
#	src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
 2019-04-30 15:39:50 +02:00
Timo Volkmann
bac0a31fd3 fixed bugs in cache creation and processing 2019-04-30 15:30:50 +02:00
rchrist
fad27b0e35 save 2019-04-30 15:28:57 +02:00
rchrist
247e762289 design of profl 2019-04-30 14:21:22 +02:00
Timo Volkmann
865d48cd63 reworked cache creation 2019-04-30 02:00:38 +02:00
Timo Volkmann
2536996b16 CacheEnd now shows reward correctly 2019-04-29 22:17:58 +02:00
Timo Volkmann
8636443f87 fixed merge problems 2019-04-29 22:16:18 +02:00
Timo Volkmann
2b691fa6f3 fixed git problems 2019-04-29 21:51:33 +02:00
Timo Volkmann
33ed2e32b9 fixed cache process 2019-04-29 21:34:26 +02:00
Timo Volkmann
65d3e77558 fixed some bugs and created data-store for current cache 2019-04-29 20:37:30 +02:00
rchrist
51b9587410 started logical implementation of profile and team 2019-04-29 19:51:12 +02:00
rchrist
bd811fbe99 icon for teaminvites updated 2019-04-28 20:56:05 +02:00
rchrist
45cef7d5f3 Profile mockup updated for presentation 2019-04-28 20:53:06 +02:00
rchrist
62de51f07d create Team added (MOCKUP) 2019-04-27 22:06:06 +02:00
rchrist
8c10b4286d ranking for teams added (MOCKUP) 2019-04-27 21:52:53 +02:00
rchrist
c10820d832 myProfile and myTeams MOCKUP version added 2019-04-27 21:43:23 +02:00
rchrist
85cfd5e3f4 Merge branch 'develop' into frontend/robin 2019-04-25 13:56:07 +02:00
rchrist
a7223a49cb finished user story Registrierung 2019-04-25 13:55:27 +02:00
Timo Volkmann
57c5c7c39a redirect finished station to CacheEnd. not tested 2019-04-25 12:38:04 +02:00
Timo Volkmann
33e6b6a35e Merge branch 'frontend/kathy' into frontend/timo 2019-04-25 12:26:03 +02:00
Katharina Will
dcdbe2dd68 Minor changes to CacheEnd 2019-04-25 12:09:39 +02:00
Timo Volkmann
479173de84 changes for cache creation 2019-04-25 12:08:03 +02:00
Timo Volkmann
b4057e9c85 Merge branch 'frontend/kathy' into frontend/timo 
# Conflicts:
#	frontend/src/pages/CacheStart.vue
 2019-04-25 10:27:29 +02:00
Timo Volkmann
3ed9a1bf21 implemented qr-code scanner in caching process 2019-04-25 10:22:28 +02:00
Katharina Will
11e84effa1 Added missing end-tags 2019-04-24 11:00:20 +02:00
Katharina Will
582edef020 Minor changes to CacheEnd 2019-04-24 10:10:02 +02:00
Timo Volkmann
e412d4a797 updated frontend caching logic 2019-04-24 09:31:54 +02:00
Katharina Will
6f6fa8a0b0 Added error handling to CacheStart and implemented qr scanner as own page 2019-04-23 21:02:02 +02:00
rchrist
1427e4dcd2 Merge branch 'develop' into frontend/robin 2019-04-23 16:58:51 +02:00
rchrist
7a693d51f9 register page added 2019-04-23 16:58:22 +02:00
Katharina Will
fe3070204d Added functionality to start a Cache and view first station 2019-04-23 15:53:13 +02:00
Katharina Will
bfe303f277 Merge branch 'develop' into frontend/kathy 2019-04-23 14:56:44 +02:00
Katharina Will
30365d8db6 Modified cacheStart and cacheEnd 2019-04-23 14:55:34 +02:00
Timo Volkmann
0ec3dbb0b1 qr-code scanner working 2019-04-22 22:43:58 +02:00
Katharina Will
6e53127fed Added pages for starting and ending a cache 2019-04-21 20:40:31 +02:00
Maximilian Leopold
a72d65a518 Merge branch 'frontend/robin' into backend/max 2019-04-19 18:53:04 +02:00
Maximilian Leopold
063b0a0816 Added config 2019-04-19 18:52:49 +02:00
rchrist
0173cb28c6 Merge branch 'develop' into frontend/robin 2019-04-19 18:03:31 +02:00
Timo Volkmann
79cfd4b280 fixed broken getMyCaches call in frontend 2019-04-18 22:37:44 +02:00
rchrist
c690c620e4 updated error handling to see the difference between request errors, response errors and other ones 2019-04-18 22:03:23 +02:00
rchrist
ddd21915c8 added first error dialogs w/o any error specification 2019-04-18 18:04:40 +02:00
Timo Volkmann
621978e08d resolved merge conflict 2019-04-18 12:59:02 +02:00
Timo Volkmann
3611b49165 Merge branch 'develop' into frontend/timo 2019-04-18 12:58:43 +02:00
Timo Volkmann
da4bbdeeea fixed login and admin evaluation 2019-04-18 12:51:57 +02:00
Maximilian Leopold
496c5fcb6b Ready to deploy 2019-04-18 12:48:33 +02:00
Timo Volkmann
71b0618ab2 Fixed login, several other fixes 2019-04-17 23:22:44 +02:00
Timo Volkmann
377f28a564 first test implementation of qr-code-scanner 2019-04-15 21:45:38 +02:00
Timo Volkmann
789c04a8e8 centralized API-URL in quasar.conf.js 2019-04-15 18:00:32 +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
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
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
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
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
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
Timo Volkmann
2723c59056 changes in Cache & Station Editpages, worked on cacheCollector store 2019-04-09 03:41:05 +02:00
Katharina Will
941eba5e3d Added button to create new cache 2019-04-08 14:48:56 +02:00
Timo Volkmann
560e90b760 continued work on Cache and Station 2019-04-08 14:46:37 +02:00
Katharina Will
741f175cc2 Applied changes to layout 2019-04-08 14:04:09 +02:00
Katharina Will
ca0c21bf4d Merge branch 'develop' into frontend/kathy 2019-04-08 13:20:02 +02:00
Katharina Will
e5f8f23b18 Resolved conflicts 2019-04-08 13:18:19 +02:00
Katharina Will
74f664e2ba Implemented view of rankinglist 2019-04-08 13:09:16 +02:00
Timo Volkmann
239dc92b58 changes in Cache & Station Editpages, added cacheCollector Store 2019-04-05 14:40:10 +02:00