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.

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

Changed styling of duedates #75

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed styling of duedates #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a33a6de
used Todoist colors for due dates; all same text size; overdue in bol…
thyed May 17, 2020
df6f845
reset avatar size to 27px
thyed May 17, 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
18 changes: 12 additions & 6 deletions MMM-Todoist.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,18 @@
}

.overdue {
text-decoration: underline #ac0000;
color: #D1453B; /* original Todoist color */
font-weight: bold;
}

.today {
text-decoration: underline #03a05c;
color: #058527; /* original Todoist color */
font-weight: bold;
}

.tomorrow {
text-decoration: underline #166cec;
color: #B7741E; /* original Todoist color */
font-weight: bold;
}

.projectcolor {
Expand All @@ -56,8 +59,10 @@
/* filter: grayscale(100%); */
height: 27px;
display: block;
margin-left: 10px;
margin-right: auto;
margin-top: 2px;
margin-bottom: 2px;
margin-left: 5px;
margin-right: 5px;
}

.divTable{
Expand All @@ -74,6 +79,7 @@
.divTableCell, .divTableHead {
/* border: 1px solid #999999; */
display: table-cell;
vertical-align: middle;
/* padding: 3px 10px; */
}
.divTableHeading {
Expand All @@ -92,4 +98,4 @@
.todoTextCell {
width: 400px;
overflow: hidden;
}
}
49 changes: 20 additions & 29 deletions MMM-Todoist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Module.register("MMM-Todoist", {
// "#ffcc00", "#74e8d3", "#3bd5fb", "#dc4fad", "#ac193d", "#d24726", "#82ba00", "#03b3b2", "#008299",
// "#5db2ff", "#0072c6", "#000000", "#777777"
// ], //These colors come from Todoist and their order matters if you want the colors to match your Todoist project colors.

//TODOIST Change how they are doing Project Colors, so now I'm changing it.
projectColors: {
30:'#b8256f',
Expand Down Expand Up @@ -418,15 +418,15 @@ Module.register("MMM-Todoist", {
return this.createCell("spacerCell", " ");
},
addTodoTextCell: function(item) {
return this.createCell("title bright alignLeft",
return this.createCell("title bright alignLeft",
this.shorten(item.content, this.config.maxTitleLength, this.config.wrapEvents));

// return this.createCell("title bright alignLeft", item.content);
},
addDueDateCell: function(item) {
var className = "bright align-right dueDate ";
var className = "xsmall bright align-right dueDate ";
var innerHTML = "";

var oneDay = 24 * 60 * 60 * 1000;
var dueDateTime = new Date(item.due.date);
var dueDate = new Date(dueDateTime.getFullYear(), dueDateTime.getMonth(), dueDateTime.getDate());
Expand All @@ -435,14 +435,15 @@ Module.register("MMM-Todoist", {
var diffDays = Math.floor((dueDate - today + 7200000) / (oneDay));
var diffMonths = (dueDate.getFullYear() * 12 + dueDate.getMonth()) - (now.getFullYear() * 12 + now.getMonth());

if (diffDays < -1) {
innerHTML = dueDate.toLocaleDateString(config.language, {
"month": "short"
}) + " " + dueDate.getDate();
className += "xsmall overdue";
if (diffDays < -7) {
innerHTML = dueDate.toLocaleDateString(config.language, {"month":"short", "day":"numeric"});
className += "overdue";
} else if (diffDays >= -7 && diffDays < -1) {
innerHTML = dueDate.toLocaleDateString(config.language, {"weekday":"long"});
className += "overdue";
} else if (diffDays === -1) {
innerHTML = this.translate("YESTERDAY");
className += "xsmall overdue";
className += "overdue";
} else if (diffDays === 0) {
innerHTML = this.translate("TODAY");
if (item.all_day || dueDateTime >= now) {
Expand All @@ -452,25 +453,15 @@ Module.register("MMM-Todoist", {
}
} else if (diffDays === 1) {
innerHTML = this.translate("TOMORROW");
className += "xsmall tomorrow";
className += "tomorrow";
} else if (diffDays < 7) {
innerHTML = dueDate.toLocaleDateString(config.language, {
"weekday": "short"
});
className += "xsmall";
innerHTML = dueDate.toLocaleDateString(config.language, {"weekday": "long"});
} else if (diffMonths < 7 || dueDate.getFullYear() == now.getFullYear()) {
innerHTML = dueDate.toLocaleDateString(config.language, {
"month": "short"
}) + " " + dueDate.getDate();
className += "xsmall";
innerHTML = dueDate.toLocaleDateString(config.language, {"month":"short", "day":"numeric"});
} else if (item.due.date === "2100-12-31") {
innerHTML = "";
className += "xsmall";
} else {
innerHTML = dueDate.toLocaleDateString(config.language, {
"month": "short"
}) + " " + dueDate.getDate() + " " + dueDate.getFullYear();
className += "xsmall";
innerHTML = dueDate.toLocaleDateString(config.language, {"year":"numeric", "month": "short", "day":"numeric"});
}

if (innerHTML !== "" && !item.all_day) {
Expand All @@ -496,7 +487,7 @@ Module.register("MMM-Todoist", {
var innerHTML = project.name + "<span class='projectcolor' style='color: " + projectcolor + "; background-color: " + projectcolor + "'></span>";
return this.createCell("xsmall", innerHTML);
},
addAssigneeAvatorCell: function(item, collaboratorsMap) {
addAssigneeAvatorCell: function(item, collaboratorsMap) {
var avatarImg = document.createElement("img");
avatarImg.className = "todoAvatarImg";

Expand All @@ -511,7 +502,7 @@ Module.register("MMM-Todoist", {
return cell;
},
getDom: function () {

//Add a new div to be able to display the update time alone after all the task
var wrapper = document.createElement("div");

Expand All @@ -529,7 +520,7 @@ Module.register("MMM-Todoist", {

var divBody = document.createElement("div");
divBody.className = "divTableBody";

if (this.tasks === undefined) {
return wrapper;
}
Expand All @@ -546,7 +537,7 @@ Module.register("MMM-Todoist", {
var divRow = document.createElement("div");
//Add the Row
divRow.className = "divTableRow";


//Columns
divRow.appendChild(this.addPriorityIndicatorCell(item));
Expand All @@ -563,7 +554,7 @@ Module.register("MMM-Todoist", {

divBody.appendChild(divRow);
});

divTable.appendChild(divBody);
wrapper.appendChild(divTable);

Expand Down