Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: shawakash/payBox
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e12ff73704358c6131c7c7221770c2501b351d94
Choose a base ref
..
head repository: shawakash/payBox
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 016510e81b185ab38daaacf28eb8149c4a245db0
Choose a head ref
Showing with 50,725 additions and 6,337 deletions.
  1. +36 −0 .github/workflows/docker-image.yml
  2. BIN .idea/copilot/chatSessions/00000000000.xd
  3. BIN .idea/copilot/chatSessions/blobs/version
  4. +53 −0 .idea/copilot/chatSessions/xd.lck
  5. +0 −8 .idea/modules.xml
  6. +0 −17 .idea/payBox.iml
  7. +0 −3 .idea/works.md
  8. +33 −16 .idea/workspace.xml
  9. +2 −0 apps/web/.dockerignore
  10. +58 −0 apps/web/app/account/components/selectAccount.tsx
  11. +27 −0 apps/web/app/account/components/side-nav.tsx
  12. +77 −49 apps/web/app/{wallet → account}/create/components/account-create-form.tsx
  13. +59 −0 apps/web/app/account/create/components/avatar-upload.tsx
  14. +43 −0 apps/web/app/account/create/page.tsx
  15. +18 −0 apps/web/app/account/layout.tsx
  16. +52 −0 apps/web/app/account/page.tsx
  17. +5 −3 apps/web/app/layout.tsx
  18. +0 −65 apps/web/app/wallet/components/account-switcher.tsx
  19. +0 −258 apps/web/app/wallet/components/mai-display.tsx
  20. +0 −89 apps/web/app/wallet/components/mail-list.tsx
  21. +0 −202 apps/web/app/wallet/components/mail.tsx
  22. +0 −87 apps/web/app/wallet/components/nav.tsx
  23. +0 −205 apps/web/app/wallet/components/side-nav-wrapper.tsx
  24. +0 −38 apps/web/app/wallet/create/page.tsx
  25. +0 −323 apps/web/app/wallet/data.tsx
  26. +0 −56 apps/web/app/wallet/layout.tsx
  27. +0 −43 apps/web/app/wallet/page.tsx
  28. +0 −15 apps/web/app/wallet/use-mail.tsx
  29. +37 −0 apps/web/components/ui/progress.tsx
  30. +17 −0 apps/web/lib/helper.ts
  31. +3 −1 apps/web/package.json
  32. +2 −0 backend/api/.dockerignore
  33. +17 −0 backend/api/CHANGELOG.md
  34. +6 −3 backend/api/package.json
  35. +22 −2 backend/api/src/Redis.ts
  36. +31 −4 backend/api/src/auth/middleware.ts
  37. +72 −2 backend/api/src/auth/util.ts
  38. +5 −1 backend/api/src/config.ts
  39. +16 −5 backend/api/src/index.ts
  40. +41 −10 backend/api/src/redis/account.ts
  41. +6 −2 backend/api/src/redis/address.ts
  42. +8 −5 backend/api/src/redis/client.ts
  43. +5 −4 backend/api/src/redis/txn.ts
  44. +36 −3 backend/api/src/redis/wallet.ts
  45. +113 −26 backend/api/src/routes/account.ts
  46. +5 −3 backend/api/src/routes/address.ts
  47. +28 −38 backend/api/src/routes/client.ts
  48. +2 −1 backend/api/src/routes/qrcode.ts
  49. +5 −3 backend/api/src/routes/transaction.ts
  50. +12 −3 backend/api/src/routes/wallet.ts
  51. +9 −0 backend/backend-common/.dockerignore
  52. +24 −0 backend/backend-common/.env.example
  53. +34 −0 backend/backend-common/.gitignore
  54. +13 −0 backend/backend-common/.yarnrc
  55. +7 −0 backend/backend-common/CHANGELOG.md
  56. +25 −0 backend/backend-common/package.json
  57. +61 −0 backend/backend-common/src/config.ts
  58. +42 −3 backend/{api → backend-common}/src/db/account.ts
  59. +2 −3 backend/{api → backend-common}/src/db/address.ts
  60. +46 −0 backend/backend-common/src/db/chat.ts
  61. +27 −15 backend/{api → backend-common}/src/db/client.ts
  62. +43 −0 backend/backend-common/src/db/friendship.ts
  63. +3 −1 backend/{api → backend-common}/src/db/index.ts
  64. +2 −3 backend/{api → backend-common}/src/db/qrcode.ts
  65. +1 −1 backend/{api → backend-common}/src/db/transaction.ts
  66. +104 −25 backend/{api → backend-common}/src/db/wallet.ts
  67. +2 −0 backend/backend-common/src/index.ts
  68. +109 −0 backend/backend-common/tsconfig.json
  69. +45 −0 backend/chat-hasura/docker-compose.yml
  70. +4 −0 backend/chat-hasura/hasura/config.yaml
  71. 0 backend/chat-hasura/hasura/metadata/actions.graphql
  72. +6 −0 backend/chat-hasura/hasura/metadata/actions.yaml
  73. +1 −0 backend/chat-hasura/hasura/metadata/allow_list.yaml
  74. +1 −0 backend/chat-hasura/hasura/metadata/api_limits.yaml
  75. +1 −0 backend/chat-hasura/hasura/metadata/backend_configs.yaml
  76. +1 −0 backend/chat-hasura/hasura/metadata/cron_triggers.yaml
  77. +14 −0 backend/chat-hasura/hasura/metadata/databases/databases.yaml
  78. +3 −0 backend/chat-hasura/hasura/metadata/databases/default/tables/public_channel.yaml
  79. +3 −0 backend/chat-hasura/hasura/metadata/databases/default/tables/public_chat.yaml
  80. +2 −0 backend/chat-hasura/hasura/metadata/databases/default/tables/tables.yaml
  81. +1 −0 backend/chat-hasura/hasura/metadata/graphql_schema_introspection.yaml
  82. +1 −0 backend/chat-hasura/hasura/metadata/inherited_roles.yaml
  83. +1 −0 backend/chat-hasura/hasura/metadata/metrics_config.yaml
  84. +1 −0 backend/chat-hasura/hasura/metadata/network.yaml
  85. +1 −0 backend/chat-hasura/hasura/metadata/opentelemetry.yaml
  86. +1 −0 backend/chat-hasura/hasura/metadata/query_collections.yaml
  87. +1 −0 backend/chat-hasura/hasura/metadata/remote_schemas.yaml
  88. +1 −0 backend/chat-hasura/hasura/metadata/rest_endpoints.yaml
  89. +1 −0 backend/chat-hasura/hasura/metadata/version.yaml
  90. +1 −0 backend/chat-hasura/hasura/migrations/default/1710517208464_create_table_public_chat/down.sql
  91. +18 −0 backend/chat-hasura/hasura/migrations/default/1710517208464_create_table_public_chat/up.sql
  92. +1 −0 backend/chat-hasura/hasura/migrations/default/1710517419995_create_table_public_channel/down.sql
  93. +18 −0 backend/chat-hasura/hasura/migrations/default/1710517419995_create_table_public_channel/up.sql
  94. +10 −0 backend/chat-zeus/.dockerignore
  95. +34 −0 backend/chat-zeus/.gitignore
  96. +13 −0 backend/chat-zeus/.yarnrc
  97. +24 −0 backend/chat-zeus/package.json
  98. +9 −0 backend/chat-zeus/src/codegen.yml
  99. +1 −0 backend/chat-zeus/src/codegen/index.ts
  100. +723 −0 backend/chat-zeus/src/codegen/types.ts
  101. +3 −0 backend/chat-zeus/src/index.ts
  102. +391 −0 backend/chat-zeus/src/zeus/const.ts
  103. +3,565 −0 backend/chat-zeus/src/zeus/index.ts
  104. +109 −0 backend/chat-zeus/tsconfig.json
  105. +20 −0 backend/hasura/hasura/metadata/databases/default/tables/public_chat.yaml
  106. +21 −0 backend/hasura/hasura/metadata/databases/default/tables/public_client.yaml
  107. +28 −0 backend/hasura/hasura/metadata/databases/default/tables/public_friendship.yaml
  108. +3 −0 backend/hasura/hasura/metadata/databases/default/tables/public_friendships.yaml
  109. +2 −0 backend/hasura/hasura/metadata/databases/default/tables/tables.yaml
  110. +1 −0 backend/hasura/hasura/migrations/default/1710591321515_create_table_public_chat/down.sql
  111. +18 −0 backend/hasura/hasura/migrations/default/1710591321515_create_table_public_chat/up.sql
  112. +1 −0 backend/hasura/hasura/migrations/default/1710591974835_create_table_public_friendships/down.sql
  113. +18 −0 backend/hasura/hasura/migrations/default/1710591974835_create_table_public_friendships/up.sql
  114. +1 −0 backend/hasura/hasura/migrations/default/1710592050873_rename_table_public_friendships/down.sql
  115. +1 −0 backend/hasura/hasura/migrations/default/1710592050873_rename_table_public_friendships/up.sql
  116. +1 −0 ...a/hasura/migrations/default/1710592563340_alter_table_public_chat_alter_column_channelId/down.sql
  117. +1 −0 ...ura/hasura/migrations/default/1710592563340_alter_table_public_chat_alter_column_channelId/up.sql
  118. +1 −0 backend/hasura/hasura/migrations/default/1710592582251_set_fk_public_chat_friendshipId/down.sql
  119. +5 −0 backend/hasura/hasura/migrations/default/1710592582251_set_fk_public_chat_friendshipId/up.sql
  120. +4 −0 ...a/hasura/migrations/default/1710593665430_alter_table_public_chat_drop_column_created_at/down.sql
  121. +1 −0 ...ura/hasura/migrations/default/1710593665430_alter_table_public_chat_drop_column_created_at/up.sql
  122. +4 −0 ...asura/hasura/migrations/default/1710593690560_alter_table_public_chat_add_column_send_at/down.sql
  123. +2 −0 .../hasura/hasura/migrations/default/1710593690560_alter_table_public_chat_add_column_send_at/up.sql
  124. +4 −0 ...hasura/hasura/migrations/default/1710684774643_alter_table_public_account_add_column_img/down.sql
  125. +2 −0 ...d/hasura/hasura/migrations/default/1710684774643_alter_table_public_account_add_column_img/up.sql
  126. +1 −0 ...migrations/default/1710684799395_alter_table_public_account_add_check_constraint_img_url/down.sql
  127. +1 −0 ...a/migrations/default/1710684799395_alter_table_public_account_add_check_constraint_img_url/up.sql
  128. +2 −0 ...migrations/default/1710684811570_alter_table_public_account_add_check_constraint_img_url/down.sql
  129. +2 −0 ...a/migrations/default/1710684811570_alter_table_public_account_add_check_constraint_img_url/up.sql
  130. +2 −0 backend/mote/.dockerignore
  131. +2 −0 backend/ws/.dockerignore
  132. +9 −0 backend/ws/CHANGELOG.md
  133. +2 −2 backend/ws/package.json
  134. +106 −0 backend/ws/src/Redis/ChatSub.ts
  135. +18 −0 backend/ws/src/cluster.ts
  136. +3 −1 backend/ws/src/config.ts
  137. +58 −19 backend/ws/src/index.ts
  138. +1 −1 backend/ws/tsconfig.json
  139. +2 −0 backend/zeus/.dockerignore
  140. +1 −1 backend/zeus/package.json
  141. +861 −0 backend/zeus/src/codegen/types.ts
  142. +499 −0 backend/zeus/src/zeus/const.ts
  143. +3,840 −248 backend/zeus/src/zeus/index.ts
  144. +16 −0 docker/backend-common/Dockerfile
  145. +25 −0 docker/chat-zeus/Dockerfile
  146. +1 −1 docker/zeus/Dockerfile
  147. +34,996 −0 package-lock.json
  148. +2 −0 packages/common/.dockerignore
  149. +12 −0 packages/common/CHANGELOG.md
  150. +1 −1 packages/common/package.json
  151. +11 −2 packages/common/src/constant.ts
  152. +160 −141 packages/common/src/types.ts
  153. +3 −9 packages/common/src/validations/account.ts
  154. +16 −0 packages/common/src/validations/friendship.ts
  155. +2 −0 packages/kafka/.dockerignore
  156. +7 −0 packages/kafka/CHANGELOG.md
  157. +3 −4 packages/kafka/package.json
  158. +35 −0 packages/kafka/src/consumer/chat.ts
  159. +31 −0 packages/kafka/src/consumer/txn.ts
  160. +0 −199 packages/kafka/src/db/address.ts
  161. +0 −804 packages/kafka/src/db/client.ts
  162. +0 −3 packages/kafka/src/db/index.ts
  163. +0 −257 packages/kafka/src/db/transaction.ts
  164. +13 −23 packages/kafka/src/index.ts
  165. +34 −0 packages/kafka/src/producer/chat.ts
  166. +1 −0 packages/kafka/src/producer/index.ts
  167. +2 −0 packages/recoil/.dockerignore
  168. +3,289 −2,977 yarn.lock
36 changes: 36 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -153,3 +153,39 @@ jobs:

- name: Push @paybox/mote Docker image
run: docker push shawakash/paybox-mote:${{ github.sha }}

chat_zeus_image:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build @paybox/chat-zeus Docker image
run: docker build -t shawakash/paybox-chat-zeus:${{ github.sha }} -f ./docker/chat-zeus/Dockerfile .

- name: Push @paybox/chat-zeus Docker image
run: docker push shawakash/paybox-chat-zeus:${{ github.sha }}

backend_common_image:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build @paybox/backend-common Docker image
run: docker build -t shawakash/paybox-backend-common:${{ github.sha }} -f ./docker/backend-common/Dockerfile .

- name: Push @paybox/backend-common Docker image
run: docker push shawakash/paybox-backend-common:${{ github.sha }}
Binary file added .idea/copilot/chatSessions/00000000000.xd
Binary file not shown.
Binary file added .idea/copilot/chatSessions/blobs/version
Binary file not shown.
53 changes: 53 additions & 0 deletions .idea/copilot/chatSessions/xd.lck

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

17 changes: 0 additions & 17 deletions .idea/payBox.iml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/works.md

This file was deleted.

49 changes: 33 additions & 16 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions apps/web/.dockerignore
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ node_modules
.build
.next
out
.env
dist
.DS_Store
npm-debug.log
yarn-error.log
58 changes: 58 additions & 0 deletions apps/web/app/account/components/selectAccount.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
"use client"
import React, { useState } from 'react'

import { cn } from "@/lib/utils"
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select"

interface SelectAccountProps {
accounts: {
id: string,
name: string
}[],
isCollapsed: boolean,
selectedAccount: string,
setSelectedAccount: (accountId: string) => void
}

export function SelectAcocunt({accounts, isCollapsed, selectedAccount, setSelectedAccount}: SelectAccountProps) {

return (
<>
<Select defaultValue={selectedAccount} onValueChange={setSelectedAccount}>
<SelectTrigger
className={cn(
"flex items-center gap-2 [&>span]:line-clamp-1 [&>span]:flex [&>span]:w-full [&>span]:items-center [&>span]:gap-1 [&>span]:truncate [&_svg]:h-4 [&_svg]:w-4 [&_svg]:shrink-0",
isCollapsed &&
"flex h-9 w-9 shrink-0 items-center justify-center p-0 [&>span]:w-auto [&>svg]:hidden"
)}
aria-label="Select account"
>
<SelectValue placeholder="Select an account">
<span className={cn("ml-2", isCollapsed && "hidden")}>
{
accounts.find((account) => account.id === selectedAccount)
?.name
}
</span>
</SelectValue>
</SelectTrigger>
<SelectContent>
{accounts.map((account) => (
<SelectItem key={account.id} value={account.id}>
<div className="flex items-center gap-3 [&_svg]:h-4 [&_svg]:w-4 [&_svg]:shrink-0 [&_svg]:text-foreground">
{account.name}
{/* <div className="">{account.id.slice(0, 5)}</div> */}
</div>
</SelectItem>
))}
</SelectContent>
</Select>
</>
)
}
27 changes: 27 additions & 0 deletions apps/web/app/account/components/side-nav.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
"use client";
import { AccountType } from '@paybox/common';
import React, { useState } from 'react'
import { SelectAcocunt } from './selectAccount';

interface AccountNavProps {
accounts: AccountType[]
}

export function AccountNav({ accounts }: AccountNavProps) {
const [selectedAccount, setSelectedAccount] = useState<string>(accounts[0].id)
return (
<>
<SelectAcocunt
accounts={accounts.map(acc => {
return {
id: acc.id,
name: acc.name
}
})}
isCollapsed={false}
selectedAccount={selectedAccount}
setSelectedAccount={setSelectedAccount}
/>
</>
)
}
Loading