Skip to content

Commit

Permalink
Merge branch 'main' into class-overview-redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
jpelay committed Jun 12, 2024
2 parents eba8c75 + b4abbe2 commit a14ee11
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions static/js/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -680,15 +680,15 @@ export async function showAchievements(achievements: Achievement[] | undefined,
$('#achievement_pop_up').removeAttr('reload');
$('#achievement_pop_up').removeAttr('redirect');
location.reload();
}, achievements.length * 6000);
}, achievements.length * 3000);
}
if (redirect) {
$('#achievement_pop_up').attr('redirect', redirect);
setTimeout(function(){
$('#achievement_pop_up').removeAttr('reload');
$('#achievement_pop_up').removeAttr('redirect');
window.location.pathname = redirect;
}, achievements.length * 6000);
}, achievements.length * 3000);
}
}

Expand All @@ -700,11 +700,11 @@ function showAchievement(achievement: Achievement) {
$('#achievement_pop_up').fadeIn(1000, function () {
setTimeout(function(){
$('#achievement_pop_up').fadeOut(1000);
}, 4000);
}, 1000);
});
setTimeout(()=>{
resolve();
;} , 6000
;} , 1000
);
});
}
Expand Down Expand Up @@ -793,7 +793,7 @@ export async function delete_program(id: string, prompt: string) {
updateSelectOptions('adventure');
// this function decreases the total programs saved
updateProgramCount();
const response = await postJsonWithAchievements('/programs/delete', { id });
const response = await postJsonWithAchievements('/programs/delete', { id });
showAchievements(response.achievement, true, "");
// issue request on the Bar component.
console.log("resp", response)
Expand Down
8 changes: 4 additions & 4 deletions static/js/appbundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -120147,15 +120147,15 @@ def note_with_error(value, err):
$("#achievement_pop_up").removeAttr("reload");
$("#achievement_pop_up").removeAttr("redirect");
location.reload();
}, achievements.length * 6e3);
}, achievements.length * 3e3);
}
if (redirect2) {
$("#achievement_pop_up").attr("redirect", redirect2);
setTimeout(function() {
$("#achievement_pop_up").removeAttr("reload");
$("#achievement_pop_up").removeAttr("redirect");
window.location.pathname = redirect2;
}, achievements.length * 6e3);
}, achievements.length * 3e3);
}
}
function showAchievement(achievement) {
Expand All @@ -120166,12 +120166,12 @@ def note_with_error(value, err):
$("#achievement_pop_up").fadeIn(1e3, function() {
setTimeout(function() {
$("#achievement_pop_up").fadeOut(1e3);
}, 4e3);
}, 1e3);
});
setTimeout(() => {
resolve2();
;
}, 6e3);
}, 1e3);
});
}
function removeBulb() {
Expand Down
6 changes: 3 additions & 3 deletions static/js/appbundle.js.map

Large diffs are not rendered by default.

0 comments on commit a14ee11

Please sign in to comment.