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.

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

feat: add Node.js basics, add some additional features #37

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
"type": "penalty", // Штрафной пункт. Указано количество баллов которое снимается, если он выбран.
"text": "Тестовый - Oшибки или предупреждения eslint-config-airbnb-base",
"max": -15
},
{
"type": "penalty", // Штрафной пункт. Указан процент от общего количества баллов которые снимается, если он выбран.
"text": "Тестовый - Pull Request сделан НЕ в свой репозиторий",
"max": "-20%"
}
]
}
Expand Down
161 changes: 161 additions & 0 deletions active-tasks/node-nodejs-basics.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
{
"taskName": "Node.js basics Q4-2022",
"github": "https://github.com/AlreadyBored/nodejs-assignments/blob/main/assignments/nodejs-basics/assignment.md",
"information": "Scoring: Node.js basics",
"criteria": [
{
"type": "title",
"title": "For check simplification you have npm-scripts in \"package.json.\"\nNB! Some scripts have predefined data (e.g. environment variables, CLI arguments). Feel free to change it during the check if necessary.\n\nMax score: 206"
},
{
"type": "title",
"title": "File system (src/fs)"
},
{
"type": "subtask",
"text": "`create.js` implemented properly",
"max": 6
},
{
"type": "subtask",
"text": "`copy.js` implemented properly",
"max": 10
},
{
"type": "subtask",
"text": "`rename.js` implemented properly",
"max": 10
},
{
"type": "subtask",
"text": "`delete.js` implemented properly",
"max": 6
},
{
"type": "subtask",
"text": "`list.js` implemented properly",
"max": 6
},
{
"type": "subtask",
"text": "`read.js` implemented properly",
"max": 6
},
{
"type": "title",
"title": "Command line interface(src/cli)"
},
{
"type": "subtask",
"text": "`env.js` implemented properly",
"max": 6
},
{
"type": "subtask",
"text": "`args.js` implemented properly",
"max": 6
},
{
"type": "title",
"title": "Modules(src/modules)"
},
{
"type": "subtask",
"text": "`cjsToEsm.cjs` refactored properly",
"max": 20
},
{
"type": "title",
"title": "Hash (src/hash)"
},
{
"type": "subtask",
"text": "`calcHash.js` implemented properly",
"max": 10
},
{
"type": "title",
"title": "Streams (src/streams)"
},
{
"type": "subtask",
"text": "`read.js` implemented properly",
"max": 10
},
{
"type": "subtask",
"text": "`write.js` implemented properly",
"max": 10
},
{
"type": "subtask",
"text": "`transform.js` implemented properly",
"max": 10
},
{
"type": "title",
"title": "Zlib (src/zip)"
},
{
"type": "subtask",
"text": "`compress.js` implemented properly",
"max": 10
},
{
"type": "subtask",
"text": "`decompress.js` implemented properly",
"max": 10
},
{
"type": "title",
"title": "Advanced Scope"
},
{
"type": "title",
"title": "Worker Threads (src/wt)"
},
{
"type": "subtask",
"text": "`worker.js` implemented properly",
"max": 10
},
{
"type": "subtask",
"text": "`main.js` implemented properly",
"max": 30
},
{
"type": "title",
"title": "Child Processes (src/cp)"
},
{
"type": "subtask",
"text": "spawns child process",
"max": 10
},
{
"type": "subtask",
"text": "child process `stdin` receives input from master process `stdin`",
"max": 10
},
{
"type": "subtask",
"text": "child process `stdout` sends data to master process `stdout`",
"max": 10
},
{
"type": "title",
"title": "Forfeits"
},
{
"type": "penalty",
"text": "Any external tools/libraries are used",
"max": "-95%"
},
{
"type": "penalty",
"text": "Commits after deadline (except commits that affect only Readme.md, .gitignore, etc.)",
"max": "-30%"
}
]
}
13 changes: 13 additions & 0 deletions css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,10 @@ label:hover {
font-size: 35px;
}

.task-max-score .wide-digit {
font-size: 24px;
}

.feedback-buttons {
position: relative;
text-align: right;
Expand Down Expand Up @@ -633,3 +637,12 @@ label:hover {
width: 60%;
text-align: left;
}

code {
display: inline-block;
padding: 0 6px;
border-radius: 4px;
background: #00000026;
font-size: .85em;
line-height: 150%;
}
2 changes: 1 addition & 1 deletion index.js

Large diffs are not rendered by default.

53 changes: 41 additions & 12 deletions js/RenderView.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export function render(criteria, taskName, information) {
});

let total = 0;
let totalWithPercent = 0;
const renderList = [];
criteria.forEach((el, i) => {
el.status === 'main'
Expand Down Expand Up @@ -83,12 +84,14 @@ export function render(criteria, taskName, information) {
// reset state
reset.click();

const percentData = {};

domList.addEventListener('click', (e) => {
const parent = e.target.parentElement;
const id = e.target.dataset.id;

const task = filteredCriteria[id];

if (e.target.tagName === 'INPUT') {
const radio = e.target;
const scoreId = radio.dataset.score;
Expand All @@ -105,18 +108,31 @@ export function render(criteria, taskName, information) {
if (task.status === undefined) checkDone();

// Calculate actual Total Score
const isPercentPenalty = task.max[task.max.length - 1] === '%';
const scores = [0, +(task.max / 2).toFixed(1), task.max];
if (task.status >= 0) {
if (task.status >= 0 && !isPercentPenalty) {
total -=
task.type !== 'penalty'
? scores[task.status]
: scores[task.status] * 2;
task.type !== 'penalty'
? scores[task.status]
: scores[task.status] * 2;
}
total +=
task.type !== 'penalty' ? scores[scoreId] : scores[scoreId] * 2;
if(!isPercentPenalty) {
total +=
task.type !== 'penalty' ? scores[scoreId] : scores[scoreId] * 2;
} else {
if (scoreId == 1){
percentData[task.text] = task.max.slice(0, -1);
} else {
delete percentData[task.text];
}
}
const percentSum = Object
.keys(percentData)
.reduce((sum, key) => sum - percentData[key], 0);
totalWithPercent = (total - total * ((percentSum) * 0.01)).toFixed(1);
task.status = scoreId;

scoreboard.innerHTML = total < 0 ? 0 : total;
scoreboard.innerHTML = totalWithPercent < 0 ? 0 : totalWithPercent;

if (+scoreId === 1 && task.type == 'subtask') {
task.needFeedback = true;
Expand Down Expand Up @@ -193,10 +209,10 @@ export function render(criteria, taskName, information) {
taskMaxScore.classList.add('task-max-score');
const scoreDesc =
el.type == 'penalty' ? 'Штрафные баллы' : 'Балл за выполнение';
taskMaxScore.innerHTML = `<span>${scoreDesc}</span><p>${el.max}</p>`;
taskMaxScore.innerHTML = `<span>${scoreDesc}</span><p ${(el.max.length > 3) ? 'class="wide-digit"' : ''}>${el.max}</p>`;
const taskDesc = document.createElement('div');
taskDesc.classList.add('task-description');
taskDesc.innerHTML = `<p class='task-title'>${el.text}</p>`;
taskDesc.innerHTML = `<p class='task-title'>${getFormatedText(el.text)}</p>`;
taskDesc.innerHTML +=
"<a class='add-feedback' href='#' onclick='addFeedback(event);'>Добавить отзыв</a>";

Expand Down Expand Up @@ -297,9 +313,9 @@ export function render(criteria, taskName, information) {
let resultList = filteredCriteria.filter(
(item) => item && item.status != undefined
);
let points = total % 10 > 1 && total % 10 <= 4 ? 'балла' : 'баллов';
let points = totalWithPercent % 10 > 1 && totalWithPercent % 10 <= 4 ? 'балла' : 'баллов';
content.innerHTML += `<p><strong>Ваша оценка - ${
total >= 0 ? total : 0
totalWithPercent >= 0 ? totalWithPercent : 0
} ${points}</strong> \r\n</p><p>Отзыв по пунктам ТЗ:\r\n</p>`;

const resultDescriptions = {
Expand Down Expand Up @@ -485,3 +501,16 @@ export function render(criteria, taskName, information) {
document.body.removeChild(el);
};
}

//chande `some code` to <code>some code</code>
function getFormatedText(text) {
return text
.split('`')
.map((text, i, arr) =>
(i < (arr.length - 1))
? [text, ((i % 2) === 0 ? '<code>' : '</code>')]
: text
)
.flat()
.join('')
}
22 changes: 22 additions & 0 deletions public/script.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
"use strict";

var _RenderTasks = require("../js/RenderTasks.js");
var start = document.querySelector('.start');
start && start.addEventListener("click", function (e) {
e.stopPropagation();
if (e.target.parentElement.tagName == "SECTION") e.target.parentElement.style.display = "none";
});
var header = document.querySelector('header');
var offsetTop = header.offsetTop;
window.onscroll = function () {
return stickyHeader();
};
function stickyHeader() {
if (window.pageYOffset > offsetTop + 100) {
header.classList.add("sticky");
} else {
header.classList.remove("sticky");
}
}
var renderTasks = new _RenderTasks.RenderTasks('tasks-to-render.json');
renderTasks.initTasks();
2 changes: 1 addition & 1 deletion tasks-to-render.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"0":"active-tasks/Angular-YouTube-client.json","1":"active-tasks/HTML&CSS.json","2":"active-tasks/Nodejs_basic-task1-caesar.json","3":"active-tasks/art-quiz.json","4":"active-tasks/async-race.json","5":"active-tasks/audio-player.json","6":"active-tasks/calculator.json","7":"active-tasks/clean-code-s1e1.json","8":"active-tasks/codejam-2022q3.json","9":"active-tasks/codejam-the-gem-puzzle.json","10":"active-tasks/covid-dashboard.json","11":"active-tasks/custom-video.json","12":"active-tasks/cv-stage1.json","13":"active-tasks/cv.json","14":"active-tasks/eco-sounds.json","15":"active-tasks/english-for-kids.json","16":"active-tasks/english-puzzle.json","17":"active-tasks/fancy-weather.json","18":"active-tasks/image-galery.json","19":"active-tasks/js30.json","20":"active-tasks/memory-game.json","21":"active-tasks/momentum-stage1.json","22":"active-tasks/momentum.json","23":"active-tasks/movie-app.json","24":"active-tasks/movie-search.json","25":"active-tasks/museum-adaptive.json","26":"active-tasks/museum-dom.json","27":"active-tasks/museum-stage0.json","28":"active-tasks/museum.json","29":"active-tasks/photo-filter.json","30":"active-tasks/portfolio.json","31":"active-tasks/random-game.json","32":"active-tasks/random-jokes.json","33":"active-tasks/react-schedule.json","34":"active-tasks/react-xcheck.json","35":"active-tasks/rs-clone-presentation.json","36":"active-tasks/rs-clone.json","37":"active-tasks/rs-ds-2-linear-regression.json","38":"active-tasks/rs-ds-7-clustering-dimensionality-reduction.json","39":"active-tasks/rs-lang.json","40":"active-tasks/rs-scc.json","41":"active-tasks/rslang.json","42":"active-tasks/rss-english-for-kids.json","43":"active-tasks/rss-fancy-weather.json","44":"active-tasks/rss-movie-search.json","45":"active-tasks/rss-singolo-dom-and-responsive.json","46":"active-tasks/rss-singolo.json","47":"active-tasks/rss-virtual-keyboard.json","48":"active-tasks/schedule.json","49":"active-tasks/song-bird.json","50":"active-tasks/songbird.json","51":"active-tasks/speakit.json","52":"active-tasks/tic-tac-toe.json","53":"active-tasks/travel-part1.json","54":"active-tasks/travel-part2.json","55":"active-tasks/travel-part3.json","56":"active-tasks/virtual-keyboard.json","57":"active-tasks/virtual-piano.json","58":"active-tasks/wildlife.json"}
{"0":"active-tasks/Angular-YouTube-client.json","1":"active-tasks/HTML&CSS.json","2":"active-tasks/Nodejs_basic-task1-caesar.json","3":"active-tasks/art-quiz.json","4":"active-tasks/async-race.json","5":"active-tasks/audio-player.json","6":"active-tasks/calculator.json","7":"active-tasks/clean-code-s1e1.json","8":"active-tasks/codejam-2022q3.json","9":"active-tasks/codejam-the-gem-puzzle.json","10":"active-tasks/covid-dashboard.json","11":"active-tasks/custom-video.json","12":"active-tasks/cv-stage1.json","13":"active-tasks/cv.json","14":"active-tasks/eco-sounds.json","15":"active-tasks/english-for-kids.json","16":"active-tasks/english-puzzle.json","17":"active-tasks/fancy-weather.json","18":"active-tasks/image-galery.json","19":"active-tasks/js30.json","20":"active-tasks/memory-game.json","21":"active-tasks/momentum-stage1.json","22":"active-tasks/momentum.json","23":"active-tasks/movie-app.json","24":"active-tasks/movie-search.json","25":"active-tasks/museum-adaptive.json","26":"active-tasks/museum-dom.json","27":"active-tasks/museum-stage0.json","28":"active-tasks/museum.json","29":"active-tasks/node-nodejs-basics.json","30":"active-tasks/photo-filter.json","31":"active-tasks/portfolio.json","32":"active-tasks/random-game.json","33":"active-tasks/random-jokes.json","34":"active-tasks/react-schedule.json","35":"active-tasks/react-xcheck.json","36":"active-tasks/rs-clone-presentation.json","37":"active-tasks/rs-clone.json","38":"active-tasks/rs-ds-2-linear-regression.json","39":"active-tasks/rs-ds-7-clustering-dimensionality-reduction.json","40":"active-tasks/rs-lang.json","41":"active-tasks/rs-scc.json","42":"active-tasks/rslang.json","43":"active-tasks/rss-english-for-kids.json","44":"active-tasks/rss-fancy-weather.json","45":"active-tasks/rss-movie-search.json","46":"active-tasks/rss-singolo-dom-and-responsive.json","47":"active-tasks/rss-singolo.json","48":"active-tasks/rss-virtual-keyboard.json","49":"active-tasks/schedule.json","50":"active-tasks/song-bird.json","51":"active-tasks/songbird.json","52":"active-tasks/speakit.json","53":"active-tasks/tic-tac-toe.json","54":"active-tasks/travel-part1.json","55":"active-tasks/travel-part2.json","56":"active-tasks/travel-part3.json","57":"active-tasks/virtual-keyboard.json","58":"active-tasks/virtual-piano.json","59":"active-tasks/wildlife.json"}