From f1993fc8a1a91e95f6668f7a74cdac03ea5b1591 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 30 Oct 2020 16:18:42 +0000 Subject: [PATCH 1/9] smaller keymap name --- public/css/style.scss | 1 + public/js/script.js | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/style.scss b/public/css/style.scss index a594acfa5..4218ee2e8 100644 --- a/public/css/style.scss +++ b/public/css/style.scss @@ -3058,6 +3058,7 @@ key { .r5 { display: grid; grid-template-columns: 3.5fr 6fr 3.5fr; + font-size: 0.5rem; // &.matrixSpace { // // grid-template-columns: 6.75fr 1.9fr 6.75fr; // grid-template-columns: 6.9fr 4.6fr 6.9fr; // wider spacebar diff --git a/public/js/script.js b/public/js/script.js index f1efd1288..79ea247e2 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1764,7 +1764,6 @@ function showResult(difficultyFailed = false) { time = secondsToString(roundTo2(testtime)); } $("#result .stats .time .bottom .text").text(time); - $("#result .stats .raw .bottom").removeAttr("aria-label"); $("#result .stats .acc .bottom").removeAttr("aria-label"); $("#result .stats .time .bottom").attr( @@ -1786,7 +1785,7 @@ function showResult(difficultyFailed = false) { $("#result .stats .wpm .top").text("cpm"); $("#result .stats .wpm .bottom").attr( "aria-label", - stats.wpm + ` (${roundTo2(stats.wpm)} wpm)` + stats.wpm * 5 + ` (${roundTo2(stats.wpm)} wpm)` ); $("#result .stats .wpm .bottom").text(Math.round(stats.wpm * 5)); $("#result .stats .raw .bottom").text(Math.round(stats.wpmRaw * 5)); From 0a887537239df009839d279c55d2cc135b6cfef5 Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 3 Nov 2020 21:52:22 +0000 Subject: [PATCH 2/9] removing auto refresh --- public/js/userconfig.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/public/js/userconfig.js b/public/js/userconfig.js index 3b4b63782..748e62cbf 100644 --- a/public/js/userconfig.js +++ b/public/js/userconfig.js @@ -639,10 +639,7 @@ function setEnableAds(val, nosave) { val = "off"; } config.enableAds = val; - if (!nosave) - saveConfigToCookie().then(() => { - setTimeout(location.reload(), 500); - }); + if (!nosave) saveConfigToCookie(); } //flip colors From 57d71927957bcb5114c56dbc65479bbfdecb9798 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 4 Nov 2020 00:48:01 +0000 Subject: [PATCH 3/9] renamed start script, added deploy scripts --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 22900b923..02d8c40e1 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,12 @@ "license": "GPL-3.0", "private": true, "scripts": { + "postinstall": "cd functions && npm install", "build": "npx gulp build", - "start": "npm run build && firebase serve", - "start:dev": "npm run build && concurrently --kill-others \"npx gulp watch\" \"firebase serve\"", - "postinstall": "cd functions && npm install" + "start": "npm run build && concurrently --kill-others \"npx gulp watch\" \"firebase serve\"", + "deploy:live:hosting": "npm run build && firebase deploy -P live --only hosting", + "deploy:live:functions": "npm run build && firebase deploy -P live --only functions", + "deploy:live": "npm run build && firebase deploy -P live" }, "engines": { "node": "10" From 3090ef1702ff8e4854f889816069c01dd8052188 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 4 Nov 2020 00:48:33 +0000 Subject: [PATCH 4/9] updated version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02d8c40e1..6c55fa043 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monkeytype", - "version": "1.5.3", + "version": "1.5.6", "license": "GPL-3.0", "private": true, "scripts": { From 0e42bbb0c7df2d74d2dbe34709c254108ab09da5 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 4 Nov 2020 00:55:00 +0000 Subject: [PATCH 5/9] ignoring public --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2f65e55b7..63a7e8e05 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ functions/serviceAccountKey_live_copy.json #generated files dist/ +public/ From 115e6a7efd1fee468dcc1dde29851732cd1b52ec Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 4 Nov 2020 01:01:31 +0000 Subject: [PATCH 6/9] nevermind, not ignoring --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 63a7e8e05..2f65e55b7 100644 --- a/.gitignore +++ b/.gitignore @@ -80,4 +80,3 @@ functions/serviceAccountKey_live_copy.json #generated files dist/ -public/ From 15f8146db57bc345dffe7fe2fbf32afd1c565c75 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 4 Nov 2020 01:01:39 +0000 Subject: [PATCH 7/9] public is now static --- gulpfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7754c148c..a9db8838c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -30,7 +30,7 @@ task("sass", function () { }); task("static", function () { - return src("./public/**/*").pipe(dest("./dist/")); + return src("./static/**/*").pipe(dest("./dist/")); }); task("clean", function () { @@ -40,7 +40,7 @@ task("clean", function () { task("compile", series("static", "sass", "cat")); task("watch", function () { - watch(["./public/**/*", "./src/**/*"], series("compile")); + watch(["./static/**/*", "./src/**/*"], series("compile")); }); task("build", series("clean", "compile")); From d9c817871a1af1c8ff44d5b637e9a14d1096f6a2 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 4 Nov 2020 01:02:19 +0000 Subject: [PATCH 8/9] moved files from public to static --- {public => static}/ads.txt | 0 {public => static}/css/balloon.css | 0 {public => static}/css/fa.css | 0 {public => static}/fav.png | Bin {public => static}/funbox/choo_choo.css | 0 {public => static}/funbox/earthquake.css | 0 {public => static}/funbox/list.json | 0 {public => static}/funbox/mirror.css | 0 {public => static}/funbox/nausea.css | 0 {public => static}/funbox/read_ahead.css | 0 {public => static}/funbox/round_round_baby.css | 0 {public => static}/funbox/simon_says.css | 0 {public => static}/funbox/space_balls.css | 0 {public => static}/index.html | 0 {public => static}/js/chart.min.js | 0 {public => static}/js/chartjs-plugin-annotation.js | 0 {public => static}/js/chartjs-plugin-trendline.js | 0 {public => static}/js/easing.js | 0 {public => static}/js/english_quotes.json | 0 {public => static}/js/fonts.json | 0 {public => static}/js/html2canvas.min.js | 0 {public => static}/js/jquery-3.5.1.min.js | 0 {public => static}/js/jquery.color.min.js | 0 {public => static}/js/jquery.cookie-1.4.1.min.js | 0 {public => static}/js/moment.min.js | 0 {public => static}/languages/arabic.json | 0 {public => static}/languages/czech.json | 0 {public => static}/languages/dutch.json | 0 {public => static}/languages/english.json | 0 {public => static}/languages/english_10k.json | 0 {public => static}/languages/english_1k.json | 0 {public => static}/languages/finnish.json | 0 {public => static}/languages/french.json | 0 {public => static}/languages/german.json | 0 {public => static}/languages/hebrew.json | 0 {public => static}/languages/hungarian.json | 0 {public => static}/languages/icelandic_1k.json | 0 {public => static}/languages/indonesian.json | 0 {public => static}/languages/italian.json | 0 {public => static}/languages/list.json | 0 {public => static}/languages/norwegian.json | 0 {public => static}/languages/polish.json | 0 {public => static}/languages/portuguese.json | 0 {public => static}/languages/romanian.json | 0 {public => static}/languages/russian.json | 0 {public => static}/languages/slovak.json | 0 {public => static}/languages/spanish.json | 0 {public => static}/languages/spanish_1k.json | 0 {public => static}/languages/thai.json | 0 {public => static}/languages/turkish.json | 0 {public => static}/mtsocial.png | Bin {public => static}/privacy-policy.html | 0 {public => static}/robots.txt | 0 {public => static}/sound/click1/click1_1.wav | Bin {public => static}/sound/click1/click1_2.wav | Bin {public => static}/sound/click1/click1_3.wav | Bin {public => static}/sound/click2/click2_1.wav | Bin {public => static}/sound/click2/click2_2.wav | Bin {public => static}/sound/click2/click2_3.wav | Bin {public => static}/sound/click3/click3_1.wav | Bin {public => static}/sound/click3/click3_2.wav | Bin {public => static}/sound/click3/click3_3.wav | Bin {public => static}/sound/click4/A.mp3 | Bin {public => static}/sound/click4/B.mp3 | Bin {public => static}/sound/click4/C.mp3 | Bin {public => static}/sound/click4/K.mp3 | Bin {public => static}/sound/click4/R.mp3 | Bin {public => static}/sound/click4/T.mp3 | Bin {public => static}/sound/click4/click4_1.wav | Bin {public => static}/sound/click4/click4_2.wav | Bin {public => static}/sound/click4/click4_3.wav | Bin {public => static}/sound/click4/click4_4.wav | Bin {public => static}/sound/click4/click4_5.wav | Bin {public => static}/sound/click4/click4_6.wav | Bin {public => static}/sound/error.wav | Bin {public => static}/themes/8008.css | 0 {public => static}/themes/9009.css | 0 {public => static}/themes/aether.css | 0 {public => static}/themes/alduin.css | 0 {public => static}/themes/alpine.css | 0 {public => static}/themes/bento.css | 0 {public => static}/themes/bingsu.css | 0 {public => static}/themes/bliss.css | 0 {public => static}/themes/botanical.css | 0 {public => static}/themes/bushido.css | 0 {public => static}/themes/cafe.css | 0 {public => static}/themes/camping.css | 0 {public => static}/themes/carbon.css | 0 {public => static}/themes/cyberspace.css | 0 {public => static}/themes/dark.css | 0 {public => static}/themes/dark_magic_girl.css | 0 {public => static}/themes/deku.css | 0 {public => static}/themes/dollar.css | 0 {public => static}/themes/dots.css | 0 {public => static}/themes/dracula.css | 0 {public => static}/themes/drowning.css | 0 {public => static}/themes/dualshot.css | 0 {public => static}/themes/froyo.css | 0 {public => static}/themes/fundamentals.css | 0 {public => static}/themes/future_funk.css | 0 {public => static}/themes/graen.css | 0 {public => static}/themes/gruvbox_dark.css | 0 {public => static}/themes/gruvbox_light.css | 0 {public => static}/themes/hammerhead.css | 0 {public => static}/themes/honey.css | 0 {public => static}/themes/ishtar.css | 0 {public => static}/themes/joker.css | 0 {public => static}/themes/laser.css | 0 {public => static}/themes/lil_dragon.css | 0 {public => static}/themes/lime.css | 0 {public => static}/themes/list.json | 0 {public => static}/themes/luna.css | 0 {public => static}/themes/magic_girl.css | 0 {public => static}/themes/mashu.css | 0 {public => static}/themes/matcha_moccha.css | 0 {public => static}/themes/matrix.css | 0 {public => static}/themes/menthol.css | 0 {public => static}/themes/metaverse.css | 0 {public => static}/themes/metropolis.css | 0 {public => static}/themes/miami.css | 0 {public => static}/themes/miami_nights.css | 0 {public => static}/themes/milkshake.css | 0 {public => static}/themes/mint.css | 0 {public => static}/themes/mizu.css | 0 {public => static}/themes/modern_dolch.css | 0 {public => static}/themes/monokai.css | 0 {public => static}/themes/mr_sleeves.css | 0 {public => static}/themes/ms_cupcakes.css | 0 {public => static}/themes/nausea.css | 0 {public => static}/themes/nautilus.css | 0 {public => static}/themes/nebula.css | 0 {public => static}/themes/night_runner.css | 0 {public => static}/themes/nord.css | 0 {public => static}/themes/norse.css | 0 {public => static}/themes/oblivion.css | 0 {public => static}/themes/olive.css | 0 {public => static}/themes/olivia.css | 0 {public => static}/themes/paper.css | 0 {public => static}/themes/pastel.css | 0 {public => static}/themes/pulse.css | 0 {public => static}/themes/red_dragon.css | 0 {public => static}/themes/red_samurai.css | 0 {public => static}/themes/retro.css | 0 {public => static}/themes/retrocast.css | 0 {public => static}/themes/rgb.css | 0 {public => static}/themes/serika.css | 0 {public => static}/themes/serika_dark.css | 0 {public => static}/themes/shadow.css | 0 {public => static}/themes/shoko.css | 0 {public => static}/themes/solarized_dark.css | 0 {public => static}/themes/solarized_light.css | 0 {public => static}/themes/strawberry.css | 0 {public => static}/themes/striker.css | 0 {public => static}/themes/superuser.css | 0 {public => static}/themes/sweden.css | 0 {public => static}/themes/taro.css | 0 {public => static}/themes/terminal.css | 0 {public => static}/themes/terra.css | 0 {public => static}/themes/vaporwave.css | 0 {public => static}/themes/voc.css | 0 {public => static}/themes/watermelon.css | 0 {public => static}/themes/wavez.css | 0 {public => static}/webfonts/fa-brands-400.eot | Bin {public => static}/webfonts/fa-brands-400.svg | 0 {public => static}/webfonts/fa-brands-400.ttf | Bin {public => static}/webfonts/fa-brands-400.woff | Bin {public => static}/webfonts/fa-brands-400.woff2 | Bin {public => static}/webfonts/fa-regular-400.eot | Bin {public => static}/webfonts/fa-regular-400.svg | 0 {public => static}/webfonts/fa-regular-400.ttf | Bin {public => static}/webfonts/fa-regular-400.woff | Bin {public => static}/webfonts/fa-regular-400.woff2 | Bin {public => static}/webfonts/fa-solid-900.eot | Bin {public => static}/webfonts/fa-solid-900.svg | 0 {public => static}/webfonts/fa-solid-900.ttf | Bin {public => static}/webfonts/fa-solid-900.woff | Bin {public => static}/webfonts/fa-solid-900.woff2 | Bin 177 files changed, 0 insertions(+), 0 deletions(-) rename {public => static}/ads.txt (100%) rename {public => static}/css/balloon.css (100%) rename {public => static}/css/fa.css (100%) rename {public => static}/fav.png (100%) rename {public => static}/funbox/choo_choo.css (100%) rename {public => static}/funbox/earthquake.css (100%) rename {public => static}/funbox/list.json (100%) rename {public => static}/funbox/mirror.css (100%) rename {public => static}/funbox/nausea.css (100%) rename {public => static}/funbox/read_ahead.css (100%) rename {public => static}/funbox/round_round_baby.css (100%) rename {public => static}/funbox/simon_says.css (100%) rename {public => static}/funbox/space_balls.css (100%) rename {public => static}/index.html (100%) rename {public => static}/js/chart.min.js (100%) rename {public => static}/js/chartjs-plugin-annotation.js (100%) rename {public => static}/js/chartjs-plugin-trendline.js (100%) rename {public => static}/js/easing.js (100%) rename {public => static}/js/english_quotes.json (100%) rename {public => static}/js/fonts.json (100%) rename {public => static}/js/html2canvas.min.js (100%) rename {public => static}/js/jquery-3.5.1.min.js (100%) rename {public => static}/js/jquery.color.min.js (100%) rename {public => static}/js/jquery.cookie-1.4.1.min.js (100%) rename {public => static}/js/moment.min.js (100%) rename {public => static}/languages/arabic.json (100%) rename {public => static}/languages/czech.json (100%) rename {public => static}/languages/dutch.json (100%) rename {public => static}/languages/english.json (100%) rename {public => static}/languages/english_10k.json (100%) rename {public => static}/languages/english_1k.json (100%) rename {public => static}/languages/finnish.json (100%) rename {public => static}/languages/french.json (100%) rename {public => static}/languages/german.json (100%) rename {public => static}/languages/hebrew.json (100%) rename {public => static}/languages/hungarian.json (100%) rename {public => static}/languages/icelandic_1k.json (100%) rename {public => static}/languages/indonesian.json (100%) rename {public => static}/languages/italian.json (100%) rename {public => static}/languages/list.json (100%) rename {public => static}/languages/norwegian.json (100%) rename {public => static}/languages/polish.json (100%) rename {public => static}/languages/portuguese.json (100%) rename {public => static}/languages/romanian.json (100%) rename {public => static}/languages/russian.json (100%) rename {public => static}/languages/slovak.json (100%) rename {public => static}/languages/spanish.json (100%) rename {public => static}/languages/spanish_1k.json (100%) rename {public => static}/languages/thai.json (100%) rename {public => static}/languages/turkish.json (100%) rename {public => static}/mtsocial.png (100%) rename {public => static}/privacy-policy.html (100%) rename {public => static}/robots.txt (100%) rename {public => static}/sound/click1/click1_1.wav (100%) rename {public => static}/sound/click1/click1_2.wav (100%) rename {public => static}/sound/click1/click1_3.wav (100%) rename {public => static}/sound/click2/click2_1.wav (100%) rename {public => static}/sound/click2/click2_2.wav (100%) rename {public => static}/sound/click2/click2_3.wav (100%) rename {public => static}/sound/click3/click3_1.wav (100%) rename {public => static}/sound/click3/click3_2.wav (100%) rename {public => static}/sound/click3/click3_3.wav (100%) rename {public => static}/sound/click4/A.mp3 (100%) rename {public => static}/sound/click4/B.mp3 (100%) rename {public => static}/sound/click4/C.mp3 (100%) rename {public => static}/sound/click4/K.mp3 (100%) rename {public => static}/sound/click4/R.mp3 (100%) rename {public => static}/sound/click4/T.mp3 (100%) rename {public => static}/sound/click4/click4_1.wav (100%) rename {public => static}/sound/click4/click4_2.wav (100%) rename {public => static}/sound/click4/click4_3.wav (100%) rename {public => static}/sound/click4/click4_4.wav (100%) rename {public => static}/sound/click4/click4_5.wav (100%) rename {public => static}/sound/click4/click4_6.wav (100%) rename {public => static}/sound/error.wav (100%) rename {public => static}/themes/8008.css (100%) rename {public => static}/themes/9009.css (100%) rename {public => static}/themes/aether.css (100%) rename {public => static}/themes/alduin.css (100%) rename {public => static}/themes/alpine.css (100%) rename {public => static}/themes/bento.css (100%) rename {public => static}/themes/bingsu.css (100%) rename {public => static}/themes/bliss.css (100%) rename {public => static}/themes/botanical.css (100%) rename {public => static}/themes/bushido.css (100%) rename {public => static}/themes/cafe.css (100%) rename {public => static}/themes/camping.css (100%) rename {public => static}/themes/carbon.css (100%) rename {public => static}/themes/cyberspace.css (100%) rename {public => static}/themes/dark.css (100%) rename {public => static}/themes/dark_magic_girl.css (100%) rename {public => static}/themes/deku.css (100%) rename {public => static}/themes/dollar.css (100%) rename {public => static}/themes/dots.css (100%) rename {public => static}/themes/dracula.css (100%) rename {public => static}/themes/drowning.css (100%) rename {public => static}/themes/dualshot.css (100%) rename {public => static}/themes/froyo.css (100%) rename {public => static}/themes/fundamentals.css (100%) rename {public => static}/themes/future_funk.css (100%) rename {public => static}/themes/graen.css (100%) rename {public => static}/themes/gruvbox_dark.css (100%) rename {public => static}/themes/gruvbox_light.css (100%) rename {public => static}/themes/hammerhead.css (100%) rename {public => static}/themes/honey.css (100%) rename {public => static}/themes/ishtar.css (100%) rename {public => static}/themes/joker.css (100%) rename {public => static}/themes/laser.css (100%) rename {public => static}/themes/lil_dragon.css (100%) rename {public => static}/themes/lime.css (100%) rename {public => static}/themes/list.json (100%) rename {public => static}/themes/luna.css (100%) rename {public => static}/themes/magic_girl.css (100%) rename {public => static}/themes/mashu.css (100%) rename {public => static}/themes/matcha_moccha.css (100%) rename {public => static}/themes/matrix.css (100%) rename {public => static}/themes/menthol.css (100%) rename {public => static}/themes/metaverse.css (100%) rename {public => static}/themes/metropolis.css (100%) rename {public => static}/themes/miami.css (100%) rename {public => static}/themes/miami_nights.css (100%) rename {public => static}/themes/milkshake.css (100%) rename {public => static}/themes/mint.css (100%) rename {public => static}/themes/mizu.css (100%) rename {public => static}/themes/modern_dolch.css (100%) rename {public => static}/themes/monokai.css (100%) rename {public => static}/themes/mr_sleeves.css (100%) rename {public => static}/themes/ms_cupcakes.css (100%) rename {public => static}/themes/nausea.css (100%) rename {public => static}/themes/nautilus.css (100%) rename {public => static}/themes/nebula.css (100%) rename {public => static}/themes/night_runner.css (100%) rename {public => static}/themes/nord.css (100%) rename {public => static}/themes/norse.css (100%) rename {public => static}/themes/oblivion.css (100%) rename {public => static}/themes/olive.css (100%) rename {public => static}/themes/olivia.css (100%) rename {public => static}/themes/paper.css (100%) rename {public => static}/themes/pastel.css (100%) rename {public => static}/themes/pulse.css (100%) rename {public => static}/themes/red_dragon.css (100%) rename {public => static}/themes/red_samurai.css (100%) rename {public => static}/themes/retro.css (100%) rename {public => static}/themes/retrocast.css (100%) rename {public => static}/themes/rgb.css (100%) rename {public => static}/themes/serika.css (100%) rename {public => static}/themes/serika_dark.css (100%) rename {public => static}/themes/shadow.css (100%) rename {public => static}/themes/shoko.css (100%) rename {public => static}/themes/solarized_dark.css (100%) rename {public => static}/themes/solarized_light.css (100%) rename {public => static}/themes/strawberry.css (100%) rename {public => static}/themes/striker.css (100%) rename {public => static}/themes/superuser.css (100%) rename {public => static}/themes/sweden.css (100%) rename {public => static}/themes/taro.css (100%) rename {public => static}/themes/terminal.css (100%) rename {public => static}/themes/terra.css (100%) rename {public => static}/themes/vaporwave.css (100%) rename {public => static}/themes/voc.css (100%) rename {public => static}/themes/watermelon.css (100%) rename {public => static}/themes/wavez.css (100%) rename {public => static}/webfonts/fa-brands-400.eot (100%) rename {public => static}/webfonts/fa-brands-400.svg (100%) rename {public => static}/webfonts/fa-brands-400.ttf (100%) rename {public => static}/webfonts/fa-brands-400.woff (100%) rename {public => static}/webfonts/fa-brands-400.woff2 (100%) rename {public => static}/webfonts/fa-regular-400.eot (100%) rename {public => static}/webfonts/fa-regular-400.svg (100%) rename {public => static}/webfonts/fa-regular-400.ttf (100%) rename {public => static}/webfonts/fa-regular-400.woff (100%) rename {public => static}/webfonts/fa-regular-400.woff2 (100%) rename {public => static}/webfonts/fa-solid-900.eot (100%) rename {public => static}/webfonts/fa-solid-900.svg (100%) rename {public => static}/webfonts/fa-solid-900.ttf (100%) rename {public => static}/webfonts/fa-solid-900.woff (100%) rename {public => static}/webfonts/fa-solid-900.woff2 (100%) diff --git a/public/ads.txt b/static/ads.txt similarity index 100% rename from public/ads.txt rename to static/ads.txt diff --git a/public/css/balloon.css b/static/css/balloon.css similarity index 100% rename from public/css/balloon.css rename to static/css/balloon.css diff --git a/public/css/fa.css b/static/css/fa.css similarity index 100% rename from public/css/fa.css rename to static/css/fa.css diff --git a/public/fav.png b/static/fav.png similarity index 100% rename from public/fav.png rename to static/fav.png diff --git a/public/funbox/choo_choo.css b/static/funbox/choo_choo.css similarity index 100% rename from public/funbox/choo_choo.css rename to static/funbox/choo_choo.css diff --git a/public/funbox/earthquake.css b/static/funbox/earthquake.css similarity index 100% rename from public/funbox/earthquake.css rename to static/funbox/earthquake.css diff --git a/public/funbox/list.json b/static/funbox/list.json similarity index 100% rename from public/funbox/list.json rename to static/funbox/list.json diff --git a/public/funbox/mirror.css b/static/funbox/mirror.css similarity index 100% rename from public/funbox/mirror.css rename to static/funbox/mirror.css diff --git a/public/funbox/nausea.css b/static/funbox/nausea.css similarity index 100% rename from public/funbox/nausea.css rename to static/funbox/nausea.css diff --git a/public/funbox/read_ahead.css b/static/funbox/read_ahead.css similarity index 100% rename from public/funbox/read_ahead.css rename to static/funbox/read_ahead.css diff --git a/public/funbox/round_round_baby.css b/static/funbox/round_round_baby.css similarity index 100% rename from public/funbox/round_round_baby.css rename to static/funbox/round_round_baby.css diff --git a/public/funbox/simon_says.css b/static/funbox/simon_says.css similarity index 100% rename from public/funbox/simon_says.css rename to static/funbox/simon_says.css diff --git a/public/funbox/space_balls.css b/static/funbox/space_balls.css similarity index 100% rename from public/funbox/space_balls.css rename to static/funbox/space_balls.css diff --git a/public/index.html b/static/index.html similarity index 100% rename from public/index.html rename to static/index.html diff --git a/public/js/chart.min.js b/static/js/chart.min.js similarity index 100% rename from public/js/chart.min.js rename to static/js/chart.min.js diff --git a/public/js/chartjs-plugin-annotation.js b/static/js/chartjs-plugin-annotation.js similarity index 100% rename from public/js/chartjs-plugin-annotation.js rename to static/js/chartjs-plugin-annotation.js diff --git a/public/js/chartjs-plugin-trendline.js b/static/js/chartjs-plugin-trendline.js similarity index 100% rename from public/js/chartjs-plugin-trendline.js rename to static/js/chartjs-plugin-trendline.js diff --git a/public/js/easing.js b/static/js/easing.js similarity index 100% rename from public/js/easing.js rename to static/js/easing.js diff --git a/public/js/english_quotes.json b/static/js/english_quotes.json similarity index 100% rename from public/js/english_quotes.json rename to static/js/english_quotes.json diff --git a/public/js/fonts.json b/static/js/fonts.json similarity index 100% rename from public/js/fonts.json rename to static/js/fonts.json diff --git a/public/js/html2canvas.min.js b/static/js/html2canvas.min.js similarity index 100% rename from public/js/html2canvas.min.js rename to static/js/html2canvas.min.js diff --git a/public/js/jquery-3.5.1.min.js b/static/js/jquery-3.5.1.min.js similarity index 100% rename from public/js/jquery-3.5.1.min.js rename to static/js/jquery-3.5.1.min.js diff --git a/public/js/jquery.color.min.js b/static/js/jquery.color.min.js similarity index 100% rename from public/js/jquery.color.min.js rename to static/js/jquery.color.min.js diff --git a/public/js/jquery.cookie-1.4.1.min.js b/static/js/jquery.cookie-1.4.1.min.js similarity index 100% rename from public/js/jquery.cookie-1.4.1.min.js rename to static/js/jquery.cookie-1.4.1.min.js diff --git a/public/js/moment.min.js b/static/js/moment.min.js similarity index 100% rename from public/js/moment.min.js rename to static/js/moment.min.js diff --git a/public/languages/arabic.json b/static/languages/arabic.json similarity index 100% rename from public/languages/arabic.json rename to static/languages/arabic.json diff --git a/public/languages/czech.json b/static/languages/czech.json similarity index 100% rename from public/languages/czech.json rename to static/languages/czech.json diff --git a/public/languages/dutch.json b/static/languages/dutch.json similarity index 100% rename from public/languages/dutch.json rename to static/languages/dutch.json diff --git a/public/languages/english.json b/static/languages/english.json similarity index 100% rename from public/languages/english.json rename to static/languages/english.json diff --git a/public/languages/english_10k.json b/static/languages/english_10k.json similarity index 100% rename from public/languages/english_10k.json rename to static/languages/english_10k.json diff --git a/public/languages/english_1k.json b/static/languages/english_1k.json similarity index 100% rename from public/languages/english_1k.json rename to static/languages/english_1k.json diff --git a/public/languages/finnish.json b/static/languages/finnish.json similarity index 100% rename from public/languages/finnish.json rename to static/languages/finnish.json diff --git a/public/languages/french.json b/static/languages/french.json similarity index 100% rename from public/languages/french.json rename to static/languages/french.json diff --git a/public/languages/german.json b/static/languages/german.json similarity index 100% rename from public/languages/german.json rename to static/languages/german.json diff --git a/public/languages/hebrew.json b/static/languages/hebrew.json similarity index 100% rename from public/languages/hebrew.json rename to static/languages/hebrew.json diff --git a/public/languages/hungarian.json b/static/languages/hungarian.json similarity index 100% rename from public/languages/hungarian.json rename to static/languages/hungarian.json diff --git a/public/languages/icelandic_1k.json b/static/languages/icelandic_1k.json similarity index 100% rename from public/languages/icelandic_1k.json rename to static/languages/icelandic_1k.json diff --git a/public/languages/indonesian.json b/static/languages/indonesian.json similarity index 100% rename from public/languages/indonesian.json rename to static/languages/indonesian.json diff --git a/public/languages/italian.json b/static/languages/italian.json similarity index 100% rename from public/languages/italian.json rename to static/languages/italian.json diff --git a/public/languages/list.json b/static/languages/list.json similarity index 100% rename from public/languages/list.json rename to static/languages/list.json diff --git a/public/languages/norwegian.json b/static/languages/norwegian.json similarity index 100% rename from public/languages/norwegian.json rename to static/languages/norwegian.json diff --git a/public/languages/polish.json b/static/languages/polish.json similarity index 100% rename from public/languages/polish.json rename to static/languages/polish.json diff --git a/public/languages/portuguese.json b/static/languages/portuguese.json similarity index 100% rename from public/languages/portuguese.json rename to static/languages/portuguese.json diff --git a/public/languages/romanian.json b/static/languages/romanian.json similarity index 100% rename from public/languages/romanian.json rename to static/languages/romanian.json diff --git a/public/languages/russian.json b/static/languages/russian.json similarity index 100% rename from public/languages/russian.json rename to static/languages/russian.json diff --git a/public/languages/slovak.json b/static/languages/slovak.json similarity index 100% rename from public/languages/slovak.json rename to static/languages/slovak.json diff --git a/public/languages/spanish.json b/static/languages/spanish.json similarity index 100% rename from public/languages/spanish.json rename to static/languages/spanish.json diff --git a/public/languages/spanish_1k.json b/static/languages/spanish_1k.json similarity index 100% rename from public/languages/spanish_1k.json rename to static/languages/spanish_1k.json diff --git a/public/languages/thai.json b/static/languages/thai.json similarity index 100% rename from public/languages/thai.json rename to static/languages/thai.json diff --git a/public/languages/turkish.json b/static/languages/turkish.json similarity index 100% rename from public/languages/turkish.json rename to static/languages/turkish.json diff --git a/public/mtsocial.png b/static/mtsocial.png similarity index 100% rename from public/mtsocial.png rename to static/mtsocial.png diff --git a/public/privacy-policy.html b/static/privacy-policy.html similarity index 100% rename from public/privacy-policy.html rename to static/privacy-policy.html diff --git a/public/robots.txt b/static/robots.txt similarity index 100% rename from public/robots.txt rename to static/robots.txt diff --git a/public/sound/click1/click1_1.wav b/static/sound/click1/click1_1.wav similarity index 100% rename from public/sound/click1/click1_1.wav rename to static/sound/click1/click1_1.wav diff --git a/public/sound/click1/click1_2.wav b/static/sound/click1/click1_2.wav similarity index 100% rename from public/sound/click1/click1_2.wav rename to static/sound/click1/click1_2.wav diff --git a/public/sound/click1/click1_3.wav b/static/sound/click1/click1_3.wav similarity index 100% rename from public/sound/click1/click1_3.wav rename to static/sound/click1/click1_3.wav diff --git a/public/sound/click2/click2_1.wav b/static/sound/click2/click2_1.wav similarity index 100% rename from public/sound/click2/click2_1.wav rename to static/sound/click2/click2_1.wav diff --git a/public/sound/click2/click2_2.wav b/static/sound/click2/click2_2.wav similarity index 100% rename from public/sound/click2/click2_2.wav rename to static/sound/click2/click2_2.wav diff --git a/public/sound/click2/click2_3.wav b/static/sound/click2/click2_3.wav similarity index 100% rename from public/sound/click2/click2_3.wav rename to static/sound/click2/click2_3.wav diff --git a/public/sound/click3/click3_1.wav b/static/sound/click3/click3_1.wav similarity index 100% rename from public/sound/click3/click3_1.wav rename to static/sound/click3/click3_1.wav diff --git a/public/sound/click3/click3_2.wav b/static/sound/click3/click3_2.wav similarity index 100% rename from public/sound/click3/click3_2.wav rename to static/sound/click3/click3_2.wav diff --git a/public/sound/click3/click3_3.wav b/static/sound/click3/click3_3.wav similarity index 100% rename from public/sound/click3/click3_3.wav rename to static/sound/click3/click3_3.wav diff --git a/public/sound/click4/A.mp3 b/static/sound/click4/A.mp3 similarity index 100% rename from public/sound/click4/A.mp3 rename to static/sound/click4/A.mp3 diff --git a/public/sound/click4/B.mp3 b/static/sound/click4/B.mp3 similarity index 100% rename from public/sound/click4/B.mp3 rename to static/sound/click4/B.mp3 diff --git a/public/sound/click4/C.mp3 b/static/sound/click4/C.mp3 similarity index 100% rename from public/sound/click4/C.mp3 rename to static/sound/click4/C.mp3 diff --git a/public/sound/click4/K.mp3 b/static/sound/click4/K.mp3 similarity index 100% rename from public/sound/click4/K.mp3 rename to static/sound/click4/K.mp3 diff --git a/public/sound/click4/R.mp3 b/static/sound/click4/R.mp3 similarity index 100% rename from public/sound/click4/R.mp3 rename to static/sound/click4/R.mp3 diff --git a/public/sound/click4/T.mp3 b/static/sound/click4/T.mp3 similarity index 100% rename from public/sound/click4/T.mp3 rename to static/sound/click4/T.mp3 diff --git a/public/sound/click4/click4_1.wav b/static/sound/click4/click4_1.wav similarity index 100% rename from public/sound/click4/click4_1.wav rename to static/sound/click4/click4_1.wav diff --git a/public/sound/click4/click4_2.wav b/static/sound/click4/click4_2.wav similarity index 100% rename from public/sound/click4/click4_2.wav rename to static/sound/click4/click4_2.wav diff --git a/public/sound/click4/click4_3.wav b/static/sound/click4/click4_3.wav similarity index 100% rename from public/sound/click4/click4_3.wav rename to static/sound/click4/click4_3.wav diff --git a/public/sound/click4/click4_4.wav b/static/sound/click4/click4_4.wav similarity index 100% rename from public/sound/click4/click4_4.wav rename to static/sound/click4/click4_4.wav diff --git a/public/sound/click4/click4_5.wav b/static/sound/click4/click4_5.wav similarity index 100% rename from public/sound/click4/click4_5.wav rename to static/sound/click4/click4_5.wav diff --git a/public/sound/click4/click4_6.wav b/static/sound/click4/click4_6.wav similarity index 100% rename from public/sound/click4/click4_6.wav rename to static/sound/click4/click4_6.wav diff --git a/public/sound/error.wav b/static/sound/error.wav similarity index 100% rename from public/sound/error.wav rename to static/sound/error.wav diff --git a/public/themes/8008.css b/static/themes/8008.css similarity index 100% rename from public/themes/8008.css rename to static/themes/8008.css diff --git a/public/themes/9009.css b/static/themes/9009.css similarity index 100% rename from public/themes/9009.css rename to static/themes/9009.css diff --git a/public/themes/aether.css b/static/themes/aether.css similarity index 100% rename from public/themes/aether.css rename to static/themes/aether.css diff --git a/public/themes/alduin.css b/static/themes/alduin.css similarity index 100% rename from public/themes/alduin.css rename to static/themes/alduin.css diff --git a/public/themes/alpine.css b/static/themes/alpine.css similarity index 100% rename from public/themes/alpine.css rename to static/themes/alpine.css diff --git a/public/themes/bento.css b/static/themes/bento.css similarity index 100% rename from public/themes/bento.css rename to static/themes/bento.css diff --git a/public/themes/bingsu.css b/static/themes/bingsu.css similarity index 100% rename from public/themes/bingsu.css rename to static/themes/bingsu.css diff --git a/public/themes/bliss.css b/static/themes/bliss.css similarity index 100% rename from public/themes/bliss.css rename to static/themes/bliss.css diff --git a/public/themes/botanical.css b/static/themes/botanical.css similarity index 100% rename from public/themes/botanical.css rename to static/themes/botanical.css diff --git a/public/themes/bushido.css b/static/themes/bushido.css similarity index 100% rename from public/themes/bushido.css rename to static/themes/bushido.css diff --git a/public/themes/cafe.css b/static/themes/cafe.css similarity index 100% rename from public/themes/cafe.css rename to static/themes/cafe.css diff --git a/public/themes/camping.css b/static/themes/camping.css similarity index 100% rename from public/themes/camping.css rename to static/themes/camping.css diff --git a/public/themes/carbon.css b/static/themes/carbon.css similarity index 100% rename from public/themes/carbon.css rename to static/themes/carbon.css diff --git a/public/themes/cyberspace.css b/static/themes/cyberspace.css similarity index 100% rename from public/themes/cyberspace.css rename to static/themes/cyberspace.css diff --git a/public/themes/dark.css b/static/themes/dark.css similarity index 100% rename from public/themes/dark.css rename to static/themes/dark.css diff --git a/public/themes/dark_magic_girl.css b/static/themes/dark_magic_girl.css similarity index 100% rename from public/themes/dark_magic_girl.css rename to static/themes/dark_magic_girl.css diff --git a/public/themes/deku.css b/static/themes/deku.css similarity index 100% rename from public/themes/deku.css rename to static/themes/deku.css diff --git a/public/themes/dollar.css b/static/themes/dollar.css similarity index 100% rename from public/themes/dollar.css rename to static/themes/dollar.css diff --git a/public/themes/dots.css b/static/themes/dots.css similarity index 100% rename from public/themes/dots.css rename to static/themes/dots.css diff --git a/public/themes/dracula.css b/static/themes/dracula.css similarity index 100% rename from public/themes/dracula.css rename to static/themes/dracula.css diff --git a/public/themes/drowning.css b/static/themes/drowning.css similarity index 100% rename from public/themes/drowning.css rename to static/themes/drowning.css diff --git a/public/themes/dualshot.css b/static/themes/dualshot.css similarity index 100% rename from public/themes/dualshot.css rename to static/themes/dualshot.css diff --git a/public/themes/froyo.css b/static/themes/froyo.css similarity index 100% rename from public/themes/froyo.css rename to static/themes/froyo.css diff --git a/public/themes/fundamentals.css b/static/themes/fundamentals.css similarity index 100% rename from public/themes/fundamentals.css rename to static/themes/fundamentals.css diff --git a/public/themes/future_funk.css b/static/themes/future_funk.css similarity index 100% rename from public/themes/future_funk.css rename to static/themes/future_funk.css diff --git a/public/themes/graen.css b/static/themes/graen.css similarity index 100% rename from public/themes/graen.css rename to static/themes/graen.css diff --git a/public/themes/gruvbox_dark.css b/static/themes/gruvbox_dark.css similarity index 100% rename from public/themes/gruvbox_dark.css rename to static/themes/gruvbox_dark.css diff --git a/public/themes/gruvbox_light.css b/static/themes/gruvbox_light.css similarity index 100% rename from public/themes/gruvbox_light.css rename to static/themes/gruvbox_light.css diff --git a/public/themes/hammerhead.css b/static/themes/hammerhead.css similarity index 100% rename from public/themes/hammerhead.css rename to static/themes/hammerhead.css diff --git a/public/themes/honey.css b/static/themes/honey.css similarity index 100% rename from public/themes/honey.css rename to static/themes/honey.css diff --git a/public/themes/ishtar.css b/static/themes/ishtar.css similarity index 100% rename from public/themes/ishtar.css rename to static/themes/ishtar.css diff --git a/public/themes/joker.css b/static/themes/joker.css similarity index 100% rename from public/themes/joker.css rename to static/themes/joker.css diff --git a/public/themes/laser.css b/static/themes/laser.css similarity index 100% rename from public/themes/laser.css rename to static/themes/laser.css diff --git a/public/themes/lil_dragon.css b/static/themes/lil_dragon.css similarity index 100% rename from public/themes/lil_dragon.css rename to static/themes/lil_dragon.css diff --git a/public/themes/lime.css b/static/themes/lime.css similarity index 100% rename from public/themes/lime.css rename to static/themes/lime.css diff --git a/public/themes/list.json b/static/themes/list.json similarity index 100% rename from public/themes/list.json rename to static/themes/list.json diff --git a/public/themes/luna.css b/static/themes/luna.css similarity index 100% rename from public/themes/luna.css rename to static/themes/luna.css diff --git a/public/themes/magic_girl.css b/static/themes/magic_girl.css similarity index 100% rename from public/themes/magic_girl.css rename to static/themes/magic_girl.css diff --git a/public/themes/mashu.css b/static/themes/mashu.css similarity index 100% rename from public/themes/mashu.css rename to static/themes/mashu.css diff --git a/public/themes/matcha_moccha.css b/static/themes/matcha_moccha.css similarity index 100% rename from public/themes/matcha_moccha.css rename to static/themes/matcha_moccha.css diff --git a/public/themes/matrix.css b/static/themes/matrix.css similarity index 100% rename from public/themes/matrix.css rename to static/themes/matrix.css diff --git a/public/themes/menthol.css b/static/themes/menthol.css similarity index 100% rename from public/themes/menthol.css rename to static/themes/menthol.css diff --git a/public/themes/metaverse.css b/static/themes/metaverse.css similarity index 100% rename from public/themes/metaverse.css rename to static/themes/metaverse.css diff --git a/public/themes/metropolis.css b/static/themes/metropolis.css similarity index 100% rename from public/themes/metropolis.css rename to static/themes/metropolis.css diff --git a/public/themes/miami.css b/static/themes/miami.css similarity index 100% rename from public/themes/miami.css rename to static/themes/miami.css diff --git a/public/themes/miami_nights.css b/static/themes/miami_nights.css similarity index 100% rename from public/themes/miami_nights.css rename to static/themes/miami_nights.css diff --git a/public/themes/milkshake.css b/static/themes/milkshake.css similarity index 100% rename from public/themes/milkshake.css rename to static/themes/milkshake.css diff --git a/public/themes/mint.css b/static/themes/mint.css similarity index 100% rename from public/themes/mint.css rename to static/themes/mint.css diff --git a/public/themes/mizu.css b/static/themes/mizu.css similarity index 100% rename from public/themes/mizu.css rename to static/themes/mizu.css diff --git a/public/themes/modern_dolch.css b/static/themes/modern_dolch.css similarity index 100% rename from public/themes/modern_dolch.css rename to static/themes/modern_dolch.css diff --git a/public/themes/monokai.css b/static/themes/monokai.css similarity index 100% rename from public/themes/monokai.css rename to static/themes/monokai.css diff --git a/public/themes/mr_sleeves.css b/static/themes/mr_sleeves.css similarity index 100% rename from public/themes/mr_sleeves.css rename to static/themes/mr_sleeves.css diff --git a/public/themes/ms_cupcakes.css b/static/themes/ms_cupcakes.css similarity index 100% rename from public/themes/ms_cupcakes.css rename to static/themes/ms_cupcakes.css diff --git a/public/themes/nausea.css b/static/themes/nausea.css similarity index 100% rename from public/themes/nausea.css rename to static/themes/nausea.css diff --git a/public/themes/nautilus.css b/static/themes/nautilus.css similarity index 100% rename from public/themes/nautilus.css rename to static/themes/nautilus.css diff --git a/public/themes/nebula.css b/static/themes/nebula.css similarity index 100% rename from public/themes/nebula.css rename to static/themes/nebula.css diff --git a/public/themes/night_runner.css b/static/themes/night_runner.css similarity index 100% rename from public/themes/night_runner.css rename to static/themes/night_runner.css diff --git a/public/themes/nord.css b/static/themes/nord.css similarity index 100% rename from public/themes/nord.css rename to static/themes/nord.css diff --git a/public/themes/norse.css b/static/themes/norse.css similarity index 100% rename from public/themes/norse.css rename to static/themes/norse.css diff --git a/public/themes/oblivion.css b/static/themes/oblivion.css similarity index 100% rename from public/themes/oblivion.css rename to static/themes/oblivion.css diff --git a/public/themes/olive.css b/static/themes/olive.css similarity index 100% rename from public/themes/olive.css rename to static/themes/olive.css diff --git a/public/themes/olivia.css b/static/themes/olivia.css similarity index 100% rename from public/themes/olivia.css rename to static/themes/olivia.css diff --git a/public/themes/paper.css b/static/themes/paper.css similarity index 100% rename from public/themes/paper.css rename to static/themes/paper.css diff --git a/public/themes/pastel.css b/static/themes/pastel.css similarity index 100% rename from public/themes/pastel.css rename to static/themes/pastel.css diff --git a/public/themes/pulse.css b/static/themes/pulse.css similarity index 100% rename from public/themes/pulse.css rename to static/themes/pulse.css diff --git a/public/themes/red_dragon.css b/static/themes/red_dragon.css similarity index 100% rename from public/themes/red_dragon.css rename to static/themes/red_dragon.css diff --git a/public/themes/red_samurai.css b/static/themes/red_samurai.css similarity index 100% rename from public/themes/red_samurai.css rename to static/themes/red_samurai.css diff --git a/public/themes/retro.css b/static/themes/retro.css similarity index 100% rename from public/themes/retro.css rename to static/themes/retro.css diff --git a/public/themes/retrocast.css b/static/themes/retrocast.css similarity index 100% rename from public/themes/retrocast.css rename to static/themes/retrocast.css diff --git a/public/themes/rgb.css b/static/themes/rgb.css similarity index 100% rename from public/themes/rgb.css rename to static/themes/rgb.css diff --git a/public/themes/serika.css b/static/themes/serika.css similarity index 100% rename from public/themes/serika.css rename to static/themes/serika.css diff --git a/public/themes/serika_dark.css b/static/themes/serika_dark.css similarity index 100% rename from public/themes/serika_dark.css rename to static/themes/serika_dark.css diff --git a/public/themes/shadow.css b/static/themes/shadow.css similarity index 100% rename from public/themes/shadow.css rename to static/themes/shadow.css diff --git a/public/themes/shoko.css b/static/themes/shoko.css similarity index 100% rename from public/themes/shoko.css rename to static/themes/shoko.css diff --git a/public/themes/solarized_dark.css b/static/themes/solarized_dark.css similarity index 100% rename from public/themes/solarized_dark.css rename to static/themes/solarized_dark.css diff --git a/public/themes/solarized_light.css b/static/themes/solarized_light.css similarity index 100% rename from public/themes/solarized_light.css rename to static/themes/solarized_light.css diff --git a/public/themes/strawberry.css b/static/themes/strawberry.css similarity index 100% rename from public/themes/strawberry.css rename to static/themes/strawberry.css diff --git a/public/themes/striker.css b/static/themes/striker.css similarity index 100% rename from public/themes/striker.css rename to static/themes/striker.css diff --git a/public/themes/superuser.css b/static/themes/superuser.css similarity index 100% rename from public/themes/superuser.css rename to static/themes/superuser.css diff --git a/public/themes/sweden.css b/static/themes/sweden.css similarity index 100% rename from public/themes/sweden.css rename to static/themes/sweden.css diff --git a/public/themes/taro.css b/static/themes/taro.css similarity index 100% rename from public/themes/taro.css rename to static/themes/taro.css diff --git a/public/themes/terminal.css b/static/themes/terminal.css similarity index 100% rename from public/themes/terminal.css rename to static/themes/terminal.css diff --git a/public/themes/terra.css b/static/themes/terra.css similarity index 100% rename from public/themes/terra.css rename to static/themes/terra.css diff --git a/public/themes/vaporwave.css b/static/themes/vaporwave.css similarity index 100% rename from public/themes/vaporwave.css rename to static/themes/vaporwave.css diff --git a/public/themes/voc.css b/static/themes/voc.css similarity index 100% rename from public/themes/voc.css rename to static/themes/voc.css diff --git a/public/themes/watermelon.css b/static/themes/watermelon.css similarity index 100% rename from public/themes/watermelon.css rename to static/themes/watermelon.css diff --git a/public/themes/wavez.css b/static/themes/wavez.css similarity index 100% rename from public/themes/wavez.css rename to static/themes/wavez.css diff --git a/public/webfonts/fa-brands-400.eot b/static/webfonts/fa-brands-400.eot similarity index 100% rename from public/webfonts/fa-brands-400.eot rename to static/webfonts/fa-brands-400.eot diff --git a/public/webfonts/fa-brands-400.svg b/static/webfonts/fa-brands-400.svg similarity index 100% rename from public/webfonts/fa-brands-400.svg rename to static/webfonts/fa-brands-400.svg diff --git a/public/webfonts/fa-brands-400.ttf b/static/webfonts/fa-brands-400.ttf similarity index 100% rename from public/webfonts/fa-brands-400.ttf rename to static/webfonts/fa-brands-400.ttf diff --git a/public/webfonts/fa-brands-400.woff b/static/webfonts/fa-brands-400.woff similarity index 100% rename from public/webfonts/fa-brands-400.woff rename to static/webfonts/fa-brands-400.woff diff --git a/public/webfonts/fa-brands-400.woff2 b/static/webfonts/fa-brands-400.woff2 similarity index 100% rename from public/webfonts/fa-brands-400.woff2 rename to static/webfonts/fa-brands-400.woff2 diff --git a/public/webfonts/fa-regular-400.eot b/static/webfonts/fa-regular-400.eot similarity index 100% rename from public/webfonts/fa-regular-400.eot rename to static/webfonts/fa-regular-400.eot diff --git a/public/webfonts/fa-regular-400.svg b/static/webfonts/fa-regular-400.svg similarity index 100% rename from public/webfonts/fa-regular-400.svg rename to static/webfonts/fa-regular-400.svg diff --git a/public/webfonts/fa-regular-400.ttf b/static/webfonts/fa-regular-400.ttf similarity index 100% rename from public/webfonts/fa-regular-400.ttf rename to static/webfonts/fa-regular-400.ttf diff --git a/public/webfonts/fa-regular-400.woff b/static/webfonts/fa-regular-400.woff similarity index 100% rename from public/webfonts/fa-regular-400.woff rename to static/webfonts/fa-regular-400.woff diff --git a/public/webfonts/fa-regular-400.woff2 b/static/webfonts/fa-regular-400.woff2 similarity index 100% rename from public/webfonts/fa-regular-400.woff2 rename to static/webfonts/fa-regular-400.woff2 diff --git a/public/webfonts/fa-solid-900.eot b/static/webfonts/fa-solid-900.eot similarity index 100% rename from public/webfonts/fa-solid-900.eot rename to static/webfonts/fa-solid-900.eot diff --git a/public/webfonts/fa-solid-900.svg b/static/webfonts/fa-solid-900.svg similarity index 100% rename from public/webfonts/fa-solid-900.svg rename to static/webfonts/fa-solid-900.svg diff --git a/public/webfonts/fa-solid-900.ttf b/static/webfonts/fa-solid-900.ttf similarity index 100% rename from public/webfonts/fa-solid-900.ttf rename to static/webfonts/fa-solid-900.ttf diff --git a/public/webfonts/fa-solid-900.woff b/static/webfonts/fa-solid-900.woff similarity index 100% rename from public/webfonts/fa-solid-900.woff rename to static/webfonts/fa-solid-900.woff diff --git a/public/webfonts/fa-solid-900.woff2 b/static/webfonts/fa-solid-900.woff2 similarity index 100% rename from public/webfonts/fa-solid-900.woff2 rename to static/webfonts/fa-solid-900.woff2 From d8f9a40edd34c66b19d78dade3bb4281b1e056d4 Mon Sep 17 00:00:00 2001 From: Corey Bergeron Date: Tue, 3 Nov 2020 20:29:47 -0500 Subject: [PATCH 9/9] added enable ads to command line --- package-lock.json | 2 +- src/js/commandline.js | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index cf207e660..d8da575d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "monkeytype", - "version": "1.5.3", + "version": "1.5.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/js/commandline.js b/src/js/commandline.js index 902360d9d..5501af046 100644 --- a/src/js/commandline.js +++ b/src/js/commandline.js @@ -309,6 +309,15 @@ let commands = { toggleShowOutOfFocusWarning(); }, }, + { + id: "setEnableAds", + display: "Set enable ads...", + subgroup: true, + exec: () => { + currentCommands.push(commandsEnableAds); + showCommandLine(); + }, + }, { id: "togglePresetCustomTheme", display: "Toggle preset/custom theme", @@ -758,6 +767,36 @@ let commandsDifficulty = { ], }; +let commandsEnableAds = { + title: "Set enable ads...", + list: [ + { + id: "setEnableAdsOff", + display: "off", + exec: () => { + setEnableAds("off"); + showNotification("Don't forget to refresh the page!", 3000); + }, + }, + { + id: "setEnableAdsOn", + display: "on", + exec: () => { + setEnableAds("on"); + showNotification("Don't forget to refresh the page!", 3000); + }, + }, + { + id: "setEnableMax", + display: "Sellout", + exec: () => { + setEnableAds("max"); + showNotification("Don't forget to refresh the page!", 3000); + }, + }, + ], +}; + let commandsCaretStyle = { title: "Change caret style...", list: [