Skip to content

Commit

Permalink
Merge branch 'webinar/registration' into update/multi-tanency
Browse files Browse the repository at this point in the history
  • Loading branch information
nxtCoder19 committed Sep 23, 2024
2 parents b4cc722 + 8466f7c commit e3574b3
Show file tree
Hide file tree
Showing 64 changed files with 2,304 additions and 9,661 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ src/generated/plugin/node_modules
src/design-system/node_modules
src/apps/devdoc/node_modules
src/apps/devdoc/.next
src/apps/webinar/.env

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ out
storybook-dist

tsconfig-compile.tsbuildinfo

.secrets
18 changes: 12 additions & 6 deletions Dockerfile.webinar
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
FROM node:20.8.1-alpine as base
FROM node:20.8.1-alpine AS base
RUN apk add g++ make py3-pip
RUN npm i -g pnpm
WORKDIR /app
COPY ./package.json ./package.json
COPY ./pnpm-lock.yaml ./pnpm-lock.yaml

COPY ./src/generated/package.json ./src/generated/package.json
COPY ./src/generated/plugin/package.json ./src/generated/plugin/package.json
RUN mkdir -p ./src/generated/plugin
COPY ./src/generated/package.json ./src/generated/pnpm-lock.yaml ./src/generated/
COPY ./src/generated/plugin/package.json ./src/generated/plugin/pnpm-lock.yaml ./src/generated/plugin/

RUN pnpm i
RUN --mount=type=bind,source=package.json,target=package.json \
--mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
--mount=type=cache,target=/root/.local/share/pnpm/store \
pnpm i --frozen-lockfile

# lib
COPY ./lib ./lib

# design system
COPY ./src/design-system/ ./src/design-system/
WORKDIR /app/src/design-system
RUN pnpm i -p
RUN pnpm i --frozen-lockfile
RUN pnpm local:release

# webinar
WORKDIR /app
COPY ./src/apps/webinar ./src/apps/webinar
WORKDIR /app/src/apps/webinar
RUN pnpm i -p
RUN pnpm i --frozen-lockfile
RUN pnpm build

FROM node:20.8.1-alpine
Expand Down
4 changes: 2 additions & 2 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tasks:
- |
BASE_URL=dev.kloudlite.io
COOKIE_DOMAIN=".kloudlite.io"
GATEWAY_URL="http://gateway.kloudlite.svc.cluster.local:3000"
GATEWAY_URL="http://gateway-api.kloudlite.svc.cluster.local:3000"
case {{.app}} in
"auth")
PORT=4000
Expand Down Expand Up @@ -106,7 +106,7 @@ tasks:
BASE_URL=kloudlite.io
URL_SUFFIX=""
COOKIE_DOMAIN=".kloudlite.io"
GATEWAY_URL="http://gateway.kloudlite.svc.cluster.local:3000"
GATEWAY_URL="http://gateway-api.kloudlite.svc.cluster.local:3000"
case {{.app}} in
"auth")
Expand Down
10 changes: 10 additions & 0 deletions lib/shared-statics/events.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"code-unbound-new-age-development-environments": {
"name": "Code Unbound: New Age Development Environments",
"dyteMeetingId": "bbbba7f8-3643-41fd-831a-15a321f80966",
"date": "2024-09-21",
"starttime": "12:15",
"endtime": "13:15",
"type": "Online"
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"homepage": "https://kloudlite.github.io",
"type": "module",
"scripts": {
"postinstall": "cd src/generated && pnpm i",
"postinstall": "cd src/generated && ls -al && pnpm i --frozen-lockfile",
"fake": "esbuild fake-data-generator/gen.ts --format=cjs --outfile=public/dist/fake-data-generator.cjs --platform=node && node public/dist/fake-data-generator.cjs",
"dev": "remix dev",
"serve": "remix-serve ./public/${APP}/server",
Expand Down Expand Up @@ -140,4 +140,4 @@
"typescript": "^5.3.3",
"typescript-json-schema": "^0.62.0"
}
}
}
1 change: 1 addition & 0 deletions src/apps/devdoc/.env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
APP_ENV=development
AUTH_URL=https://auth.dev.kloudlite.io
CONSOLE_URL=https://console.dev.kloudlite.io
CONTACT_URL=https://marketing-api.dev.kloudlite.io/website/contact-us
1 change: 1 addition & 0 deletions src/apps/devdoc/.env.production
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
APP_ENV=production
AUTH_URL=https://auth.kloudlite.io
CONSOLE_URL=https://console.kloudlite.io
CONTACT_URL=https://marketing-api.dev.kloudlite.io/website/contact-us
1 change: 1 addition & 0 deletions src/apps/devdoc/.eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ rules:

import/extensions: 0
import/prefer-default-export: off
import/no-relative-packages: 0

react/jsx-uses-react: 0
react/jsx-uses-vars: 1
Expand Down
25 changes: 2 additions & 23 deletions src/apps/devdoc/firebase.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"hosting": {
"public": "out",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"cleanUrls": true,
"trailingSlash": false,
"redirects": [
Expand All @@ -15,22 +11,5 @@
"type": 301
}
]
},
"functions": [
{
"source": "functions",
"codebase": "default",
"ignore": [
"node_modules",
".git",
"firebase-debug.log",
"firebase-debug.*.log",
"*.local"
],
"predeploy": [
"npm --prefix \"$RESOURCE_DIR\" run lint",
"npm --prefix \"$RESOURCE_DIR\" run build"
]
}
]
}
}
32 changes: 0 additions & 32 deletions src/apps/devdoc/functions/.eslintrc.js

This file was deleted.

10 changes: 0 additions & 10 deletions src/apps/devdoc/functions/.gitignore

This file was deleted.

Loading

0 comments on commit e3574b3

Please sign in to comment.