Commit Graph

110 Commits

Author SHA1 Message Date
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
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
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
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