Merge pull request #1303 from masb0ymas/dev

Dev

Author: masb0ymas

.env.docker-production

@@ -28,6 +28,7 @@ SEQUELIZE_DATABASE=expresso
 SEQUELIZE_USERNAME=postgres
 SEQUELIZE_PASSWORD=postgres
 SEQUELIZE_SYNC=false
+SEQUELIZE_LOGGING=true
 SEQUELIZE_TIMEZONE=Asia/Jakarta
 
 MAIL_DRIVER=smtp
@@ -51,9 +52,12 @@ REDIS_PORT=6379
 REDIS_PASSWORD=
 
 STORAGE_PROVIDER=minio
-STORAGE_HOST= # for minio only
+STORAGE_HOST=127.0.0.1 # for MinIO
+STORAGE_PORT=9000      # for MinIO
 STORAGE_ACCESS_KEY=
 STORAGE_SECRET_KEY=
 STORAGE_BUCKET_NAME=expresso
 STORAGE_REGION=ap-southeast-1
 STORAGE_SIGN_EXPIRED=7d
+
+OPEN_STREET_MAP_URL=https://nominatim.openstreetmap.org

.env.docker-staging

@@ -28,6 +28,7 @@ SEQUELIZE_DATABASE=expresso
 SEQUELIZE_USERNAME=postgres
 SEQUELIZE_PASSWORD=postgres
 SEQUELIZE_SYNC=false
+SEQUELIZE_LOGGING=true
 SEQUELIZE_TIMEZONE=Asia/Jakarta
 
 MAIL_DRIVER=smtp
@@ -51,9 +52,12 @@ REDIS_PORT=6379
 REDIS_PASSWORD=
 
 STORAGE_PROVIDER=minio
-STORAGE_HOST= # for minio only
+STORAGE_HOST=127.0.0.1 # for MinIO
+STORAGE_PORT=9000      # for MinIO
 STORAGE_ACCESS_KEY=
 STORAGE_SECRET_KEY=
 STORAGE_BUCKET_NAME=expresso
 STORAGE_REGION=ap-southeast-1
 STORAGE_SIGN_EXPIRED=7d
+
+OPEN_STREET_MAP_URL=https://nominatim.openstreetmap.org

.env.example

@@ -28,6 +28,7 @@ SEQUELIZE_DATABASE=expresso
 SEQUELIZE_USERNAME=postgres
 SEQUELIZE_PASSWORD=postgres
 SEQUELIZE_SYNC=false
+SEQUELIZE_LOGGING=true
 SEQUELIZE_TIMEZONE=Asia/Jakarta
 
 MAIL_DRIVER=smtp
@@ -51,9 +52,12 @@ REDIS_PORT=6379
 REDIS_PASSWORD=
 
 STORAGE_PROVIDER=minio
-STORAGE_HOST= # for minio only
+STORAGE_HOST=127.0.0.1 # for MinIO
+STORAGE_PORT=9000 # for MinIO
 STORAGE_ACCESS_KEY=
 STORAGE_SECRET_KEY=
 STORAGE_BUCKET_NAME=expresso
 STORAGE_REGION=ap-southeast-1
 STORAGE_SIGN_EXPIRED=7d
+
+OPEN_STREET_MAP_URL=https://nominatim.openstreetmap.org

.eslintrc.js

@@ -11,26 +11,25 @@ module.exports = {
     'prettier/prettier': 'error',
     semi: 'off',
     radix: 'off',
+    'no-new': 'off',
+    'new-cap': 'off',
+    'no-shadow': 'off',
     'func-names': 'off',
     'no-console': 'off',
-    'no-shadow': 'off',
-    'no-unused-vars': ['error', { args: 'none' }],
     'consistent-return': 'off',
+    'no-unused-vars': ['error', { args: 'none' }],
     'no-underscore-dangle': 'off',
+    'no-useless-constructor': 'off',
     'import/prefer-default-export': 'off',
     'import/no-unresolved': 'off',
-    'new-cap': 'off',
-    'no-new': 'off',
     'import/extensions': 'off',
-    'no-useless-constructor': 'off',
     '@typescript-eslint/no-misused-promises': 'off',
     '@typescript-eslint/strict-boolean-expressions': 'off',
     '@typescript-eslint/no-useless-constructor': 'error',
     '@typescript-eslint/no-extraneous-class': 'off',
     '@typescript-eslint/restrict-template-expressions': 'off',
     '@typescript-eslint/naming-convention': 'off',
     '@typescript-eslint/ban-ts-comment': 'off',
-    '@typescript-eslint/no-dynamic-delete': 'off',
     'n/no-path-concat': 'off',
   },
   env: {

.swcrc

@@ -1,62 +1,30 @@
-[
-  {
-    "$schema": "https://json.schemastore.org/swcrc",
-    "jsc": {
-      "parser": {
-        "syntax": "typescript",
-        "tsx": false,
-        "decorators": true,
-        "dynamicImport": false
-      },
-      "paths": {
-        "~/*": ["dist/*"]
-      },
-      "target": "es2022",
-      "loose": true,
-      "keepClassNames": false,
-      "externalHelpers": false,
-      "transform": {
-        "legacyDecorator": true,
-        "decoratorMetadata": true
-      }
+{
+  "$schema": "https://json.schemastore.org/swcrc",
+  "jsc": {
+    "parser": {
+      "syntax": "typescript",
+      "tsx": false,
+      "decorators": true,
+      "dynamicImport": false
     },
-    "module": {
-      "type": "commonjs",
-      "strict": false,
-      "strictMode": true,
-      "lazy": false,
-      "noInterop": false
+    "paths": {
+      "~/*": ["dist/*"]
     },
-    "minify": true
+    "target": "es2022",
+    "loose": true,
+    "keepClassNames": false,
+    "externalHelpers": false,
+    "transform": {
+      "legacyDecorator": true,
+      "decoratorMetadata": true
+    }
   },
-  {
-    "$schema": "https://json.schemastore.org/swcrc",
-    "jsc": {
-      "parser": {
-        "syntax": "ecmascript",
-        "jsx": false,
-        "decorators": true,
-        "dynamicImport": false
-      },
-      "paths": {
-        "~/*": ["dist/*"]
-      },
-      "target": "es2022",
-      "loose": true,
-      "keepClassNames": false,
-      "externalHelpers": false,
-      "transform": {
-        "legacyDecorator": true,
-        "decoratorMetadata": true
-      }
-    },
-    "module": {
-      "type": "commonjs",
-      "strict": false,
-      "strictMode": true,
-      "lazy": false,
-      "noInterop": false
-    },
-    "minify": true
-  }
-]
+  "module": {
+    "type": "commonjs",
+    "strict": false,
+    "strictMode": true,
+    "lazy": false,
+    "noInterop": false
+  },
+  "minify": true
+}

README.md

@@ -1,10 +1,10 @@
-# expresso with Sequelize
+# expresso with TypeORM
 
-[![documentation](https://img.shields.io/badge/Documentation-yes-brightgreen.svg)](https://github.com/masb0ymas/expresso-sequelize#readme)
-[![maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/masb0ymas/expresso-sequelize/graphs/commit-activity)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/masb0ymas/expresso-sequelize/blob/master/LICENSE.md)
+[![documentation](https://img.shields.io/badge/Documentation-yes-brightgreen.svg)](https://github.com/masb0ymas/expresso-typeorm#readme)
+[![maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/masb0ymas/expresso-typeorm/graphs/commit-activity)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/masb0ymas/expresso-typeorm/blob/master/LICENSE.md)
 
-[![version](https://img.shields.io/badge/Version-5.0.3-blue.svg?cacheSeconds=2592000)](https://github.com/masb0ymas/expresso-sequelize/releases/tag/v5.0.3)
+[![version](https://img.shields.io/badge/Version-4.3.0-blue.svg?cacheSeconds=2592000)](https://github.com/masb0ymas/expresso-typeorm/releases/tag/v4.3.0)
 [![Express](https://img.shields.io/badge/Express-4.18.2-informational?logo=express&color=22272E)](https://expressjs.com/)
 ![Node](https://badges.aleen42.com/src/node.svg)
 ![Eslint](https://badges.aleen42.com/src/eslint.svg)
@@ -13,11 +13,12 @@
 
 ## Feature
 
-- [TypeScript](https://github.com/microsoft/TypeScript) `4.9.x`
-- [Sequelize](https://github.com/sequelize/sequelize) `6.x`
+- [TypeScript](https://github.com/microsoft/TypeScript) `5.1.x`
+- [TypeORM](https://github.com/typeorm/typeorm) `0.3.x`
 - [Nodemailer](https://github.com/nodemailer/nodemailer) `6.x`
 - [Handlebars](https://github.com/wycats/handlebars.js) for templating HTML
 - [Yup](https://github.com/jquense/yup) for validation schema `1.x`
+- [SWC](https://github.com/swc-project/swc) for build runtime app `1.3.x`
 - JavaScript Style [Standard with TypeScript](https://github.com/standard/eslint-config-standard-with-typescript)
 - Formating code using [Prettier](https://github.com/prettier/prettier) Integration [Eslint](https://github.com/prettier/eslint-config-prettier) and [TypeScript Eslint](https://github.com/typescript-eslint/typescript-eslint#readme)
 - Using [Module Alias](https://github.com/ilearnio/module-alias) for simplify the require/import paths
@@ -30,8 +31,12 @@
 1. Clone this repository
 2. Duplicate `.env.example` to `.env`
 3. Setup database settings inside `.env` file
-4. Create your database ( manual )
+4. Create your database ( manual ) or run `yarn db:create && yarn db:reset`
 5. Run `yarn dev` command
+6. Run watch command `yarn dev:watch`
+7. Release your app for *Production* or *Staging* with `yarn release`
+8. Build your code with Docker `docker build -t yourname/express:v1.0.0 .`
+9. Run with docker image `docker run -p 7000:8000 -d yourname/express:v1.0.0`
 
 ## Author
 

assets/locales/en/translation.json

@@ -5,17 +5,18 @@
     "already_phone": "Phone number already in use",
     "already_email": "Email already in use",
     "incorrect_email_or_pass": "Incorrect email or password",
+    "incorrect_current_pass": "Incorrect current password",
     "incorrect_phone": "Incorrect phone number",
     "incorrect_pin": "Incorrect pin",
-    "incorrect_UUID_format": "Incorrect uuid format",
+    "incorrect_uuid_format": "Incorrect uuid format",
     "invalid_user_login": "Invalid user login",
     "session_ended": "The login session has ended, please re-login.",
     "otp_expired": "OTP expired",
     "in_active_account": "Your account is not active",
     "account_not_found": "Account not found or not registered",
     "block_policy": "Your account has been blocked for violating policy",
     "cant_be_empty": "can't be empty",
-    "not_found": "data not found or has been deleted",
+    "not_found": "{{entity}} data not found or has been deleted",
     "mail_template": "Invalid template path for email registration",
     "too_many_request": "Too Many Requests",
     "please_check_your_email": "Please check your email account to verify your email and continue the registration process"

assets/locales/id/translation.json

@@ -5,17 +5,18 @@
     "already_phone": "Nomor telepon sudah digunakan",
     "already_email": "Email sudah digunakan",
     "incorrect_email_or_pass": "email atau kata sandi salah",
+    "incorrect_current_pass": "kata sandi saat ini salah",
     "incorrect_phone": "Nomor telepon salah",
     "incorrect_pin": "Pin salah",
-    "incorrect_UUID_format": "Format uuid tidak benar",
+    "incorrect_uuid_format": "Format uuid tidak benar",
     "invalid_user_login": "Login pengguna tidak valid",
     "session_ended": "Sesi masuk telah berakhir, harap masuk kembali.",
     "otp_expired": "OTP kedaluwarsa",
     "in_active_account": "Akunmu tidak aktif",
     "account_not_found": "Akun tidak ditemukan atau tidak terdaftar",
     "block_policy": "Akun Anda telah diblokir karena melanggar kebijakan",
     "cant_be_empty": "tidak boleh kosong",
-    "not_found": "data tidak ditemukan atau telah dihapus",
+    "not_found": "{{entity}} data tidak ditemukan atau telah dihapus",
     "mail_template": "Direktori template email pendaftaran tidak benar",
     "too_many_request": "Terlalu Banyak Permintaan",
     "please_check_your_email": "silakan periksa akun email Anda untuk memverifikasi email Anda dan melanjutkan proses pendaftaran"