Commit Graph

177 Commits

Author SHA1 Message Date
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
Timo Volkmann
91b0ca27c6 auth store, new views, router changes
added vuex store to make user details globally available.
some changes in Login, Overview.
added Cache & CacheView.
added StationView & StationEdit.
2019-04-04 22:49:56 +02:00
Timo Volkmann
2a459818f2 some changes 2019-04-04 15:00:53 +02:00
Timo Volkmann
0f7a4a56e6 added view for Stations 2019-04-04 10:25:11 +02:00
Timo Volkmann
fee5f4319d Implemented: startCache Call and logout Call, some improvements in controller 2019-04-02 23:28:27 +02:00
Katharina Will
6233d89802 Merge branch 'frontend/kathy' into develop 2019-03-27 19:51:39 +01:00
Timo Volkmann
67d6ad1b6b adopted changes from kathy, some changes and implemented api/allCaches, api/login 2019-03-27 19:21:43 +01:00
Katharina Will
0c74d23195 Modified layout on index and mylayout 2019-03-27 13:46:34 +01:00
Katharina Will
545b3ffeff enhanced layout for cacheview and index 2019-03-27 12:53:45 +01:00
Timo Volkmann
53dfb2a90a some fixes 2019-03-27 10:24:53 +01:00
Timo Volkmann
a36c3f7469 pt. 2 2019-03-27 01:30:10 +01:00
Timo Volkmann
76d42d30ef header und cache overview 2019-03-26 22:26:23 +01:00
Timo Volkmann
907d344a26 added error dialog 2019-03-26 13:18:56 +01:00
Timo Volkmann
ab4a642619 login implemented and wired 2019-03-25 22:39:41 +01:00
Timo Volkmann
7db636b01a some changes 2019-03-25 19:22:48 +01:00
Timo Volkmann
3721b4986c Merge branch 'frontend/kathy' into frontend/timo
# Conflicts:
#	frontend/quasar.conf.js
#	frontend/src/router/routes.js
2019-03-24 12:44:48 +01:00
Timo Volkmann
b75f4d65e3 changed quasar dev port to 8081 and therefor added CORS policy to controller. tested allcaches api 2019-03-23 17:52:36 +01:00
Timo Volkmann
42e6d72fc3 changed quasar dev port to 8081 and therefor added CORS policy to controller. tested allcaches api 2019-03-23 17:52:19 +01:00
Katharina Will
7a72715117 Designed pages CacheView and Login 2019-03-23 17:24:02 +01:00
Timo Volkmann
9001b6d733 fetch data from localhost/allCaches 2019-03-23 11:36:02 +01:00
Timo Volkmann
2f2f0edff7 sample cards for caches 2019-03-23 10:43:39 +01:00
Timo Volkmann
10ac55b36b first simple data from demo api in index.vue 2019-03-21 23:24:10 +01:00
Timo Volkmann
8613ff1fb8 Merge branch 'frontend/timo' into develop 2019-03-21 17:34:59 +01:00
Timo Volkmann
ab9e57030c cleaned 2019-03-21 17:34:46 +01:00
Timo Volkmann
2417a94429 Merge branch 'frontend/timo' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into frontend/timo 2019-03-21 16:57:42 +01:00
Timo Volkmann
87f39f0ef4 added pages for Sprint 1 2019-03-21 16:57:29 +01:00
Maximilian Leopold
174f71d051 Added properties 2019-03-21 12:36:48 +01:00
Timo Volkmann
7d8b75a2b3 added frontend component, modified gradle.build 2019-03-19 23:01:54 +01:00