Skip to content

Commit 646398f

Browse files
authored
Merge pull request #828 from karrioapi/hotfix-dev-setup
[Hotfix] dev setup
2 parents 199ad4f + 0b56526 commit 646398f

File tree

77 files changed

+1371
-713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1371
-713
lines changed

.env.sample

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
# Core Server Settings
66
DEBUG_MODE=True
77
ADMIN_DASHBOARD=True
8-
ALLOWED_HOSTS=*
8+
ALLOWED_HOSTS=*,localhost,127.0.0.1
99
SECRET_KEY="n*s-ex6@ex_r1i%bk=3jd)p+lsick5bi*90!mbk7rc3iy_op1r"
10+
USE_HTTPS=False
1011

11-
# Database Configuration
12+
# Database Configuration (SQLite for Development)
1213
DATABASE_NAME=db.sqlite3
14+
# Uncomment below for PostgreSQL development
1315
# DATABASE_ENGINE=postgresql
1416
# DATABASE_USERNAME=postgres
1517
# DATABASE_PASSWORD=postgres
1618
# DATABASE_NAME=db
19+
# DATABASE_HOST=localhost
20+
# DATABASE_PORT=5432
1721

1822
# Authentication & Access
1923
ALLOW_SIGNUP=True
@@ -42,48 +46,3 @@ OIDC_RSA_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----\nMIIJKQIBAAKCAgEA92+93Tyg6
4246

4347
# Plugin Configuration
4448
ENABLE_ALL_PLUGINS_BY_DEFAULT=True
45-
46-
# =============================================================================
47-
# KARRIO DASHBOARD CONFIGURATION
48-
# =============================================================================
49-
50-
# Dashboard Core Settings
51-
NEXT_PUBLIC_DASHBOARD_VERSION=2025.X
52-
NEXT_PUBLIC_KARRIO_PUBLIC_URL=http://localhost:5002
53-
54-
# Multi-tenancy Configuration
55-
NEXT_PUBLIC_MULTI_TENANT=false
56-
KARRIO_ADMIN_API_KEY=XXX
57-
58-
# Next.js Authentication Configuration
59-
AUTH_TRUST_HOST=true
60-
NEXTAUTH_URL=http://localhost:3000
61-
NEXTAUTH_SECRET="n*s-ex6@ex_r1i%bk=3jd)p+lsick5bi*90!mbk7rc3iy_op1r"
62-
63-
# Address Autocomplete Service
64-
NEXT_PUBLIC_ADDRESS_AUTO_COMPLETE_SERVICE=google
65-
NEXT_PUBLIC_ADDRESS_AUTO_COMPLETE_SERVICE_KEY=xxxxxxxxxxx
66-
67-
# Error Tracking & Monitoring
68-
SENTRY_IGNORE_API_RESOLUTION_ERROR=1
69-
# NEXT_PUBLIC_SENTRY_DSN=https://xxxxx
70-
71-
# =============================================================================
72-
# KARRIO AI AGENT CONFIGURATION (Optional - requires karrio-cli[dev])
73-
# =============================================================================
74-
75-
# Google AI Studio Configuration (recommended for development)
76-
GOOGLE_GENAI_USE_VERTEXAI=FALSE
77-
GOOGLE_API_KEY=YOUR_GOOGLE_API_KEY_HERE
78-
79-
# Google Cloud Vertex AI Configuration (alternative to AI Studio)
80-
# GOOGLE_GENAI_USE_VERTEXAI=TRUE
81-
# GOOGLE_CLOUD_PROJECT=YOUR_PROJECT_ID
82-
# GOOGLE_CLOUD_LOCATION=YOUR_LOCATION
83-
84-
# =============================================================================
85-
# SHARED/CROSS-CUTTING CONFIGURATION
86-
# =============================================================================
87-
88-
# Server Communication (used by both server and dashboard)
89-
# KARRIO_URL=http://localhost:5002

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# Karrio 2025.5rc10
2+
3+
## Changes
4+
5+
### Chore
6+
7+
- chore: introduce 'setup-dev-env' for full end-to-end dev environment setup.
8+
9+
> [!IMPORTANT]
10+
> This release is changing karrio's dashboard default port from `:3000` to `:3002`
11+
112
# Karrio 2025.5rc9
213

314
## Changes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ docker compose up
5151
```
5252

5353
- Karrio server accessible at <http://localhost:5002>
54-
- Karrio dashboard accessible at <http://localhost:3000>
54+
- Karrio dashboard accessible at <http://localhost:3002>
5555

5656
Default Login: `admin@example.com` | `demo`
5757

apps/api/karrio/server/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.5rc9
1+
2025.5rc10

apps/dashboard/.env.sample

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,48 @@
1-
# karrio dashboard environment variables
1+
# =============================================================================
2+
# KARRIO DASHBOARD CONFIGURATION
3+
# =============================================================================
4+
5+
# Core Dashboard Settings
26
NEXT_PUBLIC_DASHBOARD_VERSION=2025.X
37

4-
# karrio server
8+
# =============================================================================
9+
# SERVER INTEGRATION
10+
# =============================================================================
11+
12+
# Karrio API Server Configuration
513
# KARRIO_URL=http://localhost:5002
614
NEXT_PUBLIC_KARRIO_PUBLIC_URL=http://localhost:5002
715

8-
# Required for MULTI_TENANT
9-
NEXT_PUBLIC_MULTI_TENANT=false
10-
KARRIO_ADMIN_API_KEY=XXX
16+
# =============================================================================
17+
# AUTHENTICATION CONFIGURATION
18+
# =============================================================================
1119

12-
# next-auth config
20+
# Next.js Authentication Settings
1321
AUTH_TRUST_HOST=true
14-
NEXTAUTH_URL=http://localhost:3000
22+
NEXTAUTH_URL=http://localhost:3002
1523
NEXTAUTH_SECRET="n*s-ex6@ex_r1i%bk=3jd)p+lsick5bi*90!mbk7rc3iy_op1r"
1624
JWT_APP_SECRET_KEY="n*s-ex6@ex_r1i%bk=3jd)p+lsick5bi*90!mbk7rc3iy_op1r"
1725

18-
# Sentry
19-
# NEXT_PUBLIC_SENTRY_DSN=https://xxxxx
20-
SENTRY_IGNORE_API_RESOLUTION_ERROR=1
26+
# =============================================================================
27+
# MULTI-TENANCY CONFIGURATION
28+
# =============================================================================
2129

22-
# Address Autocomplete
30+
# Multi-tenant Settings (Enterprise)
31+
NEXT_PUBLIC_MULTI_TENANT=false
32+
KARRIO_ADMIN_API_KEY=XXX
33+
34+
# =============================================================================
35+
# THIRD-PARTY INTEGRATIONS
36+
# =============================================================================
37+
38+
# Address Autocomplete Service
2339
NEXT_PUBLIC_ADDRESS_AUTO_COMPLETE_SERVICE=google # values: canadapost, google
2440
NEXT_PUBLIC_ADDRESS_AUTO_COMPLETE_SERVICE_KEY=xxxxxxxxxxx
25-
NEXT_PUBLIC_ADDRESS_AUTO_COMPLETE_SERVICE_KEY=xxxxxxxxxxx
41+
42+
# =============================================================================
43+
# ERROR TRACKING & MONITORING
44+
# =============================================================================
45+
46+
# Sentry Configuration
47+
# NEXT_PUBLIC_SENTRY_DSN=https://xxxxx
48+
SENTRY_IGNORE_API_RESOLUTION_ERROR=1

apps/dashboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@karrio/dashboard",
33
"version": "1.0.0",
44
"scripts": {
5-
"dev": "next dev",
5+
"dev": "next dev --port 3002",
66
"build": "next build",
77
"start": "next start",
88
"lint": "next lint"

apps/web/.env.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ KARRIO_ADMIN_API_KEY=XXX
1111

1212
# next-auth config
1313
AUTH_TRUST_HOST=true
14-
NEXTAUTH_URL=http://localhost:3000
14+
NEXTAUTH_URL=http://localhost:3002
1515
NEXTAUTH_SECRET="n*s-ex6@ex_r1i%bk=3jd)p+lsick5bi*90!mbk7rc3iy_op1r"
1616

1717
# Sentry

apps/web/src/app/docs/developing/api-development/local-setup/page.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ docker compose ps
5252
Once running, you should have:
5353
5454
- **API Server**: http://localhost:5002
55-
- **Dashboard**: http://localhost:3000
55+
- **Dashboard**: http://localhost:3002
5656
- **API Documentation**: http://localhost:5002/openapi
5757
5858
## Testing Your API Setup

apps/web/src/app/docs/products/app-store/api-integration/page.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ export function useWebSocketConnection(appContext) {
786786
// Attempt to reconnect after 3 seconds
787787
reconnectTimeoutRef.current = setTimeout(() => {
788788
connect();
789-
}, 3000);
789+
}, 3002);
790790
};
791791

792792
ws.onerror = (error) => {

apps/web/src/app/docs/products/app-store/app-manifest/page.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ Define environment-specific settings.
347347
export const manifest: AppManifest = {
348348
environment: {
349349
development: {
350-
api_base_url: "http://localhost:3000",
350+
api_base_url: "http://localhost:3002",
351351
debug: true,
352352
},
353353
staging: {

0 commit comments

Comments
 (0)