Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SVendittelli/MMM-fitbit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: m-roberts/MMM-Fitbit2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Jan 18, 2020

  1. Monster commit

    m-roberts committed Jan 18, 2020
    Copy the full SHA
    4d29de7 View commit details
  2. Tidy up README

    m-roberts committed Jan 18, 2020
    Copy the full SHA
    9e0672c View commit details
  3. Re-add socket notifications

    m-roberts committed Jan 18, 2020
    Copy the full SHA
    09ff159 View commit details
  4. Copy the full SHA
    419fbac View commit details
  5. Copy the full SHA
    16694da View commit details
  6. Copy the full SHA
    2557e16 View commit details
  7. Copy the full SHA
    1a29b21 View commit details
  8. Copy the full SHA
    55c7803 View commit details
  9. Update TODO

    m-roberts committed Jan 18, 2020
    Copy the full SHA
    d5c4576 View commit details

Commits on Jan 23, 2020

  1. Copy the full SHA
    6b96260 View commit details

Commits on Jan 29, 2020

  1. Copy the full SHA
    1fefc55 View commit details
  2. Copy the full SHA
    fb8a382 View commit details
  3. Add urgent fix to TODO

    m-roberts committed Jan 29, 2020
    Copy the full SHA
    0f16e60 View commit details
  4. Copy the full SHA
    b596efb View commit details
  5. Fix print_data

    m-roberts committed Jan 29, 2020
    Copy the full SHA
    007b690 View commit details
  6. Copy the full SHA
    f914d61 View commit details
  7. Copy the full SHA
    fe6a785 View commit details
  8. Copy the full SHA
    b1b4731 View commit details

Commits on Jan 30, 2020

  1. Copy the full SHA
    7d9444f View commit details
  2. Copy the full SHA
    52b6265 View commit details

Commits on Feb 1, 2020

  1. Copy the full SHA
    6c2d5ed View commit details

Commits on Feb 3, 2020

  1. UI improvements and refactor

    Modularise div generation
    Overhaul CSS structure to improve styling
    
    Improve socket notification names
    Combine value, goal and unit into one object
    m-roberts committed Feb 3, 2020
    Copy the full SHA
    5d0a8d4 View commit details
  2. Copy the full SHA
    8b4cef0 View commit details
  3. Copy the full SHA
    bffb232 View commit details
  4. Some final MVP touches

    m-roberts committed Feb 3, 2020
    Copy the full SHA
    de466c3 View commit details
  5. Fix subsequent API calls

    m-roberts committed Feb 3, 2020
    Copy the full SHA
    f049fe2 View commit details
  6. Copy the full SHA
    4a586f3 View commit details

Commits on Feb 4, 2020

  1. Copy the full SHA
    d6a7bbf View commit details

Commits on Feb 5, 2020

  1. Copy the full SHA
    243130f View commit details

Commits on Feb 12, 2020

  1. Copy the full SHA
    01ff2e1 View commit details
  2. Copy the full SHA
    642a047 View commit details

Commits on May 17, 2020

  1. Copy the full SHA
    aa5c64c View commit details
  2. Enable multiple users

    m-roberts committed May 17, 2020
    Copy the full SHA
    430d350 View commit details

Commits on Apr 10, 2021

  1. Copy the full SHA
    e958665 View commit details

Commits on May 16, 2021

  1. Copy the full SHA
    27706ea View commit details

Commits on Dec 19, 2021

  1. Update README.md

    m-roberts authored Dec 19, 2021
    Copy the full SHA
    30fcf6d View commit details
252 changes: 248 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,250 @@
python/testing.py
python/fitbit/test.py
####################
# Python.gitignore #
####################

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

##################
# Node.gitignore #
##################
# Logs
logs
*.log
*.pyc
*.ini
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

# parcel-bundler cache (https://parceljs.org/)
.cache

# Next.js build output
.next

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

#########################
# Additional parameters #
#########################
.DS_Store
python/*.json
19 changes: 19 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.2.1
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files

- repo: https://github.com/pre-commit/mirrors-autopep8
rev: v1.4.4
hooks:
- id: autopep8

- repo: https://github.com/pre-commit/mirrors-fixmyjs
rev: v2.0.0
hooks:
- id: fixmyjs
9 changes: 9 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
The MIT License (MIT)

Copyright (c) 2016-2020 Sam Vendittelli, Mike Roberts, and MMM-Fitbit2 contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
48 changes: 48 additions & 0 deletions MMM-Fitbit2.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.MMM-Fitbit2 .wrapper {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}

.MMM-Fitbit2 .widget {
padding: 10px 5px 0 5px;
}

.MMM-Fitbit2 .widgettext {
height: 60px;
padding: 0 0 5px 0;
text-align: center;
}

.MMM-Fitbit2 .widgeticon {
opacity: 0.6;
height: 40px;
display: block;
margin: 0 auto;
}

.MMM-Fitbit2 .widgetprogbarbkg {
position: relative;
width: 75px;
height: 5px;
background-color: grey;
}

.MMM-Fitbit2 .widgetprogbar {
position: absolute;
height: 100%;
background-color: lightgrey;
}

.MMM-Fitbit2 .lastsyncedwrapper {
position: relative;
}

.MMM-Fitbit2 .textbottomwrapper {
position: absolute;
bottom: 0;
}

.MMM-Fitbit2 .textbottom {
position: relative;
}
Loading