#123 Добавлена поддержка TypeScript

gbagretsov · May 2, 2022 · 2800205 · 2800205
1 parent b65fd32
commit 2800205
Show file tree

Hide file tree

Showing 70 changed files with 1,334 additions and 122 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,6 @@ npm-debug.log
 *.dev
 .DS_Store
 
-public/dist
+compiled/public/dist
+compiled/app
+compiled/front
diff --git a/Procfile b/Procfile
@@ -1,2 +1,2 @@
-web: node index.js
+web: node compiled/app/index.js
 release: npm run migrate up
diff --git a/app/.eslintrc b/app/.eslintrc
@@ -0,0 +1,33 @@
+{
+  "env": {
+    "es2021": true,
+    "node": true
+  },
+  "root": true,
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "rules": {
+    "indent": [
+      "error",
+      2
+    ],
+    "linebreak-style": [
+      "error",
+      "windows"
+    ],
+    "quotes": [
+      "error",
+      "single"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ],
+    "no-console": "off"
+  },
+  "plugins": ["@typescript-eslint"]
+}
diff --git a/app/api/api.js → app/src/api/api.js b/app/api/api.js → app/src/api/api.js
diff --git a/app/api/custom-reactions.js → app/src/api/custom-reactions.js b/app/api/custom-reactions.js → app/src/api/custom-reactions.js
diff --git a/app/api/settings.js → app/src/api/settings.js b/app/api/settings.js → app/src/api/settings.js
diff --git a/app/api/words.js → app/src/api/words.js b/app/api/words.js → app/src/api/words.js
diff --git a/app/chat/chat.js → app/src/chat/chat.js b/app/chat/chat.js → app/src/chat/chat.js
diff --git a/app/chat/chat.test.js → app/src/chat/chat.test.js b/app/chat/chat.test.js → app/src/chat/chat.test.js
diff --git a/app/custom-reactions/custom-reactions.js → app/src/custom-reactions/custom-reactions.js b/app/custom-reactions/custom-reactions.js → app/src/custom-reactions/custom-reactions.js
diff --git a/...custom-reactions/custom-reactions.test.js → ...custom-reactions/custom-reactions.test.js b/...custom-reactions/custom-reactions.test.js → ...custom-reactions/custom-reactions.test.js
diff --git a/app/daily/daily.js → app/src/daily/daily.js b/app/daily/daily.js → app/src/daily/daily.js
diff --git a/app/daily/daily.test.js → app/src/daily/daily.test.js b/app/daily/daily.test.js → app/src/daily/daily.test.js
diff --git a/app/daily/holidays.js → app/src/daily/holidays.js b/app/daily/holidays.js → app/src/daily/holidays.js
diff --git a/app/daily/holidays.test.js → app/src/daily/holidays.test.js b/app/daily/holidays.test.js → app/src/daily/holidays.test.js
diff --git a/app/daily/run-daily.js → app/src/daily/run-daily.js b/app/daily/run-daily.js → app/src/daily/run-daily.js
diff --git a/app/daily/weather.js → app/src/daily/weather.js b/app/daily/weather.js → app/src/daily/weather.js
diff --git a/app/db.js → app/src/db.js b/app/db.js → app/src/db.js
diff --git a/app/game/.gitignore → app/src/game/.gitignore b/app/game/.gitignore → app/src/game/.gitignore
diff --git a/app/game/admin.js → app/src/game/admin.js b/app/game/admin.js → app/src/game/admin.js
diff --git a/app/game/game.js → app/src/game/game.js b/app/game/game.js → app/src/game/game.js
diff --git a/app/game/game.test.js → app/src/game/game.test.js b/app/game/game.test.js → app/src/game/game.test.js
diff --git a/app/src/index.ts b/app/src/index.ts
@@ -0,0 +1,18 @@
+import express from 'express';
+import bodyParser from 'body-parser';
+import path from 'path';
+
+import receiver from './receiver';
+import {router as apiRouter} from './api/api';
+
+const app = express();
+const PORT = process.env.PORT || 5000;
+
+app.use(express.static(path.join(__dirname, '../public')));
+app.use(bodyParser.json());
+
+receiver(app);
+
+app.use('/api', apiRouter);
+
+app.listen(PORT, () => console.log(`Listening on ${ PORT }`));
diff --git a/app/polls-watch/getPolls.vkscript → app/src/polls-watch/getPolls.vkscript b/app/polls-watch/getPolls.vkscript → app/src/polls-watch/getPolls.vkscript
diff --git a/app/polls-watch/polls-watch.js → app/src/polls-watch/polls-watch.js b/app/polls-watch/polls-watch.js → app/src/polls-watch/polls-watch.js
diff --git a/app/polls-watch/polls-watch.test.js → app/src/polls-watch/polls-watch.test.js b/app/polls-watch/polls-watch.test.js → app/src/polls-watch/polls-watch.test.js
diff --git a/app/polls-watch/run-polls-watch.js → app/src/polls-watch/run-polls-watch.js b/app/polls-watch/run-polls-watch.js → app/src/polls-watch/run-polls-watch.js
diff --git a/app/receiver.js → app/src/receiver.js b/app/receiver.js → app/src/receiver.js
diff --git a/app/speech/.gitignore → app/src/speech/.gitignore b/app/speech/.gitignore → app/src/speech/.gitignore
diff --git a/app/speech/speech.js → app/src/speech/speech.js b/app/speech/speech.js → app/src/speech/speech.js
diff --git a/app/speech/speech.test.js → app/src/speech/speech.test.js b/app/speech/speech.test.js → app/src/speech/speech.test.js
diff --git a/app/statistics/book-antiqua-bold.ttf → app/src/statistics/book-antiqua-bold.ttf b/app/statistics/book-antiqua-bold.ttf → app/src/statistics/book-antiqua-bold.ttf
diff --git a/app/statistics/book-antiqua.ttf → app/src/statistics/book-antiqua.ttf b/app/statistics/book-antiqua.ttf → app/src/statistics/book-antiqua.ttf
diff --git a/app/statistics/leaderboardPhotoTemplate.jpg → ...c/statistics/leaderboardPhotoTemplate.jpg b/app/statistics/leaderboardPhotoTemplate.jpg → ...c/statistics/leaderboardPhotoTemplate.jpg
diff --git a/app/statistics/statistics-constants.js → app/src/statistics/statistics-constants.js b/app/statistics/statistics-constants.js → app/src/statistics/statistics-constants.js
diff --git a/app/statistics/statistics.js → app/src/statistics/statistics.js b/app/statistics/statistics.js → app/src/statistics/statistics.js
diff --git a/app/statistics/statistics.test.js → app/src/statistics/statistics.test.js b/app/statistics/statistics.test.js → app/src/statistics/statistics.test.js
diff --git a/app/util.js → app/src/util.js b/app/util.js → app/src/util.js
diff --git a/app/util.test.js → app/src/util.test.js b/app/util.test.js → app/src/util.test.js
diff --git a/app/vk.js → app/src/vk.js b/app/vk.js → app/src/vk.js
diff --git a/app/tsconfig.json b/app/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "ES2021",
+    "module": "CommonJS",
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "outDir": "../compiled/app",
+    "sourceMap": true,
+    "incremental": true,
+    "allowJs": true
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.js"
+  ]
+}
diff --git a/public/index.html → compiled/public/index.html b/public/index.html → compiled/public/index.html
diff --git a/friends-vk-bot.iml b/friends-vk-bot.iml
@@ -2,7 +2,10 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/compiled/app" />
+      <excludeFolder url="file://$MODULE_DIR$/compiled/front" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

diff --git a/.babelrc → front/.babelrc b/.babelrc → front/.babelrc
diff --git a/front/.eslintrc b/front/.eslintrc
@@ -0,0 +1,36 @@
+{
+  "env": {
+    "es2021": true,
+    "browser": true
+  },
+  "root": true,
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "rules": {
+    "indent": [
+      "error",
+      2
+    ],
+    "linebreak-style": [
+      "error",
+      "windows"
+    ],
+    "quotes": [
+      "error",
+      "single"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ],
+    "no-console": "off"
+  },
+  "plugins": ["@typescript-eslint"],
+  "ignorePatterns": [
+    "webpack.config.js"
+  ]
+}
diff --git a/front/.eslintrc.js b/front/.eslintrc.js
diff --git a/front/App.jsx → front/src/App.jsx b/front/App.jsx → front/src/App.jsx
diff --git a/front/App.scss → front/src/App.scss b/front/App.scss → front/src/App.scss
diff --git a/front/_mixins.scss → front/src/_mixins.scss b/front/_mixins.scss → front/src/_mixins.scss
diff --git a/...custom-reactions/CustomReactionEditor.jsx → ...custom-reactions/CustomReactionEditor.jsx b/...custom-reactions/CustomReactionEditor.jsx → ...custom-reactions/CustomReactionEditor.jsx
diff --git a/...ustom-reactions/CustomReactionEditor.scss → ...ustom-reactions/CustomReactionEditor.scss b/...ustom-reactions/CustomReactionEditor.scss → ...ustom-reactions/CustomReactionEditor.scss
diff --git a/front/custom-reactions/CustomReactions.jsx → .../src/custom-reactions/CustomReactions.jsx b/front/custom-reactions/CustomReactions.jsx → .../src/custom-reactions/CustomReactions.jsx
diff --git a/front/custom-reactions/CustomReactions.scss → ...src/custom-reactions/CustomReactions.scss b/front/custom-reactions/CustomReactions.scss → ...src/custom-reactions/CustomReactions.scss
diff --git a/front/index.js → front/src/index.js b/front/index.js → front/src/index.js
diff --git a/front/message/Message.jsx → front/src/message/Message.jsx b/front/message/Message.jsx → front/src/message/Message.jsx
diff --git a/front/message/Message.scss → front/src/message/Message.scss b/front/message/Message.scss → front/src/message/Message.scss
diff --git a/front/settings/Settings.jsx → front/src/settings/Settings.jsx b/front/settings/Settings.jsx → front/src/settings/Settings.jsx
diff --git a/front/settings/Settings.scss → front/src/settings/Settings.scss b/front/settings/Settings.scss → front/src/settings/Settings.scss
diff --git a/front/token/Token.jsx → front/src/token/Token.jsx b/front/token/Token.jsx → front/src/token/Token.jsx
diff --git a/front/token/Token.scss → front/src/token/Token.scss b/front/token/Token.scss → front/src/token/Token.scss
diff --git a/front/words/Word.jsx → front/src/words/Word.jsx b/front/words/Word.jsx → front/src/words/Word.jsx
diff --git a/front/words/Words.jsx → front/src/words/Words.jsx b/front/words/Words.jsx → front/src/words/Words.jsx
diff --git a/front/words/Words.scss → front/src/words/Words.scss b/front/words/Words.scss → front/src/words/Words.scss
diff --git a/front/tsconfig.json b/front/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2021",
+    "module": "ES2022",
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "outDir": "../compiled/front",
+    "sourceMap": true,
+    "incremental": true,
+    "allowJs": true
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.js",
+    "src/**/*.jsx"
+  ]
+}
diff --git a/webpack.config.js → front/webpack.config.cjs b/webpack.config.js → front/webpack.config.cjs
@@ -2,7 +2,7 @@ const path = require('path');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
-  entry: './front/index.js',
+  entry: './front/src/index.js',
   mode: 'development',
   module: {
     rules: [
@@ -20,12 +20,12 @@ module.exports = {
   },
   resolve: { extensions: ['*', '.js', '.jsx'] },
   output: {
-    path: path.resolve(__dirname, 'public/dist/'),
+    path: path.resolve(__dirname, '../compiled/public/dist/'),
     filename: 'bundle.js'
   },
   plugins: [
     new MiniCssExtractPlugin({
       filename: 'style.css',
     })
   ],
-};
+};
diff --git a/index.js b/index.js