Skip to content
Merged
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
453 changes: 250 additions & 203 deletions backend/public/javascripts/jquery.js

Large diffs are not rendered by default.

112 changes: 92 additions & 20 deletions backend/public/javascripts/mario.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,40 @@ clear_stage_list_mini = new Array();
fail_stage_list_mini = new Array();
last_stage_mini = -123;
random_stage_mini = new Array();
timer_start_mini = 0;
timer_end_mini = 0;
first_flag_mini = false;

clear_stage_list_arc = new Array();
fail_stage_list_arc = new Array();
last_stage_arc = -123;
random_stage_arc = new Array();
timer_start_arc = 0;
timer_end_arc = 0;

function checkCookie(cookieName) {
let cookieArray = document.cookie.split(';'); // 쿠키를 세미콜론 기준으로 분리하여 배열로 만듦

for(let i = 0; i < cookieArray.length; i++) {
let cookie = cookieArray[i].trim(); // trim 메소드로 앞뒤 공백 제거
if (cookie.indexOf(cookieName) === 0) { // cookieName으로 시작하는 쿠키가 있는지 확인
return true;
}
}
return false; // for loop를 다 돌았는데도 cookieName으로 시작하는 쿠키를 찾지 못했으므로 false 반환
}

function getCookieValue(cookieName) {
let cookieArray = document.cookie.split(';'); // 쿠키를 세미콜론 기준으로 분리하여 배열로 만듦

for(let i = 0; i < cookieArray.length; i++) {
let cookie = cookieArray[i].trim(); // trim 메소드로 앞뒤 공백 제거
if (cookie.indexOf(cookieName) === 0) { // cookieName으로 시작하는 쿠키가 있는지 확인
return cookie.substring(cookieName.length + 1); // '='을 포함하기 위해 +1을 함. cookieName 다음부터 끝까지가 값임
}
}
return ""; // for loop를 다 돌았는데도 cookieName으로 시작하는 쿠키를 찾지 못했으므로 빈 문자열 반환
}

/* @@@@@@@@@@@@@@@@@ 돌아가는 별자리 함수 @@@@@@@@@@@@@@@@@ */
/* 랜덤 int 가져오는 함수 */
Expand Down Expand Up @@ -338,6 +367,15 @@ function setCookieData_mini() {
document.cookie = "rs_mini=" + random_stage_mini.join("@");
}
}
/* 타이머 초기화 함수 */
function initial_timer_mini(){
if(!checkCookie("visited_mini")) {
alert("시작할때까지 잠시만 기다려주세요.");
document.cookie = 'visited_mini=true;';
timer_start_mini = Date.now();
document.cookie = `start_mini=${timer_start_mini}`;
}
}

/* save data in cookies */
function checkResult_mini() {
Expand Down Expand Up @@ -459,21 +497,33 @@ function submitSolutionMarioMini(input) {

/* super secret */
function superSecret_mini() {
clear_stage_list_mini = atob(clear_stage_list_mini).split('@')
clear_stage_list_mini = clear_stage_list_mini.filter((element) => element !== '')
// clear_stage_list_mini = atob(clear_stage_list_mini).split('@')
// clear_stage_list_mini = clear_stage_list_mini.filter((element) => element !== '')

if (TOTAL_STAGE == clear_stage_list_mini.length) {
alert("Congraturation!");
if (!confirm("Reset?")) {
// alert("None")
} else {
document.cookie = "csl_mini=";
document.cookie = "fsl_mini=";
document.cookie = "ls_mini=";
document.cookie = "rs_mini=";
window.location.reload();
if(!checkCookie("end_mini")) {
// 타이머 멈추는 코드 구현
timer_end_mini = Date.now();
timer_start_mini = Number(getCookieValue('start_mini'))
const diff = timer_end_mini - timer_start_mini;
const sec = Math.floor(diff / 1000);
alert(`Congraturation! ${sec}`);
document.cookie = `end_mini=${sec}`;
} else{
sec = Number(getCookieValue('end_mini'))
alert(`Congraturation! ${sec}`);
}
} else {

// if (!confirm("Reset?")) {
// // alert("None")
// } else {
// document.cookie = "csl_mini=";
// document.cookie = "fsl_mini=";
// document.cookie = "ls_mini=";
// document.cookie = "rs_mini=";
// window.location.reload();
// }
} /*else {
if (
!confirm(
"You can get reward when you achieve 100%\nDo you want to reset?"
Expand All @@ -487,9 +537,18 @@ function superSecret_mini() {
document.cookie = "rs_mini=";
window.location.reload();
}
}
} */
}

function initial_timer_arc(){
if(!checkCookie("visited_arc")) {
alert("시작할때까지 잠시만 기다려주세요.");
document.cookie = 'visited_arc=true;';
timer_start_arc = Date.now();
document.cookie = `start_arc=${timer_start_arc}`;
}
}

// ARC competition을 위한 코드
function setCookieData_arc() {
var cookies = document.cookie.split(";").map((el) => el.split("="));
Expand Down Expand Up @@ -680,21 +739,34 @@ function submitSolutionMarioARC(input) {

/* super secret */
function superSecret_arc() {
clear_stage_list_arc = atob(clear_stage_list_arc).split('@')
clear_stage_list_arc = clear_stage_list_arc.filter((element) => element !== '')
// clear_stage_list_arc = atob(clear_stage_list_arc).split('@')
// clear_stage_list_arc = clear_stage_list_arc.filter((element) => element !== '')

if (TOTAL_STAGE == clear_stage_list_arc.length) {
alert("Congraturation!");
// 타이머 멈추는 코드 구현
if(!checkCookie("end_arc")) {
// 타이머 멈추는 코드 구현
timer_end_arc = Date.now();
timer_start_arc = Number(getCookieValue('start_arc'))
const diff = timer_end_arc - timer_start_arc;
const sec = Math.floor(diff / 1000);
alert(`Congraturation! ${sec} sec`);
document.cookie = `end_arc=${sec}`;
}else{
sec = Number(getCookieValue('end_arc'))
alert(`Congraturation! ${sec}`);
}
/*
if (!confirm("Reset?")) {
// alert("None")
} else {
} /*else {
document.cookie = "csl_arc=";
document.cookie = "fsl_arc=";
document.cookie = "ls_arc=";
document.cookie = "rs_arc=";
window.location.reload();
}
} else {
} */
} /* else {
if (
!confirm(
"You can get reward when you achieve 100%\nDo you want to reset?"
Expand All @@ -708,5 +780,5 @@ function superSecret_arc() {
document.cookie = "rs_arc=";
window.location.reload();
}
}
} */
}
58 changes: 46 additions & 12 deletions backend/public/stylesheets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ h5 {
#editor_grid_control_btns {
float:left;
justify-content: center;
margin: auto;
min-width: 50%;
max-width: fit-content;
margin-top: 10px;
margin-bottom: 10px;
background: white;
Expand All @@ -123,18 +126,41 @@ h5 {


#resize_control_btns {
max-width:fit-content;
min-width:50%;
margin:auto;
margin-bottom: 10px;

margin-bottom: 20px;
justify-content: center;
}

#critical_control_btns {
max-width: fit-content;
min-width: 50%;
#resize_control_btns .input-group{
justify-content: center;
}
#resize_control_btns .form-outline{
width: 30%;
}
#critical_control_btns {
margin-right: 20px;
}
/*
#undo_button, #redo_button {
display: inline-block;
margin: 5px;
background-color: #007bff;
color: white;
border: none;
padding: 10px 24px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
transition-duration: 0.4s;
cursor: pointer;
border-radius: 12px;
}

#undo_button:hover, #redo_button:hover {
background-color: white;
color: black;
}
*/

button:focus {outline:0;}

Expand All @@ -144,14 +170,22 @@ button:focus {outline:0;}
margin-top: 18px;
margin-bottom: 10px;
width: 100%;
}

#toolbar-selection label {
max-width: 20%;
}
#toolbar-selection > .btn {
width: 34%;
#undo-redo {
width: 30%;
margin:auto;
margin-bottom: 20px;
}

#toolbar-selection {
max-width:100%;
min-width:50%;
max-width: 80%;
min-width: 40%;
justify-content: center;
margin:auto;
margin-bottom: 10px;
}

Expand Down
14 changes: 1 addition & 13 deletions backend/routes/problemset.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,7 @@ 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,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
}

console.log(userName)

try{
Expand All @@ -42,8 +32,6 @@ router.get('/:id', async function(req, res, next) {
userName: userName,
miniARC_idlist: data,
ARC_idlist: data2,
ran1: minirand,
ran2: rand
})


Expand Down
5 changes: 3 additions & 2 deletions backend/views/arc_competition.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@
setCookieData_arc();
checkResult_arc();
makeStars();
initial_timer_arc()
};
</script>
</head>
Expand All @@ -329,8 +330,8 @@
<div class="progress-bar-move"></div>
<div class="titlePER">0%</div>
</div>
<div class="super-secret" onclick="superSecret()">
<div class="title">REWARD</div>
<div class="super-secret" onclick="superSecret_arc()">
<div class="title">Complete</div>
</div>
</div>
<div class="backSky">
Expand Down
Loading