From 373d156488ee9d5799cc44014fb952529ad2f3f1 Mon Sep 17 00:00:00 2001 From: shreyash-x Date: Wed, 19 Apr 2023 11:14:00 +0530 Subject: [PATCH 1/4] Added debug mode logs --- .gitignore | 3 ++- Logger.js | 9 ++++++--- main.js | 13 ++++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5320a7f3..5e50410d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ exprepos .vscode/* plugins/ dist/ -.npmrc \ No newline at end of file +.npmrc +*.log \ No newline at end of file diff --git a/Logger.js b/Logger.js index 0386cde4..97f380a5 100644 --- a/Logger.js +++ b/Logger.js @@ -16,9 +16,8 @@ const log = new winston.createLogger({ myFormat ), transports: [ - new winston.transports.Console({ level: "info", format: combine(colorize({all: true}),timestamp(),myFormat), handleExceptions: true }), - new winston.transports.File({ filename: "build-error.log", level: "error", handleExceptions: true }), - new winston.transports.File({ filename: "build-combined.log", handleExceptions: true }) + new winston.transports.File({ filename: path.resolve(PROJECT_ROOT,"build-error.log"), level: "error", handleExceptions: true }), + new winston.transports.File({ filename: path.resolve(PROJECT_ROOT,"build-combined.log"), handleExceptions: true }) ], exitOnError: false }); @@ -35,6 +34,10 @@ module.exports.addDebug = function () { log.add(new winston.transports.Console({level: "debug",format: combine(colorize({all: true}),timestamp(),myFormat), handleExceptions: true})) } +module.exports.addInfo = function () { + log.add(new winston.transports.Console({level: "info",format: combine(colorize({all: true}),timestamp(),myFormat), handleExceptions: true})) +} + module.exports.debug = module.exports.log = function () { log.debug.apply(log, formatLogArguments(arguments)) } diff --git a/main.js b/main.js index 8a55db83..24ecaf5f 100644 --- a/main.js +++ b/main.js @@ -191,6 +191,14 @@ function main() { { src = args.src; } + + let isDebug = args.debug || false; + if(isDebug){ + log.addDebug(); + log.info("Debug mode enabled"); + } else { + log.addInfo(); + } let option = ""; if (args._.length === 1) { @@ -207,17 +215,12 @@ function main() { let isExpDesc = args.validateExpdesc || false; let isDeploy = args.deploy || false; let isPlugin = args.disablePlugin ? false : true; - let isDebug = args.debug || false; log.info("Calling build with options: "); log.info(`isClean: ${isClean}`); log.info(`isESLINT: ${isESLINT}`); log.info(`isExpDesc: ${isExpDesc}`); log.info(`isDeploy: ${isDeploy}`); log.info(`isPlugin: ${isPlugin}`); - log.info(`isDebug: ${isDebug}`); - if(isDebug){ - log.addDebug(); - } build( isClean, isESLINT, From 9a7c24b1e2a365fccb611ad83c35a04f8b0b718c Mon Sep 17 00:00:00 2001 From: Aditya Date: Fri, 21 Apr 2023 19:58:52 +0530 Subject: [PATCH 2/4] code refactored --- Experiment.js | 2 +- Logger.js | 8 ++++---- main.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Experiment.js b/Experiment.js index fdf5b83b..79a66272 100644 --- a/Experiment.js +++ b/Experiment.js @@ -24,7 +24,7 @@ function getAssessmentPath(src, units) { let paths = getAssessmentPath(nextSrc, unit.units); assessmentPath.push(...paths); } - if (unit["content-type"] === "assesment" || unit["content-type"] === "assessment") { + if (unit["content-type"] === ContentTypes.ASSESMENT || unit["content-type"] === ContentTypes.ASSESSMENT) { const quiz = path.resolve(src, unit.source); assessmentPath.push(quiz); } diff --git a/Logger.js b/Logger.js index 97f380a5..39208449 100644 --- a/Logger.js +++ b/Logger.js @@ -5,7 +5,7 @@ var PROJECT_ROOT = __dirname const { format } = winston; const { combine, timestamp, printf, colorize } = format; -const myFormat = printf(({ level, message, timestamp }) => { +const vlabsDefaultFormat = printf(({ level, message, timestamp }) => { return `${timestamp} ${level}: ${message}`; }); @@ -13,7 +13,7 @@ const log = new winston.createLogger({ level: "debug", format: combine( timestamp(), - myFormat + vlabsDefaultFormat ), transports: [ new winston.transports.File({ filename: path.resolve(PROJECT_ROOT,"build-error.log"), level: "error", handleExceptions: true }), @@ -31,11 +31,11 @@ log.stream = { // code and still possible to replace winston in the future. module.exports.addDebug = function () { - log.add(new winston.transports.Console({level: "debug",format: combine(colorize({all: true}),timestamp(),myFormat), handleExceptions: true})) + log.add(new winston.transports.Console({level: "debug",format: combine(colorize({all: true}),timestamp(),vlabsDefaultFormat), handleExceptions: true})) } module.exports.addInfo = function () { - log.add(new winston.transports.Console({level: "info",format: combine(colorize({all: true}),timestamp(),myFormat), handleExceptions: true})) + log.add(new winston.transports.Console({level: "info",format: combine(colorize({all: true}),timestamp(),vlabsDefaultFormat), handleExceptions: true})) } module.exports.debug = module.exports.log = function () { diff --git a/main.js b/main.js index 24ecaf5f..69a13563 100644 --- a/main.js +++ b/main.js @@ -1,7 +1,7 @@ #!/usr/bin/env node const fs = require("fs"); const shell = require("shelljs"); -const { BuildEnvs, validBuildEnv } = require("./Enums.js"); +const { BuildEnvs, validBuildEnv, ContentTypes } = require("./Enums.js"); const { run } = require("./expGen.js"); const minimist = require("minimist"); const Config = require("./Config.js"); @@ -18,7 +18,7 @@ function getAssessmentPath(src,units){ let paths = getAssessmentPath(nextSrc,unit.units); assessmentPath.push(...paths); } - if(unit["content-type"] === "assesment" || unit["content-type"] === "assessment"){ + if(unit["content-type"] === ContentTypes.ASSESMENT || unit["content-type"] === ContentTypes.ASSESSMENT){ const quiz = path.resolve(src, unit.source); assessmentPath.push(quiz); } From dfe466e69ec4f38a32fb1ba1b1564af3d9877e72 Mon Sep 17 00:00:00 2001 From: Aditya Date: Sat, 22 Apr 2023 00:18:02 +0530 Subject: [PATCH 3/4] code refactored --- Aim.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Aim.js b/Aim.js index e6f8a99d..c9217d0b 100644 --- a/Aim.js +++ b/Aim.js @@ -16,6 +16,8 @@ class Aim extends Task { basedir, "aim.md", "index.html", + [], + [], lu_label ); } From 92d37a151601f266d6c6f92f0615c15b0ef5b0f1 Mon Sep 17 00:00:00 2001 From: Vjs Pranavasri Date: Thu, 11 May 2023 19:15:02 +0530 Subject: [PATCH 4/4] Fix typo in event handler (#113) --- templates/assets/js/event-handler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/assets/js/event-handler.js b/templates/assets/js/event-handler.js index f5b1b76c..896e1fcd 100644 --- a/templates/assets/js/event-handler.js +++ b/templates/assets/js/event-handler.js @@ -26,7 +26,7 @@ document.getElementById('bug-report').addEventListener('vl-bug-report', (e)=>{ icon: 'success', iconColor: "white", background:"#a5dc86", - title: 'Bug Reported Succesfully', + title: 'Bug Reported Successfully', }) }else{ Toast.fire({ @@ -38,4 +38,4 @@ document.getElementById('bug-report').addEventListener('vl-bug-report', (e)=>{ title: 'Bug Report Failed, Please Try Again', }) } -}) \ No newline at end of file +})