ProjectB/projectb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workarea changes : RV

Browse Source
This commit is contained in:
venkateswaran ubuntu 2023-11-27 12:00:07 +05:30
parent 595c0b8e85
commit ae5590521a
4 changed files with 200 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
addform.html
View File

@ -48,13 +48,12 @@
<script src="assets/js/vendor/modernizr-3.5.0.min.js"></script> <script src="assets/js/vendor/modernizr-3.5.0.min.js"></script>
<script src="assets/js/quill.js"></script> <!-- <script src="assets/js/quill.js"></script>
<script src="assets/css/quill.snow.css"></script> <script src="assets/css/quill.snow.css"></script> -->
<script src="./node_modules/quill-image-resize-module/image-resize.min.js"></script>
<script src="./node_modules/quill-resize-module/dist/resize.js"></script> <!-- <script src="./node_modules/quill-resize-module/dist/resize.js"></script> -->
<link rel="stylesheet" href="./node_modules/quill-resize-module/dist/resize.css"> <!-- <link rel="stylesheet" href="./node_modules/quill-resize-module/dist/resize.css"> -->
<script src="https://html2canvas.hertzen.com/dist/html2canvas.min.js"></script> <script src="https://html2canvas.hertzen.com/dist/html2canvas.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js"></script>
@ -375,16 +374,16 @@
.work-area1{ .work-area1{
background-color: transparent; background-color: transparent;
position: absolute; position: absolute;
top:-8px; top:13px;
left:-18px; left:295px;
border-width:0; border-width:0;
transform:rotate(58deg); /* transform:rotate(58deg);
transition: box-shadow 0.3s, background-color 0.3s; transition: box-shadow 0.3s, background-color 0.3s; */
color: #bf303b; color: #bf303b;
} }
.work-area1::before{ .work-area1::before{
content: '\2BC7'; content: '\2715';
font-size: 24px; font-size: 24px;
} }
.work-area::before{ .work-area::before{
@ -392,7 +391,7 @@
} }
.menu-symbol { .menu-symbol {
position:absolute; position:absolute;
right:0; right:20px;
background-color: transparent; background-color: transparent;
margin-top: 14px; margin-top: 14px;
border-radius: 20%; border-radius: 20%;
@ -606,6 +605,7 @@ h1.title{
max-height: calc(100% - 60px); max-height: calc(100% - 60px);
overflow-y: auto; overflow-y: auto;
margin-bottom: 10px; margin-bottom: 10px;
height:100%;
} }
#messageForm { #messageForm {
@ -744,19 +744,10 @@ h1.title{
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {
// Initialize Quill with your specific configuration // Initialize Quill with your specific configuration
var quill = new Quill('#workarea', { var quill = new Quill('#workarea', {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: { toolbar: toolbarOptions,
container: toolbarOptions, }
clipboard: {
matchVisual: true,
},
ImageResize: {
displaySize: true,
modules: ['Resize', 'DisplaySize', 'Toolbar']
}
},
}
}); });
var chat_Div = $("#workarea"); var chat_Div = $("#workarea");
@ -767,24 +758,24 @@ h1.title{
$('#workarea').focus(function () { $('#workarea').focus(function () {
rtc_hide_and_show(chatRtc); rtc_hide_and_show(chatRtc);
}); });
document.getElementById('sidebarToggle2').addEventListener('click', function () { document.getElementById('sidebarToggle2').addEventListener('click', function () {
var sidebar = document.getElementById('rightSidebar'); var sidebar = document.getElementById('rightSidebar');
document.body.classList.toggle('sidebar-open'); document.body.classList.toggle('sidebar-open');
if (sidebar.style.width === '250px') { if (sidebar.style.width === '350px') {
sidebar.style.width = '0'; sidebar.style.width = '0';
} else { } else {
sidebar.style.width = '250px'; sidebar.style.width = '350px';
} }
}); });
document.getElementById('sidebarToggle3').addEventListener('click', function () { document.getElementById('sidebarToggle3').addEventListener('click', function () {
var sidebar = document.getElementById('rightSidebar'); var sidebar = document.getElementById('rightSidebar');
document.body.classList.toggle('sidebar-open'); document.body.classList.toggle('sidebar-open');
if (sidebar.style.width === '250px') { if (sidebar.style.width === '350px') {
sidebar.style.width = '0'; sidebar.style.width = '0';
} else { } else {
sidebar.style.width = '250px'; sidebar.style.width = '350px';
} }
}); });
@ -803,6 +794,8 @@ h1.title{
var mathCheckbox = document.getElementById('Choicemath_messageInput'); var mathCheckbox = document.getElementById('Choicemath_messageInput');
var mathField = document.getElementById('workarea_math'); var mathField = document.getElementById('workarea_math');
var richText = document.getElementById('workarea'); var richText = document.getElementById('workarea');
var quillrichText = document.getElementById('messageInput_rtc');
// Ensure MathQuill field is initially hidden // Ensure MathQuill field is initially hidden
$(mathField).hide(); $(mathField).hide();
// $(richText1).show(); // $(richText1).show();
@ -810,11 +803,12 @@ h1.title{
if (mathCheckbox.checked) { if (mathCheckbox.checked) {
$(mathField).show(); $(mathField).show();
$(richText).hide(); $(richText).hide();
rtc_hide_and_show(chatRtc); $('#messageInput_rtc').hide();
} else { } else {
$(mathField).hide(); $(mathField).hide();
$(richText).show(); $(richText).show();
rtc_hide_and_show(chatRtc); $('#messageInput_rtc').hide();
} }
}); });
@ -836,12 +830,12 @@ h1.title{
}); });
async function sendMessage(quill) { async function sendMessage(quill) {
var workarea = document.getElementById('workarea');
var workarea = document.getElementById('workarea').querySelector('.ql-editor').innerHTML;
var mathField = document.getElementById('workarea_math'); var mathField = document.getElementById('workarea_math');
var messagesContainer = document.getElementById('messages'); // console.log("workarea",workarea);
console.log("workarea",workarea); // console.log("mathField",mathField);
console.log("mathField",mathField); // console.log("messagesContainer",messagesContainer);
console.log("messagesContainer",messagesContainer);
var content = ''; var content = '';
@ -852,13 +846,18 @@ h1.title{
content = await convertToLatex(mathFieldContent); content = await convertToLatex(mathFieldContent);
} else { } else {
content = quill.root.innerHTML.trim(); content = document.getElementById('workarea').querySelector('.ql-editor').innerHTML;
} }
// Log the content to the console // Log the content to the console
console.log("Message Content: ", content); // console.log("Message Content: ", content);
if (content !== '') { if (content !== '') {
var messagesContainer = document.getElementById('messages');
// console.log(messagesContainer)
// var messageElement = document.createElement('div'); // var messageElement = document.createElement('div');
// messageElement.className = 'message'; // messageElement.className = 'message';
@ -870,6 +869,9 @@ h1.title{
if ($('#Choicemath_messageInput').prop('checked')) { if ($('#Choicemath_messageInput').prop('checked')) {
// Clear the math field content // Clear the math field content
var mathJaxContainer = document.getElementById('workarea_math');
// console.log(mathJaxContainer.value)
mathJaxContainer.value = "";
// mathField.latex(''); // mathField.latex('');
} else { } else {
quill.setText(''); quill.setText('');
@ -883,16 +885,15 @@ h1.title{
const mathStatusBoolean = true const mathStatusBoolean = true
// Check if the text contains <p> tags // Check if the text contains <p> tags
console.log("ff")
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
if (!/<p>|<\/p>/i.test(text)) { if (!/<p>|<\/p>/i.test(text)) {
console.log('text:' , text) // console.log('text:' , text)
if (mathStatusBoolean) { if (mathStatusBoolean) {
console.log('text1:' , text) // console.log('text1:' , text)
// Use MathJax to convert the text to LaTeX // Use MathJax to convert the text to LaTeX
const cov = await MathJax.tex2chtml(text).outerHTML; const cov = await MathJax.tex2chtml(text).outerHTML;
console.log('cov:' , cov); // console.log('cov:' , cov);
resolve(cov); resolve(cov);
//return cov; //return cov;
} else { } else {
@ -901,9 +902,9 @@ h1.title{
//return text; //return text;
} }
} else { } else {
console.log("pq") // console.log("pq")
const cov = await MathJax.tex2chtml(text).outerHTML; const cov = await MathJax.tex2chtml(text).outerHTML;
console.log('cov:' , cov) // console.log('cov:' , cov)
resolve(cov); resolve(cov);
//return cov; //return cov;
} }
@ -911,19 +912,20 @@ h1.title{
}); });
} }
</script> </script>
<div class="sidebar" id="rightSidebar"> <div class="sidebar" id="rightSidebar">
<div class="chat-box"> <div class="chat-box">
<button class="work-area1" id="sidebarToggle3"></button> <button class="work-area1" id="sidebarToggle3"></button>
<h2>Work Area</h2> <h2 style="font-weight: 600;">Work Area</h2>
<div id="messages" class="chat-history" ></div> <div id="messages" class="chat-history" ></div>
<form id="messageForm" action="#" method="post" onsubmit="sendMessage(); return false;"> <form id="messageForm" action="#" method="post" onsubmit="sendMessage(); return false;">
<fieldset> <fieldset>
<!-- The contentEditable div for Quill --> <!-- The contentEditable div for Quill -->
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="richText worksection" id="workarea" contentEditable="true" placeholder="Type your message and press Enter..."></div> <div class="richText worksection" id="workarea" contentEditable="true" placeholder="Type your message and press Enter..." style="position: relative; top: 4px;"></div>
</div> </div>
<div class="col-12"> <div class="col-12">
<div> <div>
@ -931,12 +933,13 @@ h1.title{
</div> </div>
</div> </div>
<div class="col-6 items2" style="display: flex; align-items: center;"> <div class="col-6 items2" style="display: flex; align-items: center; position: relative; right: 40px;">
<input style="width:14px; height:14px; margin-right: 5px;" type="checkbox" id="Choicemath_messageInput"/> <input style="width:14px; height:14px; margin-right: 5px;" type="checkbox" id="Choicemath_messageInput"/>
<span class="math">Math</span> <span class="math2">Math</span>
</div> </div>
<div class="col-6" style="display: flex; align-items: center;"> <div class="col-6" style="display: flex; align-items: center; position: relative; top: 10px;" >
<button id="sendMessageButton" class="sendMessageButton" type="button">Send</button> <button onclick="clearMessage()" id="clearMessageButton" class="sendMessageButton" type="button" style="position: relative; right: 5px;">Clear</button>
<button id="sendMessageButton" class="sendMessageButton" type="button">Add</button>
</div> </div>
</div> </div>
</fieldset> </fieldset>
@ -1155,6 +1158,23 @@ h1.title{
<script> <script>
function clearMessage() {
var val = document.getElementById('messages') ;
if(val !== null){
val.innerHTML = '';
}
var mathJaxContainer = document.getElementById('workarea_math');
var quillContainer = document.getElementById('workarea');
var quillInstance = new Quill('#workarea');
quillInstance.setText('');
// console.log(mathJaxContainer);
// console.log(quillContainer);
mathJaxContainer.value = "";
};
localStorage.setItem('scrollPosition', window.scrollY); localStorage.setItem('scrollPosition', window.scrollY);
@ -1219,16 +1239,16 @@ $(document).ready(function() {
// $(document).on("click", function (event) { // $(document).on("click", function (event) {
// var questionPaperDiv = $(".QuestionPaperClass");
// alert('test')
// var questionPaperDiv = $(".QuestionPaperClass"); // // Check if the click is outside the QuestionPaperClass and its descendants
// if (!questionPaperDiv.is(event.target) && questionPaperDiv.has(event.target).length === 0) { // if (!questionPaperDiv.is(event.target) && questionPaperDiv.find(event.target).length === 0) {
// $('.ql-toolbar').hide(); // $('.ql-toolbar').hide();
// } // }
// }); // });
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {
const scrollToTopBtn = document.getElementById('SaveButton'); const scrollToTopBtn = document.getElementById('SaveButton');
const scrollToTopBtn2 = document.getElementById('SaveButton2'); const scrollToTopBtn2 = document.getElementById('SaveButton2');
@ -1365,7 +1385,7 @@ function loadXML(xmlFileName) {
decodeData = data; decodeData = data;
} }
console.log('jsonDecodeData : ', jsonDecodeData); // console.log('jsonDecodeData : ', jsonDecodeData);
resolve(decodeData); resolve(decodeData);
xml2json(decodeData); xml2json(decodeData);
// json2nav(); // json2nav();
@ -1383,14 +1403,14 @@ function loadXML(xmlFileName) {
function saveFile(flag=0) { function saveFile(flag=0) {
var title_id = localStorage.getItem('JSON_FOR_EMPTY_QUESTION'); var title_id = localStorage.getItem('JSON_FOR_EMPTY_QUESTION');
console.log(title_id); // console.log(title_id);
var count = ""; var count = "";
if(title_id !== '' && title_id !== null) if(title_id !== '' && title_id !== null)
{ {
var parsedArray = JSON.parse(title_id); var parsedArray = JSON.parse(title_id);
var count = parsedArray.length; var count = parsedArray.length;
console.log('count - ' + count) // console.log('count - ' + count)
} }
else else
{ {
@ -1431,9 +1451,6 @@ function saveFile(flag=0) {
const { v4: uuidv4 } = require('uuid'); const { v4: uuidv4 } = require('uuid');
const Quill = require('quill'); const Quill = require('quill');
const ImageResize =require('quill-image-resize-module');
Quill.register('modules/imageResize', ImageResize);
const Question_Paper_UUID = uuidv4(); const Question_Paper_UUID = uuidv4();
var QuestionPaper_UUID = document.getElementById('QuestionPaper_UUID_ID') var QuestionPaper_UUID = document.getElementById('QuestionPaper_UUID_ID')
QuestionPaper_UUID.value = Question_Paper_UUID; QuestionPaper_UUID.value = Question_Paper_UUID;
@ -1464,44 +1481,26 @@ var quill = new Quill('#Question_title', {
var quill = new Quill('#Question_description', { var quill = new Quill('#Question_description', {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar:{ toolbar: toolbarOptions,
container:toolbarOptions,
clipboard: {
matchVisual: true,
},
ImageResize:{
displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
}
},
} }
}); });
// var quill = new Quill('#workarea', { var quill = new Quill('#workarea', {
// theme: 'snow', theme: 'snow',
// modules: { modules: {
// toolbar:{ toolbar: toolbarOptions,
// container:toolbarOptions, }
// clipboard: { });
// matchVisual: true,
// }, // var quill = new Quill('#ql-editor',{
// ImageResize:{ // theme:'snow',
// module:{
// ImageResize:{
// displaySize:true, // displaySize:true,
// modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] // modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
// } // }
// }, // }
// } // })
// });
var quill = new Quill('#ql-editor',{
theme:'snow',
module:{
ImageResize:{
displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
}
}
})
// function imageHandler() { // function imageHandler() {
@ -1524,9 +1523,7 @@ rtc_hide_and_show(setitem);
}); });
var Question_description_Div = $("#Question_description"); var Question_description_Div = $("#Question_description");
console.log("Question_description_Div",Question_description_Div);
var Question_description_previousDiv = Question_description_Div.prev(); var Question_description_previousDiv = Question_description_Div.prev();
console.log("Question_description_previousDiv",Question_description_previousDiv);
Question_description_previousDiv.attr("id", "Question_description_rtc"); Question_description_previousDiv.attr("id", "Question_description_rtc");
var questionDescriptionRtc = 'Question_description_rtc'; var questionDescriptionRtc = 'Question_description_rtc';
$('#Question_description').focus(function() { $('#Question_description').focus(function() {
@ -1838,7 +1835,6 @@ inputFields.forEach(inputField => {
}); });
var sectionText = (random_no == false) ? 'section_title_text_' + text_field_created_time : 'section_title_text_' + random_no; var sectionText = (random_no == false) ? 'section_title_text_' + text_field_created_time : 'section_title_text_' + random_no;
console.log(sectionText);
var quill = new Quill('#'+sectionText, { var quill = new Quill('#'+sectionText, {
theme: 'snow', theme: 'snow',
modules: { modules: {

194
package-lock.json generated
View File

@ -13,9 +13,9 @@
"cheerio": "^1.0.0-rc.12", "cheerio": "^1.0.0-rc.12",
"desandro-matches-selector": "^2.0.2", "desandro-matches-selector": "^2.0.2",
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"electron-context-menu": "^3.6.1",
"electron-dl": "^3.5.1", "electron-dl": "^3.5.1",
"electron-download-manager": "^2.1.2", "electron-download-manager": "^2.1.2",
"electron-context-menu": "^3.6.1",
"ev-emitter": "^2.1.2", "ev-emitter": "^2.1.2",
"fizzy-ui-utils": "^3.0.0", "fizzy-ui-utils": "^3.0.0",
"formidable": "^3.5.1", "formidable": "^3.5.1",
@ -67,9 +67,9 @@
} }
}, },
"node_modules/@electron/asar": { "node_modules/@electron/asar": {
"version": "3.2.7", "version": "3.2.8",
"resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.7.tgz", "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz",
"integrity": "sha512-8FaSCAIiZGYFWyjeevPQt+0e9xCK9YmJ2Rjg5SXgdsXon6cRnU0Yxnbe6CvJbQn26baifur2Y2G5EBayRIsjyg==", "integrity": "sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"commander": "^5.0.0", "commander": "^5.0.0",
@ -145,9 +145,9 @@
} }
}, },
"node_modules/@electron/notarize/node_modules/universalify": { "node_modules/@electron/notarize/node_modules/universalify": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 10.0.0" "node": ">= 10.0.0"
@ -201,18 +201,18 @@
} }
}, },
"node_modules/@electron/osx-sign/node_modules/universalify": { "node_modules/@electron/osx-sign/node_modules/universalify": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 10.0.0" "node": ">= 10.0.0"
} }
}, },
"node_modules/@electron/universal": { "node_modules/@electron/universal": {
"version": "1.4.2", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.2.tgz", "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.5.1.tgz",
"integrity": "sha512-ymGwXYBUGFS1DuTqYJwZ0p1gIlELKOf21zPJefij/amzV66vTXRNJ2mAtW0uRsaHfV+pzYTJVrt5oco44DFOMg==", "integrity": "sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@electron/asar": "^3.2.1", "@electron/asar": "^3.2.1",
@ -255,9 +255,9 @@
} }
}, },
"node_modules/@electron/universal/node_modules/universalify": { "node_modules/@electron/universal/node_modules/universalify": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 10.0.0" "node": ">= 10.0.0"
@ -344,9 +344,9 @@
} }
}, },
"node_modules/@types/http-cache-semantics": { "node_modules/@types/http-cache-semantics": {
"version": "4.0.3", "version": "4.0.4",
"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
"integrity": "sha512-V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA==" "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="
}, },
"node_modules/@types/keyv": { "node_modules/@types/keyv": {
"version": "3.1.4", "version": "3.1.4",
@ -358,27 +358,27 @@
} }
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "18.18.7", "version": "18.18.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.13.tgz",
"integrity": "sha512-bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ==", "integrity": "sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"undici-types": "~5.26.4" "undici-types": "~5.26.4"
} }
}, },
"node_modules/@types/responselike": { "node_modules/@types/responselike": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
"integrity": "sha512-/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA==", "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
}, },
"node_modules/@types/yauzl": { "node_modules/@types/yauzl": {
"version": "2.10.2", "version": "2.10.3",
"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
"integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==", "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"dependencies": { "dependencies": {
@ -632,9 +632,9 @@
"optional": true "optional": true
}, },
"node_modules/bootstrap-icons": { "node_modules/bootstrap-icons": {
"version": "1.11.1", "version": "1.11.2",
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.1.tgz", "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.2.tgz",
"integrity": "sha512-F0DDp7nKUX+x/QtpfRZ+XHFya60ng9nfdpdS59vDDfs4Uhuxp7zym/QavMsu/xx51txkoM9eVmpE7D08N35blw==", "integrity": "sha512-TgdiPv+IM9tgDb+dsxrnGIyocsk85d2M7T0qIgkvPedZeoZfyeG/j+yiAE4uHCEayKef2RP05ahQ0/e9Sv75Wg==",
"funding": [ "funding": [
{ {
"type": "github", "type": "github",
@ -1042,16 +1042,19 @@
} }
}, },
"node_modules/deep-equal": { "node_modules/deep-equal": {
"version": "1.1.1", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
"integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
"dependencies": { "dependencies": {
"is-arguments": "^1.0.4", "is-arguments": "^1.1.1",
"is-date-object": "^1.0.1", "is-date-object": "^1.0.5",
"is-regex": "^1.0.4", "is-regex": "^1.1.4",
"object-is": "^1.0.1", "object-is": "^1.1.5",
"object-keys": "^1.1.1", "object-keys": "^1.1.1",
"regexp.prototype.flags": "^1.2.0" "regexp.prototype.flags": "^1.5.1"
},
"engines": {
"node": ">= 0.4"
}, },
"funding": { "funding": {
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
@ -1188,6 +1191,7 @@
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
"integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
"deprecated": "Use your platform's native DOMException instead",
"dependencies": { "dependencies": {
"webidl-conversions": "^7.0.0" "webidl-conversions": "^7.0.0"
}, },
@ -1243,9 +1247,9 @@
} }
}, },
"node_modules/electron": { "node_modules/electron": {
"version": "26.4.2", "version": "26.6.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-26.4.2.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-26.6.1.tgz",
"integrity": "sha512-BOfQUOIvsq5NnssWOMqcZnA5M0ull620wvQoJq3WhXN1wJAsWu+cdjHvREyxnHbArPkV+F+x3YAi5Dt+UKoqhw==", "integrity": "sha512-4Vz9u0Jt/khPa/en2l8Jv6SWEfsK/ieWYtchl5j0clbNSjdeTucnEFOhz9B9WwsAmfQjxBnpuMZpmdBuyxq+wg==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
@ -1260,8 +1264,6 @@
"node": ">= 12.20.55" "node": ">= 12.20.55"
} }
}, },
<<<<<<< HEAD
=======
"node_modules/electron-context-menu": { "node_modules/electron-context-menu": {
"version": "3.6.1", "version": "3.6.1",
"resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.6.1.tgz", "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-3.6.1.tgz",
@ -1275,7 +1277,6 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
>>>>>>> 52fefb53d73b734e8fdafcdba63f20ecceea390e
"node_modules/electron-dl": { "node_modules/electron-dl": {
"version": "3.5.1", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.1.tgz", "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.1.tgz",
@ -1292,12 +1293,11 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
<<<<<<< HEAD
"node_modules/electron-download-manager": { "node_modules/electron-download-manager": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/electron-download-manager/-/electron-download-manager-2.1.2.tgz", "resolved": "https://registry.npmjs.org/electron-download-manager/-/electron-download-manager-2.1.2.tgz",
"integrity": "sha512-9v8aeMVZTX69NjEveKlKfTlJY74twpKktTXrmDI+UcQHZg7FtwuqxWw0ZNrjtVAOBcVNKzwG4ekn44B+xhz1tg==" "integrity": "sha512-9v8aeMVZTX69NjEveKlKfTlJY74twpKktTXrmDI+UcQHZg7FtwuqxWw0ZNrjtVAOBcVNKzwG4ekn44B+xhz1tg=="
======= },
"node_modules/electron-is-dev": { "node_modules/electron-is-dev": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-2.0.0.tgz", "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-2.0.0.tgz",
@ -1305,7 +1305,6 @@
"funding": { "funding": {
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
>>>>>>> 52fefb53d73b734e8fdafcdba63f20ecceea390e
}, },
"node_modules/electron-packager": { "node_modules/electron-packager": {
"version": "17.1.2", "version": "17.1.2",
@ -1385,9 +1384,9 @@
} }
}, },
"node_modules/electron-packager/node_modules/universalify": { "node_modules/electron-packager/node_modules/universalify": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 10.0.0" "node": ">= 10.0.0"
@ -1457,9 +1456,9 @@
} }
}, },
"node_modules/electron-wix-msi/node_modules/universalify": { "node_modules/electron-wix-msi/node_modules/universalify": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 10.0.0" "node": ">= 10.0.0"
@ -1772,9 +1771,9 @@
} }
}, },
"node_modules/flora-colossus/node_modules/universalify": { "node_modules/flora-colossus/node_modules/universalify": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 10.0.0" "node": ">= 10.0.0"
@ -1899,9 +1898,9 @@
} }
}, },
"node_modules/galactus/node_modules/universalify": { "node_modules/galactus/node_modules/universalify": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 10.0.0" "node": ">= 10.0.0"
@ -2392,11 +2391,11 @@
} }
}, },
"node_modules/is-fullwidth-code-point": { "node_modules/is-fullwidth-code-point": {
"version": "3.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
"engines": { "engines": {
"node": ">=8" "node": ">=4"
} }
}, },
"node_modules/is-ip": { "node_modules/is-ip": {
@ -2510,9 +2509,9 @@
} }
}, },
"node_modules/is-online/node_modules/http2-wrapper": { "node_modules/is-online/node_modules/http2-wrapper": {
"version": "2.2.0", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
"integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==", "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
"dependencies": { "dependencies": {
"quick-lru": "^5.1.1", "quick-lru": "^5.1.1",
"resolve-alpn": "^1.2.0" "resolve-alpn": "^1.2.0"
@ -2918,6 +2917,7 @@
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
"integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
"deprecated": "Use your platform's native DOMException instead",
"dependencies": { "dependencies": {
"webidl-conversions": "^4.0.2" "webidl-conversions": "^4.0.2"
} }
@ -2941,14 +2941,6 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/mathjax-node/node_modules/is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
"engines": {
"node": ">=4"
}
},
"node_modules/mathjax-node/node_modules/jsdom": { "node_modules/mathjax-node/node_modules/jsdom": {
"version": "11.12.0", "version": "11.12.0",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
@ -3591,9 +3583,9 @@
} }
}, },
"node_modules/public-ip/node_modules/http2-wrapper": { "node_modules/public-ip/node_modules/http2-wrapper": {
"version": "2.2.0", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
"integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==", "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
"dependencies": { "dependencies": {
"quick-lru": "^5.1.1", "quick-lru": "^5.1.1",
"resolve-alpn": "^1.2.0" "resolve-alpn": "^1.2.0"
@ -3668,9 +3660,9 @@
} }
}, },
"node_modules/punycode": { "node_modules/punycode": {
"version": "2.3.0", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
"engines": { "engines": {
"node": ">=6" "node": ">=6"
} }
@ -3686,8 +3678,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
<<<<<<< HEAD
=======
"node_modules/qs": { "node_modules/qs": {
"version": "6.5.3", "version": "6.5.3",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
@ -3696,7 +3686,6 @@
"node": ">=0.6" "node": ">=0.6"
} }
}, },
>>>>>>> 52fefb53d73b734e8fdafcdba63f20ecceea390e
"node_modules/querystringify": { "node_modules/querystringify": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@ -4123,8 +4112,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
<<<<<<< HEAD
=======
"node_modules/slice-ansi": { "node_modules/slice-ansi": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@ -4138,7 +4125,14 @@
"node": ">=8" "node": ">=8"
} }
}, },
>>>>>>> 52fefb53d73b734e8fdafcdba63f20ecceea390e "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"engines": {
"node": ">=8"
}
},
"node_modules/sort-keys": { "node_modules/sort-keys": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@ -4161,8 +4155,6 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
<<<<<<< HEAD
=======
"node_modules/source-map": { "node_modules/source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@ -4172,7 +4164,6 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
>>>>>>> 52fefb53d73b734e8fdafcdba63f20ecceea390e
"node_modules/spdx-correct": { "node_modules/spdx-correct": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@ -4257,6 +4248,14 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/string-width/node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"engines": {
"node": ">=8"
}
},
"node_modules/strip-ansi": { "node_modules/strip-ansi": {
"version": "6.0.1", "version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@ -4323,9 +4322,9 @@
} }
}, },
"node_modules/sweetalert2": { "node_modules/sweetalert2": {
"version": "11.7.32", "version": "11.10.1",
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.32.tgz", "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.1.tgz",
"integrity": "sha512-44tNNe2oLe7T94mT6dus4hc9G7qg6jZU/K5qZzpNS6e5HGPrSF6Kie6oZ7B5puIJydB34V2h/8f5EhIFivYo4A==", "integrity": "sha512-qu145oBuFfjYr5yZW9OSdG6YmRxDf8CnkgT/sXMfrXGe+asFy2imC2vlaLQ/L/naZ/JZna1MPAY56G4qYM0VUQ==",
"funding": { "funding": {
"type": "individual", "type": "individual",
"url": "https://github.com/sponsors/limonte" "url": "https://github.com/sponsors/limonte"
@ -4337,9 +4336,9 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
}, },
"node_modules/tinymce": { "node_modules/tinymce": {
"version": "6.7.2", "version": "6.8.0",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.7.2.tgz", "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.8.0.tgz",
"integrity": "sha512-6h/02jHmXyghekFzmzccZxUUEFtlPEKHxOd+gd49bjno3ybavZInPIaDd/pp2GeEwsFm20oGgJCL7UiebXm9dw==" "integrity": "sha512-WSQlyfW8aPkOVMmmHmSVeA5Dq4JuUZjTB+PmePJ27oQ+ruv3Zn4KSTsvSnDUrHlqygjDvRidrCB/m5nTWCC2nA=="
}, },
"node_modules/tippy.js": { "node_modules/tippy.js": {
"version": "6.3.7", "version": "6.3.7",
@ -4478,8 +4477,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
<<<<<<< HEAD
=======
"node_modules/uri-js": { "node_modules/uri-js": {
"version": "4.4.1", "version": "4.4.1",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@ -4488,7 +4485,6 @@
"punycode": "^2.1.0" "punycode": "^2.1.0"
} }
}, },
>>>>>>> 52fefb53d73b734e8fdafcdba63f20ecceea390e
"node_modules/url-parse": { "node_modules/url-parse": {
"version": "1.5.10", "version": "1.5.10",
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",

16
style.css
View File

@ -3588,6 +3588,15 @@ margin-top: 5px;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
} }
.math2{
font-weight: 500;
font-size: 14px;
color: #061738;
position: relative;
right: 40px;
}
.mathQuestions{ .mathQuestions{
font-weight: 500; font-weight: 500;
float: right; float: right;
@ -3759,9 +3768,4 @@ width:85px;
/* #questionPaper {
font-size:small;
text-decoration: none;
font-weight: 100;
font-style: normal !important;
} */

4
xml2json.js
View File

@ -4,7 +4,7 @@ function xml2json(xmlData) {
// console.log(xmlData); // console.log(xmlData);
var jsonDecodeData = localStorage.getItem('json_Decode_Data_For_Mcq_Crt_Ans'); var jsonDecodeData = localStorage.getItem('json_Decode_Data_For_Mcq_Crt_Ans');
// console.log(jsonDecodeData); // console.log(typeof jsonDecodeData);
function getAttributesOfXMLNode(node) function getAttributesOfXMLNode(node)
{ {
@ -64,7 +64,7 @@ function getQuestionsNodes(questionNode,type)
questionObj['answers'].push(tempChoiceobj); questionObj['answers'].push(tempChoiceobj);
} }
} }
if(jsonDecodeData !== null) if(jsonDecodeData !== 'null' && jsonDecodeData !== null)
{ {
var jsonParsedData = JSON.parse(jsonDecodeData); var jsonParsedData = JSON.parse(jsonDecodeData);