diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index 66300f73f..850e6d9cf 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -22,7 +22,7 @@ task("clean", function () { }); task("lint", function () { - return src(["./src/js/**/*.js", "./src/js/**/*.ts"]) + return src(["./src/scripts/**/*.js", "./src/scripts/**/*.ts"]) .pipe(eslint(eslintConfig)) .pipe(eslint.format()) .pipe(eslint.failAfterError()); @@ -36,7 +36,7 @@ task("lint-json", function () { }); task("copy-src-contents", function () { - return src("./src/js/**").pipe(dest("./dist/")); + return src("./src/scripts/**").pipe(dest("./dist/")); }); task("transpile-ts", function () { @@ -76,7 +76,7 @@ task("static", function () { }); task("sass", function () { - return src("./src/sass/*.scss") + return src("./src/styles/*.scss") .pipe(concat("style.scss")) .pipe(sass({ outputStyle: "compressed" }).on("error", sass.logError)) .pipe(dest("public/css")); @@ -144,9 +144,9 @@ task( ); task("watch", function () { - watch("./src/sass/**/*.scss", series("sass")); + watch("./src/styles/**/*.scss", series("sass")); watch( - ["./src/js/**/*.js", "./src/js/**/*.ts"], + ["./src/scripts/**/*.js", "./src/scripts/**/*.ts"], series("lint", "copy-src-contents", "transpile-ts", "webpack") ); watch("./static/**/*.*", series("lint-json", "static")); diff --git a/frontend/src/js/account/all-time-stats.js b/frontend/src/scripts/account/all-time-stats.js similarity index 100% rename from frontend/src/js/account/all-time-stats.js rename to frontend/src/scripts/account/all-time-stats.js diff --git a/frontend/src/js/account/mini-result-chart.js b/frontend/src/scripts/account/mini-result-chart.js similarity index 100% rename from frontend/src/js/account/mini-result-chart.js rename to frontend/src/scripts/account/mini-result-chart.js diff --git a/frontend/src/js/account/pb-tables.js b/frontend/src/scripts/account/pb-tables.js similarity index 100% rename from frontend/src/js/account/pb-tables.js rename to frontend/src/scripts/account/pb-tables.js diff --git a/frontend/src/js/account/result-filters.js b/frontend/src/scripts/account/result-filters.js similarity index 100% rename from frontend/src/js/account/result-filters.js rename to frontend/src/scripts/account/result-filters.js diff --git a/frontend/src/js/account/sign-out-button.js b/frontend/src/scripts/account/sign-out-button.js similarity index 100% rename from frontend/src/js/account/sign-out-button.js rename to frontend/src/scripts/account/sign-out-button.js diff --git a/frontend/src/js/axios-instance.ts b/frontend/src/scripts/axios-instance.ts similarity index 100% rename from frontend/src/js/axios-instance.ts rename to frontend/src/scripts/axios-instance.ts diff --git a/frontend/src/js/config.js b/frontend/src/scripts/config.js similarity index 100% rename from frontend/src/js/config.js rename to frontend/src/scripts/config.js diff --git a/frontend/src/js/controllers/account-controller.js b/frontend/src/scripts/controllers/account-controller.js similarity index 100% rename from frontend/src/js/controllers/account-controller.js rename to frontend/src/scripts/controllers/account-controller.js diff --git a/frontend/src/js/controllers/challenge-controller.js b/frontend/src/scripts/controllers/challenge-controller.js similarity index 100% rename from frontend/src/js/controllers/challenge-controller.js rename to frontend/src/scripts/controllers/challenge-controller.js diff --git a/frontend/src/js/controllers/chart-controller.js b/frontend/src/scripts/controllers/chart-controller.js similarity index 100% rename from frontend/src/js/controllers/chart-controller.js rename to frontend/src/scripts/controllers/chart-controller.js diff --git a/frontend/src/js/controllers/input-controller.js b/frontend/src/scripts/controllers/input-controller.js similarity index 100% rename from frontend/src/js/controllers/input-controller.js rename to frontend/src/scripts/controllers/input-controller.js diff --git a/frontend/src/js/controllers/page-controller.js b/frontend/src/scripts/controllers/page-controller.js similarity index 100% rename from frontend/src/js/controllers/page-controller.js rename to frontend/src/scripts/controllers/page-controller.js diff --git a/frontend/src/js/controllers/preset-controller.js b/frontend/src/scripts/controllers/preset-controller.js similarity index 100% rename from frontend/src/js/controllers/preset-controller.js rename to frontend/src/scripts/controllers/preset-controller.js diff --git a/frontend/src/js/controllers/route-controller.js b/frontend/src/scripts/controllers/route-controller.js similarity index 100% rename from frontend/src/js/controllers/route-controller.js rename to frontend/src/scripts/controllers/route-controller.js diff --git a/frontend/src/js/controllers/sound-controller.js b/frontend/src/scripts/controllers/sound-controller.js similarity index 100% rename from frontend/src/js/controllers/sound-controller.js rename to frontend/src/scripts/controllers/sound-controller.js diff --git a/frontend/src/js/controllers/tag-controller.js b/frontend/src/scripts/controllers/tag-controller.js similarity index 100% rename from frontend/src/js/controllers/tag-controller.js rename to frontend/src/scripts/controllers/tag-controller.js diff --git a/frontend/src/js/controllers/theme-controller.js b/frontend/src/scripts/controllers/theme-controller.js similarity index 100% rename from frontend/src/js/controllers/theme-controller.js rename to frontend/src/scripts/controllers/theme-controller.js diff --git a/frontend/src/js/controllers/verification-controller.js b/frontend/src/scripts/controllers/verification-controller.js similarity index 100% rename from frontend/src/js/controllers/verification-controller.js rename to frontend/src/scripts/controllers/verification-controller.js diff --git a/frontend/src/js/db.js b/frontend/src/scripts/db.js similarity index 100% rename from frontend/src/js/db.js rename to frontend/src/scripts/db.js diff --git a/frontend/src/js/elements/account-button.js b/frontend/src/scripts/elements/account-button.js similarity index 100% rename from frontend/src/js/elements/account-button.js rename to frontend/src/scripts/elements/account-button.js diff --git a/frontend/src/js/elements/commandline-lists.js b/frontend/src/scripts/elements/commandline-lists.js similarity index 100% rename from frontend/src/js/elements/commandline-lists.js rename to frontend/src/scripts/elements/commandline-lists.js diff --git a/frontend/src/js/elements/commandline.js b/frontend/src/scripts/elements/commandline.js similarity index 100% rename from frontend/src/js/elements/commandline.js rename to frontend/src/scripts/elements/commandline.js diff --git a/frontend/src/js/elements/custom-background-filter.js b/frontend/src/scripts/elements/custom-background-filter.js similarity index 100% rename from frontend/src/js/elements/custom-background-filter.js rename to frontend/src/scripts/elements/custom-background-filter.js diff --git a/frontend/src/js/elements/keymap.js b/frontend/src/scripts/elements/keymap.js similarity index 100% rename from frontend/src/js/elements/keymap.js rename to frontend/src/scripts/elements/keymap.js diff --git a/frontend/src/js/elements/leaderboards.js b/frontend/src/scripts/elements/leaderboards.js similarity index 100% rename from frontend/src/js/elements/leaderboards.js rename to frontend/src/scripts/elements/leaderboards.js diff --git a/frontend/src/js/elements/loader.js b/frontend/src/scripts/elements/loader.js similarity index 100% rename from frontend/src/js/elements/loader.js rename to frontend/src/scripts/elements/loader.js diff --git a/frontend/src/js/elements/modes-notice.js b/frontend/src/scripts/elements/modes-notice.js similarity index 100% rename from frontend/src/js/elements/modes-notice.js rename to frontend/src/scripts/elements/modes-notice.js diff --git a/frontend/src/js/elements/monkey-power.js b/frontend/src/scripts/elements/monkey-power.js similarity index 100% rename from frontend/src/js/elements/monkey-power.js rename to frontend/src/scripts/elements/monkey-power.js diff --git a/frontend/src/js/elements/notifications.js b/frontend/src/scripts/elements/notifications.js similarity index 100% rename from frontend/src/js/elements/notifications.js rename to frontend/src/scripts/elements/notifications.js diff --git a/frontend/src/js/elements/psa.js b/frontend/src/scripts/elements/psa.js similarity index 100% rename from frontend/src/js/elements/psa.js rename to frontend/src/scripts/elements/psa.js diff --git a/frontend/src/js/elements/scroll-to-top.js b/frontend/src/scripts/elements/scroll-to-top.js similarity index 100% rename from frontend/src/js/elements/scroll-to-top.js rename to frontend/src/scripts/elements/scroll-to-top.js diff --git a/frontend/src/js/elements/theme-colors.js b/frontend/src/scripts/elements/theme-colors.js similarity index 100% rename from frontend/src/js/elements/theme-colors.js rename to frontend/src/scripts/elements/theme-colors.js diff --git a/frontend/src/js/elements/version-check.js b/frontend/src/scripts/elements/version-check.js similarity index 100% rename from frontend/src/js/elements/version-check.js rename to frontend/src/scripts/elements/version-check.js diff --git a/frontend/src/js/index.js b/frontend/src/scripts/index.js similarity index 100% rename from frontend/src/js/index.js rename to frontend/src/scripts/index.js diff --git a/frontend/src/js/misc.ts b/frontend/src/scripts/misc.ts similarity index 99% rename from frontend/src/js/misc.ts rename to frontend/src/scripts/misc.ts index c48a38500..01d715157 100644 --- a/frontend/src/js/misc.ts +++ b/frontend/src/scripts/misc.ts @@ -1,6 +1,6 @@ // @ts-ignore import * as Loader from "./elements/loader"; -import * as Types from "../types/interfaces"; +import * as Types from "./types/interfaces"; export function getuid(): void { console.error("Only share this uid with Miodec and nobody else!"); diff --git a/frontend/src/js/modules.d.ts b/frontend/src/scripts/modules.d.ts similarity index 100% rename from frontend/src/js/modules.d.ts rename to frontend/src/scripts/modules.d.ts diff --git a/frontend/src/js/observables/config-event.ts b/frontend/src/scripts/observables/config-event.ts similarity index 100% rename from frontend/src/js/observables/config-event.ts rename to frontend/src/scripts/observables/config-event.ts diff --git a/frontend/src/js/observables/timer-event.ts b/frontend/src/scripts/observables/timer-event.ts similarity index 100% rename from frontend/src/js/observables/timer-event.ts rename to frontend/src/scripts/observables/timer-event.ts diff --git a/frontend/src/js/pages/about.js b/frontend/src/scripts/pages/about.js similarity index 100% rename from frontend/src/js/pages/about.js rename to frontend/src/scripts/pages/about.js diff --git a/frontend/src/js/pages/account.js b/frontend/src/scripts/pages/account.js similarity index 100% rename from frontend/src/js/pages/account.js rename to frontend/src/scripts/pages/account.js diff --git a/frontend/src/js/pages/loading.js b/frontend/src/scripts/pages/loading.js similarity index 100% rename from frontend/src/js/pages/loading.js rename to frontend/src/scripts/pages/loading.js diff --git a/frontend/src/js/pages/login.js b/frontend/src/scripts/pages/login.js similarity index 100% rename from frontend/src/js/pages/login.js rename to frontend/src/scripts/pages/login.js diff --git a/frontend/src/js/pages/page.js b/frontend/src/scripts/pages/page.js similarity index 100% rename from frontend/src/js/pages/page.js rename to frontend/src/scripts/pages/page.js diff --git a/frontend/src/js/pages/settings.js b/frontend/src/scripts/pages/settings.js similarity index 100% rename from frontend/src/js/pages/settings.js rename to frontend/src/scripts/pages/settings.js diff --git a/frontend/src/js/pages/test.js b/frontend/src/scripts/pages/test.js similarity index 100% rename from frontend/src/js/pages/test.js rename to frontend/src/scripts/pages/test.js diff --git a/frontend/src/js/popups/contact-popup.js b/frontend/src/scripts/popups/contact-popup.js similarity index 100% rename from frontend/src/js/popups/contact-popup.js rename to frontend/src/scripts/popups/contact-popup.js diff --git a/frontend/src/js/popups/custom-test-duration-popup.js b/frontend/src/scripts/popups/custom-test-duration-popup.js similarity index 100% rename from frontend/src/js/popups/custom-test-duration-popup.js rename to frontend/src/scripts/popups/custom-test-duration-popup.js diff --git a/frontend/src/js/popups/custom-text-popup.js b/frontend/src/scripts/popups/custom-text-popup.js similarity index 100% rename from frontend/src/js/popups/custom-text-popup.js rename to frontend/src/scripts/popups/custom-text-popup.js diff --git a/frontend/src/js/popups/custom-theme-popup.js b/frontend/src/scripts/popups/custom-theme-popup.js similarity index 100% rename from frontend/src/js/popups/custom-theme-popup.js rename to frontend/src/scripts/popups/custom-theme-popup.js diff --git a/frontend/src/js/popups/custom-word-amount-popup.js b/frontend/src/scripts/popups/custom-word-amount-popup.js similarity index 100% rename from frontend/src/js/popups/custom-word-amount-popup.js rename to frontend/src/scripts/popups/custom-word-amount-popup.js diff --git a/frontend/src/js/popups/edit-preset-popup.js b/frontend/src/scripts/popups/edit-preset-popup.js similarity index 100% rename from frontend/src/js/popups/edit-preset-popup.js rename to frontend/src/scripts/popups/edit-preset-popup.js diff --git a/frontend/src/js/popups/edit-tags-popup.js b/frontend/src/scripts/popups/edit-tags-popup.js similarity index 100% rename from frontend/src/js/popups/edit-tags-popup.js rename to frontend/src/scripts/popups/edit-tags-popup.js diff --git a/frontend/src/js/popups/import-export-settings-popup.js b/frontend/src/scripts/popups/import-export-settings-popup.js similarity index 100% rename from frontend/src/js/popups/import-export-settings-popup.js rename to frontend/src/scripts/popups/import-export-settings-popup.js diff --git a/frontend/src/js/popups/mobile-test-config-popup.js b/frontend/src/scripts/popups/mobile-test-config-popup.js similarity index 100% rename from frontend/src/js/popups/mobile-test-config-popup.js rename to frontend/src/scripts/popups/mobile-test-config-popup.js diff --git a/frontend/src/js/popups/pb-tables-popup.js b/frontend/src/scripts/popups/pb-tables-popup.js similarity index 100% rename from frontend/src/js/popups/pb-tables-popup.js rename to frontend/src/scripts/popups/pb-tables-popup.js diff --git a/frontend/src/js/popups/quote-approve-popup.js b/frontend/src/scripts/popups/quote-approve-popup.js similarity index 100% rename from frontend/src/js/popups/quote-approve-popup.js rename to frontend/src/scripts/popups/quote-approve-popup.js diff --git a/frontend/src/js/popups/quote-rate-popup.js b/frontend/src/scripts/popups/quote-rate-popup.js similarity index 100% rename from frontend/src/js/popups/quote-rate-popup.js rename to frontend/src/scripts/popups/quote-rate-popup.js diff --git a/frontend/src/js/popups/quote-report-popup.js b/frontend/src/scripts/popups/quote-report-popup.js similarity index 100% rename from frontend/src/js/popups/quote-report-popup.js rename to frontend/src/scripts/popups/quote-report-popup.js diff --git a/frontend/src/js/popups/quote-search-popup.js b/frontend/src/scripts/popups/quote-search-popup.js similarity index 100% rename from frontend/src/js/popups/quote-search-popup.js rename to frontend/src/scripts/popups/quote-search-popup.js diff --git a/frontend/src/js/popups/quote-submit-popup.js b/frontend/src/scripts/popups/quote-submit-popup.js similarity index 100% rename from frontend/src/js/popups/quote-submit-popup.js rename to frontend/src/scripts/popups/quote-submit-popup.js diff --git a/frontend/src/js/popups/result-tags-popup.js b/frontend/src/scripts/popups/result-tags-popup.js similarity index 100% rename from frontend/src/js/popups/result-tags-popup.js rename to frontend/src/scripts/popups/result-tags-popup.js diff --git a/frontend/src/js/popups/simple-popups.js b/frontend/src/scripts/popups/simple-popups.js similarity index 100% rename from frontend/src/js/popups/simple-popups.js rename to frontend/src/scripts/popups/simple-popups.js diff --git a/frontend/src/js/popups/support-popup.js b/frontend/src/scripts/popups/support-popup.js similarity index 100% rename from frontend/src/js/popups/support-popup.js rename to frontend/src/scripts/popups/support-popup.js diff --git a/frontend/src/js/popups/version-popup.js b/frontend/src/scripts/popups/version-popup.js similarity index 100% rename from frontend/src/js/popups/version-popup.js rename to frontend/src/scripts/popups/version-popup.js diff --git a/frontend/src/js/popups/word-filter-popup.js b/frontend/src/scripts/popups/word-filter-popup.js similarity index 100% rename from frontend/src/js/popups/word-filter-popup.js rename to frontend/src/scripts/popups/word-filter-popup.js diff --git a/frontend/src/js/ready.js b/frontend/src/scripts/ready.js similarity index 100% rename from frontend/src/js/ready.js rename to frontend/src/scripts/ready.js diff --git a/frontend/src/js/settings/language-picker.js b/frontend/src/scripts/settings/language-picker.js similarity index 100% rename from frontend/src/js/settings/language-picker.js rename to frontend/src/scripts/settings/language-picker.js diff --git a/frontend/src/js/settings/settings-group.js b/frontend/src/scripts/settings/settings-group.js similarity index 100% rename from frontend/src/js/settings/settings-group.js rename to frontend/src/scripts/settings/settings-group.js diff --git a/frontend/src/js/settings/theme-picker.js b/frontend/src/scripts/settings/theme-picker.js similarity index 100% rename from frontend/src/js/settings/theme-picker.js rename to frontend/src/scripts/settings/theme-picker.js diff --git a/frontend/src/js/states/active-page.ts b/frontend/src/scripts/states/active-page.ts similarity index 100% rename from frontend/src/js/states/active-page.ts rename to frontend/src/scripts/states/active-page.ts diff --git a/frontend/src/js/states/glarses-mode.ts b/frontend/src/scripts/states/glarses-mode.ts similarity index 100% rename from frontend/src/js/states/glarses-mode.ts rename to frontend/src/scripts/states/glarses-mode.ts diff --git a/frontend/src/js/states/page-transition.ts b/frontend/src/scripts/states/page-transition.ts similarity index 100% rename from frontend/src/js/states/page-transition.ts rename to frontend/src/scripts/states/page-transition.ts diff --git a/frontend/src/js/states/slow-timer.ts b/frontend/src/scripts/states/slow-timer.ts similarity index 100% rename from frontend/src/js/states/slow-timer.ts rename to frontend/src/scripts/states/slow-timer.ts diff --git a/frontend/src/js/states/test-active.ts b/frontend/src/scripts/states/test-active.ts similarity index 100% rename from frontend/src/js/states/test-active.ts rename to frontend/src/scripts/states/test-active.ts diff --git a/frontend/src/js/states/time.ts b/frontend/src/scripts/states/time.ts similarity index 100% rename from frontend/src/js/states/time.ts rename to frontend/src/scripts/states/time.ts diff --git a/frontend/src/js/test/british-english.js b/frontend/src/scripts/test/british-english.js similarity index 100% rename from frontend/src/js/test/british-english.js rename to frontend/src/scripts/test/british-english.js diff --git a/frontend/src/js/test/caps-warning.js b/frontend/src/scripts/test/caps-warning.js similarity index 100% rename from frontend/src/js/test/caps-warning.js rename to frontend/src/scripts/test/caps-warning.js diff --git a/frontend/src/js/test/caret.js b/frontend/src/scripts/test/caret.js similarity index 100% rename from frontend/src/js/test/caret.js rename to frontend/src/scripts/test/caret.js diff --git a/frontend/src/js/test/custom-text.js b/frontend/src/scripts/test/custom-text.js similarity index 100% rename from frontend/src/js/test/custom-text.js rename to frontend/src/scripts/test/custom-text.js diff --git a/frontend/src/js/test/focus.ts b/frontend/src/scripts/test/focus.ts similarity index 100% rename from frontend/src/js/test/focus.ts rename to frontend/src/scripts/test/focus.ts diff --git a/frontend/src/js/test/funbox.js b/frontend/src/scripts/test/funbox.js similarity index 100% rename from frontend/src/js/test/funbox.js rename to frontend/src/scripts/test/funbox.js diff --git a/frontend/src/js/test/layout-emulator.js b/frontend/src/scripts/test/layout-emulator.js similarity index 100% rename from frontend/src/js/test/layout-emulator.js rename to frontend/src/scripts/test/layout-emulator.js diff --git a/frontend/src/js/test/layouts.js b/frontend/src/scripts/test/layouts.js similarity index 100% rename from frontend/src/js/test/layouts.js rename to frontend/src/scripts/test/layouts.js diff --git a/frontend/src/js/test/lazy-mode.js b/frontend/src/scripts/test/lazy-mode.js similarity index 100% rename from frontend/src/js/test/lazy-mode.js rename to frontend/src/scripts/test/lazy-mode.js diff --git a/frontend/src/js/test/live-acc.js b/frontend/src/scripts/test/live-acc.js similarity index 100% rename from frontend/src/js/test/live-acc.js rename to frontend/src/scripts/test/live-acc.js diff --git a/frontend/src/js/test/live-burst.js b/frontend/src/scripts/test/live-burst.js similarity index 100% rename from frontend/src/js/test/live-burst.js rename to frontend/src/scripts/test/live-burst.js diff --git a/frontend/src/js/test/live-wpm.js b/frontend/src/scripts/test/live-wpm.js similarity index 100% rename from frontend/src/js/test/live-wpm.js rename to frontend/src/scripts/test/live-wpm.js diff --git a/frontend/src/js/test/manual-restart-tracker.js b/frontend/src/scripts/test/manual-restart-tracker.js similarity index 100% rename from frontend/src/js/test/manual-restart-tracker.js rename to frontend/src/scripts/test/manual-restart-tracker.js diff --git a/frontend/src/js/test/monkey.js b/frontend/src/scripts/test/monkey.js similarity index 100% rename from frontend/src/js/test/monkey.js rename to frontend/src/scripts/test/monkey.js diff --git a/frontend/src/js/test/out-of-focus.js b/frontend/src/scripts/test/out-of-focus.js similarity index 100% rename from frontend/src/js/test/out-of-focus.js rename to frontend/src/scripts/test/out-of-focus.js diff --git a/frontend/src/js/test/pace-caret.js b/frontend/src/scripts/test/pace-caret.js similarity index 100% rename from frontend/src/js/test/pace-caret.js rename to frontend/src/scripts/test/pace-caret.js diff --git a/frontend/src/js/test/pb-crown.js b/frontend/src/scripts/test/pb-crown.js similarity index 100% rename from frontend/src/js/test/pb-crown.js rename to frontend/src/scripts/test/pb-crown.js diff --git a/frontend/src/js/test/poetry.js b/frontend/src/scripts/test/poetry.js similarity index 100% rename from frontend/src/js/test/poetry.js rename to frontend/src/scripts/test/poetry.js diff --git a/frontend/src/js/test/practise-words.js b/frontend/src/scripts/test/practise-words.js similarity index 100% rename from frontend/src/js/test/practise-words.js rename to frontend/src/scripts/test/practise-words.js diff --git a/frontend/src/js/test/replay.js b/frontend/src/scripts/test/replay.js similarity index 100% rename from frontend/src/js/test/replay.js rename to frontend/src/scripts/test/replay.js diff --git a/frontend/src/js/test/result.js b/frontend/src/scripts/test/result.js similarity index 100% rename from frontend/src/js/test/result.js rename to frontend/src/scripts/test/result.js diff --git a/frontend/src/js/test/shift-tracker.js b/frontend/src/scripts/test/shift-tracker.js similarity index 100% rename from frontend/src/js/test/shift-tracker.js rename to frontend/src/scripts/test/shift-tracker.js diff --git a/frontend/src/js/test/test-config.js b/frontend/src/scripts/test/test-config.js similarity index 100% rename from frontend/src/js/test/test-config.js rename to frontend/src/scripts/test/test-config.js diff --git a/frontend/src/js/test/test-input.js b/frontend/src/scripts/test/test-input.js similarity index 100% rename from frontend/src/js/test/test-input.js rename to frontend/src/scripts/test/test-input.js diff --git a/frontend/src/js/test/test-logic.js b/frontend/src/scripts/test/test-logic.js similarity index 100% rename from frontend/src/js/test/test-logic.js rename to frontend/src/scripts/test/test-logic.js diff --git a/frontend/src/js/test/test-state.js b/frontend/src/scripts/test/test-state.js similarity index 100% rename from frontend/src/js/test/test-state.js rename to frontend/src/scripts/test/test-state.js diff --git a/frontend/src/js/test/test-stats.js b/frontend/src/scripts/test/test-stats.js similarity index 100% rename from frontend/src/js/test/test-stats.js rename to frontend/src/scripts/test/test-stats.js diff --git a/frontend/src/js/test/test-timer.js b/frontend/src/scripts/test/test-timer.js similarity index 100% rename from frontend/src/js/test/test-timer.js rename to frontend/src/scripts/test/test-timer.js diff --git a/frontend/src/js/test/test-ui.js b/frontend/src/scripts/test/test-ui.js similarity index 100% rename from frontend/src/js/test/test-ui.js rename to frontend/src/scripts/test/test-ui.js diff --git a/frontend/src/js/test/test-words.js b/frontend/src/scripts/test/test-words.js similarity index 100% rename from frontend/src/js/test/test-words.js rename to frontend/src/scripts/test/test-words.js diff --git a/frontend/src/js/test/timer-progress.js b/frontend/src/scripts/test/timer-progress.js similarity index 100% rename from frontend/src/js/test/timer-progress.js rename to frontend/src/scripts/test/timer-progress.js diff --git a/frontend/src/js/test/today-tracker.js b/frontend/src/scripts/test/today-tracker.js similarity index 100% rename from frontend/src/js/test/today-tracker.js rename to frontend/src/scripts/test/today-tracker.js diff --git a/frontend/src/js/test/tts.js b/frontend/src/scripts/test/tts.js similarity index 100% rename from frontend/src/js/test/tts.js rename to frontend/src/scripts/test/tts.js diff --git a/frontend/src/js/test/weak-spot.js b/frontend/src/scripts/test/weak-spot.js similarity index 100% rename from frontend/src/js/test/weak-spot.js rename to frontend/src/scripts/test/weak-spot.js diff --git a/frontend/src/js/test/wikipedia.js b/frontend/src/scripts/test/wikipedia.js similarity index 100% rename from frontend/src/js/test/wikipedia.js rename to frontend/src/scripts/test/wikipedia.js diff --git a/frontend/src/js/test/wordset.js b/frontend/src/scripts/test/wordset.js similarity index 100% rename from frontend/src/js/test/wordset.js rename to frontend/src/scripts/test/wordset.js diff --git a/frontend/src/types/interfaces.ts b/frontend/src/scripts/types/interfaces.ts similarity index 100% rename from frontend/src/types/interfaces.ts rename to frontend/src/scripts/types/interfaces.ts diff --git a/frontend/src/js/ui.ts b/frontend/src/scripts/ui.ts similarity index 100% rename from frontend/src/js/ui.ts rename to frontend/src/scripts/ui.ts diff --git a/frontend/src/sass/about.scss b/frontend/src/styles/about.scss similarity index 100% rename from frontend/src/sass/about.scss rename to frontend/src/styles/about.scss diff --git a/frontend/src/sass/account.scss b/frontend/src/styles/account.scss similarity index 100% rename from frontend/src/sass/account.scss rename to frontend/src/styles/account.scss diff --git a/frontend/src/sass/animations.scss b/frontend/src/styles/animations.scss similarity index 100% rename from frontend/src/sass/animations.scss rename to frontend/src/styles/animations.scss diff --git a/frontend/src/sass/banners.scss b/frontend/src/styles/banners.scss similarity index 100% rename from frontend/src/sass/banners.scss rename to frontend/src/styles/banners.scss diff --git a/frontend/src/sass/caret.scss b/frontend/src/styles/caret.scss similarity index 100% rename from frontend/src/sass/caret.scss rename to frontend/src/styles/caret.scss diff --git a/frontend/src/sass/commandline.scss b/frontend/src/styles/commandline.scss similarity index 100% rename from frontend/src/sass/commandline.scss rename to frontend/src/styles/commandline.scss diff --git a/frontend/src/sass/core.scss b/frontend/src/styles/core.scss similarity index 100% rename from frontend/src/sass/core.scss rename to frontend/src/styles/core.scss diff --git a/frontend/src/sass/footer.scss b/frontend/src/styles/footer.scss similarity index 100% rename from frontend/src/sass/footer.scss rename to frontend/src/styles/footer.scss diff --git a/frontend/src/sass/inputs.scss b/frontend/src/styles/inputs.scss similarity index 100% rename from frontend/src/sass/inputs.scss rename to frontend/src/styles/inputs.scss diff --git a/frontend/src/sass/keymap.scss b/frontend/src/styles/keymap.scss similarity index 100% rename from frontend/src/sass/keymap.scss rename to frontend/src/styles/keymap.scss diff --git a/frontend/src/sass/leaderboards.scss b/frontend/src/styles/leaderboards.scss similarity index 100% rename from frontend/src/sass/leaderboards.scss rename to frontend/src/styles/leaderboards.scss diff --git a/frontend/src/sass/login.scss b/frontend/src/styles/login.scss similarity index 100% rename from frontend/src/sass/login.scss rename to frontend/src/styles/login.scss diff --git a/frontend/src/sass/monkey.scss b/frontend/src/styles/monkey.scss similarity index 100% rename from frontend/src/sass/monkey.scss rename to frontend/src/styles/monkey.scss diff --git a/frontend/src/sass/nav.scss b/frontend/src/styles/nav.scss similarity index 100% rename from frontend/src/sass/nav.scss rename to frontend/src/styles/nav.scss diff --git a/frontend/src/sass/notifications.scss b/frontend/src/styles/notifications.scss similarity index 100% rename from frontend/src/sass/notifications.scss rename to frontend/src/styles/notifications.scss diff --git a/frontend/src/sass/popups.scss b/frontend/src/styles/popups.scss similarity index 100% rename from frontend/src/sass/popups.scss rename to frontend/src/styles/popups.scss diff --git a/frontend/src/sass/scroll.scss b/frontend/src/styles/scroll.scss similarity index 100% rename from frontend/src/sass/scroll.scss rename to frontend/src/styles/scroll.scss diff --git a/frontend/src/sass/settings.scss b/frontend/src/styles/settings.scss similarity index 100% rename from frontend/src/sass/settings.scss rename to frontend/src/styles/settings.scss diff --git a/frontend/src/sass/test.scss b/frontend/src/styles/test.scss similarity index 100% rename from frontend/src/sass/test.scss rename to frontend/src/styles/test.scss diff --git a/frontend/src/sass/z_media-queries.scss b/frontend/src/styles/z_media-queries.scss similarity index 100% rename from frontend/src/sass/z_media-queries.scss rename to frontend/src/styles/z_media-queries.scss diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 6ce5f50e7..e09362a08 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -8,5 +8,5 @@ "forceConsistentCasingInFileNames": true }, "include": ["./src/**/*.ts"], - "files": ["./src/js/modules.d.ts"] + "files": ["src/scripts/modules.d.ts"] } diff --git a/frontend/webpack-production.config.js b/frontend/webpack-production.config.js index 5b9cff821..4d3ae3772 100644 --- a/frontend/webpack-production.config.js +++ b/frontend/webpack-production.config.js @@ -32,7 +32,7 @@ module.exports = { ], }, output: { - path: path.resolve(__dirname, "public/js/"), + path: path.resolve(__dirname, "public/scripts/"), filename: "monkeytype.js", }, plugins: [ diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index 6586481c8..a3e40e472 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -15,7 +15,7 @@ module.exports = { }, }, output: { - path: path.resolve(__dirname, "public/js/"), + path: path.resolve(__dirname, "public/scripts/"), filename: "monkeytype.js", }, plugins: [ diff --git a/package.json b/package.json index 0cde065da..dde3c37ac 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "start:dev:fe": "cd frontend && npm run start:dev", "deploy:live": "cd frontend && npm run deploy:live", "install:all": "sh ./bin/install.sh", - "lint": "./node_modules/.bin/eslint './backend/**/*.js' './frontend/src/js/**/*.js'", + "lint": "./node_modules/.bin/eslint './backend/**/*.js' './frontend/src/scripts/**/*.js'", "pretty": "prettier --check './backend/**/*.js' './frontend/src/**/*.{js,scss}' './frontend/static/**/*.{json,html}'", "webpack": "cd frontend && npx webpack --config webpack.config.js" },