Merge pull request #15 from approvers/feat/web

ウェブサイトの追加

.eslintignore

@@ -0,0 +1 @@
+*.d.ts

.eslintrc.json

@@ -1,39 +1,230 @@
 {
   "env": {
+    "browser": true,
+    "es2021": true,
     "node": true
   },
   "extends": [
-    "eslint:recommended"
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended",
+    "prettier/react",
+    "prettier/@typescript-eslint"
   ],
+  "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "sourceType": "module",
-    "ecmaVersion": 2020
+    "sourceType": "module"
   },
-  "overrides": [
-    {
-      "files": [
-        "*.ts",
-        "*.tsx"
-      ],
-      "plugins": [
-        "@typescript-eslint"
-      ],
-      "extends": [
-        "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/eslint-recommended"
-      ],
-      "parser": "@typescript-eslint/parser",
-      "parserOptions": {
-        "project": "tsconfig.json"
-      },
-      "rules": {
-        "@typescript-eslint/no-explicit-any": "error",
-        "react/prop-types": "off",
-        "complexity": [
-          "error",
-          9
-        ]
-      }
-    }
-  ]
-}
+  "plugins": [
+    "react",
+    "@typescript-eslint"
+  ],
+  "settings": {
+    "react": {
+      "version": "detect"
+    },
+    "indent": 2
+  },
+  "rules": {
+    "accessor-pairs": "error",
+    "array-bracket-newline": "error",
+    "array-bracket-spacing": "error",
+    "array-callback-return": "error",
+    "arrow-body-style": "error",
+    "arrow-parens": "error",
+    "arrow-spacing": "error",
+    "block-scoped-var": "error",
+    "block-spacing": "error",
+    "brace-style": "error",
+    "callback-return": "error",
+    "camelcase": "error",
+    "capitalized-comments": "error",
+    "comma-spacing": "error",
+    "comma-style": "error",
+    "complexity": "error",
+    "computed-property-spacing": "error",
+    "consistent-return": "error",
+    "consistent-this": "error",
+    "curly": "error",
+    "default-case": "error",
+    "default-case-last": "error",
+    "default-param-last": "error",
+    "dot-notation": "error",
+    "eol-last": "error",
+    "eqeqeq": "error",
+    "func-call-spacing": "error",
+    "func-name-matching": "error",
+    "func-names": "error",
+    "func-style": "error",
+    "generator-star-spacing": "error",
+    "global-require": "error",
+    "grouped-accessor-pairs": "error",
+    "guard-for-in": "error",
+    "handle-callback-err": "error",
+    "id-blacklist": "error",
+    "id-denylist": "error",
+    "id-length": "error",
+    "id-match": "error",
+    "jsx-quotes": "error",
+    "key-spacing": "error",
+    "keyword-spacing": "error",
+    "line-comment-position": "error",
+    "linebreak-style": "error",
+    "lines-around-comment": "error",
+    "lines-around-directive": "error",
+    "lines-between-class-members": "error",
+    "max-classes-per-file": "error",
+    "max-depth": "error",
+    "max-len": "error",
+    "max-lines": "error",
+    "max-lines-per-function": "error",
+    "max-nested-callbacks": "error",
+    "max-params": "error",
+    "max-statements-per-line": "error",
+    "multiline-comment-style": "error",
+    "new-cap": "error",
+    "new-parens": "error",
+    "newline-per-chained-call": "error",
+    "no-alert": "error",
+    "no-array-constructor": "error",
+    "no-await-in-loop": "error",
+    "no-bitwise": "error",
+    "no-buffer-constructor": "error",
+    "no-caller": "error",
+    "no-catch-shadow": "error",
+    "no-confusing-arrow": "error",
+    "no-constructor-return": "error",
+    "no-continue": "error",
+    "no-div-regex": "error",
+    "no-duplicate-imports": "error",
+    "no-else-return": "error",
+    "no-eq-null": "error",
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-extra-label": "error",
+    "no-floating-decimal": "error",
+    "no-implicit-coercion": "error",
+    "no-implicit-globals": "error",
+    "no-implied-eval": "error",
+    "no-inline-comments": "error",
+    "no-invalid-this": "error",
+    "no-iterator": "error",
+    "no-label-var": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-lonely-if": "error",
+    "no-loop-func": "error",
+    "no-loss-of-precision": "error",
+    "no-magic-numbers": "warn",
+    "no-mixed-operators": "error",
+    "no-mixed-requires": "error",
+    "no-multi-assign": "error",
+    "no-multi-spaces": "error",
+    "no-multi-str": "error",
+    "no-multiple-empty-lines": "error",
+    "no-native-reassign": "error",
+    "no-negated-condition": "error",
+    "no-negated-in-lhs": "error",
+    "no-nested-ternary": "error",
+    "no-new": "error",
+    "no-new-func": "error",
+    "no-new-object": "error",
+    "no-new-require": "error",
+    "no-new-wrappers": "error",
+    "no-octal-escape": "error",
+    "no-param-reassign": "error",
+    "no-path-concat": "error",
+    "no-plusplus": "error",
+    "no-process-exit": "error",
+    "no-promise-executor-return": "error",
+    "no-proto": "error",
+    "no-restricted-exports": "error",
+    "no-restricted-globals": "error",
+    "no-restricted-imports": "error",
+    "no-restricted-modules": "error",
+    "no-restricted-properties": "error",
+    "no-restricted-syntax": "error",
+    "no-return-assign": "error",
+    "no-return-await": "error",
+    "no-script-url": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-shadow": "error",
+    "no-spaced-func": "error",
+    "no-sync": "error",
+    "no-tabs": "error",
+    "no-template-curly-in-string": "error",
+    "no-throw-literal": "error",
+    "no-trailing-spaces": "error",
+    "no-undef-init": "error",
+    "no-undefined": "error",
+    "no-underscore-dangle": "error",
+    "no-unmodified-loop-condition": "error",
+    "no-unneeded-ternary": "error",
+    "no-unreachable-loop": "error",
+    "no-unused-expressions": "error",
+    "no-useless-backreference": "error",
+    "no-useless-call": "error",
+    "no-useless-computed-key": "error",
+    "no-useless-concat": "error",
+    "no-useless-rename": "error",
+    "no-useless-return": "error",
+    "no-var": "error",
+    "no-void": "error",
+    "no-warning-comments": "error",
+    "no-whitespace-before-property": "error",
+    "nonblock-statement-body-position": "error",
+    "object-curly-newline": "error",
+    "object-property-newline": "error",
+    "object-shorthand": "error",
+    "one-var-declaration-per-line": "error",
+    "operator-assignment": "error",
+    "operator-linebreak": "error",
+    "padding-line-between-statements": "error",
+    "prefer-arrow-callback": "error",
+    "prefer-const": "error",
+    "prefer-destructuring": "error",
+    "prefer-exponentiation-operator": "error",
+    "prefer-named-capture-group": "error",
+    "prefer-numeric-literals": "error",
+    "prefer-object-spread": "error",
+    "prefer-promise-reject-errors": "error",
+    "prefer-reflect": "error",
+    "prefer-regex-literals": "error",
+    "prefer-rest-params": "error",
+    "prefer-spread": "error",
+    "prefer-template": "error",
+    "quotes": "error",
+    "radix": "error",
+    "require-atomic-updates": "error",
+    "require-await": "error",
+    "require-jsdoc": "error",
+    "require-unicode-regexp": "error",
+    "rest-spread-spacing": "error",
+    "semi": "error",
+    "semi-spacing": "error",
+    "semi-style": "error",
+    "sort-imports": "error",
+    "space-before-blocks": "error",
+    "space-in-parens": "error",
+    "space-infix-ops": "error",
+    "space-unary-ops": "error",
+    "spaced-comment": "error",
+    "strict": "error",
+    "switch-colon-spacing": "error",
+    "symbol-description": "error",
+    "template-curly-spacing": "error",
+    "template-tag-spacing": "error",
+    "unicode-bom": "error",
+    "valid-jsdoc": "error",
+    "vars-on-top": "error",
+    "wrap-iife": "error",
+    "wrap-regex": "error",
+    "yield-star-spacing": "error",
+    "yoda": "error",
+    "react/react-in-jsx-scope": "off",
+    "react/prop-types": "off"
+  }
+}

.prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "printWidth": 80,
+  "trailingComma": "all"
+}

docker-compose.yaml

@@ -10,6 +10,19 @@ services:
     environment:
       DISCORD_TOKEN: ${DISCORD_TOKEN}
       TOML_PATH: /app/analecta/laffey.toml
+      DB_CACHE_PATH: /app/.cache/users.json
       NOTIFY_INTERVAL: 10000
     volumes:
       - ./.cache:/app/.cache
+  web:
+    build:
+      context: .
+      dockerfile: ./docker/web.Dockerfile
+    container_name: ghs_web
+    env_file: .env
+    environment:
+      HOST_NAME: example.com
+      CLIENT_ID: not_found
+      CLIENT_SECRET: not_found
+    ports:
+      - 3000:3000

docker/bot.Dockerfile

@@ -2,7 +2,7 @@ FROM node:12.18.4-alpine as BUILD
 
 COPY . .
 
-RUN npm install --no-save && npm run build
+RUN npm install --no-save && npm run build:bot
 
 # ---
 
@@ -11,13 +11,13 @@ FROM node:12.18.4-alpine
 RUN addgroup -g 1993 -S bot \
   && adduser -u 1993 -S bot -G bot
 
+COPY package.json /app/
 COPY --from=BUILD node_modules/ /app/node_modules/
-COPY --from=BUILD dist/bundle.js /app/bot.js
+COPY --from=BUILD dist/bundle.js /app/dist/bundle.js
 COPY analecta/ /app/analecta/
 WORKDIR /app
 
-RUN chown bot:bot /app \
-  && mkdir -p /app/.cache
+RUN chown bot:bot /app
 VOLUME [ "/app/.cache" ]
 
-ENTRYPOINT [ "node", "./bot.js" ]
+ENTRYPOINT [ "npm", "run", "start:bot" ]

docker/web.Dockerfile

@@ -0,0 +1,20 @@
+FROM node:12.18.1-alpine
+
+EXPOSE 3000
+
+RUN addgroup -g 1994 -S web \
+  && adduser -u 1994 -S web -G web
+
+WORKDIR /app
+
+COPY package.json /app/
+RUN npm install --no-save
+
+COPY tsconfig.json /app/
+COPY src/web/ /app/
+RUN npx next build \
+  && chown web:web /app
+
+USER web
+
+ENTRYPOINT [ "npx", "next", "start" ]

exe/bot.ts

@@ -1,21 +1,19 @@
-import dotenv from "dotenv";
 import { Client, Message } from "discord.js";
-
-import { TomlLoader } from "../src/skin/toml-loader";
-import { PlainDB } from "../src/skin/plain-db";
-
-import { procs } from "../src/skin/procs";
-import { SubscriptionNotifier } from "../src/skin/notifier";
-import { Analecta } from "../src/exp/analecta";
-import { CommandProcessor } from "../src/abst/connector";
-import { GitHubApi } from "../src/skin/github-api";
-import { DiscordMessage } from "../src/skin/discord-message";
+import { Analecta } from "../src/bot/exp/analecta";
+import { CommandProcessor } from "../src/bot/abst/connector";
+import { DiscordMessage } from "../src/bot/skin/discord-message";
+import { GitHubApi } from "../src/bot/skin/github-api";
+import { PlainDB } from "../src/bot/skin/plain-db";
+import { SubscriptionNotifier } from "../src/bot/skin/notifier";
+import { TomlLoader } from "../src/bot/skin/toml-loader";
+import dotenv from "dotenv";
+import { procs } from "../src/bot/skin/procs";
 
 dotenv.config();
 
 const messageHandler = (
   analecta: Analecta,
-  builtProcs: CommandProcessor
+  builtProcs: CommandProcessor,
 ) => async (msg: Message) => {
   if (msg.author.bot) {
     return;
@@ -31,10 +29,10 @@ const messageHandler = (
 
 (async () => {
   const loader = new TomlLoader(
-    process.env.TOML_PATH || "./analecta/laffey.toml"
+    process.env.TOML_PATH || "./analecta/laffey.toml",
   );
   const db = await PlainDB.make(
-    process.env.DB_CACHE_PATH || "./.cache/users.json"
+    process.env.DB_CACHE_PATH || "./.cache/users.json",
   );
   const analecta = await loader.load();
 
@@ -52,4 +50,4 @@ const messageHandler = (
   client.on("message", messageHandler(analecta, builtProcs));
 
   client.login(process.env.DISCORD_TOKEN);
-})().catch((e) => console.error(e));
+})().catch((err) => console.error(err));