Skip to content

Commit

Permalink
Merge branch develop into feature/logger
Browse files Browse the repository at this point in the history
  • Loading branch information
tpmpb committed Dec 10, 2024
2 parents 8171ac1 + 512f086 commit e03a7af
Show file tree
Hide file tree
Showing 74 changed files with 2,149 additions and 2,944 deletions.
8 changes: 8 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
# OpenTelemetry Configuration
OTEL_RECEIVER_HTTP_PORT=4318
OTEL_HOST='localhost'
OTEL_URL='http://${OTEL_HOST}:${OTEL_RECEIVER_HTTP_PORT}/v1/metrics'

# Midaz Console
MIDAZ_CONSOLE_PORT=8081
MIDAZ_CONSOLE_SERVICE_HOST='localhost'
MIDAZ_CONSOLE_SERVICE_PORT=8081
MIDAZ_CONSOLE_BASE_PATH='http://${MIDAZ_CONSOLE_SERVICE_HOST}:${MIDAZ_CONSOLE_PORT}'

# NextAuth Configuration
NEXTAUTH_URL='http://localhost:${MIDAZ_CONSOLE_PORT}'
NEXTAUTH_SECRET=testSecret
NEXTAUTH_CASDOOR_CLIENT_ID='9670e0ca55a29a466d31'
Expand All @@ -13,6 +20,7 @@ NEXTAUTH_CASDOOR_AUTH_URL='http://${NEXTAUTH_CASDOOR_AUTH_HOST}:${NEXTAUTH_CASDO
NEXTAUTH_CASDOOR_ORGANIZATION_NAME=lerian
NEXTAUTH_CASDOOR_APPLICATION_NAME=app-midaz

# Midaz API Configuration
MIDAZ_API_HOST='ledger'
MIDAZ_API_PORT=3000
MIDAZ_BASE_PATH='http://${MIDAZ_API_HOST}:${MIDAZ_API_PORT}/v1'
Expand Down
8 changes: 8 additions & 0 deletions .env.local.example
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
# OpenTelemetry Configuration
OTEL_RECEIVER_HTTP_PORT=4318
OTEL_HOST='localhost'
OTEL_URL='http://${OTEL_HOST}:${OTEL_RECEIVER_HTTP_PORT}/v1/metrics'

# Midaz Console
MIDAZ_CONSOLE_PORT=8081
MIDAZ_CONSOLE_SERVICE_HOST='localhost'
MIDAZ_CONSOLE_SERVICE_PORT=8081
MIDAZ_CONSOLE_BASE_PATH='http://${MIDAZ_CONSOLE_SERVICE_HOST}:${MIDAZ_CONSOLE_PORT}'

# NextAuth Configuration
NEXTAUTH_URL='http://localhost:${MIDAZ_CONSOLE_PORT}'
NEXTAUTH_SECRET=testSecret
NEXTAUTH_CASDOOR_CLIENT_ID='9670e0ca55a29a466d31'
Expand All @@ -13,6 +20,7 @@ NEXTAUTH_CASDOOR_AUTH_URL='http://${NEXTAUTH_CASDOOR_AUTH_HOST}:${NEXTAUTH_CASDO
NEXTAUTH_CASDOOR_ORGANIZATION_NAME=lerian
NEXTAUTH_CASDOOR_APPLICATION_NAME=app-midaz

# Midaz API Configuration
MIDAZ_API_HOST='localhost'
MIDAZ_API_PORT=3000
MIDAZ_BASE_PATH='http://${MIDAZ_API_HOST}:${MIDAZ_API_PORT}/v1'
Expand Down
8 changes: 6 additions & 2 deletions locales/extracted/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@
"common.logoAlt": "Your organization logo",
"common.metadata": "Metadata",
"common.name": "Name",
"common.nextPage": "Next page",
"common.noOptions": "No options found.",
"common.portfolio": "Portfolio",
"common.previousPage": "Previous page",
"common.records": "records",
"common.remove": "Remove",
"common.requiredFields": "(*) required fields.",
Expand Down Expand Up @@ -159,6 +157,7 @@
"ledgers.account.sheet.edit.title": "Edit {accountName}",
"ledgers.account.sheet.tabs.details": "Account Details",
"ledgers.accounts.createFirst": "Create first account",
"ledgers.accounts.showing": "Showing {count} {number, plural, =0 {accounts} one {account} other {accounts}}.",
"ledgers.accounts.subtitle": "{count} {count, plural, =0 {accounts found} one {account found} other {accounts found}}",
"ledgers.accounts.title": "Accounts",
"ledgers.assets.createButton": "Create your first Asset",
Expand All @@ -170,6 +169,7 @@
"ledgers.assets.sheet.edit.title": "Edit {assetName}",
"ledgers.assets.sheet.tabs.details": "Assets Details",
"ledgers.assets.sheet.title": "New Asset",
"ledgers.assets.showing": "Showing {count} {number, plural, =0 {assets} one {asset} other {assets}}.",
"ledgers.assets.subtitle": "Currency or assets of any nature traded on this Ledger.",
"ledgers.assets.title": "Assets",
"ledgers.columnsTable.tooltipCopyText": "Click to copy",
Expand All @@ -192,17 +192,20 @@
"ledgers.portfolio.sheet.title": "New Portfolio",
"ledgers.portfolio.subtitle": "{count} {count, plural, =0 {portfolios found} one {portfolio found} other {portfolios found}}",
"ledgers.portfolio.title": "Portfolios",
"ledgers.portfolios.showing": "Showing {count} {number, plural, =0 {portfolios} one {portifolio} other {portfolios}}.",
"ledgers.products.emptyResource": "You haven't created any Products yet",
"ledgers.products.sheet.description": "Fill in the details of the Product you want to create.",
"ledgers.products.sheet.edit.description": "View and edit product fields.",
"ledgers.products.sheet.edit.title": "Edit {productName}",
"ledgers.products.sheet.tabs.details": "Product Details",
"ledgers.products.sheet.title": "New Product",
"ledgers.products.showing": "Showing {count} {number, plural, =0 {products} one {product} other {products}}.",
"ledgers.products.subtitle": "Clustering or allocation of customers at different levels.",
"ledgers.products.title": "Products",
"ledgers.sheet.tabs.details": "Ledger Details",
"ledgers.sheetCreate.description": "Fill in the data of the Ledger you wish to create.",
"ledgers.sheetCreate.title": "New Ledger",
"ledgers.showing": "Showing {count} {number, plural, =0 {ledgers} one {ledger} other {ledgers}}.",
"ledgers.subtitle": "Visualize and edit the Ledgers of your Organization.",
"ledgers.tab.accounts": "Accounts",
"ledgers.tab.assets": "Assets",
Expand Down Expand Up @@ -244,6 +247,7 @@
"organizations.organizationView.breadcrumbs.settings": "Settings",
"organizations.organizationView.newOrganization.title": "New Organization",
"organizations.organizationView.notFound": "Organization not found.",
"organizations.showing": "Showing {count} {number, plural, =0 {organizations} one {organization} other {organizations}}.",
"organizations.subtitle": "View and manage Organizations.",
"organizations.title": "Settings",
"organizations.toast.create.success": "Organization created!",
Expand Down
12 changes: 8 additions & 4 deletions locales/extracted/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
"common.copyMessage": "Copiado para a área de transferência!",
"common.expand": "Ampliar",
"common.inactive": "Inativo",
"common.nextPage": "Próxima Página",
"common.previousPage": "Página Anterior",
"common.tooltipCopyText": "Toque para copiar",
"entity.metadata.key": "Chave",
"entity.metadata.value": "Valor",
Expand Down Expand Up @@ -278,10 +276,16 @@
"ledgers.assets.sheet.tabs.details": "Detalhes do Ativo",
"ledgers.portfolio.sheet.tabs.details": "Detalhes do Portfólio",
"ledgers.products.sheet.tabs.details": "Detalhes do Produto",
"notFound.backToHome": "Voltar para Home",
"ledgers.sheet.tabs.details": "Detalhes do Ledger",
"common.records": "registros",
"ledgers.tab.accounts": "Contas",
"ledgers.tab.portfolios": "Portfólios",
"settings.tab.portfolios": "Portfólios"
"settings.tab.portfolios": "Portfólios",
"notFound.backToHome": "Voltar para Home",
"ledgers.assets.showing": "Mostrando {count} {number, plural, =0 {ativos} one {ativo} other {ativos}}.",
"ledgers.products.showing": "Mostrando {count} {number, plural, =0 {produtos} one {produto} other {produtos}}.",
"ledgers.showing": "Mostrando {count} {number, plural, =0 {ledgers} one {ledger} other {ledgers}}.",
"ledgers.accounts.showing": "Mostrando {count} {number, plural, =0 {contas} one {conta} other {contas}}.",
"ledgers.portfolios.showing": "Mostrando {count} {number, plural, =0 {portfólios} one {portfólio} other {portfólios}}.",
"organizations.showing": "Mostrando {count} {number, plural, =0 {organizações} one {organização} other {organizações}}."
}
7 changes: 6 additions & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@ const nextConfig = {
return config
},
experimental: {
serverComponentsExternalPackages: ['pino', 'pino-pretty']
serverComponentsExternalPackages: [
'pino',
'pino-pretty',
'@opentelemetry/instrumentation'
],
instrumentationHook: true
}
}

Expand Down
Loading

0 comments on commit e03a7af

Please sign in to comment.