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.

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

Footer #383

Open
wants to merge 99 commits into
base: feature/frontend-react
Choose a base branch
from
Open
Changes from 24 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
901a3e5
Initial React boilerplate
jainpawan21 Feb 27, 2020
dd264b5
Conversion Into React
jainpawan21 Feb 27, 2020
1570947
Fixed Font and Console Issue
jainpawan21 Feb 27, 2020
6167274
Merge pull request #20 from jainpawan21/frontend/react-codebase
vinitshahdeo Feb 27, 2020
2684336
Merge pull request #34 from vinitshahdeo/master
vinitshahdeo Feb 29, 2020
7fb4cf1
added netlify.toml config file to feature/frontend
heisastark Mar 1, 2020
2e9fd84
Added Instructions to setup environment
vngarg Mar 1, 2020
a77232f
Added the instructions to setup working environment
vngarg Mar 1, 2020
5def848
Added the instructions to setup working environment
vngarg Mar 1, 2020
b6de2a7
Updated the SETUP WORKING ENVIRONMENT.md
vngarg Mar 2, 2020
01918c9
Web App is PWA and installable now.
UddeshJain Mar 2, 2020
a41675b
Fixed center tag and unique key warning in Home.js file.
UddeshJain Mar 2, 2020
75abd4a
Added Animation to Water Tanks
vngarg Mar 2, 2020
1cba47b
Merge branch 'master' of https://github.com/vngarg/Water-Monitoring-S…
vngarg Mar 2, 2020
0fcfc23
Added FAQ's in home.html
habeeba-naaz Mar 3, 2020
f239fa2
Merge pull request #86 from UddeshJain/feature/frontend
jainpawan21 Mar 4, 2020
bd3a611
Format f239fa2
Mar 4, 2020
d4a1765
Update private property in package.json
Mar 4, 2020
e3d19a2
wrongly specified path
heisastark Mar 4, 2020
72c548a
Corrected and relocated netlify.toml
heisastark Mar 4, 2020
aa343a4
Delete netlify.toml
heisastark Mar 4, 2020
1a75713
Corrected netlify.toml file
heisastark Mar 4, 2020
c712b9f
Deployed branch faq
habeeba-naaz Mar 5, 2020
f976670
Merge pull request #116 from Adyasha8105/feature/frontend
vinitshahdeo Mar 5, 2020
3911362
Merge pull request #98 from habeeba-naaz/faq
vinitshahdeo Mar 6, 2020
9dfadc8
Merge branch 'feature/frontend' into master
vngarg Mar 6, 2020
c96836a
Format #126
Mar 7, 2020
f1e1581
Format #126
Mar 7, 2020
8259422
Delete SETUP WORKING ENVIRONMENT.md
vngarg Mar 7, 2020
b8dcb6c
Deleted README
vngarg Mar 7, 2020
88368d9
Merge pull request #67 from heisastark/feature/frontend
vinitshahdeo Mar 7, 2020
fec9248
added feature-meta tags
anmolkaur18 Mar 8, 2020
5536ebc
added feature-meta tags
anmolkaur18 Mar 8, 2020
e2161b8
Merge branch 'feature/frontend' into feature/meta-tags
vinitshahdeo Mar 7, 2020
2947952
Changes DOne
vngarg Mar 8, 2020
3381ffe
Done
vngarg Mar 8, 2020
53c9d79
Add Footer
huonggiangbui Mar 8, 2020
9a58542
Merge pull request #139 from anmolkaur18/feature/meta-tags
vinitshahdeo Mar 9, 2020
b54c34d
Add Footer
huonggiangbui Mar 9, 2020
3794ef8
Merge branch 'feature/frontend' of https://github.com/vinitshahdeo/Wa…
huonggiangbui Mar 9, 2020
4787458
Add Footer
huonggiangbui Mar 9, 2020
853fc5c
Update Footer
huonggiangbui Mar 11, 2020
f5cecf1
Merge pull request #151 from huonggiangbui/feature/frontend
vinitshahdeo Mar 11, 2020
3388a5b
Implement React Router
huonggiangbui Mar 11, 2020
6a8d926
Adding Footer. Fixes #56
siddhishree Mar 11, 2020
7fa08ab
Merge pull request #152 from huonggiangbui/feature/frontend
jainpawan21 Mar 12, 2020
ed75cf2
Merge remote-tracking branch 'upstream/feature/frontend' into feature…
siddhishree Mar 12, 2020
96950a7
Merge pull request #153 from siddhishree/feature/frontend
vinitshahdeo Mar 12, 2020
7cf4ea6
Merge branch 'feature/frontend' into master
vngarg Mar 13, 2020
1ef0fa0
Merge branch 'feature/frontend' into Animation
vngarg Mar 13, 2020
0874633
Add latest version of Bootstrap
Mar 17, 2020
bcddf23
Merge branch 'feature/frontend' into master
vinitshahdeo Mar 17, 2020
9db1885
Merge pull request #186 from Adyasha8105/master
vinitshahdeo Mar 17, 2020
98e90db
Merge branch 'feature/frontend' into master
vinitshahdeo Mar 18, 2020
b6563bd
Merge pull request #72 from vngarg/master
vinitshahdeo Mar 18, 2020
162f92b
Center Tank divs
SaranshDawra Mar 18, 2020
235b3e8
Center tank divs final changes
SaranshDawra Mar 18, 2020
e4dce05
Merge branch 'feature/frontend' into Animation
PragatiVerma18 Mar 18, 2020
19a0a0b
Merge pull request #128 from vngarg/Animation
PragatiVerma18 Mar 18, 2020
2ef859f
Merge pull request #188 from SaranshDawra/feature/frontend
jainpawan21 Mar 18, 2020
5ede4ab
update package.json
Chanchal1603 Mar 18, 2020
9947cc0
Merge pull request #192 from Chanchal1603/feature/frontend
jainpawan21 Mar 18, 2020
5a2085f
Added necessary space
goyalmuskan Mar 19, 2020
a5922a1
Merge branch 'feature/frontend' into space
goyalmuskan Mar 19, 2020
8ac01ee
Merge pull request #195 from goyalmuskan/space
vinitshahdeo Mar 19, 2020
0fb7d45
add an alarm to indicate that the tank is about to overflow
IuliaElizaS Mar 21, 2020
7efc87c
Added landing page design as per Instance #8 (#201)
satvikchachra Mar 21, 2020
99d5ebe
design for instance#4 (#204)
shreoshi-roy Mar 21, 2020
d99cfa9
Updated Footer
goyalmuskan Mar 23, 2020
49abf9e
Updated
goyalmuskan Mar 23, 2020
4b7a3ca
Merge pull request #212 from goyalmuskan/footer
vinitshahdeo Mar 23, 2020
33d3fb9
Landing Page Design
goyalmuskan Mar 24, 2020
bf270f5
Updated Design
goyalmuskan Mar 25, 2020
7b0748a
Merge pull request #213 from goyalmuskan/instance
vinitshahdeo Mar 25, 2020
a70727d
New Landing Page Design
Mar 26, 2020
51dd8ae
Updated footer
goyalmuskan Mar 27, 2020
94543f6
Merge pull request #206 from Adyasha8105/feature/frontend
vinitshahdeo Mar 28, 2020
5d48ae1
Merge pull request #223 from goyalmuskan/responsive
vinitshahdeo Apr 1, 2020
e4c7978
Landing page design - Instance #3
syedareehaquasar Apr 1, 2020
1129845
Landing Page Design in AdobeXD
SaranshDawra Apr 1, 2020
bfdcbae
png image added
SaranshDawra Apr 2, 2020
4e1743f
Merge pull request #227 from SaranshDawra/instance7
vinitshahdeo Apr 2, 2020
d1db354
fixed evt not defined
IuliaElizaS Apr 14, 2020
f011585
fix type error
IuliaElizaS Apr 17, 2020
ca4f7da
Merge branch 'feature/frontend' into overflowAlarm
IuliaElizaS Apr 17, 2020
b0318b4
Develop login and signup page (#239)
huonggiangbui Apr 29, 2020
c18abfb
Revamp FAQ Section (#286)
m-code12 May 30, 2020
0de1d2a
Add tagline
aldrinjenson May 30, 2020
15fee18
Add jumbotron
AdityaAshvin May 31, 2020
81c5774
Add Purpose section
AdityaAshvin May 31, 2020
6109336
Add About and Open Source section & fix purpose section images path
m-code12 May 31, 2020
0a3a3f4
Add responsive navbar
AdityaAshvin May 31, 2020
8e901dc
Add landing page
huonggiangbui May 31, 2020
56f695e
Merge pull request #306 from huonggiangbui/feature/frontend
PragatiVerma18 May 31, 2020
89ad135
Logo for the project
deepdarshan21 Jun 4, 2020
dea6a70
Merge pull request #308 from deepdarshan21/feature/frontend
PragatiVerma18 Jun 4, 2020
c0f72e2
Merge pull request #203 from IuliaElizaS/overflowAlarm
harshita19244 Jan 21, 2021
1a3dd02
added footer
AbhipsaGuru1012 Aug 30, 2021
76a5628
Merge branch 'feature/frontend-react' into footer
AbhipsaGuru1012 Aug 30, 2021
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
4 changes: 4 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[build]
publish = "build/"
command = "yarn build"
base = "react-frontend"
2 changes: 1 addition & 1 deletion react-frontend/src/App.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body {
background-color: #fafafa;
font-family: 'Montserrat', sans-serif;
font-family: "Montserrat", sans-serif;
}

h1 {
27 changes: 16 additions & 11 deletions react-frontend/src/App.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import React, { Component } from 'react';
import Home from './pages/Home'
import { Provider } from 'react-redux';
import store from './store/store';
import './App.css'
class App extends Component{
import React, { Component } from "react";
import Home from "./pages/Home";
import { Provider } from "react-redux";
import store from "./store/store";
import "./App.css";
import {BrowserRouter as Router, Switch, Route} from "react-router-dom";
class App extends Component {
render() {
return (
<Provider store={store}>
<Home />
</Provider>
);
return (
<Router>
<Provider store={store}>
<Switch>
<Route path="/" exact component={Home} />
</Switch>
</Provider>
</Router>
);
}
}

16 changes: 8 additions & 8 deletions react-frontend/src/actions/tankActions.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import {FETCH_TANKS} from './types';
import { FETCH_TANKS } from "./types";

export const fetchTanks = () => {
return ({
return {
type: FETCH_TANKS,
payload: [
{"id":"1","value":"70"},
{"id":"2","value":"80"},
{"id":"3","value":"40"},
{"id":"4","value":"90"}
{ id: "1", value: "70" },
{ id: "2", value: "80" },
{ id: "3", value: "40" },
{ id: "4", value: "90" }
]
})
};
};
};
2 changes: 1 addition & 1 deletion react-frontend/src/actions/types.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const FETCH_TANKS = 'FETCH_TANKS';
export const FETCH_TANKS = "FETCH_TANKS";
4 changes: 2 additions & 2 deletions react-frontend/src/components/Sticker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components'
import styled from "styled-components";

export const Sticker = styled.div`
background-color: ${props => props.backgroundColor};
@@ -7,4 +7,4 @@ export const Sticker = styled.div`
display: flex;
justify-content: center;
align-items: center;
`
`;
12 changes: 6 additions & 6 deletions react-frontend/src/components/Tank.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import styled from 'styled-components'
import styled from "styled-components";

export const TankCircle = styled.div`
height: 200px;
width: 200px;
border-color: ${props => props.borderColor || "red"};
border-width: 2px;
border-style: solid;
border-radius: 50%;
`
border-radius: 50%;
`;

export const TankWaterValue = styled.p`
position: relative;
position: relative;
display: flex;
justify-content: center;
align-items: center;
height: 200px;
width: 200px;
color: grey;
`
color: grey;
`;
4 changes: 2 additions & 2 deletions react-frontend/src/index.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
body {
margin: 0;
background-color: #fafafa;
font-family: 'Montserrat', sans-serif;
font-family: "Montserrat", sans-serif;
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
monospace;
}
6 changes: 3 additions & 3 deletions react-frontend/src/reducers/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { combineReducers } from 'redux'
import tankReducer from './tankReducer';
import { combineReducers } from "redux";
import tankReducer from "./tankReducer";

export default combineReducers({
tanks: tankReducer
})
});
6 changes: 3 additions & 3 deletions react-frontend/src/reducers/tankReducer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FETCH_TANKS } from '../actions/types';
import { FETCH_TANKS } from "../actions/types";

const initialState = {
tanks: [],
tanks: []
};

export default function(state = initialState, action) {
@@ -14,4 +14,4 @@ export default function(state = initialState, action) {
default:
return state;
}
}
}
32 changes: 16 additions & 16 deletions react-frontend/src/serviceWorker.js
Original file line number Diff line number Diff line change
@@ -11,17 +11,17 @@
// opt-in, read https://bit.ly/CRA-PWA

const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
window.location.hostname === "localhost" ||
// [::1] is the IPv6 localhost address.
window.location.hostname === '[::1]' ||
window.location.hostname === "[::1]" ||
// 127.0.0.0/8 are considered localhost for IPv4.
window.location.hostname.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
);

export function register(config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
@@ -31,7 +31,7 @@ export function register(config) {
return;
}

window.addEventListener('load', () => {
window.addEventListener("load", () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;

if (isLocalhost) {
@@ -42,8 +42,8 @@ export function register(config) {
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://bit.ly/CRA-PWA'
"This web app is being served cache-first by a service " +
"worker. To learn more, visit https://bit.ly/CRA-PWA"
);
});
} else {
@@ -64,14 +64,14 @@ function registerValidSW(swUrl, config) {
return;
}
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (installingWorker.state === "installed") {
if (navigator.serviceWorker.controller) {
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log(
'New content is available and will be used when all ' +
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
"New content is available and will be used when all " +
"tabs for this page are closed. See https://bit.ly/CRA-PWA."
);

// Execute callback
@@ -82,7 +82,7 @@ function registerValidSW(swUrl, config) {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log('Content is cached for offline use.');
console.log("Content is cached for offline use.");

// Execute callback
if (config && config.onSuccess) {
@@ -94,21 +94,21 @@ function registerValidSW(swUrl, config) {
};
})
.catch(error => {
console.error('Error during service worker registration:', error);
console.error("Error during service worker registration:", error);
});
}

function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl, {
headers: { 'Service-Worker': 'script' }
headers: { "Service-Worker": "script" }
})
.then(response => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get('content-type');
const contentType = response.headers.get("content-type");
if (
response.status === 404 ||
(contentType != null && contentType.indexOf('javascript') === -1)
(contentType != null && contentType.indexOf("javascript") === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then(registration => {
@@ -123,13 +123,13 @@ function checkValidServiceWorker(swUrl, config) {
})
.catch(() => {
console.log(
'No internet connection found. App is running in offline mode.'
"No internet connection found. App is running in offline mode."
);
});
}

export function unregister() {
if ('serviceWorker' in navigator) {
if ("serviceWorker" in navigator) {
navigator.serviceWorker.ready
.then(registration => {
registration.unregister();
2 changes: 1 addition & 1 deletion react-frontend/src/setupTests.js
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom/extend-expect';
import "@testing-library/jest-dom/extend-expect";
14 changes: 9 additions & 5 deletions react-frontend/src/store/store.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import {createStore, applyMiddleware } from 'redux'
import thunk from 'redux-thunk'
import rootReducer from '../reducers/index'
import { createStore, applyMiddleware } from "redux";
import thunk from "redux-thunk";
import rootReducer from "../reducers/index";
const initialState = {};

const middleware = [thunk];

const store = createStore(rootReducer, initialState, applyMiddleware(...middleware))
const store = createStore(
rootReducer,
initialState,
applyMiddleware(...middleware)
);

export default store
export default store;
22 changes: 22 additions & 0 deletions src/demo.html
Original file line number Diff line number Diff line change
@@ -8,6 +8,28 @@
<meta name="author" content="Vinit Shahdeo">
<link href="http://www.jqueryscript.net/css/jquerysctipttop.css" rel="stylesheet" type="text/css">
<title>Water Monitoring System</title>
<meta name="keywords" content="Water Tanks Level,Liquid Level Monitoring,Water, Open Source , Iot"/>
<meta name="distribution" content="Global">
<meta name="description" content="IOT based Liquid Level Monitoring system that keeps the user alerted in case of liquid overflow or when tank depletes "/>
<meta http-equiv="refresh" content="45">

<!-- Open Graph general (Facebook, Pinterest & Google+) -->
<meta name="og:type" content="Website"/>
<meta name="og:title" content="Water Level Monitoring System"/>
<meta name="og:url" content="https://vinitshahdeo.github.io/Water-Monitoring-System/"/>
<meta name="og:description" content="IOT based Liquid Level Monitoring system that keeps the user alerted in case of liquid overflow or when tank depletes"/>
<meta itemprop="name" content="Water Level Monitoring System">
<meta itemprop="description" content="IOT based Liquid Level Monitoring system that keeps the user alerted in case of liquid overflow or when tank depletes ">
<meta name="og:image" content="https://raw.githubusercontent.com/vinitshahdeo/Water-Monitoring-System/master/assets/animatedtank.gif"/>


<!-- Twitter -->
<meta name="twitter:card" content="summary">
<meta name="twitter:title" content="Water Level Monitoring System">
<meta name="twitter:description" content="IOT based Liquid Level Monitoring system that keeps the user alerted in case of liquid overflow or when tank depletes ">
<meta name="twitter:creator" content="@Vinit_Shahdeo" />
<meta name="twitter:image" content="https://raw.githubusercontent.com/vinitshahdeo/Water-Monitoring-System/master/assets/animatedtank.gif" />

<style>
body {
background-color: #fafafa;
417 changes: 245 additions & 172 deletions src/home.html

Large diffs are not rendered by default.