Skip to content

Commit 3195f73

Browse files
lbussylbussy
committed
Working counter, temp and json
1 parent 50adfd2 commit 3195f73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1791
-130
lines changed

Diff for: ‎.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "lib/WiFiManager"]
2-
path = lib/WiFiManager
3-
url = https://github.com/tzapu/WiFiManager.git
4-
branch = master

Diff for: ‎data/about.htm

+132
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
7+
<title>Brew Bubbles - About</title>
8+
9+
<!-- Bootstrap CSS -->
10+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
11+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
12+
13+
<link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
14+
<link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
15+
<link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
16+
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
17+
<link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
18+
<link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
19+
<link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
20+
<link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
21+
<link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
22+
<link rel="icon" type="image/png" sizes="192x192" href="/android-icon-192x192.png">
23+
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
24+
<link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
25+
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
26+
<link rel="shortcut icon" type="image/x-icon" href="/favicon-16x16.png">
27+
28+
<style>
29+
body {padding-top: 5rem; padding-bottom: 5rem;}
30+
31+
.row-padded {
32+
padding: 0.75rem 1.25rem;
33+
}
34+
35+
</style>
36+
</head>
37+
38+
<body>
39+
40+
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
41+
<a class="navbar-brand" href="/">Brew Bubbles</a>
42+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsMain" aria-controls="navbarsMain" aria-expanded="false" aria-label="Toggle navigation">
43+
<span class="navbar-toggler-icon"></span>
44+
</button>
45+
46+
<div class="collapse navbar-collapse" id="navbarsMain">
47+
<ul class="navbar-nav mr-auto">
48+
<li class="nav-item">
49+
<a class="nav-link" href="/">Home</a>
50+
</li>
51+
<li class="nav-item">
52+
<a class="nav-link" href="/settings/">Settings</a>
53+
</li>
54+
<li class="nav-item active">
55+
<a class="nav-link" href="/about/">About <span class="sr-only">(current)</span></a>
56+
</li>
57+
</ul>
58+
</div>
59+
</nav>
60+
61+
<main role="main" class="container">
62+
63+
<h4>About Brew Bubbles</h4>
64+
65+
66+
<div id="settingsapp">
67+
<div class="row row-padded">
68+
<div class="col-12">
69+
<div class="card">
70+
<h5 class="card-header">
71+
About
72+
</h5>
73+
74+
<div class="card-body">
75+
<p class="card-text">
76+
<a href="https://www.brewbubbles.com/">Brew Bubbles</a> is a project by Lee Bussy and is
77+
licensed under the <a href="https://www.gnu.org/licenses/gpl-3.0.en.html"> GNU General
78+
Public License (GPLv3)</a>. For questions, concerns, and bug reports, please reach out to
79+
<a href="https://www.homebrewtalk.com/forum/members/lbussy.144719/">LBussy</a> on the HBT
80+
forums, or <a href="https://github.com/lbussy">LBussy</a> on GitHub.
81+
</p>
82+
83+
<p class="card-text"> Brew Bubbles documentation and support can be found at the following links:<br>
84+
<ul>
85+
<li><a href="https://www.brewbubbles.com/">Brew Bubbles Homepage</a><br>
86+
<li><a href="http://docs.brewbubbles.com/">Brew Bubbles Documentation</a><br>
87+
<li><a href="https://github.com/lbussy/brew-bubbles/issues">GitHub</a><br>
88+
<li><a href="http://support.brewbubbles.com/">HomeBrewTalk Thread</a>
89+
</ul>
90+
</p>
91+
</div>
92+
</div>
93+
94+
</div>
95+
</div>
96+
97+
<div class="row row-padded">
98+
<div class="col-12">
99+
<div class="card">
100+
<h5 class="card-header">
101+
Update/Reset
102+
</h5>
103+
<div class="card-body">
104+
<p class="card-text">
105+
Your Brew Bubbles can be updated over the internet to the latest version of the Brew Bubbles
106+
firmware by clicking the "Update Firmware" button below. Additionally, if you plan on
107+
relocating your Brew Bubbles to a new network, you can reset the WiFi connection settings by
108+
clicking "Reset WiFi".
109+
</p>
110+
111+
<p class="card-text">
112+
<a href="/ota/" class="btn btn-danger">Update Firmware</a>
113+
<a href="/wifi/" class="btn btn-danger">Reset WiFi</a>
114+
</p>
115+
116+
</div>
117+
</div>
118+
</div>
119+
</div>
120+
121+
122+
</div>
123+
124+
</main>
125+
126+
127+
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
128+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
129+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
130+
131+
</body>
132+
</html>

Diff for: ‎data/android-icon-144x144.png

6.55 KB
Loading

Diff for: ‎data/android-icon-192x192.png

6.88 KB
Loading

Diff for: ‎data/android-icon-36x36.png

1.7 KB
Loading

Diff for: ‎data/android-icon-48x48.png

2.2 KB
Loading

Diff for: ‎data/android-icon-72x72.png

3.2 KB
Loading

Diff for: ‎data/android-icon-96x96.png

4.25 KB
Loading

Diff for: ‎data/apple-icon-114x114.png

5.05 KB
Loading

Diff for: ‎data/apple-icon-120x120.png

5.33 KB
Loading

Diff for: ‎data/apple-icon-144x144.png

6.55 KB
Loading

Diff for: ‎data/apple-icon-152x152.png

6.96 KB
Loading

Diff for: ‎data/apple-icon-180x180.png

8.39 KB
Loading

Diff for: ‎data/apple-icon-57x57.png

2.56 KB
Loading

Diff for: ‎data/apple-icon-60x60.png

2.71 KB
Loading

Diff for: ‎data/apple-icon-72x72.png

3.2 KB
Loading

Diff for: ‎data/apple-icon-76x76.png

3.37 KB
Loading

Diff for: ‎data/apple-icon-precomposed.png

7.44 KB
Loading

Diff for: ‎data/apple-icon.png

7.44 KB
Loading

Diff for: ‎data/browserconfig.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<browserconfig>
3+
<msapplication>
4+
<tile>
5+
<square70x70logo src="/ms-icon-70x70.png"/>
6+
<square150x150logo src="/ms-icon-150x150.png"/>
7+
<square310x310logo src="/ms-icon-310x310.png"/>
8+
<TileColor>#ffffff</TileColor>
9+
</tile>
10+
</msapplication>
11+
</browserconfig>

Diff for: ‎data/conf.txt

-2
This file was deleted.

Diff for: ‎data/favicon-16x16.png

1.27 KB
Loading

Diff for: ‎data/favicon-32x32.png

2.1 KB
Loading

Diff for: ‎data/favicon-96x96.png

4.25 KB
Loading

Diff for: ‎data/index.htm

+136
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
7+
<title>Brew Bubbles</title>
8+
9+
<!-- Bootstrap CSS -->
10+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
11+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
12+
13+
<link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
14+
<link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
15+
<link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
16+
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
17+
<link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
18+
<link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
19+
<link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
20+
<link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
21+
<link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
22+
<link rel="icon" type="image/png" sizes="192x192" href="/android-icon-192x192.png">
23+
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
24+
<link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
25+
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
26+
<link rel="shortcut icon" type="image/x-icon" href="/favicon-16x16.png">
27+
28+
<!-- Custom styles for this template -->
29+
<style>
30+
body {padding-top: 5rem; padding-bottom: 5rem;}
31+
32+
@media (min-width: 576px) {
33+
.sm-padded {
34+
padding: 0.75rem 1.25rem;
35+
}
36+
}
37+
</style>
38+
</head>
39+
40+
<body>
41+
42+
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
43+
<a class="navbar-brand" href="/">Brew Bubbles</a>
44+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
45+
<span class="navbar-toggler-icon"></span>
46+
</button>
47+
48+
<div class="collapse navbar-collapse" id="navbarsExampleDefault">
49+
<ul class="navbar-nav mr-auto">
50+
<li class="nav-item active">
51+
<a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
52+
</li>
53+
<li class="nav-item">
54+
<a class="nav-link" href="/settings/">Settings</a>
55+
</li>
56+
<li class="nav-item">
57+
<a class="nav-link" href="/about/">About</a>
58+
</li>
59+
</ul>
60+
61+
</div>
62+
</nav>
63+
64+
<main role="main" class="container">
65+
66+
<h4>Bubble Counter</h4>
67+
68+
<!-- Start vue Sensor container -->
69+
<div id="gravapp">
70+
<div class="row">
71+
<!-- Start vue Sensor loop div -->
72+
<div class="col-12 col-sm-6 sm-padded" v-for="sensor in sensors">
73+
<!-- Card -->
74+
<!-- <div class="card">
75+
<div class="card-header">
76+
<h5 class="card-title">{{sensor.color}} Tilt</h5>
77+
<h6 class="card-subtitle mb-2 text-muted">Google Sheets: {{sensor.gsheets_name}}</h6>
78+
</div> -->
79+
80+
<!-- GravitySensor Line -->
81+
<!-- <div class="row">
82+
<div class="col-6 d-flex flex-column text-center">
83+
<div class="p-2 h3">Gravity</div><div class="p-2">{{sensor.gravity | numeral('0.000')}}</div>
84+
</div>
85+
<div class="col-6 d-flex flex-column text-center">
86+
<div class="p-2 h3">Temp</div><div class="p-2 text-center">{{sensor.temp}}&deg; F</div>
87+
</div>
88+
</div> -->
89+
<!-- End GravitySensor Line -->
90+
91+
<!-- </div> -->
92+
<!-- End Card -->
93+
</div> <!-- End vue Sensor loop div -->
94+
</div>
95+
</div> <!-- End vue application container -->
96+
</main>
97+
98+
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
99+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
100+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
101+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue.js" crossorigin="anonymous"></script>
102+
<script src="https://cdn.jsdelivr.net/npm/vue-numeral-filter/dist/vue-numeral-filter.min.js" crossorigin="anonymous"></script>
103+
<script type="text/javascript">
104+
var vm = new Vue({
105+
el: '#gravapp',
106+
data: {
107+
sensors: []
108+
},
109+
mounted: function () {
110+
this.getSensors();
111+
window.setInterval(() => {
112+
this.getSensors()
113+
}, 10000) // Extending the delay as we don't update that often
114+
},
115+
methods: {
116+
getSensors: function() {
117+
var xhr = new XMLHttpRequest();
118+
var self = this;
119+
xhr.open('GET', '/json/');
120+
xhr.onload = function () {
121+
self.fullDict = JSON.parse(xhr.responseText);
122+
self.sensors = [];
123+
Object.keys(self.fullDict).forEach(function(key) {
124+
self.sensors.push(self.fullDict[key]);
125+
});
126+
//console.log(self.fullDict);
127+
//console.log(self.sensors);
128+
};
129+
xhr.send()
130+
}
131+
}
132+
});
133+
</script>
134+
135+
</body>
136+
</html>

Diff for: ‎data/manifest.json

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"name": "App",
3+
"icons": [
4+
{
5+
"src": "\/android-icon-36x36.png",
6+
"sizes": "36x36",
7+
"type": "image\/png",
8+
"density": "0.75"
9+
},
10+
{
11+
"src": "\/android-icon-48x48.png",
12+
"sizes": "48x48",
13+
"type": "image\/png",
14+
"density": "1.0"
15+
},
16+
{
17+
"src": "\/android-icon-72x72.png",
18+
"sizes": "72x72",
19+
"type": "image\/png",
20+
"density": "1.5"
21+
},
22+
{
23+
"src": "\/android-icon-96x96.png",
24+
"sizes": "96x96",
25+
"type": "image\/png",
26+
"density": "2.0"
27+
},
28+
{
29+
"src": "\/android-icon-144x144.png",
30+
"sizes": "144x144",
31+
"type": "image\/png",
32+
"density": "3.0"
33+
},
34+
{
35+
"src": "\/android-icon-192x192.png",
36+
"sizes": "192x192",
37+
"type": "image\/png",
38+
"density": "4.0"
39+
}
40+
]
41+
}

Diff for: ‎data/ms-icon-144x144.png

6.55 KB
Loading

Diff for: ‎data/ms-icon-150x150.png

6.85 KB
Loading

Diff for: ‎data/ms-icon-310x310.png

18.1 KB
Loading

Diff for: ‎data/ms-icon-70x70.png

3.08 KB
Loading

0 commit comments

Comments
 (0)