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

Landing page instance #6 #226

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4784fce
Updated link to open PRs in README.md
Swarnimashukla Mar 1, 2020
fedeca9
Update year in LICENSE.md
Swarnimashukla Mar 1, 2020
6d2f206
Update README.md
AdityaAshvin Mar 2, 2020
3901da7
Update README.md
AdityaAshvin Mar 2, 2020
48cb015
Updated README.md
kaavyajain Mar 2, 2020
bb40b22
Merge pull request #93 from kaavyajain/patch-1
vinitshahdeo Mar 2, 2020
2255416
Edited the link to GirlScript Foundation
BhardwajShweta25 Mar 2, 2020
dfd37f7
Update README.md
Akansha2202 Mar 2, 2020
6a4d689
Merge pull request #96 from BhardwajShweta25/patch-1
vinitshahdeo Mar 3, 2020
d9b43b3
Merge pull request #95 from Akansha2202/patch-1
vinitshahdeo Mar 4, 2020
ae11dd6
Merge pull request #65 from Swarnimashukla/master
vinitshahdeo Mar 4, 2020
245efff
Format ae11dd6
Mar 4, 2020
4bcfecf
made some changes
AdityaAshvin Mar 2, 2020
220d6b7
added badges
AdityaAshvin16 Mar 5, 2020
d2bc27d
added logos to the badges
AdityaAshvin16 Mar 9, 2020
3048c8e
added the logo of node.js
AdityaAshvin16 Mar 9, 2020
0423ea4
Merge pull request #85 from AdityaAshvin/feature/documentation
vinitshahdeo Mar 9, 2020
0947a4e
Add slack badge
huonggiangbui Mar 15, 2020
a4de4a7
Add files via upload
anushka-12-lal Mar 15, 2020
f7b07b3
Added infographic for the wiki (#165)
Swarnimashukla Mar 16, 2020
7159ff2
Merge pull request #178 from huonggiangbui/feature/documentation
PragatiVerma18 Mar 16, 2020
2d6fb71
Added front-end wireframe (#166)
Swarnimashukla Mar 16, 2020
42b889b
Added GitPod Button in README file and Init Files (#185)
Mit-Patel Mar 17, 2020
9c250ce
Merge pull request #179 from anushka-12-lal/feature/documentation
PragatiVerma18 Mar 18, 2020
ba78930
Merge pull request #3 from vinitshahdeo/feature/documentation
anushka-12-lal Mar 25, 2020
0235626
uploaded the logo
anushka-12-lal Mar 25, 2020
30d92fc
Delete Group 1.jpg
anushka-12-lal Mar 25, 2020
16d432e
logo added.
anushka-12-lal Mar 25, 2020
57cd972
Merge pull request #220 from anushka-12-lal/feature/documentation
PragatiVerma18 Apr 2, 2020
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
10 changes: 10 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
tasks:
- init: >
python3 -m pip install -r water_monitoring_system/requirements.txt &&
python3 manage.py water_monitoring_system/migrate

command: >
python3 water_monitoring_system/manage.py runserver
github:
prebuilds:
pullRequestsFromForks: true
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Vinit Shahdeo
Copyright (c) 2020 Vinit Shahdeo

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
157 changes: 82 additions & 75 deletions README.md

Large diffs are not rendered by default.

Binary file added Resources/GSSOC 20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/infographic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Water Monitoring System Report.pdf
Binary file not shown.
Binary file added assets/rgsoc2020.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
147 changes: 75 additions & 72 deletions src/demo.html
Original file line number Diff line number Diff line change
@@ -1,76 +1,79 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<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>
<style>
body {
background-color: #fafafa;
font-family: "Roboto";
}

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<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>
<style>
body {
background-color: #fafafa;
font-family: 'Roboto';
}
.container {
margin: 150px auto;
max-width: 960px;
}
</style>
</head>

.container {
margin: 150px auto;
max-width: 960px;
}
</style>
</head>
<body>
<div class="container">
<h1>Water Tanks</h1>
<div class="loading" style="width: 140px;height: 140px;float:left"></div>
<div class="loading" style="width: 160px;height: 160px;float:left"></div>
<div
class="waterBall1"
style="width: 200px;height:200px; float:left"
></div>
<div class="demo" style="width: 200px;height:200px; float:left"></div>
</div>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="lib/createWaterBall-jquery.js"></script>
<script>
$(".demo").createWaterBall({
targetRange: 90
});

<body>

<div class="container">
<h1>Water Tanks</h1>
<div class="loading" style="width: 140px;height: 140px;float:left"></div>
<div class="loading" style="width: 160px;height: 160px;float:left"></div>
<div class="waterBall1" style="width: 200px;height:200px; float:left"></div>
<div class="demo" style="width: 200px;height:200px; float:left"></div>
</div>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="lib/createWaterBall-jquery.js"></script>
<script>
$('.demo').createWaterBall({
targetRange: 90
});

var loadingEle = $('.loading');
var loading_width = loadingEle.width(),
loading_height = loadingEle.height();
$('.loading').createWaterBall({
cvs_config: {
width: loading_width,
height: loading_height
},
wave_config: {
waveWidth: 0.02,
waveHeight: 5
},
data_range: [30, 70, 100],
isLoading: true,
nowRange: 70,
targetRange: 70
});
setTimeout(function () {
$('.loading').createWaterBall('updateRange', 80);
}, 1000);
$('.waterBall1').createWaterBall({
csv_config: {
width: $('.waterBall1').width(),
height: $('.waterBall1').height()
},
wave_config: {
waveWidth: 0.02,
waveHeight: 5
},
data_range: [40, 50, 100],
targetRange: 45
});
</script>

</body>

</html>
var loadingEle = $(".loading");
var loading_width = loadingEle.width(),
loading_height = loadingEle.height();
$(".loading").createWaterBall({
cvs_config: {
width: loading_width,
height: loading_height
},
wave_config: {
waveWidth: 0.02,
waveHeight: 5
},
data_range: [30, 70, 100],
isLoading: true,
nowRange: 70,
targetRange: 70
});
setTimeout(function() {
$(".loading").createWaterBall("updateRange", 80);
}, 1000);
$(".waterBall1").createWaterBall({
csv_config: {
width: $(".waterBall1").width(),
height: $(".waterBall1").height()
},
wave_config: {
waveWidth: 0.02,
waveHeight: 5
},
data_range: [40, 50, 100],
targetRange: 45
});
</script>
</body>
</html>
Loading