Skip to content

Commit

Permalink
Merge pull request #154 from fleetbase/dev-v0.2.8
Browse files Browse the repository at this point in the history
v0.2.8
  • Loading branch information
roncodes committed Nov 6, 2023
2 parents 6880664 + 9c4daf7 commit a52af94
Show file tree
Hide file tree
Showing 9 changed files with 303 additions and 290 deletions.
4 changes: 2 additions & 2 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"require": {
"php": "^7.3|^8.0",
"fleetbase/core-api": "^1.3.2",
"fleetbase/fleetops-api": "^0.3.1",
"fleetbase/storefront-api": "^0.2.2",
"fleetbase/fleetops-api": "^0.3.2",
"fleetbase/storefront-api": "^0.2.3",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.75",
Expand Down
149 changes: 75 additions & 74 deletions api/composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion console/app/models/company.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default class Company extends Model {
@attr('string') owner_uuid;
@attr('string') logo_uuid;
@attr('string') backdrop_uuid;
@attr('string') address_uuid;
@attr('string') place_uuid;

/** @relationships */
@belongsTo('file') logo;
Expand Down
3 changes: 2 additions & 1 deletion console/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ module.exports = function (environment) {
driverImage: getenv('DEFAULT_DRIVER_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
userImage: getenv('DEFAULT_USER_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
contactImage: getenv('DEFAULT_CONTACT_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
vehicleImage: getenv('DEFAULT_VEHICLE_IMAGE', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/vehicle-icons/light_commercial_van.svg'),
vendorImage: getenv('DEFAULT_VENDOR_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
vehicleImage: getenv('DEFAULT_VEHICLE_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/vehicle-placeholder.png'),
vehicleAvatar: getenv('DEFAUL_VEHICLE_AVATAR', 'https://flb-assets.s3-ap-southeast-1.amazonaws.com/static/vehicle-icons/mini_bus.svg'),
},

Expand Down
18 changes: 9 additions & 9 deletions console/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fleetbase/console",
"version": "0.2.7",
"version": "0.2.8",
"private": true,
"description": "Fleetbase Console",
"repository": "",
Expand All @@ -26,12 +26,12 @@
"dependencies": {
"@ember/legacy-built-in-components": "^0.4.1",
"@fleetbase/ember-core": "^0.1.6",
"@fleetbase/ember-ui": "^0.2.2",
"@fleetbase/ember-ui": "^0.2.3",
"@fleetbase/dev-engine": "^0.1.9",
"@fleetbase/iam-engine": "^0.0.7",
"@fleetbase/fleetops-engine": "^0.3.1",
"@fleetbase/fleetops-data": "^0.1.1",
"@fleetbase/storefront-engine": "^0.2.2",
"@fleetbase/fleetops-engine": "^0.3.2",
"@fleetbase/fleetops-data": "^0.1.2",
"@fleetbase/storefront-engine": "^0.2.3",
"@fleetbase/leaflet-routing-machine": "^3.2.16",
"@fortawesome/ember-fontawesome": "^0.4.1",
"ember-intl": "^6.0.0-beta.6",
Expand Down Expand Up @@ -67,7 +67,7 @@
"dragula": "^3.7.3",
"ember-auto-import": "^2.4.2",
"ember-cli": "~4.6.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-dotenv": "^3.1.0",
Expand Down Expand Up @@ -125,9 +125,9 @@
},
"pnpm": {
"overrides": {
"@fleetbase/fleetops-data": "^0.1.1",
"@fleetbase/ember-core": "^0.1.5",
"@fleetbase/ember-ui": "^0.2.2"
"@fleetbase/fleetops-data": "^0.1.2",
"@fleetbase/ember-core": "^0.1.6",
"@fleetbase/ember-ui": "^0.2.3"
}
},
"prettier": {
Expand Down
411 changes: 211 additions & 200 deletions console/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/fleetops
Submodule fleetops updated 282 files

0 comments on commit a52af94

Please sign in to comment.