mirror of https://github.com/snachodog/mybuddy.git
lint: lint all js and sjon files with prettier
This commit is contained in:
billybonks
Christopher Charbonneau Wells
parent
e141492db7
commit
f28df6ecf3
10
.stylelintrc
10
.stylelintrc
|
|
@ -1,16 +1,10 @@
|
|||
{
|
||||
"extends": "stylelint-config-recommended-scss",
|
||||
"plugins": [
|
||||
"stylelint-order",
|
||||
"stylelint-scss"
|
||||
],
|
||||
"plugins": ["stylelint-order", "stylelint-scss"],
|
||||
"rules": {
|
||||
"at-rule-no-vendor-prefix": true,
|
||||
"media-feature-name-no-vendor-prefix": true,
|
||||
"order/order": [
|
||||
"declarations",
|
||||
"rules"
|
||||
],
|
||||
"order/order": ["declarations", "rules"],
|
||||
"property-no-vendor-prefix": true,
|
||||
"selector-no-vendor-prefix": true,
|
||||
"value-no-vendor-prefix": true
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@
|
|||
{
|
||||
"model": "core.child",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"first_name": "Fake",
|
||||
"last_name": "Child",
|
||||
"birth_date": "2017-11-11",
|
||||
|
|
@ -24,8 +23,7 @@
|
|||
{
|
||||
"model": "core.pumping",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"amount": 5.0,
|
||||
"start": "2017-11-17T17:52:00Z",
|
||||
|
|
@ -37,8 +35,7 @@
|
|||
{
|
||||
"model": "core.pumping",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"amount": 9.0,
|
||||
"start": "2017-11-17T20:03:00Z",
|
||||
|
|
@ -50,8 +47,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-18T16:00:00Z",
|
||||
"wet": false,
|
||||
|
|
@ -63,8 +59,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 3,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-18T19:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -77,8 +72,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 4,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-17T13:00:00Z",
|
||||
"wet": false,
|
||||
|
|
@ -90,8 +84,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 5,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-17T16:00:00Z",
|
||||
"wet": false,
|
||||
|
|
@ -103,8 +96,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 6,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-16T15:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -116,8 +108,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 7,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-16T18:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -129,8 +120,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 8,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-15T15:00:00Z",
|
||||
"wet": false,
|
||||
|
|
@ -142,8 +132,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 9,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-15T13:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -155,8 +144,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 10,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-15T16:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -168,8 +156,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 11,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-15T21:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -181,8 +168,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 12,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-14T15:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -194,8 +180,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 13,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-13T14:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -207,8 +192,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 14,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-13T18:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -220,8 +204,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 15,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-12T15:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -233,8 +216,7 @@
|
|||
{
|
||||
"model": "core.diaperchange",
|
||||
"pk": 16,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"time": "2017-11-11T15:00:00Z",
|
||||
"wet": true,
|
||||
|
|
@ -246,8 +228,7 @@
|
|||
{
|
||||
"model": "core.feeding",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-18T09:00:00Z",
|
||||
"end": "2017-11-18T09:30:00Z",
|
||||
|
|
@ -260,8 +241,7 @@
|
|||
{
|
||||
"model": "core.feeding",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-18T11:30:00Z",
|
||||
"end": "2017-11-18T12:00:00Z",
|
||||
|
|
@ -274,8 +254,7 @@
|
|||
{
|
||||
"model": "core.feeding",
|
||||
"pk": 3,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-18T14:00:00Z",
|
||||
"end": "2017-11-18T14:15:00Z",
|
||||
|
|
@ -289,8 +268,7 @@
|
|||
{
|
||||
"model": "core.feeding",
|
||||
"pk": 4,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-17T14:00:00Z",
|
||||
"end": "2017-11-17T14:15:00Z",
|
||||
|
|
@ -304,8 +282,7 @@
|
|||
{
|
||||
"model": "core.feeding",
|
||||
"pk": 5,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-11T14:00:00Z",
|
||||
"end": "2017-11-11T14:15:00Z",
|
||||
|
|
@ -319,8 +296,7 @@
|
|||
{
|
||||
"model": "core.feeding",
|
||||
"pk": 6,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-11T05:00:00Z",
|
||||
"end": "2017-11-11T05:15:00Z",
|
||||
|
|
@ -334,8 +310,7 @@
|
|||
{
|
||||
"model": "core.note",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"note": "Fake note.",
|
||||
"time": "2017-11-18T03:45:00Z"
|
||||
|
|
@ -344,8 +319,7 @@
|
|||
{
|
||||
"model": "core.sleep",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-17T20:30:00Z",
|
||||
"end": "2017-11-18T05:30:00Z",
|
||||
|
|
@ -356,8 +330,7 @@
|
|||
{
|
||||
"model": "core.sleep",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-18T15:00:00Z",
|
||||
"end": "2017-11-18T17:00:00Z",
|
||||
|
|
@ -368,8 +341,7 @@
|
|||
{
|
||||
"model": "core.sleep",
|
||||
"pk": 3,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-18T19:00:00Z",
|
||||
"end": "2017-11-19T04:30:00Z",
|
||||
|
|
@ -380,8 +352,7 @@
|
|||
{
|
||||
"model": "core.sleep",
|
||||
"pk": 4,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-19T08:00:00Z",
|
||||
"end": "2017-11-19T09:30:00Z",
|
||||
|
|
@ -393,8 +364,7 @@
|
|||
{
|
||||
"model": "core.temperature",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"temperature": 98.6,
|
||||
"time": "2017-11-17T17:52:00Z",
|
||||
|
|
@ -404,8 +374,7 @@
|
|||
{
|
||||
"model": "core.timer",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"name": "Fake timer",
|
||||
"start": "2017-11-18T04:30:00Z",
|
||||
"user": 1
|
||||
|
|
@ -414,8 +383,7 @@
|
|||
{
|
||||
"model": "core.tummytime",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-18T15:00:00Z",
|
||||
"end": "2017-11-18T15:03:00Z",
|
||||
|
|
@ -426,8 +394,7 @@
|
|||
{
|
||||
"model": "core.tummytime",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-18T17:15:30Z",
|
||||
"end": "2017-11-18T17:16:45Z",
|
||||
|
|
@ -438,8 +405,7 @@
|
|||
{
|
||||
"model": "core.tummytime",
|
||||
"pk": 3,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"start": "2017-11-18T20:30:00Z",
|
||||
"end": "2017-11-18T20:30:45Z",
|
||||
|
|
@ -450,8 +416,7 @@
|
|||
{
|
||||
"model": "core.weight",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"weight": 8.5,
|
||||
"date": "2017-11-11"
|
||||
|
|
@ -460,8 +425,7 @@
|
|||
{
|
||||
"model": "core.weight",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"weight": 9.5,
|
||||
"date": "2017-11-18",
|
||||
|
|
@ -471,8 +435,7 @@
|
|||
{
|
||||
"model": "core.height",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"height": 9.5,
|
||||
"date": "2017-11-11"
|
||||
|
|
@ -481,8 +444,7 @@
|
|||
{
|
||||
"model": "core.height",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"height": 10.5,
|
||||
"date": "2017-11-18",
|
||||
|
|
@ -492,8 +454,7 @@
|
|||
{
|
||||
"model": "core.headcircumference",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"head_circumference": 5.5,
|
||||
"date": "2017-11-11"
|
||||
|
|
@ -502,8 +463,7 @@
|
|||
{
|
||||
"model": "core.headcircumference",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"head_circumference": 6.5,
|
||||
"date": "2017-11-18",
|
||||
|
|
@ -513,8 +473,7 @@
|
|||
{
|
||||
"model": "core.bmi",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"bmi": 25.5,
|
||||
"date": "2017-11-11"
|
||||
|
|
@ -523,8 +482,7 @@
|
|||
{
|
||||
"model": "core.bmi",
|
||||
"pk": 2,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"child": 1,
|
||||
"bmi": 26.5,
|
||||
"date": "2017-11-18",
|
||||
|
|
@ -534,8 +492,7 @@
|
|||
{
|
||||
"model": "core.tag",
|
||||
"pk": 1,
|
||||
"fields":
|
||||
{
|
||||
"fields": {
|
||||
"name": "a name",
|
||||
"slug": "a-name",
|
||||
"color": "#FF0000",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
if (typeof jQuery === 'undefined') {
|
||||
throw new Error('Baby Buddy requires jQuery.')
|
||||
if (typeof jQuery === "undefined") {
|
||||
throw new Error("Baby Buddy requires jQuery.");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -9,29 +9,29 @@ if (typeof jQuery === 'undefined') {
|
|||
*
|
||||
* @type {{}}
|
||||
*/
|
||||
var BabyBuddy = function () {
|
||||
var BabyBuddy = (function () {
|
||||
return {};
|
||||
}();
|
||||
})();
|
||||
|
||||
/**
|
||||
* Pull to refresh.
|
||||
*
|
||||
* @type {{init: BabyBuddy.PullToRefresh.init, onRefresh: BabyBuddy.PullToRefresh.onRefresh}}
|
||||
*/
|
||||
BabyBuddy.PullToRefresh = function(ptr) {
|
||||
BabyBuddy.PullToRefresh = (function (ptr) {
|
||||
return {
|
||||
init: function () {
|
||||
ptr.init({
|
||||
mainElement: 'body',
|
||||
onRefresh: this.onRefresh
|
||||
mainElement: "body",
|
||||
onRefresh: this.onRefresh,
|
||||
});
|
||||
},
|
||||
|
||||
onRefresh: function () {
|
||||
window.location.reload();
|
||||
}
|
||||
},
|
||||
};
|
||||
}(PullToRefresh);
|
||||
})(PullToRefresh);
|
||||
|
||||
/**
|
||||
* Fix for duplicate form submission from double pressing submit
|
||||
|
|
@ -39,7 +39,7 @@ BabyBuddy.PullToRefresh = function(ptr) {
|
|||
function preventDoubleSubmit() {
|
||||
return false;
|
||||
}
|
||||
$('form').off("submit", preventDoubleSubmit);
|
||||
$("form").off("submit", preventDoubleSubmit);
|
||||
$("form").on("submit", function () {
|
||||
$(this).on("submit", preventDoubleSubmit);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -17,17 +17,19 @@
|
|||
* @return {String} The contrasting color (black or white)
|
||||
*/
|
||||
function computeComplementaryColor(hexcolor) {
|
||||
|
||||
// If a leading # is provided, remove it
|
||||
if (hexcolor.slice(0, 1) === '#') {
|
||||
if (hexcolor.slice(0, 1) === "#") {
|
||||
hexcolor = hexcolor.slice(1);
|
||||
}
|
||||
|
||||
// If a three-character hexcode, make six-character
|
||||
if (hexcolor.length === 3) {
|
||||
hexcolor = hexcolor.split('').map(function (hex) {
|
||||
hexcolor = hexcolor
|
||||
.split("")
|
||||
.map(function (hex) {
|
||||
return hex + hex;
|
||||
}).join('');
|
||||
})
|
||||
.join("");
|
||||
}
|
||||
|
||||
// Convert to RGB value
|
||||
|
|
@ -36,22 +38,24 @@
|
|||
let b = parseInt(hexcolor.substr(4, 2), 16);
|
||||
|
||||
// Get YIQ ratio
|
||||
let yiq = ((r * 299) + (g * 587) + (b * 114)) / 1000;
|
||||
let yiq = (r * 299 + g * 587 + b * 114) / 1000;
|
||||
|
||||
// Check contrast
|
||||
return (yiq >= 128) ? '#101010' : '#EFEFEF';
|
||||
return yiq >= 128 ? "#101010" : "#EFEFEF";
|
||||
}
|
||||
|
||||
// CSRF token should always be present because it is auto-included with
|
||||
// every tag-editor widget
|
||||
const CSRF_TOKEN = document.querySelector('input[name="csrfmiddlewaretoken"]').value;
|
||||
const CSRF_TOKEN = document.querySelector(
|
||||
'input[name="csrfmiddlewaretoken"]',
|
||||
).value;
|
||||
|
||||
function doReq(method, uri, data, success, fail) {
|
||||
// TODO: prefer jQuery based requests for now
|
||||
|
||||
const req = new XMLHttpRequest();
|
||||
req.addEventListener('load', () => {
|
||||
if ((req.status >= 200) && (req.status < 300)) {
|
||||
req.addEventListener("load", () => {
|
||||
if (req.status >= 200 && req.status < 300) {
|
||||
success(req.responseText, req);
|
||||
} else {
|
||||
fail(req.responseText, req);
|
||||
|
|
@ -80,11 +84,11 @@
|
|||
*/
|
||||
class TaggingBase {
|
||||
constructor(widget) {
|
||||
this.prototype = widget.querySelector('.prototype-tag');
|
||||
this.prototype = widget.querySelector(".prototype-tag");
|
||||
this.listeners = [];
|
||||
|
||||
this.modalElement = widget.querySelector('.tag-editor-error-modal');
|
||||
this.modalBodyNode = this.modalElement.querySelector('.modal-body');
|
||||
this.modalElement = widget.querySelector(".tag-editor-error-modal");
|
||||
this.modalBodyNode = this.modalElement.querySelector(".modal-body");
|
||||
|
||||
// Clean whitespace text nodes between spans
|
||||
for (const n of this.modalBodyNode.childNodes) {
|
||||
|
|
@ -95,17 +99,19 @@
|
|||
}
|
||||
|
||||
showModal(msg) {
|
||||
const selectedMessage = this.modalBodyNode.querySelector(`span[data-message='${msg}']`);
|
||||
const selectedMessage = this.modalBodyNode.querySelector(
|
||||
`span[data-message='${msg}']`,
|
||||
);
|
||||
if (!selectedMessage) {
|
||||
selectedMessage = this.modalBodyNode.childNodes[0];
|
||||
}
|
||||
|
||||
for (const n of this.modalBodyNode.childNodes) {
|
||||
n.classList.add('d-none');
|
||||
n.classList.add("d-none");
|
||||
}
|
||||
selectedMessage.classList.remove('d-none');
|
||||
selectedMessage.classList.remove("d-none");
|
||||
|
||||
jQuery(this.modalElement).modal('show');
|
||||
jQuery(this.modalElement).modal("show");
|
||||
}
|
||||
|
||||
addTagListUpdatedListener(c) {
|
||||
|
|
@ -119,7 +125,8 @@
|
|||
}
|
||||
|
||||
updateTag(tag, name, color, actionSymbol) {
|
||||
const actionTextNode = tag.querySelector('.add-remove-icon').childNodes[0];
|
||||
const actionTextNode =
|
||||
tag.querySelector(".add-remove-icon").childNodes[0];
|
||||
|
||||
name = name || tag.getAttribute("data-value");
|
||||
color = color || tag.getAttribute("data-color");
|
||||
|
|
@ -130,7 +137,10 @@
|
|||
tag.setAttribute("data-color", color);
|
||||
|
||||
const textColor = computeComplementaryColor(color);
|
||||
tag.setAttribute('style', `background-color: ${color}; color: ${textColor};`);
|
||||
tag.setAttribute(
|
||||
"style",
|
||||
`background-color: ${color}; color: ${textColor};`,
|
||||
);
|
||||
actionTextNode.textContent = actionSymbol;
|
||||
}
|
||||
|
||||
|
|
@ -146,7 +156,7 @@
|
|||
list.appendChild(tag);
|
||||
this.callTagListUpdatedListeners();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Handler for the edit field allowing to dynamically create new tags.
|
||||
|
|
@ -171,17 +181,20 @@
|
|||
this.widget = widget;
|
||||
this.taggingBase = taggingBase;
|
||||
|
||||
this.apiTagsUrl = widget.getAttribute('data-tags-url');
|
||||
this.createTagInputs = widget.querySelector('.create-tag-inputs');
|
||||
this.addTagInput = this.createTagInputs.querySelector('input[type="text"]');
|
||||
this.addTagButton = this.createTagInputs.querySelector('#add-tag');
|
||||
this.apiTagsUrl = widget.getAttribute("data-tags-url");
|
||||
this.createTagInputs = widget.querySelector(".create-tag-inputs");
|
||||
this.addTagInput =
|
||||
this.createTagInputs.querySelector('input[type="text"]');
|
||||
this.addTagButton = this.createTagInputs.querySelector("#add-tag");
|
||||
|
||||
this.addTagInput.value = "";
|
||||
|
||||
this.onInsertNewTag = onInsertNewTag;
|
||||
|
||||
this.addTagButton.addEventListener('click', () => this.onCreateTagClicked());
|
||||
this.addTagInput.addEventListener('keydown', (e) => {
|
||||
this.addTagButton.addEventListener("click", () =>
|
||||
this.onCreateTagClicked(),
|
||||
);
|
||||
this.addTagInput.addEventListener("keydown", (e) => {
|
||||
const key = e.key.toLowerCase();
|
||||
if (key === "enter") {
|
||||
e.preventDefault();
|
||||
|
|
@ -206,7 +219,7 @@
|
|||
};
|
||||
|
||||
if (!tagName) {
|
||||
fail('invalid-tag-name');
|
||||
fail("invalid-tag-name");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -217,27 +230,35 @@
|
|||
};
|
||||
|
||||
const data = JSON.stringify({
|
||||
'name': this.addTagInput.value
|
||||
name: this.addTagInput.value,
|
||||
});
|
||||
|
||||
doReq("GET", `${this.apiTagsUrl}?name=${uriTagName}`, null,
|
||||
doReq(
|
||||
"GET",
|
||||
`${this.apiTagsUrl}?name=${uriTagName}`,
|
||||
null,
|
||||
(text) => {
|
||||
const json = JSON.parse(text);
|
||||
if (json.count) {
|
||||
const tagJson = json.results[0];
|
||||
addTag(tagJson.name, tagJson.color);
|
||||
} else {
|
||||
doReq("POST", this.apiTagsUrl, data,
|
||||
doReq(
|
||||
"POST",
|
||||
this.apiTagsUrl,
|
||||
data,
|
||||
(text) => {
|
||||
const tagJson = JSON.parse(text);
|
||||
addTag(tagJson.name, tagJson.color);
|
||||
}, () => fail("tag-creation-failed")
|
||||
},
|
||||
() => fail("tag-creation-failed"),
|
||||
);
|
||||
}
|
||||
}, () => fail("tag-checking-failed")
|
||||
},
|
||||
() => fail("tag-checking-failed"),
|
||||
);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* JavaScript implementation for the tags editor.
|
||||
|
|
@ -256,11 +277,13 @@
|
|||
this.widget = tagEditorRoot;
|
||||
this.taggingBase = new TaggingBase(this.widget);
|
||||
this.addTagControl = new AddNewTagControl(
|
||||
this.widget, this.taggingBase, (t) => this.insertNewTag(t)
|
||||
this.widget,
|
||||
this.taggingBase,
|
||||
(t) => this.insertNewTag(t),
|
||||
);
|
||||
|
||||
this.currentTags = this.widget.querySelector('.current_tags');
|
||||
this.newTags = this.widget.querySelector('.new-tags');
|
||||
this.currentTags = this.widget.querySelector(".current_tags");
|
||||
this.newTags = this.widget.querySelector(".new-tags");
|
||||
this.inputElement = this.widget.querySelector('input[type="hidden"]');
|
||||
|
||||
for (const tag of this.newTags.querySelectorAll(".tag")) {
|
||||
|
|
@ -271,9 +294,7 @@
|
|||
}
|
||||
|
||||
this.updateInputList();
|
||||
this.taggingBase.addTagListUpdatedListener(
|
||||
() => this.updateInputList()
|
||||
);
|
||||
this.taggingBase.addTagListUpdatedListener(() => this.updateInputList());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -306,10 +327,10 @@
|
|||
tag.parentNode.removeChild(tag);
|
||||
this.taggingBase.insertTag(newParent, tag);
|
||||
|
||||
tag.removeEventListener('click', callback);
|
||||
tag.removeEventListener("click", callback);
|
||||
onClicked(tag);
|
||||
}
|
||||
tag.addEventListener('click', callback.bind(this));
|
||||
tag.addEventListener("click", callback.bind(this));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -332,7 +353,9 @@
|
|||
*/
|
||||
configureAddTag(tag) {
|
||||
this.taggingBase.updateTag(tag, null, null, "+");
|
||||
this.registerNewCallback(tag, this.currentTags, () => this.configureRemoveTag(tag));
|
||||
this.registerNewCallback(tag, this.currentTags, () =>
|
||||
this.configureRemoveTag(tag),
|
||||
);
|
||||
this.updateInputList();
|
||||
}
|
||||
|
||||
|
|
@ -341,13 +364,15 @@
|
|||
*/
|
||||
configureRemoveTag(tag) {
|
||||
this.taggingBase.updateTag(tag, null, null, "-");
|
||||
this.registerNewCallback(tag, this.newTags, () => this.configureAddTag(tag));
|
||||
this.registerNewCallback(tag, this.newTags, () =>
|
||||
this.configureAddTag(tag),
|
||||
);
|
||||
this.updateInputList();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
window.addEventListener('load', () => {
|
||||
for (const el of document.querySelectorAll('.babybuddy-tags-editor')) {
|
||||
window.addEventListener("load", () => {
|
||||
for (const el of document.querySelectorAll(".babybuddy-tags-editor")) {
|
||||
new TagsEditor(el);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
* * timer-minutes
|
||||
* * timer-hours
|
||||
*/
|
||||
BabyBuddy.Timer = function ($) {
|
||||
BabyBuddy.Timer = (function ($) {
|
||||
var runIntervalId = null;
|
||||
var timerId = null;
|
||||
var timerElement = null;
|
||||
|
|
@ -16,17 +16,19 @@ BabyBuddy.Timer = function ($) {
|
|||
var Timer = {
|
||||
run: function (timer_id, element_id) {
|
||||
timerId = timer_id;
|
||||
timerElement = $('#' + element_id);
|
||||
timerElement = $("#" + element_id);
|
||||
|
||||
if (timerElement.length === 0) {
|
||||
console.error('BBTimer: Timer element not found.');
|
||||
console.error("BBTimer: Timer element not found.");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (timerElement.find('.timer-seconds').length === 0
|
||||
|| timerElement.find('.timer-minutes').length === 0
|
||||
|| timerElement.find('.timer-hours').length === 0) {
|
||||
console.error('BBTimer: Element does not contain expected children.');
|
||||
if (
|
||||
timerElement.find(".timer-seconds").length === 0 ||
|
||||
timerElement.find(".timer-minutes").length === 0 ||
|
||||
timerElement.find(".timer-hours").length === 0
|
||||
) {
|
||||
console.error("BBTimer: Element does not contain expected children.");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -37,67 +39,63 @@ BabyBuddy.Timer = function ($) {
|
|||
// phones that lock with the timer page open.
|
||||
if (typeof document.hidden !== "undefined") {
|
||||
hidden = "hidden";
|
||||
}
|
||||
else if (typeof document.msHidden !== "undefined") {
|
||||
} else if (typeof document.msHidden !== "undefined") {
|
||||
hidden = "msHidden";
|
||||
}
|
||||
else if (typeof document.webkitHidden !== "undefined") {
|
||||
} else if (typeof document.webkitHidden !== "undefined") {
|
||||
hidden = "webkitHidden";
|
||||
}
|
||||
window.addEventListener('focus', Timer.handleVisibilityChange, false);
|
||||
window.addEventListener("focus", Timer.handleVisibilityChange, false);
|
||||
},
|
||||
|
||||
handleVisibilityChange: function () {
|
||||
if (!document[hidden] && (new Date()) - lastUpdate > 1) {
|
||||
if (!document[hidden] && new Date() - lastUpdate > 1) {
|
||||
Timer.update();
|
||||
}
|
||||
},
|
||||
|
||||
tick: function () {
|
||||
var s = timerElement.find('.timer-seconds');
|
||||
var s = timerElement.find(".timer-seconds");
|
||||
var seconds = Number(s.text());
|
||||
if (seconds < 59) {
|
||||
s.text(seconds + 1);
|
||||
return;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
s.text(0);
|
||||
}
|
||||
|
||||
var m = timerElement.find('.timer-minutes');
|
||||
var m = timerElement.find(".timer-minutes");
|
||||
var minutes = Number(m.text());
|
||||
if (minutes < 59) {
|
||||
m.text(minutes + 1);
|
||||
return;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
m.text(0);
|
||||
}
|
||||
|
||||
var h = timerElement.find('.timer-hours');
|
||||
var h = timerElement.find(".timer-hours");
|
||||
var hours = Number(h.text());
|
||||
h.text(hours + 1);
|
||||
},
|
||||
|
||||
update: function () {
|
||||
$.get('/api/timers/' + timerId + '/', function(data) {
|
||||
if (data && 'duration' in data) {
|
||||
$.get("/api/timers/" + timerId + "/", function (data) {
|
||||
if (data && "duration" in data) {
|
||||
clearInterval(runIntervalId);
|
||||
var duration = data.duration.split(/[\s:.]/)
|
||||
var duration = data.duration.split(/[\s:.]/);
|
||||
if (duration.length === 5) {
|
||||
duration[0] = parseInt(duration[0]) * 24 + parseInt(duration[1]);
|
||||
duration[1] = duration[2];
|
||||
duration[2] = duration[3];
|
||||
}
|
||||
timerElement.find('.timer-hours').text(parseInt(duration[0]));
|
||||
timerElement.find('.timer-minutes').text(parseInt(duration[1]));
|
||||
timerElement.find('.timer-seconds').text(parseInt(duration[2]));
|
||||
lastUpdate = new Date()
|
||||
timerElement.find(".timer-hours").text(parseInt(duration[0]));
|
||||
timerElement.find(".timer-minutes").text(parseInt(duration[1]));
|
||||
timerElement.find(".timer-seconds").text(parseInt(duration[2]));
|
||||
lastUpdate = new Date();
|
||||
runIntervalId = setInterval(Timer.tick, 1000);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
return Timer;
|
||||
}(jQuery);
|
||||
})(jQuery);
|
||||
|
|
|
|||
|
|
@ -3,39 +3,46 @@
|
|||
* Provides a "watch" function to update the dashboard at one minute intervals
|
||||
* and/or on visibility state changes.
|
||||
*/
|
||||
BabyBuddy.Dashboard = function ($) {
|
||||
BabyBuddy.Dashboard = (function ($) {
|
||||
var runIntervalId = null;
|
||||
var dashboardElement = null;
|
||||
var hidden = null;
|
||||
|
||||
var Dashboard = {
|
||||
watch: function (element_id, refresh_rate) {
|
||||
dashboardElement = $('#' + element_id);
|
||||
dashboardElement = $("#" + element_id);
|
||||
|
||||
if (dashboardElement.length == 0) {
|
||||
console.error('Baby Buddy: Dashboard element not found.');
|
||||
console.error("Baby Buddy: Dashboard element not found.");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (typeof document.hidden !== "undefined") {
|
||||
hidden = "hidden";
|
||||
}
|
||||
else if (typeof document.msHidden !== "undefined") {
|
||||
} else if (typeof document.msHidden !== "undefined") {
|
||||
hidden = "msHidden";
|
||||
}
|
||||
else if (typeof document.webkitHidden !== "undefined") {
|
||||
} else if (typeof document.webkitHidden !== "undefined") {
|
||||
hidden = "webkitHidden";
|
||||
}
|
||||
|
||||
if (typeof window.addEventListener === "undefined" || typeof document.hidden === "undefined") {
|
||||
if (
|
||||
typeof window.addEventListener === "undefined" ||
|
||||
typeof document.hidden === "undefined"
|
||||
) {
|
||||
if (refresh_rate) {
|
||||
runIntervalId = setInterval(this.update, refresh_rate);
|
||||
}
|
||||
}
|
||||
else {
|
||||
window.addEventListener('focus', Dashboard.handleVisibilityChange, false);
|
||||
} else {
|
||||
window.addEventListener(
|
||||
"focus",
|
||||
Dashboard.handleVisibilityChange,
|
||||
false,
|
||||
);
|
||||
if (refresh_rate) {
|
||||
runIntervalId = setInterval(Dashboard.handleVisibilityChange, refresh_rate);
|
||||
runIntervalId = setInterval(
|
||||
Dashboard.handleVisibilityChange,
|
||||
refresh_rate,
|
||||
);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -49,8 +56,8 @@ BabyBuddy.Dashboard = function ($) {
|
|||
update: function () {
|
||||
// TODO: Someday maybe update in place?
|
||||
location.reload();
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
return Dashboard;
|
||||
}(jQuery);
|
||||
})(jQuery);
|
||||
|
|
|
|||
|
|
@ -1,89 +1,78 @@
|
|||
const basePath = 'babybuddy/static/babybuddy/';
|
||||
const basePath = "babybuddy/static/babybuddy/";
|
||||
|
||||
module.exports = {
|
||||
basePath: basePath,
|
||||
extrasConfig: {
|
||||
fonts: {
|
||||
dest: basePath + 'font/',
|
||||
files: 'babybuddy/static_src/fontello/font/*'
|
||||
dest: basePath + "font/",
|
||||
files: "babybuddy/static_src/fontello/font/*",
|
||||
},
|
||||
images: {
|
||||
dest: basePath + 'img/',
|
||||
files: '**/static_src/img/**/*'
|
||||
dest: basePath + "img/",
|
||||
files: "**/static_src/img/**/*",
|
||||
},
|
||||
logo: {
|
||||
dest: basePath + 'logo/',
|
||||
files: 'babybuddy/static_src/logo/**/*'
|
||||
dest: basePath + "logo/",
|
||||
files: "babybuddy/static_src/logo/**/*",
|
||||
},
|
||||
root: {
|
||||
dest: basePath + 'root/',
|
||||
files: 'babybuddy/static_src/root/*'
|
||||
}
|
||||
dest: basePath + "root/",
|
||||
files: "babybuddy/static_src/root/*",
|
||||
},
|
||||
},
|
||||
glyphFontConfig: {
|
||||
configFile: 'babybuddy/static_src/fontello/config.json',
|
||||
dest: 'babybuddy/static_src/fontello'
|
||||
configFile: "babybuddy/static_src/fontello/config.json",
|
||||
dest: "babybuddy/static_src/fontello",
|
||||
},
|
||||
scriptsConfig: {
|
||||
dest: basePath + 'js/',
|
||||
dest: basePath + "js/",
|
||||
vendor: [
|
||||
'node_modules/pulltorefreshjs/dist/index.umd.js',
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/@popperjs/core/dist/umd/popper.js',
|
||||
'node_modules/bootstrap/dist/js/bootstrap.js',
|
||||
'node_modules/masonry-layout/dist/masonry.pkgd.js'
|
||||
"node_modules/pulltorefreshjs/dist/index.umd.js",
|
||||
"node_modules/jquery/dist/jquery.js",
|
||||
"node_modules/@popperjs/core/dist/umd/popper.js",
|
||||
"node_modules/bootstrap/dist/js/bootstrap.js",
|
||||
"node_modules/masonry-layout/dist/masonry.pkgd.js",
|
||||
],
|
||||
graph: [
|
||||
'node_modules/plotly.js/dist/plotly-cartesian.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-ca.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-cs.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-de.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-da.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-es.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-fi.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-fr.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-hu.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-it.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-no.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-nl.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-pl.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-pt-br.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-pt-pt.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-ru.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-sv.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-tr.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-uk.js',
|
||||
'node_modules/plotly.js/dist/plotly-locale-zh-cn.js',
|
||||
"node_modules/plotly.js/dist/plotly-cartesian.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-ca.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-cs.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-de.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-da.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-es.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-fi.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-fr.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-hu.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-it.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-no.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-nl.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-pl.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-pt-br.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-pt-pt.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-ru.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-sv.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-tr.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-uk.js",
|
||||
"node_modules/plotly.js/dist/plotly-locale-zh-cn.js",
|
||||
],
|
||||
app: [
|
||||
'babybuddy/static_src/js/babybuddy.js',
|
||||
'api/static_src/js/*.js',
|
||||
'core/static_src/js/*.js',
|
||||
'dashboard/static_src/js/*.js'
|
||||
"babybuddy/static_src/js/babybuddy.js",
|
||||
"api/static_src/js/*.js",
|
||||
"core/static_src/js/*.js",
|
||||
"dashboard/static_src/js/*.js",
|
||||
],
|
||||
tags_editor: [
|
||||
'babybuddy/static_src/js/tags_editor.js'
|
||||
]
|
||||
tags_editor: ["babybuddy/static_src/js/tags_editor.js"],
|
||||
},
|
||||
stylesConfig: {
|
||||
dest: basePath + 'css/',
|
||||
app: 'babybuddy/static_src/scss/babybuddy.scss',
|
||||
ignore: [
|
||||
'babybuddy.scss'
|
||||
]
|
||||
dest: basePath + "css/",
|
||||
app: "babybuddy/static_src/scss/babybuddy.scss",
|
||||
ignore: ["babybuddy.scss"],
|
||||
},
|
||||
testsConfig: {
|
||||
isolated: [
|
||||
'babybuddy.tests.tests_views.ViewsTestCase.test_password_reset'
|
||||
],
|
||||
isolated: ["babybuddy.tests.tests_views.ViewsTestCase.test_password_reset"],
|
||||
},
|
||||
watchConfig: {
|
||||
scriptsGlob: [
|
||||
'*/static_src/js/**/*.js',
|
||||
'!babybuddy/static/js/'
|
||||
],
|
||||
stylesGlob: [
|
||||
'*/static_src/scss/**/*.scss'
|
||||
]
|
||||
}
|
||||
scriptsGlob: ["*/static_src/js/**/*.js", "!babybuddy/static/js/"],
|
||||
stylesGlob: ["*/static_src/scss/**/*.scss"],
|
||||
},
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue