Compare commits

...

17 Commits

Author SHA1 Message Date
Ronald A. Richardson
435552f332 updated docker-compose.yml to set baseUrl for solid server 2023-12-06 13:51:45 +08:00
Ronald A. Richardson
e0615c5a9b api setup to link to solid extension 2023-12-05 18:09:37 +08:00
Ronald A. Richardson
a830e190fa getting started with solid protocol integration, setting up oidc client 2023-12-05 18:06:23 +08:00
Shiv Thakker
5c7e0a1c56 Update README.md 2023-11-28 15:08:12 +08:00
Ron
e3acd28c18 Merge pull request #162 from fleetbase/dev-v0.3.1
v0.3.1
2023-11-24 17:39:37 +08:00
Ronald A. Richardson
313b6e63a8 added other extensions 2023-11-24 17:30:53 +08:00
Ronald A. Richardson
a7ed7ee935 resolved conflicts for merge 2023-11-24 17:25:37 +08:00
Ronald A. Richardson
1e28d9d8d8 Upgraded dependencies with patches and improvements for improved UX 2023-11-24 17:20:03 +08:00
Ron
0c31b54fde Merge pull request #159 from fleetbase/fix-deploy-workflow
Fix CD workflow
2023-11-22 16:40:41 +08:00
Ronald A. Richardson
f6b83e5638 upgraded to aws-actions/configure-aws-credentials@v4 2023-11-22 16:39:04 +08:00
Ronald A. Richardson
b30ee818fc added api/auth.json to gitignore 2023-11-22 16:34:30 +08:00
Ronald A. Richardson
6ec9ad59d3 few patches for flespi extension integration 2023-11-17 13:38:55 +08:00
Ron
10ff2e066b Merge pull request #156 from fleetbase/dev-v0.3.0
v0.3.0
2023-11-16 19:01:14 +08:00
Ronald A. Richardson
f56db88ad6 fleetops: fix filters, improve drawer component w/ state, several patches and upgrades 2023-11-16 18:49:17 +08:00
Ron
033cf5cfe0 Merge pull request #155 from fleetbase/dev-v0.2.9
v0.2.9
2023-11-09 17:21:56 +08:00
Ronald A. Richardson
4a4dc76e60 Added scheduler feature, scope/live map drawer feature, and bug fixes and dependency upgrades 2023-11-09 17:04:10 +08:00
Ron
a52af94b00 Merge pull request #154 from fleetbase/dev-v0.2.8
v0.2.8
2023-11-06 20:12:39 +08:00
18 changed files with 2212 additions and 1604 deletions

View File

@@ -35,7 +35,7 @@ jobs:
echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV
- name: Configure AWS Credentials - name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2 uses: aws-actions/configure-aws-credentials@v4
with: with:
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
role-session-name: github role-session-name: github

1
.gitignore vendored
View File

@@ -14,6 +14,7 @@ api/storage/public
api/vendor api/vendor
api/composer.dev.json api/composer.dev.json
api/composer-install-dev.sh api/composer-install-dev.sh
api/auth.json
act.sh act.sh
composer-auth.json composer-auth.json
packages/billing-api packages/billing-api

3
.gitmodules vendored
View File

@@ -39,3 +39,6 @@
[submodule "docs/api-reference"] [submodule "docs/api-reference"]
path = docs/api-reference path = docs/api-reference
url = git@github.com:fleetbase/api-reference.git url = git@github.com:fleetbase/api-reference.git
[submodule "packages/solid"]
path = packages/solid
url = git@github.com:fleetbase/solid.git

View File

@@ -10,6 +10,9 @@
<a href="https://fleetbase.github.io/guides" rel="nofollow">Fleetbase Documentation →</a> <a href="https://fleetbase.github.io/guides" rel="nofollow">Fleetbase Documentation →</a>
<br> <br>
<br> <br>
<a href="https://meetings.hubspot.com/shiv-thakker" rel="nofollow">Book a Demo</a>
<br>
<br>
<a href="https://github.com/fleetbase/fleetbase/issues">Report an Issue</a> <a href="https://github.com/fleetbase/fleetbase/issues">Report an Issue</a>
· ·
<a href="https://fleetbase.github.io/api-reference">API Reference</a> <a href="https://fleetbase.github.io/api-reference">API Reference</a>

View File

@@ -10,8 +10,9 @@
"require": { "require": {
"php": "^7.3|^8.0", "php": "^7.3|^8.0",
"fleetbase/core-api": "^1.3.2", "fleetbase/core-api": "^1.3.2",
"fleetbase/fleetops-api": "^0.3.2", "fleetbase/fleetops-api": "^0.3.5",
"fleetbase/storefront-api": "^0.2.3", "fleetbase/storefront-api": "^0.2.4",
"fleetbase/solid-api": "^0.0.1",
"fruitcake/laravel-cors": "^2.0", "fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1", "guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.75", "laravel/framework": "^8.75",
@@ -32,6 +33,12 @@
"nunomaduro/collision": "^5.10", "nunomaduro/collision": "^5.10",
"phpunit/phpunit": "^9.5.10" "phpunit/phpunit": "^9.5.10"
}, },
"repositories": [
{
"type": "path",
"url": "../packages/solid"
}
],
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"App\\": "app/", "App\\": "app/",

1671
api/composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -43,7 +43,7 @@ module.exports = function (defaults) {
postcssMixins, postcssMixins,
postcssPresetEnv({ stage: 1 }), postcssPresetEnv({ stage: 1 }),
postcssEach, postcssEach,
tailwind('./tailwind.js'), tailwind('./tailwind.config.js'),
autoprefixer, autoprefixer,
], ],
}, },

View File

@@ -1,6 +1,6 @@
{ {
"name": "@fleetbase/console", "name": "@fleetbase/console",
"version": "0.2.8", "version": "0.3.1",
"private": true, "private": true,
"description": "Fleetbase Console", "description": "Fleetbase Console",
"repository": "", "repository": "",
@@ -25,25 +25,25 @@
}, },
"dependencies": { "dependencies": {
"@ember/legacy-built-in-components": "^0.4.1", "@ember/legacy-built-in-components": "^0.4.1",
"@fleetbase/ember-core": "^0.1.6", "@fleetbase/ember-core": "^0.1.8",
"@fleetbase/ember-ui": "^0.2.3", "@fleetbase/ember-ui": "^0.2.6",
"@fleetbase/fleetops-data": "^0.1.5",
"@fleetbase/fleetops-engine": "^0.3.5",
"@fleetbase/storefront-engine": "^0.2.4",
"@fleetbase/dev-engine": "^0.1.9", "@fleetbase/dev-engine": "^0.1.9",
"@fleetbase/iam-engine": "^0.0.7", "@fleetbase/iam-engine": "^0.0.7",
"@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", "@fleetbase/leaflet-routing-machine": "^3.2.16",
"@fortawesome/ember-fontawesome": "^0.4.1", "@fortawesome/ember-fontawesome": "^0.4.1",
"ember-intl": "^6.0.0-beta.6",
"ember-changeset": "^4.1.2", "ember-changeset": "^4.1.2",
"ember-changeset-validations": "^4.1.1", "ember-changeset-validations": "^4.1.1",
"ember-composable-helpers": "^5.0.0", "ember-composable-helpers": "^5.0.0",
"ember-concurrency": "^3.0.0", "ember-concurrency": "^3.0.0",
"ember-concurrency-decorators": "^2.0.3", "ember-concurrency-decorators": "^2.0.3",
"ember-intl": "6.0.0-beta.6",
"ember-math-helpers": "^2.18.2", "ember-math-helpers": "^2.18.2",
"ember-power-select": "^6.0.1", "ember-power-select": "^6.0.1",
"ember-prism": "^0.13.0", "ember-prism": "^0.13.0",
"ember-radio-button": "^3.0.0-beta.1", "ember-radio-button": "3.0.0-beta.1",
"ember-tag-input": "^3.1.0", "ember-tag-input": "^3.1.0",
"fleetbase-extensions-indexer": "^0.0.4", "fleetbase-extensions-indexer": "^0.0.4",
"postcss-at-rules-variables": "^0.3.0", "postcss-at-rules-variables": "^0.3.0",
@@ -125,9 +125,9 @@
}, },
"pnpm": { "pnpm": {
"overrides": { "overrides": {
"@fleetbase/fleetops-data": "^0.1.2", "@fleetbase/fleetops-data": "^0.1.5",
"@fleetbase/ember-core": "^0.1.6", "@fleetbase/ember-core": "^0.1.8",
"@fleetbase/ember-ui": "^0.2.3" "@fleetbase/ember-ui": "^0.2.6"
} }
}, },
"prettier": { "prettier": {

2080
console/pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -15,6 +15,14 @@ services:
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MYSQL_DATABASE: "fleetbase" MYSQL_DATABASE: "fleetbase"
solid:
image: solidproject/community-server:7
command: ["--baseUrl", "http://solid:3000"]
ports:
- "3000:3000"
volumes:
- ./solid/data:/data
socket: socket:
image: socketcluster/socketcluster:v17.4.0 image: socketcluster/socketcluster:v17.4.0
ports: ports:

1
packages/solid Submodule

Submodule packages/solid added at dc2ee3a0ec