Skip to content

random edit, sidebar made #1

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

Merged
ConfeitoHS merged 2 commits into from
Jul 31, 2023
Merged

random edit, sidebar made #1

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
30a4fef
random edit, sidebar made
Holy-moly-cow Jul 31, 2023
53bd40b
Merge branch 'main' into main
ConfeitoHS Jul 31, 2023
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
48 changes: 48 additions & 0 deletions backend/public/javascripts/jquery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,3 +1455,51 @@ function convertCellIdsToCoordinates(cellIds) {

return coordinates;
}
function openMiniARCTasklist() {
//$("#ARC_task_side_nav").hide()
//$("#ARC_task_list").hide();
$("#sidenav_overlay").fadeIn('0.2s');

$("#mini_ARC_task_side_nav").addClass('open');
$("#ARC_task_side_nav").removeClass('open')
$("#sidenav_overlay").on('click', function(){
$("#mini_ARC_task_side_nav").removeClass('open');
$("#sidenav_overlay").fadeOut('0.2s');
})


//$("#mini_ARC_task_list").show();
//$("#mini_ARC_task_side_nav").width("250px");
//$("#mini_ARC_task_list").width("250px");
//$("#container-fluid").css('margin-left', '250px');
}

function openARCTasklist() {
$("#sidenav_overlay").fadeIn('0.2s');
$("#ARC_task_side_nav").addClass('open');
$("#mini_ARC_task_side_nav").removeClass('open')
$("#sidenav_overlay").on('click', function(){
$("#ARC_task_side_nav").removeClass('open');
$("#sidenav_overlay").fadeOut('0.2s');
})
//$("#ARC_task_list").show();
//$("#mini_ARC_task_side_nav").hide();
//$("#mini_ARC_task_list").hide();
//$("#ARC_task_side_nav").width("250px");
//$("#ARC_task_list").width("250px");
//$("#container-fluid").css('margin-left', '250px');
}

function closeMiniARCTaskList() {
$("#mini_ARC_task_side_nav").removeClass('open')

// $("#mini_ARC_task_side_nav").hide();
//$("#container-fluid").css('margin-left', '0');
}

function closeARCTaskList() {
$("#ARC_task_side_nav").removeClass('open');

//$("#ARC_task_side_nav").hide();
//$("#container-fluid").css('margin-left', '0');
}
28 changes: 28 additions & 0 deletions backend/public/stylesheets/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,31 @@ button:focus {outline:0;}
margin: 90px auto;
height: 20px;
}
.sidenav{
width: 15%;
float: left;
position: fixed;
z-index: 1000;
transform: translate3d(-100%,0,0);
transition: all 0.3s;
overflow-y: scroll;
height: 100%;
}
.sidenav.open{
transform: translate3d(0,0,0);
transition: all 0.3s;
}

.sidenav button{
background-color: transparent;
border-color: transparent;
}

#sidenav_overlay{
position: fixed;
width: 100vw;
height: 100vh;
background: rgba(0, 0, 0, 0.5);
z-index: 999;
display: none;
}
49 changes: 43 additions & 6 deletions backend/routes/problemset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,30 @@ router.get('/:id', async function(req, res, next) {
var data
var data2
// var minirand = logic_function.getRandomInt(5948,6096)
var minirand = logic_function.getRandomInt(5948,6084)
var minirand = logic_function.getRandomInt(5948,6096)
const random_stage_mini = [5952,5971,5978,5983,6015,6018,6021,6022,6026,6033,6048,6055]
if (random_stage_mini.indexOf(minirand)!=-1) {
minirand+=2
}
// var rand = logic_function.getRandomInt(6098,6496)
var rand = logic_function.getRandomInt(6085,6471)
var rand = logic_function.getRandomInt(6098,6496)
const random_stage_arc = [6186, 6227, 6241, 6247, 6268, 6271, 6291, 6299, 6303, 6309, 6410, 6490]
if (random_stage_arc.indexOf(rand)!=-1) {
rand+=2
}
console.log(userName)

try{
// data = await userhelper.getARCList(userName,mini=true);
// data2 = await userhelper.getARCList(userName);
data = await userhelper.getARCList_test(userName,mini=true);
data2 = await userhelper.getARCList_test(userName);
console.log(data2);
} catch (err) {
console.log(err)
return res.status(500).send("Internal Server Error")
}

res.render('problem_set', {
userName: userName,
miniARC_idlist: data,
Expand All @@ -40,22 +49,34 @@ router.get('/:id', async function(req, res, next) {

});

router.get('/:id/:problem', function(req, res, next) {
router.get('/:id/:problem', async function(req, res, next) {
const userName = req.params.id
const problem = req.params.problem

console.log(userName, problem)
const params = problem;

// var minirand = logic_function.getRandomInt(5948,6096)
var minirand = logic_function.getRandomInt(5948,6096)
const random_stage_mini = [5952,5971,5978,5983,6015,6018,6021,6022,6026,6033,6048,6055]
if (random_stage_mini.indexOf(minirand)!=-1) {
minirand+=2
}
// var rand = logic_function.getRandomInt(6098,6496)
var rand = logic_function.getRandomInt(6098,6496)
const random_stage_arc = [6186, 6227, 6241, 6247, 6268, 6271, 6291, 6299, 6303, 6309, 6410, 6490]
if (random_stage_arc.indexOf(rand)!=-1) {
rand+=2
}
const qs = req.query.subp
let subprobidx;
if(!qs){
subprobidx = 0;
} else {
subprobidx = parseInt(qs)
}
db.get("SELECT content FROM HappyARC WHERE id = ?", [params], async (err, row) => {

db.get("SELECT content FROM HappyARC WHERE id = ?", [params], (err, row) => {
// db.get("SELECT content FROM tasklist WHERE id = ?", [params], (err, row) => {
if (err) {
console.error(err.message);
Expand Down Expand Up @@ -85,6 +106,18 @@ router.get('/:id/:problem', function(req, res, next) {
// console.log(h)

// console.log(traingrid)
var data, data2;
try{
// data = await userhelper.getARCList(userName,mini=true);
// data2 = await userhelper.getARCList(userName);
data = await userhelper.getARCList_test(userName,mini=true);
data2 = await userhelper.getARCList_test(userName);
console.log(data2);
} catch (err) {
console.log(err)
return res.status(500).send("Internal Server Error")
}

return res.render('problem_solve', {
userName: userName,
train: trainData,
Expand All @@ -95,7 +128,11 @@ router.get('/:id/:problem', function(req, res, next) {
subprobcnt: testgrid.length,
p:cellsize,
reset: resettedgrid,
competition: 0
competition: 0,
miniARC_idlist: data,
ARC_idlist: data2,
ran1: minirand,
ran2: rand
})
} else {
return res.status(404).send('Content not found');
Expand Down
22 changes: 22 additions & 0 deletions backend/views/problem_solve.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,36 @@

<!--Main layout-->
<main class="my-5">
<nav id="ARC_task_side_nav" class="sidenav card card_2" ">

<% ARC_idlist.forEach( value => { %>
<button onclick="window.location.href='./<%= value.id %>'" > <%= value.task_name %> </button>
<% }) %>

</nav>

<nav id="mini_ARC_task_side_nav" class="sidenav card card_2" ">

<% miniARC_idlist.forEach( value => { %>
<button onclick="window.location.href='./<%= value.id %>'" > <%= value.task_name %> </button>
<% }) %>

</nav>
<div id="sidenav_overlay"></div>
<div class="container-fluid">
<!--Section: Content-->
<section class="text-center">
<h4 class="pt-5 mb-5"><strong>Try Solving Mini-ARC or ARC Problems!</strong></h4>

<button class="testing_button" id="browse_task" onclick="openMiniARCTasklist()">Browse MINI-ARC</button>
<button class="testing_button" id="browse_task" onclick="openARCTasklist()">Browse ARC</button>
<button onclick="window.location.href='./<%= ran1 %>'">Random MINI-ARC</button>
<button onclick="window.location.href='./<%= ran2 %>'">Random ARC</button>


<div class="container-fluid">
<div class="row">


<div class="card card_2 col-lg-4" style="overflow-y: scroll;">
<h5>
Expand Down