From 33ca09808e42885360e01895c960ef9c4e979dd7 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Fri, 24 Sep 2021 22:58:23 -0600 Subject: [PATCH] Move everything for the server in to a server folder to make room for the site --- config.template.toml => server/config.template.toml | 0 package-lock.json => server/package-lock.json | 13 +++++++------ package.json => server/package.json | 1 + .../quote-bracket.service | 0 {src => server/src}/constants.ts | 0 .../src}/endpoints/discord/auth/callback.ts | 0 .../src}/endpoints/discord/auth/redirect.ts | 0 {src => server/src}/endpoints/discord/webhook.ts | 0 .../src}/endpoints/management/create_bracket.ts | 0 .../endpoints/management/delete/delete_message.ts | 0 .../management/delete/remove_components.ts | 0 {src => server/src}/endpoints/management/is_tied.ts | 0 .../src}/endpoints/management/view_bracket_data.ts | 0 {src => server/src}/endpoints/management/winners.ts | 0 {src => server/src}/main.ts | 0 {src => server/src}/types/config.d.ts | 0 {src => server/src}/types/database.d.ts | 0 {src => server/src}/types/discord_components.ts | 0 {src => server/src}/types/misc.d.ts | 0 .../src}/utils/components/buttons/count_votes.ts | 0 .../src}/utils/components/buttons/delete_vote.ts | 0 .../src}/utils/components/buttons/my_vote.ts | 0 .../src}/utils/components/buttons/view_db.ts | 0 .../src}/utils/components/dropdowns/select_quote.ts | 0 {src => server/src}/utils/data.ts | 0 {src => server/src}/utils/quotes.ts | 0 26 files changed, 8 insertions(+), 6 deletions(-) rename config.template.toml => server/config.template.toml (100%) rename package-lock.json => server/package-lock.json (98%) rename package.json => server/package.json (97%) rename quote-bracket.service => server/quote-bracket.service (100%) rename {src => server/src}/constants.ts (100%) rename {src => server/src}/endpoints/discord/auth/callback.ts (100%) rename {src => server/src}/endpoints/discord/auth/redirect.ts (100%) rename {src => server/src}/endpoints/discord/webhook.ts (100%) rename {src => server/src}/endpoints/management/create_bracket.ts (100%) rename {src => server/src}/endpoints/management/delete/delete_message.ts (100%) rename {src => server/src}/endpoints/management/delete/remove_components.ts (100%) rename {src => server/src}/endpoints/management/is_tied.ts (100%) rename {src => server/src}/endpoints/management/view_bracket_data.ts (100%) rename {src => server/src}/endpoints/management/winners.ts (100%) rename {src => server/src}/main.ts (100%) rename {src => server/src}/types/config.d.ts (100%) rename {src => server/src}/types/database.d.ts (100%) rename {src => server/src}/types/discord_components.ts (100%) rename {src => server/src}/types/misc.d.ts (100%) rename {src => server/src}/utils/components/buttons/count_votes.ts (100%) rename {src => server/src}/utils/components/buttons/delete_vote.ts (100%) rename {src => server/src}/utils/components/buttons/my_vote.ts (100%) rename {src => server/src}/utils/components/buttons/view_db.ts (100%) rename {src => server/src}/utils/components/dropdowns/select_quote.ts (100%) rename {src => server/src}/utils/data.ts (100%) rename {src => server/src}/utils/quotes.ts (100%) diff --git a/config.template.toml b/server/config.template.toml similarity index 100% rename from config.template.toml rename to server/config.template.toml diff --git a/package-lock.json b/server/package-lock.json similarity index 98% rename from package-lock.json rename to server/package-lock.json index a0a8fab..0e7c223 100644 --- a/package-lock.json +++ b/server/package-lock.json @@ -17,6 +17,7 @@ "@types/node": "^16.3.1", "axios": "^0.21.1", "glob": "^7.1.7", + "joi": "^17.4.2", "module-alias": "^2.2.2", "path": "^0.12.7", "toml": "^3.0.0", @@ -496,9 +497,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/joi": { - "version": "17.4.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.1.tgz", - "integrity": "sha512-gDPOwQ5sr+BUxXuPDGrC1pSNcVR/yGGcTI0aCnjYxZEa3za60K/iCQ+OFIkEHWZGVCUcUlXlFKvMmrlmxrG6UQ==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz", + "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==", "dependencies": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", @@ -1032,9 +1033,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "joi": { - "version": "17.4.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.1.tgz", - "integrity": "sha512-gDPOwQ5sr+BUxXuPDGrC1pSNcVR/yGGcTI0aCnjYxZEa3za60K/iCQ+OFIkEHWZGVCUcUlXlFKvMmrlmxrG6UQ==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz", + "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==", "requires": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", diff --git a/package.json b/server/package.json similarity index 97% rename from package.json rename to server/package.json index cd6aff0..6a62b96 100644 --- a/package.json +++ b/server/package.json @@ -29,6 +29,7 @@ "@types/node": "^16.3.1", "axios": "^0.21.1", "glob": "^7.1.7", + "joi": "^17.4.2", "module-alias": "^2.2.2", "path": "^0.12.7", "toml": "^3.0.0", diff --git a/quote-bracket.service b/server/quote-bracket.service similarity index 100% rename from quote-bracket.service rename to server/quote-bracket.service diff --git a/src/constants.ts b/server/src/constants.ts similarity index 100% rename from src/constants.ts rename to server/src/constants.ts diff --git a/src/endpoints/discord/auth/callback.ts b/server/src/endpoints/discord/auth/callback.ts similarity index 100% rename from src/endpoints/discord/auth/callback.ts rename to server/src/endpoints/discord/auth/callback.ts diff --git a/src/endpoints/discord/auth/redirect.ts b/server/src/endpoints/discord/auth/redirect.ts similarity index 100% rename from src/endpoints/discord/auth/redirect.ts rename to server/src/endpoints/discord/auth/redirect.ts diff --git a/src/endpoints/discord/webhook.ts b/server/src/endpoints/discord/webhook.ts similarity index 100% rename from src/endpoints/discord/webhook.ts rename to server/src/endpoints/discord/webhook.ts diff --git a/src/endpoints/management/create_bracket.ts b/server/src/endpoints/management/create_bracket.ts similarity index 100% rename from src/endpoints/management/create_bracket.ts rename to server/src/endpoints/management/create_bracket.ts diff --git a/src/endpoints/management/delete/delete_message.ts b/server/src/endpoints/management/delete/delete_message.ts similarity index 100% rename from src/endpoints/management/delete/delete_message.ts rename to server/src/endpoints/management/delete/delete_message.ts diff --git a/src/endpoints/management/delete/remove_components.ts b/server/src/endpoints/management/delete/remove_components.ts similarity index 100% rename from src/endpoints/management/delete/remove_components.ts rename to server/src/endpoints/management/delete/remove_components.ts diff --git a/src/endpoints/management/is_tied.ts b/server/src/endpoints/management/is_tied.ts similarity index 100% rename from src/endpoints/management/is_tied.ts rename to server/src/endpoints/management/is_tied.ts diff --git a/src/endpoints/management/view_bracket_data.ts b/server/src/endpoints/management/view_bracket_data.ts similarity index 100% rename from src/endpoints/management/view_bracket_data.ts rename to server/src/endpoints/management/view_bracket_data.ts diff --git a/src/endpoints/management/winners.ts b/server/src/endpoints/management/winners.ts similarity index 100% rename from src/endpoints/management/winners.ts rename to server/src/endpoints/management/winners.ts diff --git a/src/main.ts b/server/src/main.ts similarity index 100% rename from src/main.ts rename to server/src/main.ts diff --git a/src/types/config.d.ts b/server/src/types/config.d.ts similarity index 100% rename from src/types/config.d.ts rename to server/src/types/config.d.ts diff --git a/src/types/database.d.ts b/server/src/types/database.d.ts similarity index 100% rename from src/types/database.d.ts rename to server/src/types/database.d.ts diff --git a/src/types/discord_components.ts b/server/src/types/discord_components.ts similarity index 100% rename from src/types/discord_components.ts rename to server/src/types/discord_components.ts diff --git a/src/types/misc.d.ts b/server/src/types/misc.d.ts similarity index 100% rename from src/types/misc.d.ts rename to server/src/types/misc.d.ts diff --git a/src/utils/components/buttons/count_votes.ts b/server/src/utils/components/buttons/count_votes.ts similarity index 100% rename from src/utils/components/buttons/count_votes.ts rename to server/src/utils/components/buttons/count_votes.ts diff --git a/src/utils/components/buttons/delete_vote.ts b/server/src/utils/components/buttons/delete_vote.ts similarity index 100% rename from src/utils/components/buttons/delete_vote.ts rename to server/src/utils/components/buttons/delete_vote.ts diff --git a/src/utils/components/buttons/my_vote.ts b/server/src/utils/components/buttons/my_vote.ts similarity index 100% rename from src/utils/components/buttons/my_vote.ts rename to server/src/utils/components/buttons/my_vote.ts diff --git a/src/utils/components/buttons/view_db.ts b/server/src/utils/components/buttons/view_db.ts similarity index 100% rename from src/utils/components/buttons/view_db.ts rename to server/src/utils/components/buttons/view_db.ts diff --git a/src/utils/components/dropdowns/select_quote.ts b/server/src/utils/components/dropdowns/select_quote.ts similarity index 100% rename from src/utils/components/dropdowns/select_quote.ts rename to server/src/utils/components/dropdowns/select_quote.ts diff --git a/src/utils/data.ts b/server/src/utils/data.ts similarity index 100% rename from src/utils/data.ts rename to server/src/utils/data.ts diff --git a/src/utils/quotes.ts b/server/src/utils/quotes.ts similarity index 100% rename from src/utils/quotes.ts rename to server/src/utils/quotes.ts