fix: general (#17)

productdevbook · web-flow · commit a82175e322c6 · 2022-08-06T12:34:39.000+03:00
* fix: nestjs env

* fix: package json scope

* fix: docker-compose

* fix: nestjs validation and nullable fcm json

* fix: vue

* Update README.md

* fix: lint

* core: vue-web env add
diff --git a/README.md b/README.md
@@ -1,11 +1,30 @@
+
+![](docs/productdevbook.png)
+
+## Discord
+![productdevbook](https://discordapp.com/api/guilds/982896043463180310/widget.png?style=shield)
+
 ### Website
 * http://localhost:3000 - vue
 * http://localhost:5000 - vue-mobile
 * http://localhost:4000/graphql - api
 
-### Setup
+# Setup
 
 ```properties
 pnpm install
-pnpm dev
+docker-compose up
+```
+
+### Env setup
+Example env file change name to .env
+```
+/apps/nestjs/.env.example -> /apps/nestjs/.env
+/apps/vue-web/.env.example -> /apps/vue-web/.env
 ```
+
+### Docker running
+```properties
+pnpm db:up // migrations db
+pnpm dev
+```
diff --git a/apps/nestjs/.env.example b/apps/nestjs/.env.example
@@ -6,11 +6,11 @@ CORS_ORIGIN=http://localhost:3000,https://studio.apollographql.com,http://localh
 FALLBACK_LANGUAGE='en'
 
 # Database config
-DATABASE_URL='postgresql://USER:PASSWORD@HOST:PORT/DATABASE'
+DATABASE_URL='postgresql://postgres:postgres@localhost:5432/postgres'
 
 # JWT config
-JWT_EXPIRES_IN=600
-JWT_REFRESH_EXPIRES_IN=604800
+JWT_EXPIRES_IN=15m
+JWT_REFRESH_EXPIRES_IN=24h
 JWT_EXPIRATION_TIME=12h
 JWT_AUDIENCE=localhost:3000
 JWT_COOKIE_NAME=accessToken
@@ -37,11 +37,10 @@ BUCKET_REGION='bucket_region'
 BUCKET_HOST='aws?linode?digitalocean?'
 
 # Redis Server Set up
-REDIS_URL='redis://:PASSWORD@HOST:PORT'
+REDIS_URL='redis://:@localhost:6379'
 REDIS_CACHE_TTL=600
 
 # Graphql Upload
 MAX_FILE_SIZE=5242880
 MAX_FILES=5
-
-FCM_JSON='{}'
+PLAYGROUND=true
diff --git a/apps/nestjs/src/config/validation.ts b/apps/nestjs/src/config/validation.ts
@@ -13,7 +13,7 @@ export const validationSchema = Joi.object({
   JWT_PRIVATE_KEY: Joi.string().required(),
   JWT_EXPIRES_IN: Joi.string().required(),
   JWT_AUDIENCE: Joi.string().required(),
-  JWT_ISSUER: Joi.string().required(),
+  JWT_ISSUER: Joi.string(),
 
   JWT_COOKIE_NAME: Joi.string().required(),
   JWT_REFRESH_EXPIRES_IN: Joi.string().required(),
@@ -37,6 +37,6 @@ export const validationSchema = Joi.object({
   MAX_FILE_SIZE: Joi.number().required(),
   MAX_FILES: Joi.number().required(),
 
-  FCM_JSON: Joi.string().required(),
+  FCM_JSON: Joi.string(),
 
 })
diff --git a/apps/nestjs/src/shared/services/notification.service.ts b/apps/nestjs/src/shared/services/notification.service.ts
@@ -7,10 +7,12 @@ import { IConfig } from '@/config/interfaces/config.interface'
 @Injectable()
 export class NotificationService {
   constructor(configService: ConfigService<IConfig>) {
-    const firebaseCredentials = JSON.parse(configService.get('fcm_json').replace(/'/g, '"'))
-    firebase.initializeApp({
-      credential: firebase.credential.cert(firebaseCredentials),
-    })
+    if (configService.get('fcm_json')) {
+      const firebaseCredentials = JSON.parse(configService.get('fcm_json').replace(/'/g, '"'))
+      firebase.initializeApp({
+        credential: firebase.credential.cert(firebaseCredentials),
+      })
+    }
   }
 
   async sendToDevice(title: string, data: Notification = { title: 'Title', body: 'body' }, token: string): Promise<Boolean> {
diff --git a/apps/vue-web/.env.example b/apps/vue-web/.env.example
@@ -0,0 +1,3 @@
+VITE_FIREBASE_CONFIG=
+VITE_VAPID_KEY=
+VITE_SERVER_URL=localhost
diff --git a/apps/vue-web/src/main.ts b/apps/vue-web/src/main.ts
@@ -4,12 +4,10 @@ import axios from 'axios'
 import 'uno.css'
 import './assets/base.css'
 import { createHead } from '@vueuse/head'
-import { onMessage } from 'firebase/messaging'
-import router, { routes } from './router'
-import { messaging } from './services/notifications'
-import App from './App.vue'
 // import { onMessage } from 'firebase/messaging'
+import router, { routes } from './router'
 // import { messaging } from './services/notifications'
+import App from './App.vue'
 
 const meta = document.createElement('meta')
 meta.name = 'naive-ui-style'
@@ -43,41 +41,44 @@ if (import.meta.hot)
   import.meta.hot.accept()
 
 init()
-onMessage(messaging, (payload) => {
-  if (payload.notification === undefined)
-    return
+// TODO nullable Firebase messaging
+// if (import.meta.env.VITE_FIREBASE_CONFIG) {
+//   onMessage(messaging, (payload) => {
+//     if (payload.notification === undefined)
+//       return
 
-  // console.log(payload.data)
-  const notificationData = payload
+//     // console.log(payload.data)
+//     const notificationData = payload
 
-  // eslint-disable-next-line no-console
-  console.log(
-    '[firebase-messaging-sw.js] Received foreground message ',
-    notificationData,
-  )
-  const { tSuccess } = usePWebNotification()
-  if (notificationData.data)
-    tSuccess({ title: notificationData.data.title, description: notificationData.data.body })
+//     // eslint-disable-next-line no-console
+//     console.log(
+//       '[firebase-messaging-sw.js] Received foreground message ',
+//       notificationData,
+//     )
+//     const { tSuccess } = usePWebNotification()
+//     if (notificationData.data)
+//       tSuccess({ title: notificationData.data.title, description: notificationData.data.body })
 
-  const { title, body } = notificationData.data as { title: string; body: string }
-  const notificationTitle = title
-  const notificationOptions = {
-    body,
-    icon: '/logo-dark.png',
-  }
+//     const { title, body } = notificationData.data as { title: string; body: string }
+//     const notificationTitle = title
+//     const notificationOptions = {
+//       body,
+//       icon: '/logo-dark.png',
+//     }
 
-  navigator.serviceWorker.ready.then((registration) => {
-    registration
-      .showNotification(notificationTitle, notificationOptions)
-      .then(() => {
-        // eslint-disable-next-line no-console
-        console.log('[firebase-messaging-sw.js] Notification shown')
-      })
-      .catch((error) => {
-        console.error(
-          '[firebase-messaging-sw.js] Error showing notification',
-          error,
-        )
-      })
-  })
-})
+//     navigator.serviceWorker.ready.then((registration) => {
+//       registration
+//         .showNotification(notificationTitle, notificationOptions)
+//         .then(() => {
+//           // eslint-disable-next-line no-console
+//           console.log('[firebase-messaging-sw.js] Notification shown')
+//         })
+//         .catch((error) => {
+//           console.error(
+//             '[firebase-messaging-sw.js] Error showing notification',
+//             error,
+//           )
+//         })
+//     })
+//   })
+// }
diff --git a/apps/vue-web/src/pages/auth/login.vue b/apps/vue-web/src/pages/auth/login.vue
@@ -8,7 +8,6 @@ import type { SchemaOf } from 'yup'
 import { boolean, object, string } from 'yup'
 import type { SignInInput } from '@oku/api'
 import { useI18n } from 'vue-i18n'
-import { initNotif } from '~/services/notifications'
 
 const userStore = useUserStore()
 const { t } = useI18n()
@@ -61,7 +60,6 @@ const onSubmit = form.handleSubmit(async (values) => {
   {
     onSuccess: (res) => {
       // router.push(res)
-      initNotif()
     },
     onLoading: (res) => {
       isLoading.value = res
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,20 +1,20 @@
 version: "3.9"
-
 services:
-  monorepo:
+  postgres:
     image: postgres:latest
     platform: linux/x86_64
     restart: unless-stopped
     ports:
-      - 62162:5432
+      - 5432:5432
     environment:
       - POSTGRES_DB=postgres
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
     volumes:
       - monorepo:/var/lib/postgresql/data
+      - ./initdb:/docker-entrypoint-initdb.d
 
-  redisnonorepo:
+  redis:
     image: redis:latest
     restart: unless-stopped
     ports:
@@ -27,4 +27,4 @@ services:
 volumes:
   monorepo:
     driver: local
-    name: monorepo
+    name: monorepo
diff --git a/docs/productdevbook.png b/docs/productdevbook.png
diff --git a/initdb/extensions.sh b/initdb/extensions.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+set -u
+sleep 10
+
+main() {
+  echo "CREATING UUID-OSSP and pgcrypto EXTENSIONS" 
+  create_extensions
+  echo "EXTENSIONS CREATED SUCCESSFULLY"
+}
+
+
+create_extensions() {
+  psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+	    CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+      CREATE EXTENSION IF NOT EXISTS "pgcrypto";
+EOSQL
+}
+
+main "$@"
+
diff --git a/package.json b/package.json
@@ -4,16 +4,16 @@
   "workspaces": ["apps/*", "packages/*"],
   "scripts": {
     "dev": "turbo run dev --parallel --no-cache",
-    "dev:vue-storybook": "turbo run dev --parallel --no-cache --scope=@productdevbook/storybook-vue",
-    "dev:web": "turbo run dev --parallel --no-cache --scope=vue-web --scope=@oku/api --scope=app-nestjs --scope=oku-i18n",
-    "dev:mobile": "turbo run dev --parallel --no-cache --scope=vue-mobile --scope=@oku/api  --scope=app-nestjs --scope=oku-i18n",
-    "dev:ui:web": "turbo run dev --parallel --no-cache --scope=vue-web --scope=@productdevbook/storybook-vue",
-    "dev:ui:mobile": "turbo run dev --parallel --no-cache --scope=vue-mobile --scope=@productdevbook/storybook-vue",
+    "dev:vue-storybook": "turbo run dev --parallel --no-cache --filter=@productdevbook/storybook-vue",
+    "dev:web": "turbo run dev --parallel --no-cache --filter=vue-web --filter=@oku/api --filter=app-nestjs --filter=oku-i18n",
+    "dev:mobile": "turbo run dev --parallel --no-cache --filter=vue-mobile --filter=@oku/api  --filter=app-nestjs --filter=oku-i18n",
+    "dev:ui:web": "turbo run dev --parallel --no-cache --filter=vue-web --filter=@productdevbook/storybook-vue",
+    "dev:ui:mobile": "turbo run dev --parallel --no-cache --filter=vue-mobile --filter=@productdevbook/storybook-vue",
     "dev:nestjs": "turbo run dev --filter=app-nestjs",
     "build": "turbo run build",
-    "build:nestjs": "turbo run build --parallel --scope=app-nestjs",
-    "build:vue-web": "turbo run build --parallel --scope=vue-web",
-    "build:vue-mobile": "turbo run build --parallel --scope=vue-mobile",
+    "build:nestjs": "turbo run build --parallel --filter=app-nestjs",
+    "build:vue-web": "turbo run build --parallel --filter=vue-web",
+    "build:vue-mobile": "turbo run build --parallel --filter=vue-mobile",
     "app": "pnpm --filter vue-mobile refresh",
     "run:android": "pnpm --filter vue-mobile ionic capacitor run android",
     "run:ios": "pnpm --filter vue-mobile ionic capacitor run ios",
@@ -26,7 +26,7 @@
     "db:update": "pnpm --filter app-nestjs migrate:update",
     "db:push": "pnpm --filter app-nestjs migrate:push",
     "db:delete": "pnpm --filter app-nestjs migrate:drop",
-    "db:data": "pnpm --filternestjs mikro-orm seeder:run",
+    "db:data": "pnpm --filter nestjs mikro-orm seeder:run",
     "db:revert": "pnpm --filter app-nestjs migrate:revert",
     "db:show": "pnpm --filter app-nestjs migrate:show",
     "generate": "pnpm --filter @oku/api build && pnpm --filter api app:create",
@@ -59,10 +59,6 @@
     "vue-mobile": "workspace:*",
     "vue-web": "workspace:*"
   },
-  "engines": {
-    "npm": "8.x",
-    "node": "16.x"
-  },
   "packageManager": "pnpm@7.6.0",
   "dependencies": {
     "add": "2.0.6",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+VITE_FIREBASE_CONFIG=`
	`2`	`+VITE_VAPID_KEY=`
	`3`	`+VITE_SERVER_URL=localhost`