diff --git a/.gitignore b/.gitignore index aba08ce..496a062 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .vscode/* to-do.md -updates \ No newline at end of file +updates +taskList.css.map \ No newline at end of file diff --git a/index.html b/index.html index 3a15ed0..12fa526 100644 --- a/index.html +++ b/index.html @@ -14,8 +14,14 @@ + + Task List diff --git a/scripts/extraScripts.js b/scripts/extraScripts.js new file mode 100644 index 0000000..e69de29 diff --git a/scripts/taskList.js b/scripts/taskList.js index e13ad9b..f794628 100644 --- a/scripts/taskList.js +++ b/scripts/taskList.js @@ -810,9 +810,9 @@ async function addTask(username, userColor, task) { let addedTaskIndices = addTaskFunction.body.addedTaskIndices; let tasksFailedToAdd = addTaskFunction.body.tasksFailedToAdd; - // if (!scrolling) { - await renderTaskListToDOM(); - // } + if (!scrolling) { + await renderTaskListToDOM(); + } let displayedTasksAdded = addedTaskIndices.map((t) => { return `(${t.index + 1}) ${t.task}`; @@ -2580,6 +2580,15 @@ function sleep(ms) { return new Promise((resolve) => setTimeout(resolve, ms)); } +function randomTasks(num) { + let tasks = []; + for (let i = 0; i < num; i++) { + tasks.push(`task ${i + 1}`); + } + + return tasks.join(", "); +} + // unit tests async function tests() { let listOfStreamers = [ @@ -2587,20 +2596,16 @@ async function tests() { `followRythonDev2`, `followRythonDev3`, `followRythonDev4`, - // `followRythonDev5`, - // `followRythonDev6`, - // `followRythonDev7`, + `followRythonDev5`, + `followRythonDev6`, + `followRythonDev7`, ]; for (let i = 0; i < listOfStreamers.length; i++) { - addTask( - listOfStreamers[i], - "#ffc0cb", - `task 1, task 2, task 3, task 4, task 5` - ); + let randomNum = Math.floor(Math.random() * 10) + 1; + + addTask(listOfStreamers[i], "#ffc0cb", randomTasks(randomNum)); await sleep(1000); - // markTaskDone(listOfStreamers[i], `1, 2, 3, 4, 5`); - // await sleep(1000); } } diff --git a/styles/extraStyles.css b/styles/extraStyles.css new file mode 100644 index 0000000..7adfd44 --- /dev/null +++ b/styles/extraStyles.css @@ -0,0 +1,10 @@ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +#main-container { + width: 100%; + height: 100vh; +} diff --git a/styles/taskList.css b/styles/taskList.css index 3f6411e..1e41e90 100644 --- a/styles/taskList.css +++ b/styles/taskList.css @@ -47,6 +47,18 @@ box-sizing: border-box; } +@keyframes scroll { + 0% { + transform: translateY(0); + } + 100% { + transform: translateY(-100%); + } +} +.primary, .secondary { + animation: scroll linear infinite; +} + #main-container { width: 100%; height: 100vh; diff --git a/styles/taskList.css.map b/styles/taskList.css.map index 99b871b..13f689c 100644 --- a/styles/taskList.css.map +++ b/styles/taskList.css.map @@ -1 +1 @@ -{"version":3,"sources":["taskList.scss","taskList.css"],"names":[],"mappings":"AAAA;EACC,uBAAA;EACA,yBAAA;EAEA,gDAAA;EAEA,6BAAA;EACA,+BAAA;EACA,8BAAA;EAEA,mCAAA;EACA,iCAAA;EAEA,iCAAA;EACA,+BAAA;EAEA,6CAAA;EAEA,0BAAA;EACA,4BAAA;EACA,2BAAA;EAEA,wBAAA;EACA,gCAAA;EACA,0BAAA;EACA,0BAAA;EAEA,8BAAA;EAEA,2CAAA;EAEA,wBAAA;EACA,0BAAA;EACA,yBAAA;EAEA,sBAAA;EAEA,oBAAA;EACA,kBAAA;EACA,4BAAA;EAEA,2CAAA;EAEA,8BAAA;EACA,sBAAA;EACA,wBAAA;EAEA,0BAAA;EACA,wBAAA;EACA,yBAAA;EAEA,8BAAA;EACA,4BAAA;EAEA,yBAAA;EACA,8BAAA;EACA,4BAAA;EAEA,wBAAA;ACjBD;;ADoBA;EACC,SAAA;EACA,UAAA;EACA,sBAAA;ACjBD;;ADqBA;EACC,WAAA;EACA,aAAA;EAEA,aAAA;EACA,sBAAA;EAEA,8EAAA;EAGA,mDAAA;EAEA,yEAAA;EACA,6CAAA;EAEA,oCAAA;ACxBD;AD0BC;EACC,aAAA;EACA,8BAAA;EAEA,wEAAA;EAEA,mEAAA;EACA,0CAAA;EAEA,+BAAA;EACA,0CAAA;EAEA,sCAAA;EACA,kCAAA;EACA,sCAAA;AC5BF;AD8BE;EACC,6BAAA;AC5BH;AD8BE;EACC,UAAA;AC5BH;AD+BE;EACC,4CAAA;AC7BH;ADiCC;EACC,gCAAA;AC/BF;ADkCC;EACC,WAAA;EACA,YAAA;EAEA,gBAAA;EAEA,kBAAA;EAEA,wCAAA;EAEA,6BAAA;EACA,oCAAA;EACA,gCAAA;EAEA,+BAAA;EAEA,+DAAA;EACA,wCAAA;EAEA,UAAA;ACvCF;ADyCE;EACC,sCAAA;ACvCH;AD0CE;EAEC,cAAA;EAEA,OAAA;EAEA,aAAA;EACA,sBAAA;EAEA,mBAAA;EAEA,iBAAA;EACA,kBAAA;EAEA,kCAAA;EAEA,sCAAA;AC/CH;ADkDG;EACC,oEAAA;EAEA,wCAAA;EAEA,wCAAA;EAEA,wBAAA;EAEA,+DAAA;EACA,wCAAA;ACpDJ;ADsDI;EACC,wCAAA;EACA,oCAAA;ACpDL;ADuDI;EACC,mBAAA;ACrDL;ADuDK;EACC,aAAA;ACrDN;ADuDM;EACC,uBAAA;EACA,iCAAA;EACA,iBAAA;ACrDP;ADwDM;EACC,oBAAA;EACA,kCAAA;EACA,0CAAA;EACA,4BAAA;EACA,gBAAA;ACtDP;AD0DK;EACC,kCAAA;ACxDN;AD0DM;EACC,6BAAA;EACA,kCAAA;ACxDP;AD6DK;EACC,8CAAA;EACA,mCAAA;EAEA,gFAAA;EAGA,8CAAA;EAEA,uBAAA;EAAA,kBAAA;EAEA,4DAAA;AChEN","file":"taskList.css"} \ No newline at end of file +{"version":3,"sources":["taskList.scss","taskList.css"],"names":[],"mappings":"AAAA;EACC,uBAAA;EACA,yBAAA;EAEA,gDAAA;EAEA,6BAAA;EACA,+BAAA;EACA,8BAAA;EAEA,mCAAA;EACA,iCAAA;EAEA,iCAAA;EACA,+BAAA;EAEA,6CAAA;EAEA,0BAAA;EACA,4BAAA;EACA,2BAAA;EAEA,wBAAA;EACA,gCAAA;EACA,0BAAA;EACA,0BAAA;EAEA,8BAAA;EAEA,2CAAA;EAEA,wBAAA;EACA,0BAAA;EACA,yBAAA;EAEA,sBAAA;EAEA,oBAAA;EACA,kBAAA;EACA,4BAAA;EAEA,2CAAA;EAEA,8BAAA;EACA,sBAAA;EACA,wBAAA;EAEA,0BAAA;EACA,wBAAA;EACA,yBAAA;EAEA,8BAAA;EACA,4BAAA;EAEA,yBAAA;EACA,8BAAA;EACA,4BAAA;EAEA,wBAAA;ACjBD;;ADoBA;EACC,SAAA;EACA,UAAA;EACA,sBAAA;ACjBD;;ADoBA;EACI;IACI,wBAAA;ECjBN;EDmBE;IACI,4BAAA;ECjBN;AACF;ADoBA;EACI,iCAAA;AClBJ;;ADsBA;EACC,WAAA;EACA,aAAA;EAEA,aAAA;EACA,sBAAA;EAEA,8EAAA;EAGA,mDAAA;EAEA,yEAAA;EACA,6CAAA;EAEA,oCAAA;ACzBD;AD2BC;EACC,aAAA;EACA,8BAAA;EAEA,wEAAA;EAEA,mEAAA;EACA,0CAAA;EAEA,+BAAA;EACA,0CAAA;EAEA,sCAAA;EACA,kCAAA;EACA,sCAAA;AC7BF;AD+BE;EACC,6BAAA;AC7BH;AD+BE;EACC,UAAA;AC7BH;ADgCE;EACC,4CAAA;AC9BH;ADkCC;EACC,gCAAA;AChCF;ADmCC;EACC,WAAA;EACA,YAAA;EAEA,gBAAA;EAEA,kBAAA;EAEA,wCAAA;EAEA,6BAAA;EACA,oCAAA;EACA,gCAAA;EAEA,+BAAA;EAEA,+DAAA;EACA,wCAAA;EAEA,UAAA;ACxCF;AD0CE;EACC,sCAAA;ACxCH;AD2CE;EAEC,cAAA;EAEA,OAAA;EAEA,aAAA;EACA,sBAAA;EAEA,mBAAA;EAEA,iBAAA;EACA,kBAAA;EAEA,kCAAA;EAEA,sCAAA;AChDH;ADmDG;EACC,oEAAA;EAEA,wCAAA;EAEA,wCAAA;EAEA,wBAAA;EAEA,+DAAA;EACA,wCAAA;ACrDJ;ADuDI;EACC,wCAAA;EACA,oCAAA;ACrDL;ADwDI;EACC,mBAAA;ACtDL;ADwDK;EACC,aAAA;ACtDN;ADwDM;EACC,uBAAA;EACA,iCAAA;EACA,iBAAA;ACtDP;ADyDM;EACC,oBAAA;EACA,kCAAA;EACA,0CAAA;EACA,4BAAA;EACA,gBAAA;ACvDP;AD2DK;EACC,kCAAA;ACzDN;AD2DM;EACC,6BAAA;EACA,kCAAA;ACzDP;AD8DK;EACC,8CAAA;EACA,mCAAA;EAEA,gFAAA;EAGA,8CAAA;EAEA,uBAAA;EAAA,kBAAA;EAEA,4DAAA;ACjEN","file":"taskList.css"} \ No newline at end of file