Merge branch 'typescript'

gggneo · Jul 23, 2021 · 987ab05 · 987ab05
2 parents 9473528 + 141f79f
commit 987ab05
Show file tree

Hide file tree

Showing 249 changed files with 25,966 additions and 16,693 deletions.
diff --git a/README.md b/README.md
@@ -1,51 +1,57 @@
 # 🏦 react-bank
 
-Banking app built in React, Redux and Node.
+Banking app built in TypeScript, React, Redux and Node.
 There is also an option to use Strapi, but you would have to adjust the Front End to use it.
 
 Demo user (automatically created when you start the app):
 
 Login: email@example.com<br />
 Password: admin123
 
+**(Please note this app needs to be adjusted to use the new Strapi Back End)**
+
 ## What's inside?
 
-* Login/register
-* Accounts
-* Transactions + new transaction
-* Credit/debit cards + change PIN/limits
-* Internal messages
-* User profile incl. data change
-* Help form
-* Income change chart
-* Currency stats
-* Form validation, async routing
-* Dummy data generator
+-  Login/register
+-  Accounts
+-  Transactions + new transaction
+-  Credit/debit cards + change PIN/limits
+-  Internal messages
+-  User profile incl. data change
+-  Help form
+-  Income change chart
+-  Currency stats
+-  Form validation, async routing
+-  Dummy data generator
 
 ![react-bank screenshot](screenshot.png?raw=true)
 
 ## Some details
+
 Inspired by [Daily UI 30](https://symu.co/freebies/ui-kits-9/daily-ui-30-elements/) PSD files.<br />
 Moved to HTML5/CSS3 using Avocode ([link to HTML/CSS repo](https://github.com/jurkian/daily-ui-30-html)).
 
 Technologies:
 
 WEB:
-* React
-* Redux
-* React Router
-* Webpack
-* Sass
-* Bootstrap 4
-* JWT tokens
-* recharts
-* react-dates
+
+-  TypeScript
+-  React
+-  Redux
+-  React Router
+-  Webpack
+-  Sass
+-  Bootstrap 4
+-  JWT tokens
+-  recharts
+-  react-dates
 
 API:
-* Node, Express, Strapi
-* JWT tokens
-* Database: MongoDB, Mongoose (old API), MySQL or MariaDB (new API on Strapi)
-* Fixer.io for currency rates
+
+-  Node, Express, Strapi
+-  JWT tokens
+-  Database: MongoDB, Mongoose (old API), MySQL or MariaDB (new API on Strapi)
+-  Fixer.io for currency rates
 
 ## How to use it?
 
@@ -71,12 +77,13 @@ To create an optimized build in both cases, run `npm run build` in `web` folder
 ## First steps with Strapi
 
 1. When you start the app, you should create yourself an example user, like `email@example.com`/`admin123`<br />
-You can also use dummy data generator by sending `POST` request to `http://localhost:1337/app/generate-dummy-data`<br />
-It will create few users and for each one of them few accounts, cards, transactions, messages and stats for the income/expenses stats widget on Front End<br />
+   You can also use dummy data generator by sending `POST` request to `http://localhost:1337/app/generate-dummy-data`<br />
+   It will create few users and for each one of them few accounts, cards, transactions, messages and stats for the income/expenses stats widget on Front End<br />
 
 2. Go to Strapi admin panel `http://localhost:1337` and set proper roles for all the endpoints your app is using, like enable generating dummy data for `Public` role. Otherwise you will see "Forbidden" every time you try to connect to the API
 
 ## How to run Strapi API on VPS using PM2?
+
 I assume you will use Ubuntu 20.04 LTS as your system
 
 1. Install node `sudo apt install nodejs` and npm `sudo apt install npm`

diff --git a/.editorconfig → api/.editorconfig b/.editorconfig → api/.editorconfig
diff --git a/.env.example → api/.env.example b/.env.example → api/.env.example
diff --git a/.eslintignore → api/.eslintignore b/.eslintignore → api/.eslintignore
diff --git a/.eslintrc → api/.eslintrc b/.eslintrc → api/.eslintrc
diff --git a/.gitignore → api/.gitignore b/.gitignore → api/.gitignore
@@ -111,13 +111,4 @@ license.txt
 exports
 *.cache
 build
-.strapi-updater.json
-
-############################
-# Web
-############################
-
-web/**/node_modules
-web/**/build
-web/.env
-web/src/**/*.css
+.strapi-updater.json
diff --git a/.prettierrc → api/.prettierrc b/.prettierrc → api/.prettierrc
diff --git a/api/account/models/account.js b/api/account/models/account.js
diff --git a/api/account/services/account.js b/api/account/services/account.js
diff --git a/api/.gitkeep → api/api/.gitkeep b/api/.gitkeep → api/api/.gitkeep
diff --git a/api/account/config/routes.json → api/api/account/config/routes.json b/api/account/config/routes.json → api/api/account/config/routes.json
diff --git a/api/account/controllers/account.js → api/api/account/controllers/account.js b/api/account/controllers/account.js → api/api/account/controllers/account.js
diff --git a/api/account/models/account.settings.json → api/api/account/models/account.settings.json b/api/account/models/account.settings.json → api/api/account/models/account.settings.json
diff --git a/api/card/config/routes.json → api/api/card/config/routes.json b/api/card/config/routes.json → api/api/card/config/routes.json
diff --git a/api/card/controllers/card.js → api/api/card/controllers/card.js b/api/card/controllers/card.js → api/api/card/controllers/card.js
diff --git a/api/card/models/card.settings.json → api/api/card/models/card.settings.json b/api/card/models/card.settings.json → api/api/card/models/card.settings.json
diff --git a/api/common/config/routes.json → api/api/common/config/routes.json b/api/common/config/routes.json → api/api/common/config/routes.json
diff --git a/api/common/controllers/clean-database.js → api/api/common/controllers/clean-database.js b/api/common/controllers/clean-database.js → api/api/common/controllers/clean-database.js
diff --git a/api/common/controllers/common.js → api/api/common/controllers/common.js b/api/common/controllers/common.js → api/api/common/controllers/common.js
diff --git a/...common/controllers/generate-dummy-data.js → ...common/controllers/generate-dummy-data.js b/...common/controllers/generate-dummy-data.js → ...common/controllers/generate-dummy-data.js
diff --git a/api/errors/services/errors.js → api/api/errors/services/errors.js b/api/errors/services/errors.js → api/api/errors/services/errors.js
diff --git a/api/form/config/routes.json → api/api/form/config/routes.json b/api/form/config/routes.json → api/api/form/config/routes.json
diff --git a/api/form/controllers/form.js → api/api/form/controllers/form.js b/api/form/controllers/form.js → api/api/form/controllers/form.js
diff --git a/api/message/config/routes.json → api/api/message/config/routes.json b/api/message/config/routes.json → api/api/message/config/routes.json
diff --git a/api/message/controllers/message.js → api/api/message/controllers/message.js b/api/message/controllers/message.js → api/api/message/controllers/message.js
diff --git a/api/message/models/message.settings.json → api/api/message/models/message.settings.json b/api/message/models/message.settings.json → api/api/message/models/message.settings.json
diff --git a/api/settings/config/routes.json → api/api/settings/config/routes.json b/api/settings/config/routes.json → api/api/settings/config/routes.json
diff --git a/api/settings/controllers/settings.js → api/api/settings/controllers/settings.js b/api/settings/controllers/settings.js → api/api/settings/controllers/settings.js
diff --git a/api/settings/models/settings.settings.json → ...pi/settings/models/settings.settings.json b/api/settings/models/settings.settings.json → ...pi/settings/models/settings.settings.json
diff --git a/api/stats/config/routes.json → api/api/stats/config/routes.json b/api/stats/config/routes.json → api/api/stats/config/routes.json
diff --git a/api/stats/controllers/stats.js → api/api/stats/controllers/stats.js b/api/stats/controllers/stats.js → api/api/stats/controllers/stats.js
diff --git a/api/stats/models/stats.settings.json → api/api/stats/models/stats.settings.json b/api/stats/models/stats.settings.json → api/api/stats/models/stats.settings.json
diff --git a/api/transfer/config/routes.json → api/api/transfer/config/routes.json b/api/transfer/config/routes.json → api/api/transfer/config/routes.json
diff --git a/api/transfer/controllers/create-valids.js → ...api/transfer/controllers/create-valids.js b/api/transfer/controllers/create-valids.js → ...api/transfer/controllers/create-valids.js
diff --git a/api/transfer/controllers/transfer.js → api/api/transfer/controllers/transfer.js b/api/transfer/controllers/transfer.js → api/api/transfer/controllers/transfer.js
diff --git a/api/transfer/models/transfer.settings.json → ...pi/transfer/models/transfer.settings.json b/api/transfer/models/transfer.settings.json → ...pi/transfer/models/transfer.settings.json
diff --git a/api/card/models/card.js b/api/card/models/card.js
diff --git a/api/card/services/card.js b/api/card/services/card.js
diff --git a/api/common/services/common.js b/api/common/services/common.js
diff --git a/components/stats/stats-component.json → api/components/stats/stats-component.json b/components/stats/stats-component.json → api/components/stats/stats-component.json
diff --git a/config/env/development/database.js → api/config/env/development/database.js b/config/env/development/database.js → api/config/env/development/database.js
diff --git a/config/env/development/middleware.js → api/config/env/development/middleware.js b/config/env/development/middleware.js → api/config/env/development/middleware.js
diff --git a/config/env/development/plugins.js → api/config/env/development/plugins.js b/config/env/development/plugins.js → api/config/env/development/plugins.js
diff --git a/config/env/development/server.js → api/config/env/development/server.js b/config/env/development/server.js → api/config/env/development/server.js
diff --git a/config/env/production/database.js → api/config/env/production/database.js b/config/env/production/database.js → api/config/env/production/database.js
diff --git a/config/env/production/middleware.js → api/config/env/production/middleware.js b/config/env/production/middleware.js → api/config/env/production/middleware.js
diff --git a/config/env/production/plugins.js → api/config/env/production/plugins.js b/config/env/production/plugins.js → api/config/env/production/plugins.js
diff --git a/config/env/production/server.js → api/config/env/production/server.js b/config/env/production/server.js → api/config/env/production/server.js
diff --git a/config/functions/bootstrap.js → api/config/functions/bootstrap.js b/config/functions/bootstrap.js → api/config/functions/bootstrap.js
diff --git a/config/functions/responses/404.js → api/config/functions/responses/404.js b/config/functions/responses/404.js → api/config/functions/responses/404.js
diff --git a/config/policies/pass-jwt-user.js → api/config/policies/pass-jwt-user.js b/config/policies/pass-jwt-user.js → api/config/policies/pass-jwt-user.js
diff --git a/develop-inspect.js → api/develop-inspect.js b/develop-inspect.js → api/develop-inspect.js
diff --git a/ecosystem.config.js → api/ecosystem.config.js b/ecosystem.config.js → api/ecosystem.config.js
diff --git a/extensions/.gitkeep → api/extensions/.gitkeep b/extensions/.gitkeep → api/extensions/.gitkeep
diff --git a/extensions/users-permissions/config/jwt.js → ...xtensions/users-permissions/config/jwt.js b/extensions/users-permissions/config/jwt.js → ...xtensions/users-permissions/config/jwt.js
diff --git a/...ions/users-permissions/config/routes.json → ...ions/users-permissions/config/routes.json b/...ions/users-permissions/config/routes.json → ...ions/users-permissions/config/routes.json
diff --git a/...sions/controllers/functions/get-myself.js → ...sions/controllers/functions/get-myself.js b/...sions/controllers/functions/get-myself.js → ...sions/controllers/functions/get-myself.js
diff --git a/...ermissions/controllers/functions/login.js → ...ermissions/controllers/functions/login.js b/...ermissions/controllers/functions/login.js → ...ermissions/controllers/functions/login.js
diff --git a/.../controllers/functions/register-valids.js → .../controllers/functions/register-valids.js b/.../controllers/functions/register-valids.js → .../controllers/functions/register-valids.js
diff --git a/...issions/controllers/functions/register.js → ...issions/controllers/functions/register.js b/...issions/controllers/functions/register.js → ...issions/controllers/functions/register.js
diff --git a/...ons/users-permissions/controllers/user.js → ...ons/users-permissions/controllers/user.js b/...ons/users-permissions/controllers/user.js → ...ons/users-permissions/controllers/user.js
diff --git a/...ers-permissions/models/User.settings.json → ...ers-permissions/models/User.settings.json b/...ers-permissions/models/User.settings.json → ...ers-permissions/models/User.settings.json
diff --git a/favicon.ico → api/favicon.ico b/favicon.ico → api/favicon.ico
diff --git a/api/form/services/form.js b/api/form/services/form.js
diff --git a/api/message/models/message.js b/api/message/models/message.js
diff --git a/api/message/services/message.js b/api/message/services/message.js
diff --git a/middlewares/customErrorHandler/index.js → api/middlewares/customErrorHandler/index.js b/middlewares/customErrorHandler/index.js → api/middlewares/customErrorHandler/index.js
diff --git a/package-lock.json → api/package-lock.json b/package-lock.json → api/package-lock.json
diff --git a/package.json → api/package.json b/package.json → api/package.json
@@ -9,23 +9,26 @@
     "build": "strapi build",
     "strapi": "strapi"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "@types/lodash": "^4.14.171",
+    "@types/node": "^16.3.2"
+  },
   "dependencies": {
-    "faker": "^5.1.0",
-    "joi": "^17.3.0",
+    "faker": "^5.5.3",
+    "joi": "^17.4.0",
     "knex": "<0.20.0",
     "moment": "^2.29.1",
     "mysql": "latest",
-    "strapi": "3.3.4",
-    "strapi-admin": "3.3.4",
-    "strapi-connector-bookshelf": "3.3.4",
-    "strapi-plugin-content-manager": "3.3.4",
-    "strapi-plugin-content-type-builder": "3.3.4",
-    "strapi-plugin-email": "3.3.4",
-    "strapi-plugin-upload": "3.3.4",
-    "strapi-plugin-users-permissions": "3.3.4",
-    "strapi-provider-email-mailgun": "^3.3.4",
-    "strapi-utils": "3.3.4"
+    "strapi": "3.6.5",
+    "strapi-admin": "3.6.5",
+    "strapi-connector-bookshelf": "3.6.5",
+    "strapi-plugin-content-manager": "3.6.5",
+    "strapi-plugin-content-type-builder": "3.6.5",
+    "strapi-plugin-email": "3.6.5",
+    "strapi-plugin-upload": "3.6.5",
+    "strapi-plugin-users-permissions": "3.6.5",
+    "strapi-provider-email-mailgun": "^3.6.5",
+    "strapi-utils": "3.6.5"
   },
   "author": {
     "name": ""

diff --git a/public/robots.txt → api/public/robots.txt b/public/robots.txt → api/public/robots.txt
diff --git a/public/uploads/.gitkeep → api/public/uploads/.gitkeep b/public/uploads/.gitkeep → api/public/uploads/.gitkeep
diff --git a/server.js → api/server.js b/server.js → api/server.js
diff --git a/api/settings/models/settings.js b/api/settings/models/settings.js
diff --git a/api/settings/services/settings.js b/api/settings/services/settings.js
diff --git a/api/stats/models/stats.js b/api/stats/models/stats.js
diff --git a/api/stats/services/stats.js b/api/stats/services/stats.js
diff --git a/api/transfer/models/transfer.js b/api/transfer/models/transfer.js
diff --git a/api/transfer/services/transfer.js b/api/transfer/services/transfer.js
diff --git a/api/tsconfig.base.json b/api/tsconfig.base.json
@@ -0,0 +1,18 @@
+{
+   "compilerOptions": {
+      "paths": {
+         "root/*": ["./src/."],
+         "assets/*": ["./src/assets"],
+         "components/*": ["./src/components"],
+         "configs/*": ["./src/configs"],
+         "extensions/*": ["./src/extensions"],
+         "layouts/*": ["./src/layouts"],
+         "actions/*": ["./src/redux/actions"],
+         "reducers/*": ["./src/redux/reducers"],
+         "utility/*": ["./src/utility"],
+         "views/*": ["./src/views"],
+         "valids/*": ["./src/valids"],
+         "*": ["./src/*"]
+      }
+   }
+}
diff --git a/api/tsconfig.json b/api/tsconfig.json
@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "node_modules",
+    "**/node_modules/*"
+  ],
+  "extends": "./tsconfig.base.json"
+}