-
Notifications
You must be signed in to change notification settings - Fork 264
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
Reading Schema Update #193
Merged
ArpitKotecha
merged 21 commits into
vinitshahdeo:feature/backend-node
from
lakshyajit165:feature/backend-node
Apr 1, 2020
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
903a6bd
added new mentor's details
vinitshahdeo cdcd6fc
Format 7a84c1e
9743c81
fixed italics issue in FAQs section
vinitshahdeo 92cf35f
Format 61f714f
47bc833
fixed font weight issue
vinitshahdeo b6aeb16
Format 0c2a1c3
6b2ebea
removed extra *
vinitshahdeo 0f3e9e5
added rgsoc snippet
vinitshahdeo 0f9b49d
Format e645f24
f06689c
Format #134
d2a822c
fixed issues in .md rendering
vinitshahdeo 7931114
added a snippet for rgsoc
vinitshahdeo e669281
added info+logo for RGSOC
vinitshahdeo ccd58f0
added link to tweet
vinitshahdeo fc5fda0
added link to RGSoC issue
vinitshahdeo b0dd731
added rgsoc logo
vinitshahdeo f9bd9b0
added rgsoc logo
vinitshahdeo d19b712
added link to rgsoc issue
vinitshahdeo 99b766f
added links to hall of fame badge
373a9fb
Modified the reading model
lakshyajit165 37c239a
Updated reading schema, added GeoJSON
lakshyajit165 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ArpitKotecha Can you please review this. I see similar PR at other places too? Can you please verify.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vinitshahdeo Probably while creating/modifying routes in other PR's they have modified the schema accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vinitshahdeo Maybe we can merge this and request in other PR to include this schema instead of modifying by themselve.