Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#48 forecasting #11

Open
wants to merge 140 commits into
base: master
Choose a base branch
from
Open

#48 forecasting #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
d03e13c
#new homepage of weatherApp
Oct 29, 2018
c75aa8d
added clickevents
sholtkamp Nov 1, 2018
f29bd81
Merge pull request #14 from Albertios/develop
sholtkamp Nov 1, 2018
f5ccd0e
Update README.md
YouQam Nov 1, 2018
0ad9e78
new pages
Nov 6, 2018
003084b
update lite version of weatherPage
Nov 6, 2018
bb066ca
update
Nov 6, 2018
78b5643
new page aboutWeatherPage
Nov 6, 2018
966e7d5
update add navbar
Nov 6, 2018
297d6ca
update new navList
Nov 6, 2018
9896f2b
update add icons to title
Nov 6, 2018
37c0857
Merge pull request #18 from Albertios/UI
Albertios Nov 6, 2018
5467f77
popover working
sholtkamp Nov 6, 2018
6f4827e
leaflet added to popover
sholtkamp Nov 6, 2018
2fb73f5
size adjustments implemented
sholtkamp Nov 6, 2018
9e727d2
closed #19
Nov 8, 2018
8e2b346
Merge pull request #26 from Albertios/weatherMap
SarahLechler Nov 9, 2018
5ac93d2
fully functioning leaflet map
sholtkamp Nov 9, 2018
45691b9
boxLayer in popover
SarahLechler Nov 13, 2018
bed2e2a
Merge remote-tracking branch 'origin/leaflet_popover' into leaflet_po…
SarahLechler Nov 13, 2018
baf1163
republish working leaflet
sholtkamp Nov 13, 2018
e93d1f8
Merge pull request #30 from Albertios/leaflet_popover
SarahLechler Nov 13, 2018
f11662d
Merge branch 'master' into develop
SarahLechler Nov 16, 2018
98b68f0
Merge pull request #32 from Albertios/develop
SarahLechler Nov 16, 2018
5db7300
basic charts popover
SarahLechler Nov 16, 2018
31eb1e3
bug fixing after merging develop with master
Nov 16, 2018
148cbb7
resolves #24 Popups with button for saving ID
SarahLechler Nov 17, 2018
85d6e7d
Merge remote-tracking branch 'origin/leaflet_popover' into leaflet_po…
SarahLechler Nov 17, 2018
5a4d4c9
function for popup
SarahLechler Nov 19, 2018
7b110e6
add storage to project
SarahLechler Nov 19, 2018
00521e8
Merge pull request #34 from Albertios/leaflet_popover
Albertios Nov 19, 2018
5435375
add locating
sholtkamp Nov 19, 2018
d587061
Merge pull request #35 from Albertios/leaflet_temp
Albertios Nov 19, 2018
18d7ffa
Location and search working
sholtkamp Nov 19, 2018
15dd611
added dummy custom marker
sholtkamp Nov 19, 2018
8cbfea6
Merge pull request #37 from Albertios/leaflet_temp
SarahLechler Nov 19, 2018
48ad801
resolves #31 changed Marker symbol to custom M
SarahLechler Nov 19, 2018
0def940
Merge pull request #38 from Albertios/boxMarkers
Albertios Nov 19, 2018
e24ca69
Merge branch 'charts' into boxMarkers
SarahLechler Nov 19, 2018
0c1a85f
stats as popover
SarahLechler Nov 19, 2018
dcb0d80
hot fix bastis marker
Nov 19, 2018
9d957f6
Merge pull request #39 from Albertios/stats
sholtkamp Nov 20, 2018
caa14f1
Green Marker, chart.js in package.json
SarahLechler Nov 20, 2018
55f545f
Delete PLATZHALTER.txt
sholtkamp Nov 20, 2018
cc3c003
Merge branch 'master' into newMarker
sholtkamp Nov 20, 2018
54f575d
Merge pull request #41 from Albertios/newMarker
sholtkamp Nov 20, 2018
06ac30f
new style & map
Nov 29, 2018
828068e
changed senseBox ID
Nov 29, 2018
c462763
update
Nov 30, 2018
5e1a2ed
new page
Nov 30, 2018
fe6af28
working event for button in PopUp
SarahLechler Dec 4, 2018
bc6e4f7
Merge pull request #42 from Albertios/markerEvent
Albertios Dec 7, 2018
67d534a
automatic data refresh on new preference
SarahLechler Dec 7, 2018
7a0eda3
initial_implementation_of_forecasting
YouQam Dec 9, 2018
7d38108
Merge branch 'master' into automaticRefresh
Albertios Dec 10, 2018
e1d5685
Merge pull request #46 from Albertios/automaticRefresh
Albertios Dec 10, 2018
1dc4dea
delete old radar URL
Dec 10, 2018
99c2126
update leaflet page
Dec 10, 2018
b347272
update radar map
Dec 11, 2018
7e1305f
created
Dec 11, 2018
22487d6
comments added
Dec 11, 2018
3dca87b
bug fixed
Albertios Dec 12, 2018
99b3c77
new Api functions and therefore change of ajax request in leaflet
SarahLechler Jan 11, 2019
48b7f1d
working on finding closest box
sholtkamp Jan 11, 2019
57e1234
Merge pull request #54 from Albertios/rainViewerRadarMap
SarahLechler Jan 14, 2019
17fe2c0
Merge branch 'master' into api&boxLayerFix
SarahLechler Jan 14, 2019
08623fd
Merge branch 'windyAPI' into master
sholtkamp Jan 14, 2019
e595393
bugfixes for merging Albert's commit
sholtkamp Jan 14, 2019
326d936
hotfix
Albertios Jan 14, 2019
8137e00
Find closest sensebox, getSenseboxData
SarahLechler Jan 14, 2019
1ce02a6
Merge branch 'master' into api&boxLayerFix
SarahLechler Jan 14, 2019
2d1566c
marker for closest sensebox
SarahLechler Jan 14, 2019
dc80d76
Merge pull request #56 from Albertios/api&boxLayerFix
sholtkamp Jan 14, 2019
74a6f0e
changed locate btn
Albertios Jan 14, 2019
8f0b33e
charts based on sensor, updating chart still missing
SarahLechler Jan 14, 2019
5c20576
NodeJs Server
YouQam Jan 14, 2019
689871a
cleansed chartData to min and max values of days
SarahLechler Jan 18, 2019
005f67b
fix for getClosestSensebox Function when location is searched
SarahLechler Jan 18, 2019
23dd016
Merge remote-tracking branch 'origin/distanceFix' into leafletUpgrade
Albertios Jan 18, 2019
01151b1
fix for Graphs --> save data in callback as an array
SarahLechler Jan 18, 2019
3142ac6
Merge remote-tracking branch 'origin/distanceFix' into leafletUpgrade
Albertios Jan 18, 2019
1fe76f6
added comments;
Albertios Jan 18, 2019
2920384
ion-select for sensor selection --> mobile interface
SarahLechler Jan 20, 2019
98f497c
added responsiveness for graphs
SarahLechler Jan 20, 2019
5020d45
button reaction when preference is set
SarahLechler Jan 20, 2019
4ddb603
popover closes after preferenced box is set
SarahLechler Jan 20, 2019
b62c7e1
Merge pull request #58 from Albertios/distanceFix
Albertios Jan 20, 2019
08c100a
Merge pull request #59 from Albertios/graphForSensor
Albertios Jan 20, 2019
1331a16
Merge pull request #60 from Albertios/markerEvent
Albertios Jan 20, 2019
7641b82
new funciton changeMarkerColor()
Albertios Jan 20, 2019
1bcc05d
Merge pull request #61 from Albertios/leafletUpgrade
SarahLechler Jan 20, 2019
c7c0234
init
sholtkamp Jan 21, 2019
74a2537
fixed about page
sholtkamp Jan 21, 2019
25c1ff4
fixed help page
sholtkamp Jan 21, 2019
594f4ef
fixed menu button
sholtkamp Jan 21, 2019
bd20e74
fixed home
sholtkamp Jan 21, 2019
1b90323
settings fixed
sholtkamp Jan 21, 2019
58034ec
resolved all conflicts regarding the pull request
sholtkamp Jan 21, 2019
81f9681
Merge pull request #62 from Albertios/fixing_harini
Albertios Jan 21, 2019
6e86594
introduced Harini's social sharing stub
sholtkamp Jan 21, 2019
46d8972
restructured app
sholtkamp Jan 21, 2019
c778beb
minor adjustments
sholtkamp Jan 21, 2019
b0e48c3
reworking structure (Help needed!!!)
sholtkamp Jan 21, 2019
da43ca8
new page
Albertios Jan 21, 2019
287e338
Merge branch 'master' into introductionPage
Albertios Jan 21, 2019
06ef6ca
hotFix
Albertios Jan 21, 2019
cbe5e97
after searching, view is fit to next sensebox and the next sensebox i…
SarahLechler Jan 21, 2019
32f9c35
color of graph adjusted to app colors, unit of data is given in heading
SarahLechler Jan 21, 2019
4f9ec8c
catches error, when no data is available
SarahLechler Jan 21, 2019
7f56c54
foresact implementation with local server, excute server.js to get it…
YouQam Jan 22, 2019
57dc61f
Merge branch 'master' into markerEvent
sholtkamp Jan 22, 2019
5231dea
Merge pull request #64 from Albertios/markerEvent
sholtkamp Jan 22, 2019
75b5e08
Merge branch 'markerEvent'
SarahLechler Jan 22, 2019
605d6e4
fixing merge issue
sholtkamp Jan 22, 2019
79b6f48
new UX
sholtkamp Jan 22, 2019
7dce414
hide sharing
sholtkamp Jan 22, 2019
e24b095
Merge pull request #67 from Albertios/introductionPage
Albertios Jan 22, 2019
e4a9777
Merge pull request #63 from Albertios/introductionPage
SarahLechler Jan 22, 2019
90979a8
Merge branch 'master' into QA
sholtkamp Jan 22, 2019
93dfaea
Revert "Merge branch 'master' into QA"
sholtkamp Jan 22, 2019
79e2ecd
Merge branch 'pre-master' into QA
Albertios Jan 22, 2019
679996f
Merge pull request #68 from Albertios/QA
Albertios Jan 22, 2019
d2ede63
hotFix
Albertios Jan 22, 2019
0987af6
bugfixes
sholtkamp Jan 22, 2019
e78b24c
Merge pull request #69 from Albertios/pre-master
sholtkamp Jan 22, 2019
480e214
merging
SarahLechler Jan 22, 2019
ce9dd62
graph can now be populated for two sensors of two different senseboxes
SarahLechler Jan 22, 2019
998aad8
merging
SarahLechler Jan 22, 2019
24bcce0
Merge branch 'master' into graphForTwoSensors
SarahLechler Jan 22, 2019
4eff8de
adding alerts for savinng boxes and if checkbox is clicked but no sen…
SarahLechler Jan 22, 2019
26718cb
graphs: error handling when no box data available
SarahLechler Jan 22, 2019
e5be0b2
Merge pull request #70 from Albertios/graphForTwoSensors
sholtkamp Jan 22, 2019
2e218c3
closes #72
SarahLechler Jan 22, 2019
b882cad
fixed spacing between checkbox and select
SarahLechler Jan 22, 2019
b73958f
Merge pull request #73 from Albertios/graphForTwoSensors
sholtkamp Jan 22, 2019
29f08d4
reworking about
sholtkamp Jan 22, 2019
f5d524d
working on about page
sholtkamp Jan 22, 2019
545c651
finalizing about 2.0
sholtkamp Jan 25, 2019
d701afc
Merge pull request #78 from Albertios/QA
Albertios Jan 25, 2019
998f66a
Merge branch 'master' into #48_forecasting
YouQam Jan 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- https://ionicframework.com/docs/cli/
- please fork this repository to develop your apps

### Prequesites
### Prequesites:-

- Node + NPM (nvm)
- https://www.npmjs.com/get-npm
Expand Down
1 change: 1 addition & 0 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,5 @@
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
<engine name="android" spec="7.1.1" />
<engine name="browser" spec="5.0.4" />
<engine name="ios" spec="4.5.5" />
</widget>
Loading