@fleetbase/solid-engine 0.0.3 → 0.0.5

package/addon/templates/data/content.hbs

@@ -0,0 +1,48 @@
+<Overlay @isOpen={{true}} @position="right" @noBackdrop={{true}} @fullHeight={{true}} @width="800px" @isResizable={{true}}>
+    <Overlay::Header @title={{@model.name}} @hideStatusDot={{true}} @titleWrapperClass="leading-5">
+        <div class="flex flex-1 justify-end">
+            <Button @type="default" @icon="times" @helpText="Close" @onClick={{this.back}} />
+        </div>
+    </Overlay::Header>
+
+    <Overlay::Body class="p-6">
+        <div class="space-y-4">
+            <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">File Information</label>
+                <div class="bg-gray-50 dark:bg-gray-800 rounded-lg p-4 space-y-2">
+                    <div class="flex justify-between">
+                        <span class="text-gray-600 dark:text-gray-400">Name:</span>
+                        <span class="text-gray-900 dark:text-white font-medium">{{@model.name}}</span>
+                    </div>
+                    <div class="flex justify-between">
+                        <span class="text-gray-600 dark:text-gray-400">Type:</span>
+                        <span class="text-gray-900 dark:text-white capitalize">{{@model.type}}</span>
+                    </div>
+                    <div class="flex justify-between">
+                        <span class="text-gray-600 dark:text-gray-400">Size:</span>
+                        <span class="text-gray-900 dark:text-white">{{@model.size}}</span>
+                    </div>
+                    <div class="flex justify-between">
+                        <span class="text-gray-600 dark:text-gray-400">Created:</span>
+                        <span class="text-gray-900 dark:text-white">{{@model.created_at}}</span>
+                    </div>
+                </div>
+            </div>
+
+            {{#if @model.url}}
+                <div>
+                    <Button @text="Open File" @icon="external-link-alt" @type="primary" @onClick={{this.viewFile}} class="w-full" />
+                </div>
+            {{/if}}
+
+            {{#if @model.content}}
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Preview</label>
+                    <div class="bg-gray-50 dark:bg-gray-800 rounded-lg p-4 max-h-96 overflow-y-auto">
+                        <pre class="text-sm text-gray-900 dark:text-white whitespace-pre-wrap">{{@model.content}}</pre>
+                    </div>
+                </div>
+            {{/if}}
+        </div>
+    </Overlay::Body>
+</Overlay>

package/addon/templates/{pods/explorer.hbs → data/index.hbs}

@@ -1,4 +1,4 @@
-<ExplorerHeader @current={{@model.id}} @pod={{this.pod}} @onStateClicked={{this.viewContents}} @searchPlaceholder="Search Contents" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+<Layout::Section::Header @title="Data" @searchPlaceholder="Search Files and Folders" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
     <Button @icon="arrow-left" @onClick={{this.back}} @helpText="Go Back" class="mr-2" />
     <Button @icon="refresh" @onClick={{this.reload}} @helpText="Refresh" class="mr-2" />
     {{#if (safe-has this.table "selectedRows")}}
@@ -12,9 +12,10 @@
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="Create new Something" class="mr-2" @onClick={{this.createSomething}} />
-</ExplorerHeader>
+    <Button @icon="folder-plus" @iconPrefix="fas" @type="secondary" @text="New Folder" class="mr-2" @onClick={{this.createFolder}} />
+    <Button @icon="download" @iconPrefix="fas" @type="primary" @text="Import Resources" class="mr-2" @onClick={{this.importResources}} />
+</Layout::Section::Header>
 <Layout::Section::Body>
-    <Table @rows={{@model.contents}} @columns={{this.columns}} @selectable={{true}} @canSelectAll={{true}} @onSetup={{fn (mut this.table)}} @tfootVerticalOffset="53" @tfootVerticalOffsetElements=".next-view-section-subheader" />
+    <Table @rows={{@model.contents}} @columns={{this.columns}} @selectable={{true}} @canSelectAll={{true}} @onSetup={{fn (mut this.table)}} />
 </Layout::Section::Body>
-{{outlet}}
+{{outlet}}

package/addon/templates/home.hbs

@@ -1,11 +1,169 @@
-<Layout::Section::Header @title="Solid for Fleetbase" />
-<Layout::Section::Body class="solid-fleetbase-home-container">
-    <h1>Welcome to Solid for Fleetbase</h1>
-    <h2>Getting Started</h2>
-    <div class="mt-2">
-        <p>
-            <a href="#" {{on "click" (perform this.authenticate)}}>Sign up for an account</a> to get started with your own Pod and WebID. Once you are logged in you can begin to manage your pods and sync data directly from Fleetbase to your Pods.
-        </p>
-    </div>
-    {{!-- <Button @text="Click to Test" @icon="magic" @onClick={{perform this.getAccountIndex}} @wrapperClass="mt-4" /> --}}
+<Layout::Section::Header @title="Solid for Fleetbase">
+    {{#if this.isAuthenticated}}
+        <Button @icon="refresh" @onClick={{perform this.refreshStatus}} @helpText="Refresh Status" @isLoading={{this.refreshStatus.isRunning}} class="mr-2" />
+        <Button @icon="sign-out-alt" @onClick={{perform this.logout}} @helpText="Logout" @type="danger" @isLoading={{this.logout.isRunning}} @disabled={{or this.refreshStatus.isRunning this.checkAuthenticationStatus.isRunning}} />
+    {{/if}}
+</Layout::Section::Header>
+
+<Layout::Section::Body class="solid-fleetbase-home-container overflow-y-scroll h-full">
+    {{#if this.checkAuthenticationStatus.isRunning}}
+        <div class="flex items-center justify-center h-64">
+            <div class="text-center">
+                <Spinner class="mb-4" />
+                <p class="text-gray-600 dark:text-gray-400">Checking authentication status...</p>
+            </div>
+        </div>
+    {{else}}
+        {{#if this.isAuthenticated}}
+            <div class="max-w-4xl mx-auto space-y-4">
+                <div class="pb-4">
+                    <h1 class="text-3xl font-bold text-gray-900 dark:text-white">Welcome back!</h1>
+                    <p class="text-gray-600 dark:text-gray-400">You are successfully connected to your Solid storage.</p>
+                </div>
+
+                <ContentPanel @title="Your Solid Identity" @open={{true}} @wrapperClass="bordered-classic">
+                    <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                        <div>
+                            <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4">Profile Information</h3>
+                            <div class="space-y-3">
+                                <div>
+                                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">Name</label>
+                                    <p class="text-gray-900 dark:text-white">{{this.userName}}</p>
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">Email</label>
+                                    <p class="text-gray-900 dark:text-white">{{this.userEmail}}</p>
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">WebID</label>
+                                    <p class="text-sm text-blue-600 dark:text-blue-400 break-all">{{this.webId}}</p>
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4">Storage Information</h3>
+                            {{#if this.hasStorageLocations}}
+                                <div class="space-y-2">
+                                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">Storage Locations</label>
+                                    {{#each this.storageLocations as |location|}}
+                                        <div class="bg-gray-50 dark:bg-gray-700 p-2 rounded text-sm">
+                                            <p class="text-blue-600 dark:text-blue-400 break-all">{{location}}</p>
+                                        </div>
+                                    {{/each}}
+                                </div>
+                            {{else}}
+                                <p class="text-gray-600 dark:text-gray-400">No storage locations found</p>
+                            {{/if}}
+                        </div>
+                    </div>
+                </ContentPanel>
+
+                <ContentPanel @title="Quick Actions" @open={{true}} @wrapperClass="bordered-classic">
+                    <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                        <div class="text-center p-6 bg-gray-50 dark:bg-gray-700 rounded-lg">
+                            <FaIcon @icon="folder-tree" @size="2x" class="text-blue-600 dark:text-blue-400 mb-3" />
+                            <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-2">Browse Data</h3>
+                            <p class="text-gray-600 dark:text-gray-400 mb-4">Explore and manage your Fleetops data in Solid</p>
+                            <div class="flex items-center justify-center">
+                                <Button @text="Browse Data" @icon="database" @type="primary" class="w-full" @onClick={{perform this.navigateToPods}} />
+                            </div>
+                        </div>
+                        <div class="text-center p-6 bg-gray-50 dark:bg-gray-700 rounded-lg">
+                            <FaIcon @icon="user" @size="2x" class="text-green-600 dark:text-green-400 mb-3" />
+                            <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-2">Account Settings</h3>
+                            <p class="text-gray-600 dark:text-gray-400 mb-4">Manage your account and profile settings</p>
+                            <div class="flex items-center justify-center">
+                                <Button @text="Account" @icon="user" @type="secondary" class="w-full" @onClick={{perform this.navigateToAccount}} />
+                            </div>
+                        </div>
+                        <div class="text-center p-6 bg-gray-50 dark:bg-gray-700 rounded-lg">
+                            <FaIcon @icon="sync" @size="2x" class="text-purple-600 dark:text-purple-400 mb-3" />
+                            <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-2">Sync Data</h3>
+                            <p class="text-gray-600 dark:text-gray-400 mb-4">Sync your Fleetbase data to Solid storage</p>
+                            <div class="flex items-center justify-center">
+                                <Button @text="Coming Soon" @icon="sync" @disabled={{true}} />
+                            </div>
+                        </div>
+                    </div>
+                </ContentPanel>
+
+                <ContentPanel @title="Connection Status" @open={{true}} @wrapperClass="bordered-classic">
+                    <div class="space-y-3">
+                        <div class="flex items-center">
+                            <div class="w-3 h-3 bg-green-500 rounded-full mr-3"></div>
+                            <span class="text-gray-900 dark:text-white">Connected to Solid server</span>
+                        </div>
+                        <div class="flex items-center">
+                            <div class="w-3 h-3 bg-green-500 rounded-full mr-3"></div>
+                            <span class="text-gray-900 dark:text-white">Authentication active</span>
+                        </div>
+                        {{#if this.hasStorageLocations}}
+                            <div class="flex items-center">
+                                <div class="w-3 h-3 bg-green-500 rounded-full mr-3"></div>
+                                <span class="text-gray-900 dark:text-white">{{this.storageLocations.length}} storage location(s) available</span>
+                            </div>
+                        {{/if}}
+                    </div>
+                </ContentPanel>
+            </div>
+        {{else}}
+            <div class="max-w-2xl mx-auto text-center">
+                <div class="mb-8">
+                    <FaIcon @icon="shield-alt" @size="4x" class="text-gray-400 dark:text-gray-600 mb-4" />
+                    <h1 class="text-3xl font-bold text-gray-900 dark:text-white mb-4">Welcome to Solid for Fleetbase</h1>
+                    <p class="text-lg text-gray-600 dark:text-gray-400 mb-8">
+                        Connect your Fleetbase account with Solid to manage your data in a decentralized way.
+                    </p>
+                </div>
+
+                <ContentPanel @title="Getting Started" @open={{true}} @wrapperClass="bordered-classic">
+                    <div class="text-left space-y-4">
+                        <div class="flex items-start">
+                            <div class="flex-shrink-0 w-8 h-8 bg-blue-100 dark:bg-blue-900 rounded-full flex items-center justify-center mr-4">
+                                <span class="text-blue-600 dark:text-blue-400 font-semibold">1</span>
+                            </div>
+                            <div>
+                                <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Sign up for a Solid account</h3>
+                                <p class="text-gray-600 dark:text-gray-400">Create your Solid account and WebID to get started with decentralized data storage.</p>
+                            </div>
+                        </div>
+                        <div class="flex items-start">
+                            <div class="flex-shrink-0 w-8 h-8 bg-blue-100 dark:bg-blue-900 rounded-full flex items-center justify-center mr-4">
+                                <span class="text-blue-600 dark:text-blue-400 font-semibold">2</span>
+                            </div>
+                            <div>
+                                <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Connect your account</h3>
+                                <p class="text-gray-600 dark:text-gray-400">Authenticate with your Solid provider to enable data synchronization.</p>
+                            </div>
+                        </div>
+                        <div class="flex items-start">
+                            <div class="flex-shrink-0 w-8 h-8 bg-blue-100 dark:bg-blue-900 rounded-full flex items-center justify-center mr-4">
+                                <span class="text-blue-600 dark:text-blue-400 font-semibold">3</span>
+                            </div>
+                            <div>
+                                <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Sync your data</h3>
+                                <p class="text-gray-600 dark:text-gray-400">Sync vehicles, drivers, and orders from Fleetbase to your Solid storage.</p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="mt-8 text-center">
+                        <Button @text="Connect to Solid" @icon="link" @type="primary" @size="lg" @onClick={{perform this.authenticate}} @isLoading={{this.authenticate.isRunning}} />
+                    </div>
+                </ContentPanel>
+
+                {{#if this.authStatus.error}}
+                    <div class="bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-700 rounded-lg p-4 mt-4">
+                        <div class="flex">
+                            <FaIcon @icon="exclamation-triangle" class="text-red-400 mr-3 mt-1" />
+                            <div>
+                                <h3 class="text-sm font-medium text-red-800 dark:text-red-200">Authentication Error</h3>
+                                <p class="text-sm text-red-700 dark:text-red-300 mt-1">{{this.authStatus.error}}</p>
+                            </div>
+                        </div>
+                    </div>
+                {{/if}}
+            </div>
+        {{/if}}
+    {{/if}}
+    <Spacer @height="200px" />
 </Layout::Section::Body>

package/app/components/modals/{backup-pod.js → create-solid-folder.js}

@@ -1 +1 @@
-export { default } from '@fleetbase/solid-engine/components/modals/backup-pod';
+export { default } from '@fleetbase/solid-engine/components/modals/create-solid-folder';

package/app/components/modals/{resync-pod.js → import-solid-resources.js}

@@ -1 +1 @@
-export { default } from '@fleetbase/solid-engine/components/modals/resync-pod';
+export { default } from '@fleetbase/solid-engine/components/modals/import-solid-resources';

package/app/components/modals/{create-pod.js → setup-css-credentials.js}

@@ -1 +1 @@
-export { default } from '@fleetbase/solid-engine/components/modals/create-pod';
+export { default } from '@fleetbase/solid-engine/components/modals/setup-css-credentials';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/solid-api",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "Solid Protocol Extension to Store and Share Data with Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -15,7 +15,7 @@
         "ember-addon",
         "ember-engine"
     ],
-    "license": "MIT",
+    "license": "AGPL-3.0-or-later",
     "authors": [
         {
             "name": "Fleetbase Pte Ltd.",
@@ -28,11 +28,11 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.22",
-        "fleetbase/fleetops-api": "^0.4.27",
+        "fleetbase/core-api": "*",
+        "fleetbase/fleetops-api": "*",
         "php-http/guzzle7-adapter": "^1.0",
         "psr/http-factory-implementation": "*",
-        "jumbojett/openid-connect-php": "^0.9.10",
+        "jumbojett/openid-connect-php": "^1.0.2",
         "easyrdf/easyrdf": "^1.1",
         "ml/json-ld": "^1.2",
         "web-token/jwt-core": "^3.0",
@@ -50,12 +50,6 @@
         "phpstan/phpstan": "^1.10.38",
         "symfony/var-dumper": "^5.4.29"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/fleetbase/laravel-model-caching"
-        }
-    ],
     "autoload": {
         "psr-4": {
             "Fleetbase\\Solid\\": "server/src/",

package/extension.json

@@ -1,8 +1,8 @@
 {
     "name": "Solid",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "Solid Protocol Extension to Store and Share Data with Fleetbase",
     "repository": "https://github.com/fleetbase/solid",
-    "license": "MIT",
+    "license": "AGPL-3.0-or-later",
     "author": "Fleetbase Pte Ltd <hello@fleetbase.io>"
 }

package/index.js

@@ -1,21 +1,10 @@
 'use strict';
 const { buildEngine } = require('ember-engines/lib/engine-addon');
 const { name } = require('./package');
-const Funnel = require('broccoli-funnel');
 
 module.exports = buildEngine({
     name,
 
-    postprocessTree(type, tree) {
-        if (type === 'css') {
-            tree = new Funnel(tree, {
-                exclude: ['**/@fleetbase/ember-ui/**/*.css'],
-            });
-        }
-
-        return tree;
-    },
-
     lazyLoading: {
         enabled: true,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/solid-engine",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "Solid Protocol Extension to Store and Share Data with Fleetbase",
     "fleetbase": {
         "route": "solid-protocol"
@@ -19,7 +19,7 @@
         "ember-engine"
     ],
     "repository": "https://github.com/fleetbase/solid",
-    "license": "MIT",
+    "license": "AGPL-3.0-or-later",
     "author": "Fleetbase Pte Ltd <hello@fleetbase.io>",
     "directories": {
         "app": "app",
@@ -45,13 +45,14 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.9",
-        "@fleetbase/ember-ui": "^0.2.13",
-        "@fleetbase/fleetops-data": "^0.1.14",
-        "@fortawesome/ember-fontawesome": "^0.4.1",
-        "@fortawesome/fontawesome-svg-core": "^6.4.0",
-        "@fortawesome/free-solid-svg-icons": "^6.4.0",
+        "@fleetbase/ember-core": "^0.3.9",
+        "@fleetbase/ember-ui": "^0.3.15",
+        "@fleetbase/fleetops-data": "^0.1.24",
+        "@fortawesome/ember-fontawesome": "^2.0.0",
+        "@fortawesome/fontawesome-svg-core": "6.4.0",
+        "@fortawesome/free-solid-svg-icons": "6.4.0",
         "broccoli-funnel": "^3.0.8",
+        "ember-auto-import": "^2.7.4",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",
         "ember-intl": "6.3.2",
@@ -68,7 +69,6 @@
         "@glimmer/tracking": "^1.1.2",
         "broccoli-asset-rev": "^3.0.0",
         "concurrently": "^8.2.2",
-        "ember-auto-import": "^2.6.3",
         "ember-cli": "~5.4.1",
         "ember-cli-clean-css": "^3.0.0",
         "ember-cli-dependency-checker": "^3.3.2",

package/server/migrations/2024_12_21_add_css_credentials_to_solid_identities_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('solid_identities', function (Blueprint $table) {
+            $table->string('css_email')->nullable()->after('identifier');
+            $table->text('css_password')->nullable()->after('css_email');
+            $table->string('css_client_id')->nullable()->after('css_password');
+            $table->text('css_client_secret')->nullable()->after('css_client_id');
+            $table->string('css_client_resource_url')->nullable()->after('css_client_secret');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('solid_identities', function (Blueprint $table) {
+            $table->dropColumn(['css_email', 'css_password', 'css_client_id', 'css_client_secret', 'css_client_resource_url']);
+        });
+    }
+};