diff --git a/gulpfile.js b/gulpfile.js index fc17cf534..a5dfe092f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -110,7 +110,7 @@ task("sass", function () { }); task("static", function () { - return src("./public/**/*").pipe(dest("./dist/")); + return src("./static/**/*").pipe(dest("./dist/")); }); task("clean", function () { @@ -120,7 +120,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")); diff --git a/package-lock.json b/package-lock.json index 6a0264850..4b740b233 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/package.json b/package.json index bcd2a4bba..c4f42b949 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,15 @@ { "name": "monkeytype", - "version": "1.5.3", + "version": "1.5.6", "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" diff --git a/src/js/commandline.js b/src/js/commandline.js index 0d4b7c513..a3a6cd16f 100644 --- a/src/js/commandline.js +++ b/src/js/commandline.js @@ -305,6 +305,15 @@ let commands = { toggleShowOutOfFocusWarning(); }, }, + { + id: "setEnableAds", + display: "Set enable ads...", + subgroup: true, + exec: () => { + currentCommands.push(commandsEnableAds); + showCommandLine(); + }, + }, { id: "togglePresetCustomTheme", display: "Toggle preset/custom theme", @@ -754,6 +763,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: [ diff --git a/src/js/script.js b/src/js/script.js index 652739721..d732922d6 100644 --- a/src/js/script.js +++ b/src/js/script.js @@ -1773,7 +1773,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( @@ -1795,7 +1794,7 @@ function showResult(difficultyFailed = false) { $("#result .stats .wpm .top .text").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)); diff --git a/src/js/userconfig.js b/src/js/userconfig.js index c835661e0..3e48b6938 100644 --- a/src/js/userconfig.js +++ b/src/js/userconfig.js @@ -641,10 +641,7 @@ function setEnableAds(val, nosave) { val = "off"; } config.enableAds = val; - if (!nosave) - saveConfigToCookie().then(() => { - setTimeout(location.reload(), 500); - }); + if (!nosave) saveConfigToCookie(); } //flip colors 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