Skip to content

Commit

Permalink
Merge pull request #489 from karrioapi/advanced-fulfilment
Browse files Browse the repository at this point in the history
[feat] Advanced fulfilment
  • Loading branch information
danh91 authored Jan 23, 2024
2 parents c6b4a38 + 4c685b3 commit 4841355
Show file tree
Hide file tree
Showing 136 changed files with 11,420 additions and 6,063 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](./LICENSE)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/cc2ac4fcb6004bca84e42a90d8acfe41)](https://www.codacy.com/gh/karrioapi/karrio/dashboard?utm_source=github.com&utm_medium=referral&utm_content=karrioapi/karrio&utm_campaign=Badge_Grade)
[![Discord](https://img.shields.io/static/v1?label=Discord&message=chat&color=738adb&logo=discord)](https://discord.gg/gS88uE7sEx)
[![YouTube](https://img.shields.io/static/v1?label=YouTube&message=karrio&color=ff0000&logo=youtube)](https://www.youtube.com/@karrioapi)
[![Docker pulls](https://img.shields.io/docker/pulls/karrio/server)](https://hub.docker.com/r/karrio/server)


Karrio is an open-source shipping infrastructure for platforms. With Karrio, you can
build shipping experiences into your platform, access a network of shipping carriers
with a single API integration, automate fulfilment and improve logistics operations.
Karrio is a developer-first shipping integration and logistics automation platform
that helps developers build shipping experiences into their platforms.

**Get up and running in 1 minute with:**

Expand All @@ -51,7 +49,10 @@ Default Login: `admin@example.com` | `demo`
- **Cloud**: Optimized for deployments using Docker.
- **Dashboard**: Use the karrio dashboard to orchestrate your logistics operations.

<img alt="Karrio Dashboard" src="screenshots/dashboard.png" />
<p align="center">
<img alt="Karrio Dashboard" src="screenshots/dashboard-home.png" width="400" />
<img alt="Karrio Dashboard" src="screenshots/shipments.png" width="400" />
</p>

## Get started

Expand Down
127 changes: 98 additions & 29 deletions apps/api/karrio/server/static/karrio/js/karrio.js

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

2 changes: 1 addition & 1 deletion apps/api/karrio/server/static/karrio/js/karrio.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/dashboard/.env.sample
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# karrio dashboard environment variables

DASHBOARD_VERSION=2023.X
DASHBOARD_VERSION=2024.X
MULTI_TENANT=false

# karrio server address
Expand Down
7 changes: 4 additions & 3 deletions apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"@codemirror/lang-html": "^6.4.0",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-xml": "^6.0.1",
"@fortawesome/fontawesome-free": "^5.15.4",
"@fortawesome/fontawesome-free": "^6.5.1",
"@headlessui/react": "^1.7.14",
"@karrio/hooks": "*",
"@karrio/lib": "*",
"@karrio/types": "*",
"@karrio/ui": "*",
"@reactivex/rxjs": "^6.6.7",
"@sentry/nextjs": "^7.77.0",
"@sentry/nextjs": "^7.95.0",
"@tanstack/react-query": "^4.13.0",
"@uiw/react-codemirror": "^4.19.4",
"axios": "^1.6.0",
Expand All @@ -40,12 +40,13 @@
"lodash.tonumber": "^4.0.3",
"mobx": "^6.12.0",
"moment": "^2.29.4",
"next": "^13.4.20-canary.13",
"next": "^14.1.0",
"next-auth": "^4.24.5",
"pino": "^7.0.3",
"posthog-js": "^1.96.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"recharts": "^2.10.3",
"redoc": "^2.1.3",
"request-ip": "^3.3.0",
"rxjs": "^7.3.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/components/tracking-preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export const TrackingPreview: React.FC<TrackingPreviewComponent> = ({ children }
<div className="columns my-0">
<div className="column is-3 is-size-7 py-1">Service</div>
<div className="column is-size-7 has-text-weight-semibold py-1">
{(tracker?.shipment?.meta as any)?.service_name || tracker?.shipment?.service}
{formatRef(tracker?.info?.shipment_service || tracker?.shipment?.meta?.service_name || tracker?.shipment?.service)}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/modules/Developers/apikeys.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default function ApiPage(pageProps: any) {

<div className="columns">
<div className="column is-5 pr-2">
<p className="subtitle is-6 py-1">Public Key</p>
<p className="subtitle is-6 py-1">Private Key</p>
<p className="is-size-7 has-text-weight-semibold pr-6">
<span>Use this key to authenticate your API calls. </span>
<a
Expand Down
Loading

0 comments on commit 4841355

Please sign in to comment.