supleed2/ELEC60013-ES-CW1
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC60013-ES-CW1.git synced 2024-12-22 21:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
39 commits 1 branch 0 tags 8.4 MiB
Commit graph

39 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aadi Desai 373972d2fc
Merge remote-tracking branch 'datapuller/main' 2022-03-07 23:29:01 +00:00
Aadi Desai 359a1ec465
Move App to subdir 2022-03-07 23:28:43 +00:00
Aadi Desai 1d39a1754a
Merge remote-tracking branch 'app/main' 2022-03-07 23:26:05 +00:00
Aadi Desai 74dd98335e
Prepare merge repo 2022-03-07 23:25:25 +00:00
Aadi Desai 35f98a2e99
Integration Complete 
Seems to work, debug print statements removed
 2022-03-02 12:34:11 +00:00
Benjamin Ramhorst ce9786ab05 Minor fixes 2022-03-01 11:07:52 +00:00
Aadi Desai 1272b78f69
Update with functionality 
OpenHaystack integration to be added for location data
 2022-02-24 20:08:26 +00:00
Aadi Desai 30b791011e
Initial Commit 2022-02-18 14:59:16 +00:00
Benjamin Ramhorst 7a9723bb34 User sessions are now passed to the backend 2022-02-15 11:52:19 +00:00
Benjamin Ramhorst f4d0527a3d Data is now collected for the user's device; not hardcoded 2022-02-15 11:06:39 +00:00
Benjamin Ramhorst 3965eb2667
Merge pull request #7 from LEG-Industries/metrics-functionality 
Code refractoring & home (metrics) page implemented
 2022-02-15 09:55:54 +00:00
Benjamin Ramhorst a3e997b06d Code refractoring & home (metrics) page implemented 2022-02-15 01:04:13 +00:00
Benjamin Ramhorst bd2e26313f
Merge pull request #6 from LEG-Industries/steps-functionality 
Steps functionality
 2022-02-14 23:31:57 +00:00
Benjamin Ramhorst 5ee93dc6be Steps page implemented 2022-02-14 23:28:27 +00:00
Benjamin Ramhorst 31b7ed3234 Fixed endpoints 2022-02-14 20:22:24 +00:00
Benjamin Ramhorst 260767d8c1 Added daily steps reading from server 2022-02-14 20:19:04 +00:00
Benjamin Ramhorst 540e124ec4
Merge pull request #5 from LEG-Industries/map-functionality 
Map-functionality
 2022-02-14 17:07:12 +00:00
Benjamin Ramhorst c929242804 Code refractoring 2022-02-14 17:03:32 +00:00
Benjamin Ramhorst 6464161b34 Complete map functionality 2022-02-14 16:59:33 +00:00
Benjamin Ramhorst 5431d765d4 Added marker on map to show pet location 2022-02-14 14:40:18 +00:00
Benjamin Ramhorst d3381b2e46
Merge pull request #4 from LEG-Industries/registration 
Registration
 2022-02-11 18:15:06 +00:00
Benjamin Ramhorst bf70bb08eb Added login page 2022-02-11 18:14:40 +00:00
Benjamin Ramhorst 4fb5dcb5f0 Added user registration page 2022-02-11 12:46:56 +00:00
Benjamin Ramhorst 716d2f7b62 Added metrics page 2022-02-10 11:06:37 +00:00
Benjamin Ramhorst cdcd7d6d6b
Merge pull request #3 from LEG-Industries/steps-page 
Steps page
 2022-02-09 19:32:20 +00:00
Benjamin Ramhorst 72e6fa0386 Implemented steps page 2022-02-09 18:29:27 +00:00
Benjamin Ramhorst c810510107 Added bar chart for steps 2022-02-09 17:52:00 +00:00
Benjamin Ramhorst e13a9436f4 Added model for showing steps data 2022-02-09 17:15:11 +00:00
Benjamin Ramhorst e21ae2e36d mend 2022-02-09 17:07:59 +00:00
Benjamin Ramhorst ac3a3a76ff Minor refractoring to allow for cleaner code and easier bar chart integration@ 2022-02-09 17:06:27 +00:00
Benjamin Ramhorst ac25c2c7f0 Added requirements for bar charts 2022-02-09 17:00:36 +00:00
Benjamin Ramhorst d29671a926
Merge pull request #2 from LEG-Industries/maps-screen 
Maps screen
 2022-02-09 16:53:21 +00:00
Benjamin Ramhorst 0785b1649c Added basic Google Map 2022-02-09 16:49:50 +00:00
Benjamin Ramhorst 1d92162f7d Added Google Maps API key 2022-02-09 16:24:09 +00:00
Benjamin Ramhorst db81c30fd6
Merge pull request #1 from LEG-Industries/basic-layout 
Basic layout
 2022-02-09 16:15:49 +00:00
Benjamin Ramhorst b33e43b532 Added dependecies for Google Maps 2022-02-09 16:14:42 +00:00
Benjamin Ramhorst 3363d514a0 Added functionality for switching between pages 2022-02-09 16:06:37 +00:00
Benjamin Ramhorst fd156f31e8 Added basic navigation bar 2022-02-09 15:50:52 +00:00
Benjamin Ramhorst 8af20d98ba First commit 2022-02-09 15:09:03 +00:00