') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Update forks by smit1678 · Pull Request #3 · OpenDustMap/dustduino-server · GitHub
Skip to content

Update forks#3

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

Merged
smit1678 merged 15 commits into from
Jun 12, 2015
Merged

Update forks #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e545b9d
remove comma
May 29, 2015
16d38ac
change addon string
May 29, 2015
30c6431
change addon strings
May 29, 2015
7b0166e
Merge pull request #18 from developmentseed/develop
May 29, 2015
6e812bf
Import source code
May 30, 2015
7782efe
add post deploy script and noinput
May 30, 2015
0d3a7bb
add noinput flag
May 30, 2015
53ee0ec
add allow host
Jun 4, 2015
b0e5be1
update documentation url
Jun 4, 2015
7676655
fix conflicts
Jun 4, 2015
d6f554e
Merge branch 'develop' of github.com:developmentseed/dustduino-server
Jun 4, 2015
aea0d26
Merge pull request #20 from developmentseed/develop
Jun 4, 2015
373488a
Merge branch 'master' of github.com:developmentseed/dustduino-server
Jun 4, 2015
f2bd185
tweak travis, add to readme, remove secure key
Jun 12, 2015
d8185b5
Merge pull request #23 from OpenDustMap/travis
Jun 12, 2015
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
5 changes: 0 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,11 +6,6 @@ branches:
only:
- master

env:
global:
- GH_REF=github.com/developmentseed/dustduino-server.git
- secure: CbzgND/x3QGeJmVIpLpjuHMn9SFuRkpyWL65KjLanM7k+h86JfmeYaOxnL/6yXYeh6klzYOq8lBQQZayfC9Pre0acrucNB0vyRBLfoW7zeUWeIuQ9Nz1JpjDNNtovDz19mpP8JxzsvzoWdIsfvT8hfeN1/P2a5V+lzZGn50c/9I=

install: echo 'no install'

script: echo 'no scripts'
Expand Down
8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ A REST API for DustDuino air quality sensors

[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)

For API documentation [click here](http://devseed.com/dustduino-server/).
For API documentation [click here](http://api.opendustmap.com).

## Deployment to Heroku

Expand DownExpand Up@@ -36,3 +36,9 @@ Start the server
```
python sensor_rest_api/manage.py runserver
```
## Docs Deployment

This project is set up with [Travis](https://travis-ci.org/) deploy scripts already included which will deploy documentation to `gh-pages`. To utilize these, you will need to enable the repo on the Travis system and include the following two environment variables.

- **GH_REF** - the URL of the repo, similar to `github.com/developmentseed/dustduino-server.git`
- **GH_TOKEN** - a GitHub personal access token available from https://github.com/settings/tokens
6 changes: 3 additions & 3 deletions app.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
"repository": "https://github.com/developmentseed/dustduino-server",
"keywords": [ "django", "arduino", "REST", "sensor" ],
"addons": [
"heroku-postgresql:hobby-dev",
"heroku addons:create sendgrid:starter",
"heroku-postgresql",
"sendgrid"
],
"env": {
"DJANGO_SECRET_KEY": {
Expand All@@ -15,6 +15,6 @@
}
},
"scripts": {
"postdeploy": "python sensor_rest_api/manage.py syncdb"
"postdeploy": "python sensor_rest_api/manage.py syncdb --noinput"
}
}
2 changes: 1 addition & 1 deletion sensor_rest_api/config/base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ class Base(Configuration):
BASE_DIR = BASE_DIR

PORTAL_URL = values.Value('http://127.0.0.1:8000')
DOCS_URL = values.Value('http://docs.sensorrestapi.apiary.io/#reference')
DOCS_URL = values.Value('https://developmentseed.org/dustduino-server/')

INSTALLED_APPS = (
'django.contrib.admin',
Expand Down
1 change: 1 addition & 0 deletions sensor_rest_api/config/production.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ class Production(Base):
SECRET_KEY = values.SecretValue()

INSTALLED_APPS += ("gunicorn", )
ALLOWED_HOSTS = ['*']

# EMAIL
EMAIL_HOST = values.Value('smtp.sendgrid.com')
Expand Down