16 Commits

Author SHA1 Message Date
mr
998fa11490 makefile 2025-11-13 10:10:05 +01:00
mr
6a7acf5e84 gitignore 2025-11-13 09:53:06 +01:00
pb
5748da0502 changed network 2025-07-30 11:15:35 +02:00
pb
eec4b26878 corrected the declared network from catalog to oc 2025-07-07 10:55:28 +02:00
mr
9364db068e test 2025-07-04 16:38:05 +02:00
mr
04b3b37666 some great fonctionnal 2025-07-04 09:45:27 +02:00
mr
692a672bbf test 2025-06-24 08:58:42 +02:00
mr
ab593a45b9 test 2025-06-13 13:33:24 +02:00
mr
c4ea1541c4 debug workflow 2025-06-13 11:54:13 +02:00
mr
76821e757f test 2025-04-28 16:10:34 +02:00
mr
66b4a2b226 ITEM_HOST 2025-04-01 10:07:11 +02:00
mr
752446dd40 dev launch mode 2025-03-06 09:33:32 +01:00
mr
863a35b878 oclib 2025-02-21 11:14:46 +01:00
mr
28510d0ba1 workflow debug 2025-02-19 08:29:03 +01:00
mr
6991283dd4 Fusion debug 2025-02-18 15:05:19 +01:00
mr
6b6da966b6 deps 2025-02-17 10:27:44 +01:00
73 changed files with 692 additions and 1897 deletions

View File

@@ -1,20 +0,0 @@
// Flutter web plugin registrant file.
//
// Generated file. Do not edit.
//
// @dart = 2.13
// ignore_for_file: type=lint
import 'package:device_info_plus/src/device_info_plus_web.dart';
import 'package:shared_preferences_web/shared_preferences_web.dart';
import 'package:super_native_extensions/super_native_extensions_web.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
void registerPlugins([final Registrar? pluginRegistrar]) {
final Registrar registrar = pluginRegistrar ?? webPluginRegistrar;
DeviceInfoPlusWebPlugin.registerWith(registrar);
SharedPreferencesPlugin.registerWith(registrar);
SuperNativeExtensionsWeb.registerWith(registrar);
registrar.registerMessageHandler();
}

View File

@@ -1,737 +0,0 @@
{
"configVersion": 2,
"packages": [
{
"name": "alert_banner",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/alert_banner-1.0.1",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "animated_toggle_switch",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/animated_toggle_switch-0.8.3",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "args",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/args-2.6.0",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "async",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/async-2.11.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "boolean_selector",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "box_transform",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/box_transform-0.4.4",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "characters",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/characters-1.3.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "clock",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/clock-1.1.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "collection",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/collection-1.18.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "convert",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/convert-3.1.1",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "cron",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/cron-0.6.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "crypto",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/crypto-3.0.3",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "cupertino_icons",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.8",
"packageUri": "lib/",
"languageVersion": "3.1"
},
{
"name": "dart_earcut",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/dart_earcut-1.1.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "dashed_path",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/dashed_path-1.0.1",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "datetime_picker_formfield",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/datetime_picker_formfield-2.0.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "desktop_window",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/desktop_window-0.4.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "device_info_plus",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/device_info_plus-10.1.2",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "device_info_plus_platform_interface",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/device_info_plus_platform_interface-7.0.1",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "dio",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/dio-5.7.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "dio_web_adapter",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/dio_web_adapter-2.0.0",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "dotted_line",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/dotted_line-3.2.3",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "el_tooltip",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/el_tooltip-2.2.1",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "fake_async",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/fake_async-1.3.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "ffi",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/ffi-2.1.3",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "file",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/file-7.0.1",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "fixnum",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/fixnum-1.1.1",
"packageUri": "lib/",
"languageVersion": "3.1"
},
{
"name": "flutter",
"rootUri": "file:///home/mr/snap/flutter/common/flutter/packages/flutter",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "flutter_advanced_switch",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/flutter_advanced_switch-3.1.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "flutter_box_transform",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/flutter_box_transform-0.4.6",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "flutter_colorpicker",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/flutter_colorpicker-1.1.0",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "flutter_event_calendar",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/flutter_event_calendar-1.0.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "flutter_flow_chart",
"rootUri": "../library/flutter_flow_chart",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "flutter_lints",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/flutter_lints-4.0.0",
"packageUri": "lib/",
"languageVersion": "3.1"
},
{
"name": "flutter_map",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/flutter_map-7.0.2",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "flutter_spinkit",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/flutter_spinkit-5.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "flutter_svg",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/flutter_svg-2.0.10+1",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "flutter_test",
"rootUri": "file:///home/mr/snap/flutter/common/flutter/packages/flutter_test",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "flutter_web_plugins",
"rootUri": "file:///home/mr/snap/flutter/common/flutter/packages/flutter_web_plugins",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "font_awesome_flutter",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/font_awesome_flutter-10.8.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "get_it",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/get_it-7.7.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "go_router",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/go_router-14.3.0",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "hover_menu",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/hover_menu-1.1.1",
"packageUri": "lib/",
"languageVersion": "2.16"
},
{
"name": "http",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/http-1.2.2",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "http_parser",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/http_parser-4.0.2",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "injectable",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/injectable-2.4.2",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "intl",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/intl-0.19.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "irondash_engine_context",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/irondash_engine_context-0.5.4",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "irondash_message_channel",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/irondash_message_channel-0.7.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "json_string",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/json_string-3.0.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "json_util",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/json_util-2.0.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "latlong2",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/latlong2-0.9.1",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "leak_tracker",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "leak_tracker_flutter_testing",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "leak_tracker_testing",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "lints",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/lints-4.0.0",
"packageUri": "lib/",
"languageVersion": "3.1"
},
{
"name": "lists",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/lists-1.0.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "localstorage",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/localstorage-5.0.0",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "logger",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/logger-2.4.0",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "logging",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/logging-1.2.0",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "matcher",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/matcher-0.12.16+1",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "material_color_utilities",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "meta",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/meta-1.15.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "mgrs_dart",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/mgrs_dart-2.0.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "number_text_input_formatter",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/number_text_input_formatter-1.0.0+8",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "path",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/path-1.9.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "path_parsing",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/path_parsing-1.0.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "path_provider",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/path_provider-2.1.4",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "path_provider_android",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_android-2.2.4",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "path_provider_foundation",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "path_provider_linux",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "path_provider_platform_interface",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "path_provider_windows",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "petitparser",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/petitparser-6.0.2",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "pixel_snap",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/pixel_snap-0.1.5",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "platform",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/platform-3.1.6",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "plugin_platform_interface",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "polylabel",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/polylabel-1.0.1",
"packageUri": "lib/",
"languageVersion": "2.13"
},
{
"name": "proj4dart",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/proj4dart-2.1.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "scoped_model",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/scoped_model-2.0.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "shamsi_date",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/shamsi_date-0.15.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "shared_preferences",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences-2.2.3",
"packageUri": "lib/",
"languageVersion": "3.1"
},
{
"name": "shared_preferences_android",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.2",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "shared_preferences_foundation",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.3",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "shared_preferences_linux",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "shared_preferences_platform_interface",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "shared_preferences_web",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.1",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "shared_preferences_windows",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "simple_gesture_detector",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/simple_gesture_detector-0.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "sky_engine",
"rootUri": "file:///home/mr/snap/flutter/common/flutter/bin/cache/pkg/sky_engine",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "source_span",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/source_span-1.10.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "sprintf",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/sprintf-7.0.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "stack_trace",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/stack_trace-1.11.1",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "star_menu",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/star_menu-4.0.1",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "stream_channel",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/stream_channel-2.1.2",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "string_scanner",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/string_scanner-1.2.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "super_clipboard",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/super_clipboard-0.8.19",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "super_drag_and_drop",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/super_drag_and_drop-0.8.19",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "super_native_extensions",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/super_native_extensions-0.8.19",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "syncfusion_flutter_calendar",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_calendar-27.1.55",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "syncfusion_flutter_core",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_core-27.1.55",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "syncfusion_flutter_datepicker",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_datepicker-27.1.55",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "table_calendar",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/table_calendar-3.1.2",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "term_glyph",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/term_glyph-1.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "test_api",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/test_api-0.7.2",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "timezone",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/timezone-0.9.4",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "typed_data",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/typed_data-1.3.2",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "unicode",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/unicode-0.3.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "uuid",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/uuid-4.5.1",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "vector_graphics",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics-1.1.11+1",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "vector_graphics_codec",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics_codec-1.1.11+1",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "vector_graphics_compiler",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics_compiler-1.1.11+1",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "vector_math",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/vector_math-2.1.4",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "vm_service",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/vm_service-14.2.5",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "web",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/web-0.5.1",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "win32",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/win32-5.7.1",
"packageUri": "lib/",
"languageVersion": "3.5"
},
{
"name": "win32_registry",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/win32_registry-1.1.3",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "wkt_parser",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/wkt_parser-2.0.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "xdg_directories",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0",
"packageUri": "lib/",
"languageVersion": "3.3"
},
{
"name": "xml",
"rootUri": "file:///home/mr/.pub-cache/hosted/pub.dev/xml-6.5.0",
"packageUri": "lib/",
"languageVersion": "3.2"
},
{
"name": "oc_front",
"rootUri": "../",
"packageUri": "lib/",
"languageVersion": "3.3"
}
],
"generated": "2025-02-17T08:56:44.408862Z",
"generator": "pub",
"generatorVersion": "3.5.3",
"flutterRoot": "file:///home/mr/snap/flutter/common/flutter",
"flutterVersion": "3.24.3",
"pubCache": "file:///home/mr/.pub-cache"
}

View File

@@ -1,485 +0,0 @@
alert_banner
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/alert_banner-1.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/alert_banner-1.0.1/lib/
animated_toggle_switch
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/animated_toggle_switch-0.8.3/
file:///home/mr/.pub-cache/hosted/pub.dev/animated_toggle_switch-0.8.3/lib/
args
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/args-2.6.0/
file:///home/mr/.pub-cache/hosted/pub.dev/args-2.6.0/lib/
async
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/async-2.11.0/
file:///home/mr/.pub-cache/hosted/pub.dev/async-2.11.0/lib/
boolean_selector
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/
file:///home/mr/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/lib/
box_transform
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/box_transform-0.4.4/
file:///home/mr/.pub-cache/hosted/pub.dev/box_transform-0.4.4/lib/
characters
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/characters-1.3.0/
file:///home/mr/.pub-cache/hosted/pub.dev/characters-1.3.0/lib/
clock
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/clock-1.1.1/
file:///home/mr/.pub-cache/hosted/pub.dev/clock-1.1.1/lib/
collection
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/collection-1.18.0/
file:///home/mr/.pub-cache/hosted/pub.dev/collection-1.18.0/lib/
convert
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/convert-3.1.1/
file:///home/mr/.pub-cache/hosted/pub.dev/convert-3.1.1/lib/
cron
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/cron-0.6.1/
file:///home/mr/.pub-cache/hosted/pub.dev/cron-0.6.1/lib/
crypto
2.19
file:///home/mr/.pub-cache/hosted/pub.dev/crypto-3.0.3/
file:///home/mr/.pub-cache/hosted/pub.dev/crypto-3.0.3/lib/
cupertino_icons
3.1
file:///home/mr/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.8/
file:///home/mr/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.8/lib/
dart_earcut
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/dart_earcut-1.1.0/
file:///home/mr/.pub-cache/hosted/pub.dev/dart_earcut-1.1.0/lib/
dashed_path
2.19
file:///home/mr/.pub-cache/hosted/pub.dev/dashed_path-1.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/dashed_path-1.0.1/lib/
datetime_picker_formfield
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/datetime_picker_formfield-2.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/datetime_picker_formfield-2.0.1/lib/
desktop_window
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/desktop_window-0.4.1/
file:///home/mr/.pub-cache/hosted/pub.dev/desktop_window-0.4.1/lib/
device_info_plus
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/device_info_plus-10.1.2/
file:///home/mr/.pub-cache/hosted/pub.dev/device_info_plus-10.1.2/lib/
device_info_plus_platform_interface
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/device_info_plus_platform_interface-7.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/device_info_plus_platform_interface-7.0.1/lib/
dio
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/dio-5.7.0/
file:///home/mr/.pub-cache/hosted/pub.dev/dio-5.7.0/lib/
dio_web_adapter
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/dio_web_adapter-2.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/dio_web_adapter-2.0.0/lib/
dotted_line
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/dotted_line-3.2.3/
file:///home/mr/.pub-cache/hosted/pub.dev/dotted_line-3.2.3/lib/
el_tooltip
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/el_tooltip-2.2.1/
file:///home/mr/.pub-cache/hosted/pub.dev/el_tooltip-2.2.1/lib/
fake_async
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/fake_async-1.3.1/
file:///home/mr/.pub-cache/hosted/pub.dev/fake_async-1.3.1/lib/
ffi
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/ffi-2.1.3/
file:///home/mr/.pub-cache/hosted/pub.dev/ffi-2.1.3/lib/
file
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/file-7.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/file-7.0.1/lib/
fixnum
3.1
file:///home/mr/.pub-cache/hosted/pub.dev/fixnum-1.1.1/
file:///home/mr/.pub-cache/hosted/pub.dev/fixnum-1.1.1/lib/
flutter_advanced_switch
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_advanced_switch-3.1.0/
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_advanced_switch-3.1.0/lib/
flutter_box_transform
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_box_transform-0.4.6/
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_box_transform-0.4.6/lib/
flutter_colorpicker
2.14
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_colorpicker-1.1.0/
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_colorpicker-1.1.0/lib/
flutter_event_calendar
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_event_calendar-1.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_event_calendar-1.0.0/lib/
flutter_lints
3.1
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_lints-4.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_lints-4.0.0/lib/
flutter_map
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_map-7.0.2/
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_map-7.0.2/lib/
flutter_spinkit
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_spinkit-5.2.1/
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_spinkit-5.2.1/lib/
flutter_svg
2.19
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_svg-2.0.10+1/
file:///home/mr/.pub-cache/hosted/pub.dev/flutter_svg-2.0.10+1/lib/
font_awesome_flutter
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/font_awesome_flutter-10.8.0/
file:///home/mr/.pub-cache/hosted/pub.dev/font_awesome_flutter-10.8.0/lib/
get_it
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/get_it-7.7.0/
file:///home/mr/.pub-cache/hosted/pub.dev/get_it-7.7.0/lib/
go_router
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/go_router-14.3.0/
file:///home/mr/.pub-cache/hosted/pub.dev/go_router-14.3.0/lib/
hover_menu
2.16
file:///home/mr/.pub-cache/hosted/pub.dev/hover_menu-1.1.1/
file:///home/mr/.pub-cache/hosted/pub.dev/hover_menu-1.1.1/lib/
http
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/http-1.2.2/
file:///home/mr/.pub-cache/hosted/pub.dev/http-1.2.2/lib/
http_parser
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/http_parser-4.0.2/
file:///home/mr/.pub-cache/hosted/pub.dev/http_parser-4.0.2/lib/
injectable
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/injectable-2.4.2/
file:///home/mr/.pub-cache/hosted/pub.dev/injectable-2.4.2/lib/
intl
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/intl-0.19.0/
file:///home/mr/.pub-cache/hosted/pub.dev/intl-0.19.0/lib/
irondash_engine_context
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/irondash_engine_context-0.5.4/
file:///home/mr/.pub-cache/hosted/pub.dev/irondash_engine_context-0.5.4/lib/
irondash_message_channel
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/irondash_message_channel-0.7.0/
file:///home/mr/.pub-cache/hosted/pub.dev/irondash_message_channel-0.7.0/lib/
json_string
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/json_string-3.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/json_string-3.0.1/lib/
json_util
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/json_util-2.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/json_util-2.0.0/lib/
latlong2
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/latlong2-0.9.1/
file:///home/mr/.pub-cache/hosted/pub.dev/latlong2-0.9.1/lib/
leak_tracker
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5/
file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5/lib/
leak_tracker_flutter_testing
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5/
file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5/lib/
leak_tracker_testing
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/lib/
lints
3.1
file:///home/mr/.pub-cache/hosted/pub.dev/lints-4.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/lints-4.0.0/lib/
lists
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/lists-1.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/lists-1.0.1/lib/
localstorage
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/localstorage-5.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/localstorage-5.0.0/lib/
logger
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/logger-2.4.0/
file:///home/mr/.pub-cache/hosted/pub.dev/logger-2.4.0/lib/
logging
2.19
file:///home/mr/.pub-cache/hosted/pub.dev/logging-1.2.0/
file:///home/mr/.pub-cache/hosted/pub.dev/logging-1.2.0/lib/
matcher
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/matcher-0.12.16+1/
file:///home/mr/.pub-cache/hosted/pub.dev/matcher-0.12.16+1/lib/
material_color_utilities
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/
file:///home/mr/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/lib/
meta
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/meta-1.15.0/
file:///home/mr/.pub-cache/hosted/pub.dev/meta-1.15.0/lib/
mgrs_dart
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/mgrs_dart-2.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/mgrs_dart-2.0.0/lib/
number_text_input_formatter
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/number_text_input_formatter-1.0.0+8/
file:///home/mr/.pub-cache/hosted/pub.dev/number_text_input_formatter-1.0.0+8/lib/
path
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/path-1.9.0/
file:///home/mr/.pub-cache/hosted/pub.dev/path-1.9.0/lib/
path_parsing
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/path_parsing-1.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/path_parsing-1.0.1/lib/
path_provider
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider-2.1.4/
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider-2.1.4/lib/
path_provider_android
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_android-2.2.4/
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_android-2.2.4/lib/
path_provider_foundation
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0/
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0/lib/
path_provider_linux
2.19
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/lib/
path_provider_platform_interface
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2/
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2/lib/
path_provider_windows
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/
file:///home/mr/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/lib/
petitparser
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/petitparser-6.0.2/
file:///home/mr/.pub-cache/hosted/pub.dev/petitparser-6.0.2/lib/
pixel_snap
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/pixel_snap-0.1.5/
file:///home/mr/.pub-cache/hosted/pub.dev/pixel_snap-0.1.5/lib/
platform
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/platform-3.1.6/
file:///home/mr/.pub-cache/hosted/pub.dev/platform-3.1.6/lib/
plugin_platform_interface
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8/
file:///home/mr/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8/lib/
polylabel
2.13
file:///home/mr/.pub-cache/hosted/pub.dev/polylabel-1.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/polylabel-1.0.1/lib/
proj4dart
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/proj4dart-2.1.0/
file:///home/mr/.pub-cache/hosted/pub.dev/proj4dart-2.1.0/lib/
scoped_model
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/scoped_model-2.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/scoped_model-2.0.0/lib/
shamsi_date
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/shamsi_date-0.15.0/
file:///home/mr/.pub-cache/hosted/pub.dev/shamsi_date-0.15.0/lib/
shared_preferences
3.1
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences-2.2.3/
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences-2.2.3/lib/
shared_preferences_android
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.2/
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.2/lib/
shared_preferences_foundation
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.3/
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.3/lib/
shared_preferences_linux
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/lib/
shared_preferences_platform_interface
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1/
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_platform_interface-2.4.1/lib/
shared_preferences_web
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.1/
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.1/lib/
shared_preferences_windows
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/
file:///home/mr/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/lib/
simple_gesture_detector
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/simple_gesture_detector-0.2.1/
file:///home/mr/.pub-cache/hosted/pub.dev/simple_gesture_detector-0.2.1/lib/
source_span
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/source_span-1.10.0/
file:///home/mr/.pub-cache/hosted/pub.dev/source_span-1.10.0/lib/
sprintf
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/sprintf-7.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/sprintf-7.0.0/lib/
stack_trace
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/stack_trace-1.11.1/
file:///home/mr/.pub-cache/hosted/pub.dev/stack_trace-1.11.1/lib/
star_menu
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/star_menu-4.0.1/
file:///home/mr/.pub-cache/hosted/pub.dev/star_menu-4.0.1/lib/
stream_channel
2.19
file:///home/mr/.pub-cache/hosted/pub.dev/stream_channel-2.1.2/
file:///home/mr/.pub-cache/hosted/pub.dev/stream_channel-2.1.2/lib/
string_scanner
2.18
file:///home/mr/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/
file:///home/mr/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/lib/
super_clipboard
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/super_clipboard-0.8.19/
file:///home/mr/.pub-cache/hosted/pub.dev/super_clipboard-0.8.19/lib/
super_drag_and_drop
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/super_drag_and_drop-0.8.19/
file:///home/mr/.pub-cache/hosted/pub.dev/super_drag_and_drop-0.8.19/lib/
super_native_extensions
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/super_native_extensions-0.8.19/
file:///home/mr/.pub-cache/hosted/pub.dev/super_native_extensions-0.8.19/lib/
syncfusion_flutter_calendar
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_calendar-27.1.55/
file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_calendar-27.1.55/lib/
syncfusion_flutter_core
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_core-27.1.55/
file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_core-27.1.55/lib/
syncfusion_flutter_datepicker
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_datepicker-27.1.55/
file:///home/mr/.pub-cache/hosted/pub.dev/syncfusion_flutter_datepicker-27.1.55/lib/
table_calendar
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/table_calendar-3.1.2/
file:///home/mr/.pub-cache/hosted/pub.dev/table_calendar-3.1.2/lib/
term_glyph
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/
file:///home/mr/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib/
test_api
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/test_api-0.7.2/
file:///home/mr/.pub-cache/hosted/pub.dev/test_api-0.7.2/lib/
timezone
2.19
file:///home/mr/.pub-cache/hosted/pub.dev/timezone-0.9.4/
file:///home/mr/.pub-cache/hosted/pub.dev/timezone-0.9.4/lib/
typed_data
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/typed_data-1.3.2/
file:///home/mr/.pub-cache/hosted/pub.dev/typed_data-1.3.2/lib/
unicode
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/unicode-0.3.1/
file:///home/mr/.pub-cache/hosted/pub.dev/unicode-0.3.1/lib/
uuid
3.0
file:///home/mr/.pub-cache/hosted/pub.dev/uuid-4.5.1/
file:///home/mr/.pub-cache/hosted/pub.dev/uuid-4.5.1/lib/
vector_graphics
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics-1.1.11+1/
file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics-1.1.11+1/lib/
vector_graphics_codec
2.17
file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics_codec-1.1.11+1/
file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics_codec-1.1.11+1/lib/
vector_graphics_compiler
2.19
file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics_compiler-1.1.11+1/
file:///home/mr/.pub-cache/hosted/pub.dev/vector_graphics_compiler-1.1.11+1/lib/
vector_math
2.14
file:///home/mr/.pub-cache/hosted/pub.dev/vector_math-2.1.4/
file:///home/mr/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/
vm_service
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/vm_service-14.2.5/
file:///home/mr/.pub-cache/hosted/pub.dev/vm_service-14.2.5/lib/
web
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/web-0.5.1/
file:///home/mr/.pub-cache/hosted/pub.dev/web-0.5.1/lib/
win32
3.5
file:///home/mr/.pub-cache/hosted/pub.dev/win32-5.7.1/
file:///home/mr/.pub-cache/hosted/pub.dev/win32-5.7.1/lib/
win32_registry
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/win32_registry-1.1.3/
file:///home/mr/.pub-cache/hosted/pub.dev/win32_registry-1.1.3/lib/
wkt_parser
2.12
file:///home/mr/.pub-cache/hosted/pub.dev/wkt_parser-2.0.0/
file:///home/mr/.pub-cache/hosted/pub.dev/wkt_parser-2.0.0/lib/
xdg_directories
3.3
file:///home/mr/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0/
file:///home/mr/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0/lib/
xml
3.2
file:///home/mr/.pub-cache/hosted/pub.dev/xml-6.5.0/
file:///home/mr/.pub-cache/hosted/pub.dev/xml-6.5.0/lib/
oc_front
3.3
file:///home/mr/Documents/OC/oc-front/
file:///home/mr/Documents/OC/oc-front/lib/
flutter_flow_chart
3.3
file:///home/mr/Documents/OC/oc-front/library/flutter_flow_chart/
file:///home/mr/Documents/OC/oc-front/library/flutter_flow_chart/lib/
sky_engine
3.2
file:///home/mr/snap/flutter/common/flutter/bin/cache/pkg/sky_engine/
file:///home/mr/snap/flutter/common/flutter/bin/cache/pkg/sky_engine/lib/
flutter
3.3
file:///home/mr/snap/flutter/common/flutter/packages/flutter/
file:///home/mr/snap/flutter/common/flutter/packages/flutter/lib/
flutter_test
3.3
file:///home/mr/snap/flutter/common/flutter/packages/flutter_test/
file:///home/mr/snap/flutter/common/flutter/packages/flutter_test/lib/
flutter_web_plugins
3.2
file:///home/mr/snap/flutter/common/flutter/packages/flutter_web_plugins/
file:///home/mr/snap/flutter/common/flutter/packages/flutter_web_plugins/lib/
2

View File

@@ -1 +0,0 @@
3.24.3

View File

@@ -1,16 +0,0 @@
# This is a generated file; do not edit or check into version control.
desktop_window=/home/mr/.pub-cache/hosted/pub.dev/desktop_window-0.4.1/
device_info_plus=/home/mr/.pub-cache/hosted/pub.dev/device_info_plus-10.1.2/
irondash_engine_context=/home/mr/.pub-cache/hosted/pub.dev/irondash_engine_context-0.5.4/
path_provider=/home/mr/.pub-cache/hosted/pub.dev/path_provider-2.1.4/
path_provider_android=/home/mr/.pub-cache/hosted/pub.dev/path_provider_android-2.2.4/
path_provider_foundation=/home/mr/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0/
path_provider_linux=/home/mr/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
path_provider_windows=/home/mr/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/
shared_preferences=/home/mr/.pub-cache/hosted/pub.dev/shared_preferences-2.2.3/
shared_preferences_android=/home/mr/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.2/
shared_preferences_foundation=/home/mr/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.3/
shared_preferences_linux=/home/mr/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/
shared_preferences_web=/home/mr/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.1/
shared_preferences_windows=/home/mr/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/
super_native_extensions=/home/mr/.pub-cache/hosted/pub.dev/super_native_extensions-0.8.19/

File diff suppressed because one or more lines are too long

2
.gitignore vendored
View File

@@ -10,7 +10,7 @@
.svn/ .svn/
build/ build/
migrate_working_dir/ migrate_working_dir/
env.env
# IntelliJ related # IntelliJ related
*.iml *.iml
*.ipr *.ipr

View File

@@ -1,19 +1,13 @@
# Environemnt to install flutter and build web # Environemnt to install flutter and build web
FROM debian:latest AS build-env FROM debian:latest AS build-env
ARG HOST=${HOST:-"http://localhost:8000"}
ARG AUTH_MODE=true
# install all needed stuff # install all needed stuff
RUN apt-get update RUN apt-get update
RUN apt-get install -y curl git unzip RUN apt-get install -y curl git unzip
ARG WORKSPACE_HOST="http://localhost:8089/oc"
ARG WORKFLOW_HOST="http://localhost:8088/oc"
ARG ITEM_HOST="http://localhost:8087/oc"
ARG SCHEDULER_HOST="http://localhost:8090/oc"
ARG LOGS_HOST="http://localhost:3100"
ARG PEER_HOST="http://localhost:8093/oc"
ARG DATACENTER_HOST="http://localhost:8092/oc"
ARG COLLABORATIVE_AREA_HOST="http://localhost:8091/oc"
ARG AUTH_MODE=true
# define variables # define variables
ARG FLUTTER_SDK=/usr/local/flutter ARG FLUTTER_SDK=/usr/local/flutter
ARG FLUTTER_VERSION=3.19.6 ARG FLUTTER_VERSION=3.19.6
@@ -43,14 +37,8 @@ RUN flutter clean
RUN flutter pub get RUN flutter pub get
RUN flutter build web \ RUN flutter build web \
--dart-define=AUTH_MODE=$AUTH_MODE \ --dart-define=AUTH_MODE=$AUTH_MODE \
--dart-define=WORKSPACE_HOST=$WORKSPACE_HOST \ --dart-define=HOST=$HOST
--dart-define=WORKFLOW_HOST=$WORKFLOW_HOST \
--dart-define=PEER_HOST=$PEER_HOST \
--dart-define=COLLABORATIVE_AREA_HOST=$COLLABORATIVE_AREA_HOST \
--dart-define=SCHEDULER_HOST=$SCHEDULER_HOST \
--dart-define=LOGS_HOST=$LOGS_HOST \
--dart-define=ITEM_HOST=$ITEM_HOST \
--dart-define=DATACENTER_HOST=$DATACENTER_HOST
# once heare the app will be compiled and ready to deploy # once heare the app will be compiled and ready to deploy
# use nginx to deploy # use nginx to deploy

View File

@@ -2,6 +2,18 @@
all: clean docker publish-kind publish-registry all: clean docker publish-kind publish-registry
linux:
./local_run.sh
purge:
lsof -t -i:8080 | xargs kill | true
run-dev:
flutter run -d linux --dart-define=AUTH_MODE=true
dev: purge run-dev
run: run:
flutter run flutter run
@@ -15,13 +27,18 @@ clean:
flutter clean flutter clean
docker: docker:
DOCKER_BUILDKIT=1 docker build -t oc/oc-front:0.0.1 -f Dockerfile . DOCKER_BUILDKIT=1 docker build -t oc-front --build-arg HOST=$(HOST) --build-arg AUTH_MODE=true -f Dockerfile .
docker tag oc/oc-front:0.0.1 oc/oc-front:latest docker tag oc-front:latest oc/oc-front:0.0.1
publish-kind: publish-kind:
kind load docker-image oc/oc-front:0.0.1 --name opencloud kind load docker-image oc/oc-front:0.0.1 --name opencloud | true
publish-registry: publish-registry:
@echo "TODO" @echo "TODO"
.PHONY: build run clean docker publish-kind publish-registry docker-deploy:
docker compose up -d
run-docker: docker publish-kind publish-registry docker-deploy
.PHONY: build run clean docker publish-kind publish-registry

View File

@@ -31,6 +31,11 @@ At the root of the project :
- `flutter clean` - `flutter clean`
- `flutter pub get` - `flutter pub get`
OR
make linux-traefik
| make linux
## Run ## Run
### Run locally (dev mode) ### Run locally (dev mode)
@@ -41,7 +46,7 @@ At the root of the project : `flutter run`
For development purpose open a chrome without CORS : `google-chrome --disable-web-security` For development purpose open a chrome without CORS : `google-chrome --disable-web-security`
At the root of the project : At the root of the project :
- `docker build . -t oc-front` - `docker build . -t oc-front`
if localisation services change : `docker build -t oc-front --build-arg WORKSPACE_HOST=<SERVICE URL> --build-arg WORKFLOW_HOST=<SERVICE URL> --build-arg SEARCH_HOST=<SERVICE URL> --build-arg ITEM_HOST=<SERVICE URL> .` if localisation services change : `docker build -t oc-front --build-arg WORKSPACE_HOST=<SERVICE URL> --build-arg WORKFLOW_HOST=<SERVICE URL> --build-arg SEARCH_HOST=<SERVICE URL> --build-arg CATALOG_HOST=<SERVICE URL> .`
- `docker-compose up -d --build --force-recreate` - `docker-compose up -d --build --force-recreate`

View File

@@ -1,12 +1,10 @@
{ {
"WORKSPACE_HOST": "http://localhost:8089/oc", "WORKSPACE_HOST": "workspace",
"WORKFLOW_HOST": "http://localhost:8088/oc", "WORKFLOW_HOST": "workflow",
"ITEM_HOST": "http://localhost:8087/oc", "CATALOG_HOST": "catalog",
"SCHEDULER_HOST": "http://localhost:8090/oc", "SCHEDULER_HOST": "scheduler",
"LOGS_HOST": "http://localhost:3100", "PEER_HOST": "peer",
"PEER_HOST": "http://localhost:8093/oc", "DATACENTER_HOST": "datacenter",
"DATACENTER_HOST": "http://localhost:8092/oc", "COLLABORATIVE_AREA_HOST": "shared",
"COLLABORATIVE_AREA_HOST": "http://localhost:8091/oc", "AUTH_HOST": "auth"
"HOST": "http://localhost:8089/oc",
"AUTH_HOST": "http://localhost:8080/auth"
} }

View File

@@ -1,12 +0,0 @@
{
"WORKSPACE_HOST": "http://beta.opencloud.com/workspace/oc",
"WORKFLOW_HOST": "http://beta.opencloud.com/workflow/oc",
"ITEM_HOST": "http://beta.opencloud.com/catalog/oc",
"SCHEDULER_HOST": "http://beta.opencloud.com/scheduler/oc",
"LOGS_HOST": "http://localhost:3100",
"PEER_HOST": "http://beta.opencloud.com/peers/oc",
"DATACENTER_HOST": "http://beta.opencloud.com/datacenter/oc",
"COLLABORATIVE_AREA_HOST": "http://beta.opencloud.com/shared/oc",
"HOST": "http://beta.opencloud.com/oc",
"AUTH_HOST": "http://beta.opencloud.com/auth/oc"
}

View File

@@ -5,9 +5,17 @@ services:
image: oc-front image: oc-front
container_name: oc-front container_name: oc-front
ports: ports:
- 8080:80 - 80:80
networks: networks:
- catalog - oc
labels:
- "traefik.enable=true"
- "traefik.http.routers.front.entrypoints=web"
- "traefik.http.routers.front.rule=PathPrefix(`/`)"
- "traefik.http.services.front.loadbalancer.server.port=80"
- "traefik.http.middlewares.front-stripprefix.stripprefix.prefixes=/"
- "traefik.http.routers.front.middlewares=front-stripprefix"
- "traefik.http.middlewares.front.forwardauth.address=http://oc-auth:8080/oc/forward"
networks: networks:
catalog: oc:
external: true external: true

4
env.env Normal file
View File

@@ -0,0 +1,4 @@
KUBERNETES_SERVICE_HOST=192.168.1.169
KUBE_CA="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTVlk3ZHZhNEdYTVdkMy9jMlhLN3JLYjlnWXgyNSthaEE0NmkyNVBkSFAKRktQL2UxSVMyWVF0dzNYZW1TTUQxaStZdzJSaVppNUQrSVZUamNtNHdhcnFvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWtlUVJpNFJiODduME5yRnZaWjZHClc2SU55NnN3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnRXA5ck04WmdNclRZSHYxZjNzOW5DZXZZeWVVa3lZUk4KWjUzazdoaytJS1FDSVFDbk05TnVGKzlTakIzNDFacGZ5ays2NEpWdkpSM3BhcmVaejdMd2lhNm9kdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
KUBE_CERT="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJWUxWNkFPQkdrU1F3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl6TVRFeU1ETTJNQjRYRFRJME1EZ3dPREV3TVRNMU5sb1hEVEkxTURndwpPREV3TVRNMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGQ2Q1MFdPeWdlQ2syQzcKV2FrOWY4MVAvSkJieVRIajRWOXBsTEo0ck5HeHFtSjJOb2xROFYxdUx5RjBtOTQ2Nkc0RmRDQ2dqaXFVSk92Swp3NVRPNnd5alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJkOFI5cXVWK2pjeUVmL0ovT1hQSzMyS09XekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTArbThqTDBJVldvUTZ0dnB4cFo4NVlMalF1SmpwdXM0aDdnSXRxS3NmUVVDSUI2M2ZNdzFBMm5OVWU1TgpIUGZOcEQwSEtwcVN0Wnk4djIyVzliYlJUNklZCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRc3hXWk9pbnIrcVp4TmFEQjVGMGsvTDF5cE01VHAxOFRaeU92ektJazQKRTFsZWVqUm9STW0zNmhPeVljbnN3d3JoNnhSUnBpMW5RdGhyMzg0S0Z6MlBvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBYZkVmYXJsZm8zTWhIL3lmemx6Cnl0OWlqbHN3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxJL2dNYnNMT3MvUUpJa3U2WHVpRVMwTEE2cEJHMXgKcnBlTnpGdlZOekZsQWlFQW1wdjBubjZqN3M0MVI0QzFNMEpSL0djNE53MHdldlFmZWdEVGF1R2p3cFk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
KUBE_DATA="LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5ZS1BFb1dhd1NKUzJlRW5oWmlYMk5VZlY1ZlhKV2krSVNnV09TNFE5VTlvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVUozblJZN0tCNEtUWUx0WnFUMS96VS84a0Z2Sk1lUGhYMm1Vc25pczBiR3FZblkyaVZEeApYVzR2SVhTYjNqcm9iZ1YwSUtDT0twUWs2OHJEbE03ckRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="

View File

@@ -12,7 +12,6 @@ class AppConfig {
Future<void> loadConfig() async { Future<void> loadConfig() async {
final response = await rootBundle.loadString('assets/config/front.json'); final response = await rootBundle.loadString('assets/config/front.json');
_config = Map<String, String>.from(json.decode(response)); _config = Map<String, String>.from(json.decode(response));
print('Config loaded: $_config');
} }
String get(String key, {String defaultValue = ''}) { String get(String key, {String defaultValue = ''}) {

View File

@@ -1,3 +1,5 @@
import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:oc_front/core/sections/end_drawer.dart'; import 'package:oc_front/core/sections/end_drawer.dart';
import 'package:oc_front/core/sections/header/header.dart'; import 'package:oc_front/core/sections/header/header.dart';
@@ -27,6 +29,7 @@ class WorkspaceLocal {
static List<AbstractItem> items = []; static List<AbstractItem> items = [];
static Future<void> init(BuildContext? context, bool changeCurrent) async { static Future<void> init(BuildContext? context, bool changeCurrent) async {
WorkspaceLocal.createWorkspace("default workspace", null);
var value = await _service.all(context); var value = await _service.all(context);
if (value.data != null && value.data!.values.isNotEmpty ) { if (value.data != null && value.data!.values.isNotEmpty ) {
var vals = value.data!.values; var vals = value.data!.values;
@@ -45,8 +48,6 @@ class WorkspaceLocal {
fill(); fill();
HeaderConstants.headerKey.currentState?.setState(() {}); HeaderConstants.headerKey.currentState?.setState(() {});
} }
} else {
await WorkspaceLocal.createWorkspace("default workspace", null);
} }
} }
@@ -106,7 +107,7 @@ class WorkspaceLocal {
WorkflowFactory.key.currentState?.setState(() {}); WorkflowFactory.key.currentState?.setState(() {});
HeaderConstants.headerKey.currentState?.setState(() {}); HeaderConstants.headerKey.currentState?.setState(() {});
} }
}); }).catchError( (e) {});
} }
static void changeWorkspaceByName(String name) { static void changeWorkspaceByName(String name) {

View File

@@ -42,14 +42,14 @@ class HeaderConstants {
static setTitle(String? v) { static setTitle(String? v) {
title = v; title = v;
Future.delayed(Duration(milliseconds: 100), () { Future.delayed(const Duration(milliseconds: 100), () {
HeaderConstants.headerWidget?.setState(() {}); HeaderConstants.headerWidget?.setState(() {});
}); });
} }
static setDescription(String? v) { static setDescription(String? v) {
description = v; description = v;
Future.delayed(Duration(milliseconds: 100), () { Future.delayed(const Duration(milliseconds: 100), () {
HeaderConstants.headerWidget?.setState(() {}); HeaderConstants.headerWidget?.setState(() {});
}); });
} }
@@ -70,7 +70,7 @@ class HeaderWidgetState extends State<HeaderWidget> {
return Container(); return Container();
} }
if (AppRouter.currentRoute.factory.searchFill()) { if (AppRouter.currentRoute.factory.searchFill()) {
return DefaultWidget(); return const DefaultWidget();
} }
HeaderConstants.height = HeaderConstants.isNoHeader(AppRouter.currentRoute.route) || !AppRouter.currentRoute.factory.searchFill() ? 50 : 100; HeaderConstants.height = HeaderConstants.isNoHeader(AppRouter.currentRoute.route) || !AppRouter.currentRoute.factory.searchFill() ? 50 : 100;
return Column( children: [ return Column( children: [
@@ -78,7 +78,7 @@ class HeaderWidgetState extends State<HeaderWidget> {
height: 50, width: getMainWidth(context), height: 50, width: getMainWidth(context),
decoration: BoxDecoration( decoration: BoxDecoration(
color: midColor, color: midColor,
border: Border(bottom: BorderSide(color: Colors.white, width: 1),) border: const Border(bottom: BorderSide(color: Colors.white, width: 1),)
), ),
child: Row(crossAxisAlignment: CrossAxisAlignment.stretch, child: Row(crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
@@ -89,7 +89,7 @@ class HeaderWidgetState extends State<HeaderWidget> {
child: child:
Container(width: 50, height: 50, Container(width: 50, height: 50,
color: Colors.black, color: Colors.black,
child: Center(child: Icon(Icons.keyboard_backspace, color: Colors.white)) child: const Center(child: Icon(Icons.keyboard_backspace, color: Colors.white))
), ),
), ),
ShallowTextInputWidget( ShallowTextInputWidget(
@@ -112,10 +112,10 @@ class HeaderWidgetState extends State<HeaderWidget> {
AppRouter.currentRoute.factory.search(context, true); AppRouter.currentRoute.factory.search(context, true);
} : null, } : null,
), ),
Container( padding: EdgeInsets.only(left: 50), Container( padding: const EdgeInsets.only(left: 50),
decoration: BoxDecoration( border: Border( left: BorderSide( color: Colors.white ))), decoration: const BoxDecoration( border: Border( left: BorderSide( color: Colors.white ))),
child: ShallowDropdownInputWidget( child: ShallowDropdownInputWidget(
prefixIcon: Padding( padding: EdgeInsets.only(right: 10), child: Icon(Icons.shopping_cart, color: Colors.grey)), prefixIcon: const Padding( padding: EdgeInsets.only(right: 10), child: Icon(Icons.shopping_cart, color: Colors.grey)),
current: WorkspaceLocal.current, current: WorkspaceLocal.current,
width: 350, width: 350,
all: () async => WorkspaceLocal.getWorkspacesShallow(), all: () async => WorkspaceLocal.getWorkspacesShallow(),

View File

@@ -18,7 +18,7 @@ class APIService<T extends SerializerDeserializer> {
Dio _dio = Dio( Dio _dio = Dio(
BaseOptions( BaseOptions(
baseUrl: const String.fromEnvironment('HOST', defaultValue: 'http://localhost:8080'), // you can keep this blank baseUrl: AppConfig().get('HOST', defaultValue: 'http://localhost:8000'), // you can keep this blank
headers: { 'Content-Type': 'application/json; charset=UTF-8', 'Access-Control-Allow-Origin': '*' }, headers: { 'Content-Type': 'application/json; charset=UTF-8', 'Access-Control-Allow-Origin': '*' },
), ),
)..interceptors.add(LogInterceptor( )..interceptors.add(LogInterceptor(
@@ -104,10 +104,10 @@ class APIService<T extends SerializerDeserializer> {
Future<APIResponse<T>> _main(String url, dynamic body, String method, String succeed, bool force, Future<APIResponse<T>> _main(String url, dynamic body, String method, String succeed, bool force,
BuildContext? context, Options? options) async { BuildContext? context, Options? options) async {
var err = ""; var err = "";
try { try {
var type = localStorage.getItem('tokenType') ?? "bearer"; _dio.options.headers["Authorization"] = "Bearer ${localStorage.getItem('accessToken') ?? ""}";
_dio.options.headers["Authorization"] = "${type[0].toUpperCase() + type.substring(1)} ${localStorage.getItem('accessToken') ?? ""}";
_dio.interceptors.clear(); _dio.interceptors.clear();
print("URL ${_dio.options.baseUrl}$url" );
var response = await _request(url, method, body, options); var response = await _request(url, method, body, options);
if (response.statusCode != null && response.statusCode! < 400) { if (response.statusCode != null && response.statusCode! < 400) {
if (method == "delete") { cache.remove(url); return APIResponse<T>(); } if (method == "delete") { cache.remove(url); return APIResponse<T>(); }
@@ -137,7 +137,7 @@ class APIService<T extends SerializerDeserializer> {
alertBannerLocation: AlertBannerLocation.bottom,); alertBannerLocation: AlertBannerLocation.bottom,);
} catch (e) { /* */ } } catch (e) { /* */ }
} }
throw Exception(err); throw Exception("${_dio.options.baseUrl}$url $err");
} }
Future<APIResponse<RawData>> raw( Future<APIResponse<RawData>> raw(
@@ -145,9 +145,8 @@ class APIService<T extends SerializerDeserializer> {
var err = ""; var err = "";
if (url != "") { if (url != "") {
try { try {
var type = localStorage.getItem('tokenType') ?? "bearer";
_dio.options.headers["Authorization"] = _dio.options.headers["Authorization"] =
"${type[0].toUpperCase() + type.substring(1)} ${localStorage.getItem('accessToken') ?? ""}"; "Bearer ${localStorage.getItem('accessToken') ?? ""}";
_dio.interceptors.clear(); _dio.interceptors.clear();
var response = await _request(url, method, body, null); var response = await _request(url, method, body, null);
if (response.statusCode != null && response.statusCode! < 400) { if (response.statusCode != null && response.statusCode! < 400) {

View File

@@ -6,13 +6,14 @@ import 'package:oc_front/main.dart';
import 'package:oc_front/models/response.dart'; import 'package:oc_front/models/response.dart';
class AuthService { class AuthService {
static var isAuth = const bool.fromEnvironment('AUTH_MODE', defaultValue: false); static var conf = AppConfig();
static var isAuth = const bool.fromEnvironment('AUTH_MODE', defaultValue: true);
static const _clientID = String.fromEnvironment('CLIENT_ID', defaultValue: 'test-client'); static const _clientID = String.fromEnvironment('CLIENT_ID', defaultValue: 'test-client');
static APIService<SimpleData> service = APIService( static APIService<SimpleData>? service;
baseURL: AppConfig().get('AUTH_HOST', defaultValue: 'http://localhost:8080/auth'),
);
static Future<void> init() async { static Future<void> init() async {
service ??= APIService<SimpleData>(baseURL:
const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + conf.get('AUTH_HOST', defaultValue: '/auth'));
if (!isAuth) { if (!isAuth) {
return; return;
} }
@@ -48,7 +49,7 @@ class AuthService {
} }
static Future<void> login(String username, String password) async { static Future<void> login(String username, String password) async {
var token = await service.post("/login?client_id=$_clientID", <String, dynamic> { var token = await service!.post("/login?client_id=$_clientID", <String, dynamic> {
"username": username, "username": username,
"password": password "password": password
}, null); }, null);
@@ -66,7 +67,7 @@ class AuthService {
} }
static Future<void> logout() async { static Future<void> logout() async {
var token = await service.delete("/logout?client_id=$_clientID", null); var token = await service!.delete("/logout?client_id=$_clientID", null);
if (token.code == 200) { if (token.code == 200) {
localStorage.setItem('accessToken', ''); localStorage.setItem('accessToken', '');
localStorage.setItem('username', ''); localStorage.setItem('username', '');
@@ -80,14 +81,14 @@ class AuthService {
return false; return false;
} }
// ignore: invalid_return_type_for_catch_error // ignore: invalid_return_type_for_catch_error
var isIntrospected = await service.get("/introspect", true, null).catchError((e) => mainKey?.currentState?.setState(() {})); var isIntrospected = await service!.get("/introspect", true, null).catchError((e) => mainKey?.currentState?.setState(() {}));
return isIntrospected.code == 200; return isIntrospected.code == 200;
} }
static Future<void> refresh( static Future<void> refresh(
String accessToken, String username, Duration duration) async { String accessToken, String username, Duration duration) async {
Future.delayed(duration, () { Future.delayed(duration, () {
service.post("/refresh?client_id=$_clientID", <String, dynamic> { service!.post("/refresh?client_id=$_clientID", <String, dynamic> {
"access_token": accessToken, "access_token": accessToken,
"username": username "username": username
}, null).then((token) { }, null).then((token) {
@@ -100,7 +101,7 @@ class AuthService {
'expiresIn', 'expiresIn',
DateTime.now() DateTime.now()
.add(Duration(seconds: token.data?.value['expires_in']) - .add(Duration(seconds: token.data?.value['expires_in']) -
Duration(seconds: 10)) const Duration(seconds: 10))
.toIso8601String()); .toIso8601String());
} }
}); });

View File

@@ -1,11 +1,10 @@
import 'package:oc_front/core/conf/conf_reader.dart';
import 'package:oc_front/models/response.dart'; import 'package:oc_front/models/response.dart';
import 'package:oc_front/core/services/api_service.dart'; import 'package:oc_front/core/services/api_service.dart';
class EnumService { class EnumService {
static final APIService<EnumData> _service = APIService<EnumData>( static var conf = AppConfig();
baseURL: const String.fromEnvironment('ITEM_HOST', static APIService<EnumData>? _service;
defaultValue: 'http://localhost:8080/catalog')
);
static String subPath = "/enum/"; static String subPath = "/enum/";
static Map<String, Map<String,dynamic>> enums = {}; static Map<String, Map<String,dynamic>> enums = {};
@@ -24,6 +23,10 @@ class EnumService {
} }
static void init() { static void init() {
_service = _service ?? APIService<EnumData>(
baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + conf.get('CATALOG_HOST',
defaultValue: '/catalog')
);
_load("infrastructure"); _load("infrastructure");
_load("storage/type"); _load("storage/type");
_load("storage/size"); _load("storage/size");
@@ -40,7 +43,7 @@ class EnumService {
} }
static void _load(String name) { static void _load(String name) {
_service.get("$subPath$name", false, null).then((response) { _service!.get("$subPath$name", false, null).then((response) {
if (response.code == 200) { if (response.code == 200) {
enums[name] = response.data!.value; enums[name] = response.data!.value;
} }

View File

@@ -71,7 +71,6 @@ class PermsService {
try { try {
var what = json.decode(foo); var what = json.decode(foo);
what = what["session"]["access_token"] as Map<String, dynamic>; what = what["session"]["access_token"] as Map<String, dynamic>;
for (var w in perms.keys) { for (var w in perms.keys) {
if (what.keys.contains(perms[w])) { if (what.keys.contains(perms[w])) {
_perms[w] = true; _perms[w] = true;

View File

@@ -1,3 +1,5 @@
import 'dart:convert';
import 'package:oc_front/core/sections/header/header.dart'; import 'package:oc_front/core/sections/header/header.dart';
import 'package:oc_front/main.dart'; import 'package:oc_front/main.dart';
import 'package:oc_front/pages/abstract_page.dart'; import 'package:oc_front/pages/abstract_page.dart';
@@ -15,7 +17,7 @@ import 'package:go_router/go_router.dart';
GlobalKey<RouterWidgetState> routerKey = GlobalKey<RouterWidgetState>(); GlobalKey<RouterWidgetState> routerKey = GlobalKey<RouterWidgetState>();
class RouterWidget extends StatefulWidget { class RouterWidget extends StatefulWidget {
const RouterWidget({Key? key}) : super(key: key); const RouterWidget({super.key});
@override RouterWidgetState createState() => RouterWidgetState(); @override RouterWidgetState createState() => RouterWidgetState();
} }
@@ -42,7 +44,8 @@ class RouterItem {
void go(BuildContext context, Map<String, String> params) { void go(BuildContext context, Map<String, String> params) {
AppRouter.currentRoute = this; AppRouter.currentRoute = this;
var newPath = "$path"; var newPath = path;
AppRouter.setRouteCookie(newPath, params, context);
for (var arg in args) { newPath = newPath.replaceAll(":$arg", params[arg] ?? ""); } for (var arg in args) { newPath = newPath.replaceAll(":$arg", params[arg] ?? ""); }
Future.delayed( const Duration(seconds: 1), () { Future.delayed( const Duration(seconds: 1), () {
HeaderConstants.setTitle(null); HeaderConstants.setTitle(null);
@@ -87,6 +90,28 @@ class AppRouter {
}); });
} }
static verifyRoute(context) async {
var url = await getRouteCookie();
if (url != null && url != "") {
for (var zone in zones) {
if (zone.route == url.replaceAll("/", "")) {
Map<String, String> params = {};
var srcParams = await getRouteParamsCookie();
for (var key in srcParams.keys) {
params[key] = "${srcParams[key]}";
}
zone.go(context, params);
return;
}
}
}
}
static Future<Map<String,dynamic>> getRouteParamsCookie() async {
final SharedPreferences prefs = await SharedPreferences.getInstance();
return prefs.getString("params") != null && prefs.getString("params") != "" ? json.decode(prefs.getString("params")!) : {};
}
static Future<String?> getRouteCookie() async { static Future<String?> getRouteCookie() async {
final SharedPreferences prefs = await SharedPreferences.getInstance(); final SharedPreferences prefs = await SharedPreferences.getInstance();
return prefs.getString("url") != "" ? prefs.getString("url") : null; return prefs.getString("url") != "" ? prefs.getString("url") : null;
@@ -95,11 +120,13 @@ class AppRouter {
static removeRouteCookie() async { static removeRouteCookie() async {
final SharedPreferences prefs = await SharedPreferences.getInstance(); final SharedPreferences prefs = await SharedPreferences.getInstance();
prefs.remove("url"); prefs.remove("url");
prefs.remove("params");
} }
static setRouteCookie( String path , BuildContext context ) async { static setRouteCookie( String path, Map<String, String> params, BuildContext context ) async {
final SharedPreferences prefs = await SharedPreferences.getInstance(); final SharedPreferences prefs = await SharedPreferences.getInstance();
prefs.setString("url", path); prefs.setString("url", path);
prefs.setString("params", params.toString());
if (realHistory.isNotEmpty && realHistory.last != path || realHistory.isEmpty) { if (realHistory.isNotEmpty && realHistory.last != path || realHistory.isEmpty) {
try { try {
var index = history.indexOf(realHistory.last); var index = history.indexOf(realHistory.last);
@@ -122,7 +149,6 @@ class AppRouter {
final SharedPreferences prefs = await SharedPreferences.getInstance(); final SharedPreferences prefs = await SharedPreferences.getInstance();
prefs.setString("url", realHistory.last); prefs.setString("url", realHistory.last);
prefs.setString("history", realHistory.join(",")); prefs.setString("history", realHistory.join(","));
var splitted = realHistory.last.split(":");
routerKey.currentState?.setState(() { }); routerKey.currentState?.setState(() { });
scaffoldKey.currentState?.setState(() {}); scaffoldKey.currentState?.setState(() {});
} }
@@ -139,7 +165,6 @@ class AppRouter {
realHistory.add(history[index + 1]); realHistory.add(history[index + 1]);
final SharedPreferences prefs = await SharedPreferences.getInstance(); final SharedPreferences prefs = await SharedPreferences.getInstance();
prefs.setString("url", realHistory.last); prefs.setString("url", realHistory.last);
var splitted = realHistory.last.split(":");
prefs.setString("history", realHistory.join(",")); prefs.setString("history", realHistory.join(","));
routerKey.currentState?.setState(() { }); routerKey.currentState?.setState(() { });
scaffoldKey.currentState?.setState(() {}); scaffoldKey.currentState?.setState(() {});

View File

@@ -5,9 +5,13 @@ import 'package:oc_front/models/response.dart';
import 'package:oc_front/models/workflow.dart'; import 'package:oc_front/models/workflow.dart';
class BookingExecutionService extends AbstractService<WorkflowExecution> { class BookingExecutionService extends AbstractService<WorkflowExecution> {
@override APIService<WorkflowExecution> service = APIService<WorkflowExecution>( @override late final APIService<WorkflowExecution> service;
baseURL: const String.fromEnvironment('DATACENTER_HOST', defaultValue: 'http://localhost:8080/datacenter')
); BookingExecutionService() {
service = APIService<WorkflowExecution>(
baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('BOOKING_HOST',
defaultValue: '/booking'));
}
@override String subPath = "/booking/"; @override String subPath = "/booking/";
@override Future<APIResponse<WorkflowExecution>> search(BuildContext? context, List<String> words, Map<String, dynamic> params) { @override Future<APIResponse<WorkflowExecution>> search(BuildContext? context, List<String> words, Map<String, dynamic> params) {

View File

@@ -1,53 +0,0 @@
import 'package:flutter/widgets.dart';
import 'package:oc_front/core/services/api_service.dart';
import 'package:oc_front/core/services/specialized_services/abstract_service.dart';
import 'package:oc_front/models/response.dart';
import 'package:oc_front/models/workflow.dart';
class CheckService extends AbstractService<Check> {
@override
late final APIService<Check> service;
@override
String subPath = "/check/";
CheckService() {
service = APIService<Check>(
baseURL: super
.conf
.get('CHECK_HOST', defaultValue: 'http://localhost:8080/check'));
}
Future<APIResponse<Check>> search(
BuildContext? context, List<String> words, Map<String, dynamic> params) {
return service.get("$subPath${words.join("/")}", true, context);
}
@override
Future<APIResponse<RawData>> all(BuildContext? context) {
throw UnimplementedError();
}
@override
Future<APIResponse<Check>> get(BuildContext? context, String id) {
throw UnimplementedError();
}
@override
Future<APIResponse<Check>> post(BuildContext? context,
Map<String, dynamic> body, Map<String, String> params) {
throw UnimplementedError();
}
@override
Future<APIResponse<Check>> put(BuildContext? context, String id,
Map<String, dynamic> body, Map<String, String> params) {
throw UnimplementedError();
}
@override
Future<APIResponse<Check>> delete(
BuildContext? context, String id, Map<String, String> params) {
throw UnimplementedError();
}
}

View File

@@ -5,9 +5,13 @@ import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/models/response.dart'; import 'package:oc_front/models/response.dart';
class DatacenterService extends AbstractService<Resource> { class DatacenterService extends AbstractService<Resource> {
@override APIService<Resource> service = APIService<Resource>( @override late final APIService<Resource> service;
baseURL: const String.fromEnvironment('DATACENTER_HOST', defaultValue: 'http://localhost:8080/datacenter')
); DatacenterService() {
service = APIService<Resource>(
baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('DATACENTER_HOST',
defaultValue: '/datacenter'));
}
@override String subPath = "/"; @override String subPath = "/";
@override Future<APIResponse<Resource>> search(BuildContext? context, List<String> words, Map<String, dynamic> params) { @override Future<APIResponse<Resource>> search(BuildContext? context, List<String> words, Map<String, dynamic> params) {

View File

@@ -9,25 +9,16 @@ class LogsService extends AbstractService<LogsResult> {
late final APIService<LogsResult> service; late final APIService<LogsResult> service;
@override @override
String subPath = "/loki/api/v1/"; String subPath = "/loki";
LogService() { LogsService() {
service = APIService<LogsResult>( service = APIService<LogsResult>(
baseURL: baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('SCHEDULER_HOST', defaultValue: '/scheduler'));
super.conf.get('LOGS_HOST', defaultValue: 'http://localhost:3100'));
} }
@override @override
Future<APIResponse<LogsResult>> search( Future<APIResponse<LogsResult>> search(BuildContext? context, List<String> words, Map<String, dynamic> params) {
BuildContext? context, List<String> words, Map<String, dynamic> params) { return service.post(subPath, params, context);
List<String> v = [];
for (var p in params.keys) {
if (p == "start" || p == "end") {
continue;
}
v.add("$p=\"${params[p]}\"");
}
return service.get("${subPath}query_range?query={${v.join(", ")}}&start=${params["start"].toString().substring(0, 10)}&end=${params["end"].toString().substring(0, 10)}", false, context);
} }
@override @override

View File

@@ -10,8 +10,8 @@ class PeerService extends AbstractService<Peer> {
PeerService() { PeerService() {
service = APIService<Peer>( service = APIService<Peer>(
baseURL: super baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super
.conf .conf
.get('PEER_HOST', defaultValue: 'http://localhost:8080/peer')); .get('PEER_HOST', defaultValue: '/peer'));
} }
} }

View File

@@ -13,9 +13,9 @@ class ResourceService extends AbstractService<Resource> {
ResourceService() { ResourceService() {
service = APIService<Resource>( service = APIService<Resource>(
baseURL: super baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super
.conf .conf
.get('ITEM_HOST', defaultValue: 'http://localhost:8080/catalog')); .get('CATALOG_HOST', defaultValue: '/catalog'));
} }
@override @override

View File

@@ -13,8 +13,8 @@ class SharedService extends AbstractService<CollaborativeArea> {
SharedService() { SharedService() {
service = APIService<CollaborativeArea>( service = APIService<CollaborativeArea>(
baseURL: super.conf.get('COLLABORATIVE_AREA_HOST', baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('COLLABORATIVE_AREA_HOST',
defaultValue: 'http://localhost:8080/shared')); defaultValue: '/shared'));
} }
Future<APIResponse<CollaborativeArea>> addWorkspace( Future<APIResponse<CollaborativeArea>> addWorkspace(

View File

@@ -5,15 +5,13 @@ import 'package:oc_front/models/response.dart';
import 'package:oc_front/models/workflow.dart'; import 'package:oc_front/models/workflow.dart';
class WorkflowExecutionService extends AbstractService<WorkflowExecutions> { class WorkflowExecutionService extends AbstractService<WorkflowExecutions> {
@override APIService<WorkflowExecutions> service = APIService<WorkflowExecutions>( @override late final APIService<WorkflowExecutions> service;
baseURL: const String.fromEnvironment('SCHEDULER_HOST', defaultValue: 'http://localhost:8080/scheduler')
);
@override String subPath = "/execution/"; @override String subPath = "/execution/";
WorkflowExecutionService() { WorkflowExecutionService() {
service = APIService<WorkflowExecutions>( service = APIService<WorkflowExecutions>(
baseURL: super.conf.get('SCHEDULER_HOST', baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('SCHEDULER_HOST',
defaultValue: 'http://localhost:8080/scheduler')); defaultValue: '/scheduler'));
} }
@override @override
Future<APIResponse<WorkflowExecutions>> search( Future<APIResponse<WorkflowExecutions>> search(

View File

@@ -4,25 +4,28 @@ import 'package:oc_front/core/services/specialized_services/abstract_service.dar
import 'package:oc_front/models/response.dart'; import 'package:oc_front/models/response.dart';
import 'package:oc_front/models/workflow.dart'; import 'package:oc_front/models/workflow.dart';
class SchedulerService extends AbstractService<WorkflowExecution> { class SchedulerService extends AbstractService<WorkflowExecutions> {
@override APIService<WorkflowExecution> service = APIService<WorkflowExecution>( @override late final APIService<WorkflowExecutions> service;
baseURL: const String.fromEnvironment('SCHEDULER_HOST', defaultValue: 'http://localhost:8080/scheduler')
); SchedulerService() {
service = APIService<WorkflowExecutions>(
baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('SCHEDULER_HOST',
defaultValue: '/scheduler'));
}
@override String subPath = "/"; @override String subPath = "/";
Future<APIResponse<WorkflowExecution>> schedule(BuildContext? context, String id, Map<String, dynamic> body, Map<String, dynamic> params) { Future<APIResponse<WorkflowExecutions>> schedule(BuildContext? context, String id, Map<String, dynamic> body, Map<String, dynamic> params) {
print("$subPath$id");
return service.post("$subPath$id", body, context); return service.post("$subPath$id", body, context);
} }
@override Future<APIResponse<WorkflowExecution>> search(BuildContext? context, List<String> words, Map<String, dynamic> params) { @override Future<APIResponse<WorkflowExecutions>> search(BuildContext? context, List<String> words, Map<String, dynamic> params) {
return throw UnimplementedError(); return throw UnimplementedError();
} }
@override Future<APIResponse<WorkflowExecution>> post(BuildContext? context, Map<String, dynamic> body, Map<String, String> params) { @override Future<APIResponse<WorkflowExecutions>> post(BuildContext? context, Map<String, dynamic> body, Map<String, String> params) {
return throw UnimplementedError(); return throw UnimplementedError();
} }
@override Future<APIResponse<WorkflowExecution>> put(BuildContext? context, String id, Map<String, dynamic> body, Map<String, String> params) { @override Future<APIResponse<WorkflowExecutions>> put(BuildContext? context, String id, Map<String, dynamic> body, Map<String, String> params) {
return throw UnimplementedError(); return throw UnimplementedError();
} }
} }

View File

@@ -1,8 +1,11 @@
import 'package:flutter/material.dart';
import 'package:oc_front/core/services/api_service.dart'; import 'package:oc_front/core/services/api_service.dart';
import 'package:oc_front/core/services/specialized_services/abstract_service.dart'; import 'package:oc_front/core/services/specialized_services/abstract_service.dart';
import 'package:oc_front/models/response.dart';
import 'package:oc_front/models/workflow.dart'; import 'package:oc_front/models/workflow.dart';
class WorflowService extends AbstractService<Workflow> { class WorflowService extends AbstractService<Workflow> {
late final APIService<Check> serviceCheck;
@override @override
late final APIService<Workflow> service; late final APIService<Workflow> service;
@override @override
@@ -10,7 +13,15 @@ class WorflowService extends AbstractService<Workflow> {
WorflowService() { WorflowService() {
service = APIService<Workflow>( service = APIService<Workflow>(
baseURL: super.conf.get('WORKFLOW_HOST', baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('WORKFLOW_HOST',
defaultValue: 'http://localhost:8080/workflow')); defaultValue: '/workflow'));
serviceCheck = APIService<Check>(
baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('WORKFLOW_HOST',
defaultValue: '/workflow'));
}
Future<APIResponse<Check>> check(
BuildContext? context, List<String> words, Map<String, dynamic> params) {
return serviceCheck.get("${subPath}check/${words.join("/")}", true, context);
} }
} }

View File

@@ -11,7 +11,7 @@ class WorkspaceService extends AbstractService<Workspace> {
WorkspaceService() { WorkspaceService() {
service = APIService<Workspace>( service = APIService<Workspace>(
baseURL: super.conf.get('WORKSPACE_HOST', baseURL: const String.fromEnvironment("HOST", defaultValue: "http://localhost:8000") + super.conf.get('WORKSPACE_HOST',
defaultValue: 'http://localhost:8080/workspace')); defaultValue: '/workspace'));
} }
} }

View File

@@ -1,9 +1,10 @@
import 'dart:async'; import 'dart:async';
import 'dart:ui';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:localstorage/localstorage.dart'; import 'package:localstorage/localstorage.dart';
import 'package:oc_front/core/models/shared_workspace_local.dart';
import 'package:oc_front/core/models/workspace_local.dart'; import 'package:oc_front/core/models/workspace_local.dart';
import 'package:oc_front/core/sections/header/header.dart'; import 'package:oc_front/core/sections/header/header.dart';
import 'package:oc_front/core/sections/header/menu.dart'; import 'package:oc_front/core/sections/header/menu.dart';
@@ -13,15 +14,8 @@ import 'package:oc_front/core/services/enum_service.dart';
import 'package:oc_front/core/services/router.dart'; import 'package:oc_front/core/services/router.dart';
import 'package:oc_front/core/sections/end_drawer.dart'; import 'package:oc_front/core/sections/end_drawer.dart';
import 'package:oc_front/widgets/dialog/login.dart'; import 'package:oc_front/widgets/dialog/login.dart';
import 'package:oc_front/core/conf/conf_reader.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
// Load configuration before running the app
final appConfig = AppConfig();
await appConfig.loadConfig();
// Run `LinuxWebViewPlugin.initialize()` first before creating a WebView. // Run `LinuxWebViewPlugin.initialize()` first before creating a WebView.
await initLocalStorage(); await initLocalStorage();
runApp(const MyApp()); runApp(const MyApp());
@@ -35,6 +29,7 @@ class MyApp extends StatelessWidget {
// This widget is the root of your application. // This widget is the root of your application.
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// Future.delayed(Duration(seconds: 2), () => AppRouter.verifyRoute(context));
AuthService.init(); AuthService.init();
EnumService.init(); EnumService.init();
SearchConstants.clear(); SearchConstants.clear();
@@ -88,7 +83,6 @@ double getMainWidth(BuildContext context) {
} }
bool loginIsSet = false; bool loginIsSet = false;
class MainPageState extends State<MainPage> { class MainPageState extends State<MainPage> {
bool isCtrl = false;
final FocusNode node = FocusNode(); final FocusNode node = FocusNode();
@override @override
void initState() { void initState() {
@@ -106,13 +100,13 @@ class MainPageState extends State<MainPage> {
// fast, so that you can just rebuild anything that needs updating rather // fast, so that you can just rebuild anything that needs updating rather
// than having to individually change instances of widgets.i // than having to individually change instances of widgets.i
scaffoldKey = GlobalKey<ScaffoldState>(); scaffoldKey = GlobalKey<ScaffoldState>();
isCtrl = false;
if (!AuthService.isConnected() && !loginIsSet) { if (!AuthService.isConnected() && !loginIsSet) {
Future.delayed(const Duration(milliseconds: 500), () { Future.delayed(const Duration(milliseconds: 500), () {
loginIsSet = true; loginIsSet = true;
showDialog( showDialog(
barrierDismissible: false, barrierDismissible: false,
context: context ?? context, builder: (context) { // ignore: use_build_context_synchronously
context: context, builder: (context) {
return AlertDialog( return AlertDialog(
insetPadding: EdgeInsets.zero, insetPadding: EdgeInsets.zero,
backgroundColor: Colors.white, backgroundColor: Colors.white,
@@ -137,23 +131,20 @@ class MainPageState extends State<MainPage> {
Container( padding: const EdgeInsets.symmetric(vertical: 30), Container( padding: const EdgeInsets.symmetric(vertical: 30),
decoration: BoxDecoration( color: darkColor), decoration: BoxDecoration( color: darkColor),
width: 50, height: getHeight(context) - 50, width: 50, height: getHeight(context) - 50,
child: SingleChildScrollView( child: LeftMenuWidget() )), child: const SingleChildScrollView( child: LeftMenuWidget() )),
SizedBox( width: getMainWidth(context), height: getHeight(context) - 50, SizedBox( width: getMainWidth(context), height: getHeight(context) - 50,
child: KeyboardListener( child: KeyboardListener(
focusNode: node, focusNode: node,
onKeyEvent: (event) async { onKeyEvent: (event) async {
if ( event.logicalKey == LogicalKeyboardKey.controlLeft ) { if( (event is KeyDownEvent) && event.logicalKey == LogicalKeyboardKey.enter) {
isCtrl = (event is KeyDownEvent); AppRouter.currentRoute.factory.search(context, false);
node.requestFocus();
} else if( (event is KeyDownEvent) && event.logicalKey == LogicalKeyboardKey.enter) {
AppRouter.currentRoute.factory.search(context, isCtrl);
node.requestFocus(); node.requestFocus();
} }
}, },
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
HeaderWidget(), const HeaderWidget(),
widget.page ?? Container() // CatalogPageWidget(), widget.page ?? Container() // CatalogPageWidget(),
], ],
), ),

View File

@@ -80,16 +80,15 @@ class Log extends SerializerDeserializer<Log> {
} else { } else {
jsonString = "${j["Name"]} : [${j["Namespace"]}] ${j["Status"]} ${j["Progress"]} (${j["Duration"].toString()})\nCreated at ${j["Created"].toString().replaceAllMapped(RegExp(r'\(\w+\)'), (match) { return ''; }).replaceAllMapped(RegExp(r'\+\w+'), (match) { return ''; })}; Started at ${j["Created"].toString().replaceAllMapped(RegExp(r'\(\w+\)'), (match) { return ''; }).replaceAllMapped(RegExp(r'\+\w+'), (match) { return ''; })}"; jsonString = "${j["Name"]} : [${j["Namespace"]}] ${j["Status"]} ${j["Progress"]} (${j["Duration"].toString()})\nCreated at ${j["Created"].toString().replaceAllMapped(RegExp(r'\(\w+\)'), (match) { return ''; }).replaceAllMapped(RegExp(r'\+\w+'), (match) { return ''; })}; Started at ${j["Created"].toString().replaceAllMapped(RegExp(r'\(\w+\)'), (match) { return ''; }).replaceAllMapped(RegExp(r'\+\w+'), (match) { return ''; })}";
} }
} on JsonFormatException catch (e) { /* */ } } on JsonFormatException catch (_) { /* */ }
message = jsonString; message = jsonString;
return jsonString; return jsonString;
} }
@override deserialize(dynamic json) { @override deserialize(dynamic json) {
try { json = json as List<dynamic>; try { json = json as List<dynamic>;
} catch (e) { return Log(); } } catch (e) { return Log(); } var l = Log(
var l = Log( timestamp: json.isNotEmpty ? DateTime.fromMillisecondsSinceEpoch(int.parse(json[0]) ~/ 1000, isUtc : true) : null,
timestamp: json.isNotEmpty ? DateTime.fromMillisecondsSinceEpoch(int.parse(json[0]) ~/ 1000) : null,
message: json.length > 1 ? getMessage(json[1].toString()) : null, message: json.length > 1 ? getMessage(json[1].toString()) : null,
rawMessage : json.length > 1 ? json[1].toString() : null, rawMessage : json.length > 1 ? json[1].toString() : null,
); );

View File

@@ -327,11 +327,10 @@ abstract class AbstractInstance<X extends AbstractPricing, S extends AbstractPar
String? name; String? name;
int? countryCode; int? countryCode;
Location? location; Location? location;
List<S> partnerships = []; //List<S> partnerships = [];
List<Param> env = []; List<Param> env = [];
List<Param> inputs = []; List<Param> inputs = [];
List<Param> outputs = []; List<Param> outputs = [];
Credential? credential;
bool isEnv(String key) { bool isEnv(String key) {
@@ -361,8 +360,7 @@ abstract class AbstractInstance<X extends AbstractPricing, S extends AbstractPar
this.inputs = json.containsKey("inputs") ? fromListJson(json["inputs"], Param()) : []; this.inputs = json.containsKey("inputs") ? fromListJson(json["inputs"], Param()) : [];
this.outputs = json.containsKey("outputs") ? fromListJson(json["outputs"], Param()) : []; this.outputs = json.containsKey("outputs") ? fromListJson(json["outputs"], Param()) : [];
this.location = json.containsKey("location") ? Location().deserialize(json["location"]) : null; this.location = json.containsKey("location") ? Location().deserialize(json["location"]) : null;
this.credential = json.containsKey("credential") ? Credential().deserialize(json["credential"]) : null; //this.partnerships = json.containsKey("partnerships") ? fromListJson(json["partnerships"], ex) : [];
this.partnerships = json.containsKey("partnerships") ? fromListJson(json["partnerships"], ex) : [];
} }
Map<String, dynamic> toJSON() { Map<String, dynamic> toJSON() {
@@ -374,8 +372,7 @@ abstract class AbstractInstance<X extends AbstractPricing, S extends AbstractPar
"env": toListJson(env), "env": toListJson(env),
"inputs": toListJson(inputs), "inputs": toListJson(inputs),
"outputs": toListJson(outputs), "outputs": toListJson(outputs),
"credential": credential?.serialize(), // TODO CREDENTIAL FORM //"partnerships": partnerships.map((e) => e.serialize()).toList(),
"partnerships": partnerships.map((e) => e.serialize()).toList(),
}; };
} }
} }

View File

@@ -48,7 +48,10 @@ class StorageItem extends AbstractItem<StoragePricing, StoragePartnership, Stora
} }
@override Map<String, dynamic> serialize() { @override Map<String, dynamic> serialize() {
var obj = infos(); var obj = {
"acronym": acronym,
"storage_type": typeEnum,
};
obj.addAll(toJSON()); obj.addAll(toJSON());
return obj; return obj;
} }

View File

@@ -334,8 +334,8 @@ class Graph extends SerializerDeserializer<Graph> {
} }
// should find arrow env info and add it to the env // should find arrow env info and add it to the env
List<Param> extParams = []; List<Param> extParams = [];
var arrows = links.where( (e) => (e.source?.id?.contains(item.id ?? "") ?? false) || (e.destination?.id?.contains(item.id ?? "") ?? false)); // var arrows = links.where( (e) => (e.source?.id?.contains(item.id ?? "") ?? false) || (e.destination?.id?.contains(item.id ?? "") ?? false));
for (var arrow in arrows) { /*for (var arrow in arrows) {
for (var info in arrow.infos) { for (var info in arrow.infos) {
var i = info as Map<String, dynamic>; var i = info as Map<String, dynamic>;
for (var entry in i.entries) { for (var entry in i.entries) {
@@ -352,7 +352,7 @@ class Graph extends SerializerDeserializer<Graph> {
} }
} }
} }
} }*/
for ( var param in what) { for ( var param in what) {
if (param.attr == null) { continue; } if (param.attr == null) { continue; }
var varName = param.name != null && (param.name!.contains("LINK_") var varName = param.name != null && (param.name!.contains("LINK_")
@@ -361,7 +361,7 @@ class Graph extends SerializerDeserializer<Graph> {
|| param.name!.contains("STORAGE_") || param.name!.contains("STORAGE_")
|| param.name!.contains("WORKFLOW_") || param.name!.contains("WORKFLOW_")
|| param.name!.contains("COMPUTE") ) ? param.name : "${el.topic.toUpperCase()}_${el.getName().toUpperCase().replaceAll(" ", "_")}_${param.attr!.toUpperCase()}"; || param.name!.contains("COMPUTE") ) ? param.name : "${el.topic.toUpperCase()}_${el.getName().toUpperCase().replaceAll(" ", "_")}_${param.attr!.toUpperCase()}";
/*alreadySeen[varName] = (alreadySeen[varName] ?? -1) + 1; /*alreadySeen[varName] = (alreInstanceadySeen[varName] ?? -1) + 1;
if ((alreadySeen[varName] ?? 0) > 0) { if ((alreadySeen[varName] ?? 0) > 0) {
varName = "${varName}_${alreadySeen[varName]}"; varName = "${varName}_${alreadySeen[varName]}";
}*/ }*/

View File

@@ -1,7 +1,6 @@
import 'package:datetime_picker_formfield/datetime_picker_formfield.dart'; import 'package:datetime_picker_formfield/datetime_picker_formfield.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:oc_front/core/services/specialized_services/booking_service.dart';
import 'package:oc_front/main.dart'; import 'package:oc_front/main.dart';
import 'package:intl/intl.dart' as intl; import 'package:intl/intl.dart' as intl;
import 'package:oc_front/pages/abstract_page.dart'; import 'package:oc_front/pages/abstract_page.dart';
@@ -22,7 +21,6 @@ class ComputePageWidget extends StatefulWidget {
bool isList = true; bool isList = true;
DateTime start = DateTime.now(); DateTime start = DateTime.now();
DateTime end = DateTime.now().add(const Duration(days: 180)); DateTime end = DateTime.now().add(const Duration(days: 180));
final BookingExecutionService _service = BookingExecutionService();
ComputePageWidget () : super(key: DatacenterFactory.key); ComputePageWidget () : super(key: DatacenterFactory.key);
@override ComputePageWidgetState createState() => ComputePageWidgetState(); @override ComputePageWidgetState createState() => ComputePageWidgetState();
@@ -66,7 +64,7 @@ class ComputePageWidgetState extends State<ComputePageWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light( colorScheme: ColorScheme.light(
background: midColor, surface: midColor,
tertiary: Colors.grey, tertiary: Colors.grey,
secondary: Colors.grey, secondary: Colors.grey,
primary: Colors.black), primary: Colors.black),
@@ -124,7 +122,7 @@ class ComputePageWidgetState extends State<ComputePageWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light( colorScheme: ColorScheme.light(
background: midColor, surface: midColor,
tertiary: Colors.grey, tertiary: Colors.grey,
secondary: Colors.grey, secondary: Colors.grey,
primary: Colors.black), primary: Colors.black),

View File

@@ -6,7 +6,6 @@ import 'package:go_router/go_router.dart';
import 'package:latlong2/latlong.dart'; import 'package:latlong2/latlong.dart';
import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map/flutter_map.dart';
import 'package:oc_front/core/services/specialized_services/datacenter_service.dart'; import 'package:oc_front/core/services/specialized_services/datacenter_service.dart';
import 'package:oc_front/main.dart';
import 'package:oc_front/models/resources/compute.dart'; import 'package:oc_front/models/resources/compute.dart';
import 'package:oc_front/models/resources/resources.dart'; import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/models/resources/storage.dart'; import 'package:oc_front/models/resources/storage.dart';
@@ -24,6 +23,7 @@ class MapFactory implements AbstractFactory {
@override void search(BuildContext context, bool special) { } @override void search(BuildContext context, bool special) { }
} }
double menuSize = 0; double menuSize = 0;
// ignore: must_be_immutable
class MapPageWidget extends StatefulWidget { class MapPageWidget extends StatefulWidget {
bool isShowed = false; bool isShowed = false;
final DatacenterService _service = DatacenterService(); final DatacenterService _service = DatacenterService();
@@ -42,7 +42,7 @@ class MapPageWidgetState extends State<MapPageWidget> {
return FutureBuilder(future: widget._service.all(context), builder: (BuildContext context, AsyncSnapshot snapshot) { return FutureBuilder(future: widget._service.all(context), builder: (BuildContext context, AsyncSnapshot snapshot) {
Map<String, Map<AbstractItem, LatLng>> coordinates = {}; Map<String, Map<AbstractItem, LatLng>> coordinates = {};
List<Marker> markerCoordinates = []; List<Marker> markerCoordinates = [];
if (snapshot.data != null&& snapshot.data!.data != null && snapshot.data!.data!.values.isNotEmpty) { if (snapshot.data != null&& snapshot.data!.data != null) {
for (var element in snapshot.data!.data!.values) { for (var element in snapshot.data!.data!.values) {
if (element["type"] == "storage") { if (element["type"] == "storage") {
StorageItem resource = StorageItem().deserialize(element); StorageItem resource = StorageItem().deserialize(element);
@@ -67,9 +67,9 @@ class MapPageWidgetState extends State<MapPageWidget> {
height: 30, height: 30,
point: coordinates[topic]![coord]!, point: coordinates[topic]![coord]!,
child: HoverMenu( width: 110, title: Container( alignment: Alignment.center, child: HoverMenu( width: 110, title: Container( alignment: Alignment.center,
constraints: BoxConstraints( maxHeight: 100, maxWidth: 100 ), constraints: const BoxConstraints( maxHeight: 100, maxWidth: 100 ),
child: Icon(FontAwesomeIcons.locationDot, child: Icon(FontAwesomeIcons.locationDot,
shadows: <Shadow>[Shadow(color: Color.fromRGBO(0, 0, 0, 1), blurRadius: 10.0)], shadows: const <Shadow>[Shadow(color: Color.fromRGBO(0, 0, 0, 1), blurRadius: 10.0)],
color: getColor(topic)) ), color: getColor(topic)) ),
items: [ Container(color: Colors.white, items: [ Container(color: Colors.white,
child: ItemRowWidget(low: true, contextWidth: 290, item: coord)) ] child: ItemRowWidget(low: true, contextWidth: 290, item: coord)) ]
@@ -77,8 +77,6 @@ class MapPageWidgetState extends State<MapPageWidget> {
)); ));
} }
} }
Rect rect = Rect.fromCenter( center: MediaQuery.of(context).size.center(Offset.zero),
width: selected ? menuSize : 0, height: (getMainHeight(context) - 50) > 0 ? (getMainHeight(context) - 50) : 0);
return Expanded( return Expanded(
child : FlutterMap( child : FlutterMap(
mapController: _mapController, mapController: _mapController,
@@ -113,6 +111,7 @@ class HoverMenuController {
} }
} }
// ignore: must_be_immutable
class HoverMenu extends StatefulWidget { class HoverMenu extends StatefulWidget {
final Widget title; final Widget title;
final double? width; final double? width;
@@ -122,12 +121,12 @@ class HoverMenu extends StatefulWidget {
HoverMenu({ HoverMenu({
Key? key, super.key,
required this.title, required this.title,
this.items = const [], this.items = const [],
this.width, this.width,
this.controller, this.controller,
}) : super(key: key); });
@override @override
HoverMenuState createState() => HoverMenuState(); HoverMenuState createState() => HoverMenuState();

View File

@@ -2,7 +2,6 @@ import 'package:datetime_picker_formfield/datetime_picker_formfield.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart' as intl; import 'package:intl/intl.dart' as intl;
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:oc_front/core/services/specialized_services/workflow_execution_service.dart';
import 'package:oc_front/main.dart'; import 'package:oc_front/main.dart';
import 'package:oc_front/pages/abstract_page.dart'; import 'package:oc_front/pages/abstract_page.dart';
import 'package:oc_front/widgets/sheduler_items/schedule.dart'; import 'package:oc_front/widgets/sheduler_items/schedule.dart';
@@ -22,7 +21,6 @@ class SchedulerPageWidget extends StatefulWidget {
bool isList = true; bool isList = true;
DateTime start = DateTime.now(); DateTime start = DateTime.now();
DateTime end = DateTime.now().add(const Duration(days: 180)); DateTime end = DateTime.now().add(const Duration(days: 180));
final WorkflowExecutionService _service = WorkflowExecutionService();
SchedulerPageWidget(): super(key: SchedulerFactory.key); SchedulerPageWidget(): super(key: SchedulerFactory.key);
@override SchedulerPageWidgetState createState() => SchedulerPageWidgetState(); @override SchedulerPageWidgetState createState() => SchedulerPageWidgetState();
static void search(BuildContext context) { } static void search(BuildContext context) { }
@@ -62,7 +60,7 @@ class SchedulerPageWidgetState extends State<SchedulerPageWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light( colorScheme: ColorScheme.light(
background: midColor, surface: midColor,
tertiary: Colors.grey, tertiary: Colors.grey,
secondary: Colors.grey, secondary: Colors.grey,
primary: Colors.black), primary: Colors.black),
@@ -120,7 +118,7 @@ class SchedulerPageWidgetState extends State<SchedulerPageWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light( colorScheme: ColorScheme.light(
background: midColor, surface: midColor,
tertiary: Colors.grey, tertiary: Colors.grey,
secondary: Colors.grey, secondary: Colors.grey,
primary: Colors.black), primary: Colors.black),

View File

@@ -66,7 +66,8 @@ final WorflowService _service = WorflowService();
var from = dash.getElement(arrow.fromID); var from = dash.getElement(arrow.fromID);
var to = dash.getElement(arrow.toID); var to = dash.getElement(arrow.toID);
if ((from?.element?.getType() == "storage" && to?.element?.getType() == "processing") if ((from?.element?.getType() == "storage" && to?.element?.getType() == "processing")
|| (from?.element?.getType() == "processing" && to?.element?.getType() == "storage")) { || (from?.element?.getType() == "processing" && to?.element?.getType() == "storage")
|| (from?.element?.getType() == "processing" && to?.element?.getType() == "processing")) {
return StorageProcessingLinkFormsWidget( dash: dash, item: arrow); return StorageProcessingLinkFormsWidget( dash: dash, item: arrow);
} }
return Container(); return Container();
@@ -95,15 +96,15 @@ final WorflowService _service = WorflowService();
var instance = objAbs as ComputeItem; var instance = objAbs as ComputeItem;
if (instance.infrastructureEnum != null) { if (instance.infrastructureEnum != null) {
if (instance.infrastructureEnum == 0) { if (instance.infrastructureEnum == 0) {
return Icon(FontAwesomeIcons.docker, size: 16); return const Icon(FontAwesomeIcons.docker, size: 16);
} else if (instance.infrastructureEnum == 1) { } else if (instance.infrastructureEnum == 1) {
return Icon(FontAwesomeIcons.lifeRing, size: 16); return const Icon(FontAwesomeIcons.lifeRing, size: 16);
} else if (instance.infrastructureEnum == 2) { } else if (instance.infrastructureEnum == 2) {
return Icon(FontAwesomeIcons.cubes, size: 16); return const Icon(FontAwesomeIcons.cubes, size: 16);
} else if (instance.infrastructureEnum == 3) { } else if (instance.infrastructureEnum == 3) {
return Icon(FontAwesomeIcons.hardDrive, size: 16); return const Icon(FontAwesomeIcons.hardDrive, size: 16);
} else if (instance.infrastructureEnum == 4) { } else if (instance.infrastructureEnum == 4) {
return Icon(FontAwesomeIcons.v, size: 16); return const Icon(FontAwesomeIcons.v, size: 16);
} }
} }
} }
@@ -114,15 +115,15 @@ final WorflowService _service = WorflowService();
var objAbs = obj as AbstractItem?; var objAbs = obj as AbstractItem?;
if (objAbs == null) { return null; } if (objAbs == null) { return null; }
if (objAbs.topic == "processing" ) { if (objAbs.topic == "processing" ) {
return Icon(FontAwesomeIcons.gear, size: 16); return const Icon(FontAwesomeIcons.gear, size: 16);
} else if (objAbs.topic == "data" ) { } else if (objAbs.topic == "data" ) {
return Icon(FontAwesomeIcons.file, size: 16); return const Icon(FontAwesomeIcons.file, size: 16);
} else if (objAbs.topic == "storage" ) { } else if (objAbs.topic == "storage" ) {
return Icon(FontAwesomeIcons.database, size: 16); return const Icon(FontAwesomeIcons.database, size: 16);
} else if (objAbs.topic == "compute" ) { } else if (objAbs.topic == "compute" ) {
return Icon(FontAwesomeIcons.microchip, size: 16); return const Icon(FontAwesomeIcons.microchip, size: 16);
} else if (objAbs.topic == "workflows" ) { } else if (objAbs.topic == "workflows" ) {
return Icon(FontAwesomeIcons.diagramProject, size: 16); return const Icon(FontAwesomeIcons.diagramProject, size: 16);
} }
return null; return null;
} }
@@ -169,11 +170,11 @@ final WorflowService _service = WorflowService();
var updateW = Workflow( var updateW = Workflow(
name: dash.name, name: dash.name,
graph: Graph(), graph: Graph(),
data: datas.map((e) => e.id).toSet().toList(), data: datas.map((e) => e.element?.getID()).toSet().toList(),
compute: compute.map((e) => e.id).toSet().toList(), compute: compute.map((e) => e.element?.getID()).toSet().toList(),
storage: storage.map((e) => e.id).toSet().toList(), storage: storage.map((e) => e.element?.getID()).toSet().toList(),
processing: processing.map((e) => e.id).toSet().toList(), processing: processing.map((e) => e.element?.getID()).toSet().toList(),
workflows: workflows.map((e) => e.id).toSet().toList(), workflows: workflows.map((e) => e.element?.getID()).toSet().toList(),
); );
updateW.fromDashboard(dash.serialize()); updateW.fromDashboard(dash.serialize());
for (var item in (updateW.graph?.items.values ?? [] as List<GraphItem>)) { for (var item in (updateW.graph?.items.values ?? [] as List<GraphItem>)) {
@@ -213,13 +214,13 @@ final WorflowService _service = WorflowService();
} }
Widget onDashboardMenu(Dashboard dash) { Widget onDashboardMenu(Dashboard dash) {
return Container( padding: EdgeInsets.only(left: 50), return Container( padding: const EdgeInsets.only(left: 50),
decoration: BoxDecoration( border: Border( left: BorderSide( color: Colors.white ))), decoration: const BoxDecoration( border: Border( left: BorderSide( color: Colors.white ))),
child: ShallowDropdownInputWidget( child: ShallowDropdownInputWidget(
filled: lightColor, filled: lightColor,
hintColor: Colors.grey.shade200, hintColor: Colors.grey.shade200,
color: Colors.white, color: Colors.white,
prefixIcon: Padding( padding: EdgeInsets.only(right: 10), child: Icon(Icons.shopping_cart, color: Colors.grey.shade200)), prefixIcon: Padding( padding: const EdgeInsets.only(right: 10), child: Icon(Icons.shopping_cart, color: Colors.grey.shade200)),
current: WorkspaceLocal.current, current: WorkspaceLocal.current,
width: 300, width: 300,
all: () async => WorkspaceLocal.getWorkspacesShallow(), all: () async => WorkspaceLocal.getWorkspacesShallow(),

View File

@@ -4,6 +4,7 @@ import 'package:oc_front/widgets/items/item_row.dart';
import 'package:oc_front/models/resources/resources.dart'; import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/core/models/workspace_local.dart'; import 'package:oc_front/core/models/workspace_local.dart';
// ignore: must_be_immutable
class CatalogWidget extends StatefulWidget { class CatalogWidget extends StatefulWidget {
double? itemWidth; double? itemWidth;
bool readOnly = false; bool readOnly = false;

View File

@@ -20,14 +20,25 @@ class ContainerFormsWidgetState extends State<ContainerFormsWidget> {
List<Widget> widgets = []; List<Widget> widgets = [];
var instance = widget.item.getSelectedInstance(); var instance = widget.item.getSelectedInstance();
if (instance != null && instance is ProcessingInstance && instance.access?.container != null) { if (instance != null && instance is ProcessingInstance && instance.access?.container != null) {
List<SubExposeFormsWidget> exposes = [];
var container = instance.access!.container!; var container = instance.access!.container!;
for (var expose in container.exposes) {
exposes.add(SubExposeFormsWidget(
readOnly: false,
width: 180,
dash: widget.dash,
empty: false,
item: expose,
elementID: widget.elementID
));
}
widgets.add(Container( widgets.add(Container(
padding: const EdgeInsets.only(bottom: 10), padding: const EdgeInsets.only(bottom: 10),
width: 180, width: 180,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text("<CONTAINER>", style: const TextStyle(fontSize: 13, fontWeight: FontWeight.bold), textAlign: TextAlign.center), const Text("<CONTAINER>", style: TextStyle(fontSize: 13, fontWeight: FontWeight.bold), textAlign: TextAlign.center),
SubTextInputWidget(subkey: "image", width: 180, empty: false, change: (value) { }, SubTextInputWidget(subkey: "image", width: 180, empty: false, change: (value) { },
initialValue: container.image, readOnly: true), initialValue: container.image, readOnly: true),
SubTextInputWidget(subkey: "command", width: 180, empty: false, change: (value) { SubTextInputWidget(subkey: "command", width: 180, empty: false, change: (value) {
@@ -39,7 +50,7 @@ class ContainerFormsWidgetState extends State<ContainerFormsWidget> {
} }
} }
widget.dash.saveDash(widget.dash.id, context); widget.dash.saveDash(widget.dash.id, context);
}, initialValue: container.command, readOnly: false,), }, initialValue: container.command, readOnly: false),
SubTextInputWidget(subkey: "args", width: 180, empty: false, change: (value) { SubTextInputWidget(subkey: "args", width: 180, empty: false, change: (value) {
container.args = value; container.args = value;
for (var el in widget.dash.elements) { for (var el in widget.dash.elements) {
@@ -54,7 +65,7 @@ class ContainerFormsWidgetState extends State<ContainerFormsWidget> {
],) ],)
)); ));
widgets.add(Container( widgets.add(Container(
width: 200, decoration: BoxDecoration( border: Border(bottom: BorderSide(color: Colors.grey))), width: 200, decoration: const BoxDecoration( border: Border(bottom: BorderSide(color: Colors.grey))),
)); ));
widgets.add(Container( widgets.add(Container(
padding: const EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 10),
@@ -86,19 +97,19 @@ class ContainerFormsWidgetState extends State<ContainerFormsWidget> {
setState(() {}); setState(() {});
}, child: }, child:
Container( margin: const EdgeInsets.only(left: 5, top: 5), Container( margin: const EdgeInsets.only(left: 5, top: 5),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.grey, width: 1)), decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5),
border: Border.all(color: Colors.grey, width: 1)
),
width: 45, height: 30, width: 45, height: 30,
child: const Row( mainAxisAlignment: MainAxisAlignment.center, child: const Row( mainAxisAlignment: MainAxisAlignment.center,
children: [ Icon(Icons.delete, color: Colors.black) ]), children: [ Icon(Icons.delete, color: Colors.black) ]),
)
) )
]), )
],) ]),
...exposes
])
)); ));
for (var expose in container.exposes) {
widgets.add(SubExposeFormsWidget( readOnly: true, width: 180, dash: widget.dash, empty: widgets.isEmpty,
item: expose, elementID: widget.elementID));
}
} }
return Column(children: widgets); return Column(children: widgets);
} }

View File

@@ -17,10 +17,10 @@ class CredentialsFormsWidgetState extends State<CredentialsFormsWidget> {
@override Widget build(BuildContext context) { @override Widget build(BuildContext context) {
List<Widget> widgets = []; List<Widget> widgets = [];
var instance = widget.item.getSelectedInstance(); var instance = widget.item.getSelectedInstance();
if (instance != null && instance.credential != null) { /*if (instance != null && instance.credential != null) {
var creds = instance.credential!; var creds = instance.credential!;
widgets.add(Container( margin: EdgeInsets.only(bottom: 15), widgets.add(Container( margin: const EdgeInsets.only(bottom: 15),
width: 200, decoration: BoxDecoration( border: Border(bottom: BorderSide(color: Colors.grey))), width: 200, decoration: const BoxDecoration( border: Border(bottom: BorderSide(color: Colors.grey))),
)); ));
widgets.add(Container( widgets.add(Container(
padding: const EdgeInsets.only(bottom: 10), padding: const EdgeInsets.only(bottom: 10),
@@ -28,9 +28,9 @@ class CredentialsFormsWidgetState extends State<CredentialsFormsWidget> {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text("<CREDENTIALS>", style: const TextStyle(fontSize: 13, fontWeight: FontWeight.bold), textAlign: TextAlign.center), const Text("<CREDENTIALS>", style: TextStyle(fontSize: 13, fontWeight: FontWeight.bold), textAlign: TextAlign.center),
SubTextInputWidget(subkey: "login", width: 180, empty: false, change: (value) { SubTextInputWidget(subkey: "login", width: 180, empty: false, change: (value) {
creds.password = value; creds.login = value;
for (var el in widget.dash.elements) { for (var el in widget.dash.elements) {
if (el.id == widget.elementID) { if (el.id == widget.elementID) {
el.element = widget.item; el.element = widget.item;
@@ -52,7 +52,7 @@ class CredentialsFormsWidgetState extends State<CredentialsFormsWidget> {
],) ],)
)); ));
widgets.add(Container( padding: EdgeInsets.only(bottom: 15), width: 200 )); widgets.add(Container( padding: EdgeInsets.only(bottom: 15), width: 200 ));
} }*/
return Column(children: widgets); return Column(children: widgets);
} }
} }

View File

@@ -1,6 +1,5 @@
import 'package:oc_front/main.dart'; import 'package:oc_front/main.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:oc_front/models/workflow.dart';
import 'package:oc_front/models/resources/resources.dart'; import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/core/services/perms_service.dart'; import 'package:oc_front/core/services/perms_service.dart';
import 'package:oc_front/widgets/forms/credentials_forms.dart'; import 'package:oc_front/widgets/forms/credentials_forms.dart';
@@ -37,7 +36,7 @@ class ResourceFormsWidgetState extends State<ResourceFormsWidget> {
} }
} }
if (widgets.isNotEmpty) { if (widgets.isNotEmpty) {
widgets.add(SizedBox( width: 200, height: 15) ); widgets.add(const SizedBox( width: 200, height: 15) );
} }
return widgets; return widgets;
} }
@@ -55,6 +54,7 @@ class ResourceFormsWidgetState extends State<ResourceFormsWidget> {
@override Widget build(BuildContext context) { @override Widget build(BuildContext context) {
print("STATE");
List<Widget> instancesCat = []; List<Widget> instancesCat = [];
List<Widget> childrenReadOnly = getWidgets(widget.item.infos()); List<Widget> childrenReadOnly = getWidgets(widget.item.infos());
List<DropdownMenuItem<String>> dpItems = []; List<DropdownMenuItem<String>> dpItems = [];
@@ -62,11 +62,11 @@ class ResourceFormsWidgetState extends State<ResourceFormsWidget> {
dpItems.add(DropdownMenuItem(value: '$i', child: Text('${instance.name}', overflow: TextOverflow.ellipsis,))); dpItems.add(DropdownMenuItem(value: '$i', child: Text('${instance.name}', overflow: TextOverflow.ellipsis,)));
} }
if (dpItems.isNotEmpty) { if (dpItems.isNotEmpty) {
childrenReadOnly.add(Padding( padding: EdgeInsets.only(top: 20), childrenReadOnly.add(Padding( padding: const EdgeInsets.only(top: 20),
child : Container( child : Container(
width: 200, decoration: BoxDecoration( border: Border(bottom: BorderSide(color: Colors.grey))), width: 200, decoration: const BoxDecoration( border: Border(bottom: BorderSide(color: Colors.grey))),
))); )));
childrenReadOnly.add(Padding(padding: EdgeInsets.only(bottom: 15), child: childrenReadOnly.add(Padding(padding: const EdgeInsets.only(bottom: 15), child:
SubDropdownInputWidget( dropdownMenuEntries: dpItems, subkey: "", width: 180, empty: false, SubDropdownInputWidget( dropdownMenuEntries: dpItems, subkey: "", width: 180, empty: false,
initialValue: "${widget.item.selectedInstance}", change: (value) { initialValue: "${widget.item.selectedInstance}", change: (value) {
if (value != null) { setState(() { widget.item.selectedInstance = int.parse(value); }); } if (value != null) { setState(() { widget.item.selectedInstance = int.parse(value); }); }
@@ -81,7 +81,7 @@ class ResourceFormsWidgetState extends State<ResourceFormsWidget> {
instancesCat.add(CredentialsFormsWidget(dash: widget.dash, item: widget.item, elementID: widget.elementID)); instancesCat.add(CredentialsFormsWidget(dash: widget.dash, item: widget.item, elementID: widget.elementID));
if (instancesCat.isNotEmpty) { if (instancesCat.isNotEmpty) {
instancesCat.add(Container( instancesCat.add(Container(
width: 200, decoration: BoxDecoration( border: Border(bottom: BorderSide(color: Colors.grey))), width: 200, decoration: const BoxDecoration( border: Border(bottom: BorderSide(color: Colors.grey))),
)); ));
} }
bool readOnly = !PermsService.getPerm(Perms.WORKFLOW_EDIT); bool readOnly = !PermsService.getPerm(Perms.WORKFLOW_EDIT);

View File

@@ -18,7 +18,6 @@ import 'package:flutter_flow_chart/flutter_flow_chart.dart';
import 'package:oc_front/widgets/inputs/shallow_text_input.dart'; import 'package:oc_front/widgets/inputs/shallow_text_input.dart';
import 'package:oc_front/core/models/shared_workspace_local.dart'; import 'package:oc_front/core/models/shared_workspace_local.dart';
import 'package:datetime_picker_formfield/datetime_picker_formfield.dart'; import 'package:datetime_picker_formfield/datetime_picker_formfield.dart';
import 'package:oc_front/core/services/specialized_services/check_service.dart';
import 'package:oc_front/core/services/specialized_services/workflow_service.dart'; import 'package:oc_front/core/services/specialized_services/workflow_service.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
@@ -40,9 +39,8 @@ class SchedulerFormsWidget extends StatefulWidget {
@override SchedulerFormsWidgetState createState() => SchedulerFormsWidgetState(); @override SchedulerFormsWidgetState createState() => SchedulerFormsWidgetState();
} }
class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> { class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
CheckService check = CheckService(); WorflowService check = WorflowService();
void save(List<GlobalKey<FormFieldState>> formKeys) { void save(List<GlobalKey<FormFieldState>> formKeys) {
print("save");
widget.error = null; widget.error = null;
widget.errorEndDate = null; widget.errorEndDate = null;
widget.errorCron = null; widget.errorCron = null;
@@ -84,7 +82,11 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
} }
} }
Duration durationBefore = widget.schedule.start!.difference(DateTime.now().toUtc()) + Duration(seconds: 5); Duration durationBefore = widget.schedule.start!.difference(DateTime.now().toUtc()) + Duration(seconds: 5);
widget._schedulerService.schedule(context, widget.item.id ?? "", widget.schedule.serialize(), {}).then((value) { widget._schedulerService.schedule(context, widget.item.id ?? "", widget.schedule.serialize(), {}).catchError( (e) {
setState(() {
widget.error = e.toString();
});
}).then((value) {
setState(() { widget.valid = true; }); setState(() { widget.valid = true; });
Future.delayed(durationBefore, () { Future.delayed(durationBefore, () {
try { try {
@@ -110,7 +112,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
} else { } else {
e = widget.schedule.end!.toUtc().toIso8601String(); e = widget.schedule.end!.toUtc().toIso8601String();
} }
check.search(context, [widget.item.id ?? "", s.substring(0, 19), e.substring(0, 19)], {}).then( check.check(context, [widget.item.id ?? "", s.substring(0, 19), e.substring(0, 19)], {}).then(
(v) { (v) {
if (v.data == null) { return; } if (v.data == null) { return; }
widget.booking = v.data!.isAvailable; widget.booking = v.data!.isAvailable;
@@ -151,7 +153,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
} catch (e) { /* */ } } catch (e) { /* */ }
} }
}); }).catchError((e) {});
} else { } else {
Future.delayed(const Duration(milliseconds: 100), () { Future.delayed(const Duration(milliseconds: 100), () {
widget.shouldSearch = true; widget.shouldSearch = true;
@@ -215,12 +217,11 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
); );
}); });
} : null, } : null,
); );
shallow.change =(p0) => Future.delayed( const Duration(seconds: 2), () async { shallow.change =(p0) => Future.delayed( const Duration(milliseconds: 100), () async {
if (shallow.compare == p0) { if (shallow.current == p0) {
await WorflowService().put(context, widget.item.id ?? "", { "name" : p0 }, {}); dash.name = p0 ?? dash.name;
} else { await WorflowService().put(context, widget.item.id ?? "", { "name" : dash.name }, {});
shallow.compare = p0;
} }
}); });
return Column( children: [ return Column( children: [
@@ -236,7 +237,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
bottom: const BorderSide(color: Colors.grey))), bottom: const BorderSide(color: Colors.grey))),
child: shallow ), child: shallow ),
const SizedBox(height: 20, width: 200 ), const SizedBox(height: 20, width: 200 ),
isService ? Text("Warning a processing is a service, if no end execution it will run forever.") : Container(), isService ? const Text("Warning a processing is a service, if no end execution it will run forever.") : Container(),
Tooltip( message: "start executions", Tooltip( message: "start executions",
child: Container( height: 40, margin: const EdgeInsets.only(top: 5), child: Container( height: 40, margin: const EdgeInsets.only(top: 5),
padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10), padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
@@ -251,7 +252,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light( colorScheme: ColorScheme.light(
background: midColor, surface: midColor,
tertiary: Colors.grey, tertiary: Colors.grey,
secondary: Colors.grey, secondary: Colors.grey,
primary: Colors.black), primary: Colors.black),
@@ -352,7 +353,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light( colorScheme: ColorScheme.light(
background: midColor, surface: midColor,
tertiary: Colors.grey, tertiary: Colors.grey,
secondary: Colors.grey, secondary: Colors.grey,
primary: Colors.black), primary: Colors.black),
@@ -390,7 +391,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))), dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light( colorScheme: ColorScheme.light(
background: midColor, surface: midColor,
tertiary: Colors.grey, tertiary: Colors.grey,
secondary: Colors.grey, secondary: Colors.grey,
primary: Colors.black), primary: Colors.black),
@@ -469,15 +470,15 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
filled: true, filled: true,
hintText: "enter cron command...", hintText: "enter cron command...",
labelText: "cron", labelText: "cron",
errorStyle: TextStyle(height: 0), errorStyle: const TextStyle(height: 0),
hintStyle: TextStyle(fontSize: 10), hintStyle: const TextStyle(fontSize: 10),
labelStyle: TextStyle(fontSize: 10), labelStyle: const TextStyle(fontSize: 10),
focusedErrorBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)), focusedErrorBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)),
errorBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)), errorBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)),
focusedBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)), focusedBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)),
enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.grey)), enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.grey)),
border: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.grey)), border: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.grey)),
contentPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
), ),
))), ))),
Container( Container(
@@ -494,12 +495,11 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
onTap: () { PermsService.getPerm(Perms.WORKFLOW_BOOKING) ? checkBooking(formKeys, null) : null; onTap: () { PermsService.getPerm(Perms.WORKFLOW_BOOKING) ? checkBooking(formKeys, null) : null;
}, child: Container( margin: const EdgeInsets.only(bottom: 5, left: 10, right: 10), }, child: Container( margin: const EdgeInsets.only(bottom: 5, left: 10, right: 10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5),
border: Border.all(color: widget.booking == null ? ( border: Border.all(color: widget.booking == null ? Colors.black : (
PermsService.getPerm(Perms.WORKFLOW_BOOKING) && PermsService.getPerm(Perms.WORKFLOW_EDIT) ? Colors.black : Colors.grey) : (
widget.booking == true ? Colors.green : redColor), width: 1)), widget.booking == true ? Colors.green : redColor), width: 1)),
width: 200, height: 30, width: 200, height: 30,
child: Icon( Icons.verified_outlined, child: Icon( Icons.verified_outlined,
color: widget.booking == null ? Colors.black : (widget.booking == true ? Colors.green : redColor)), color: widget.booking == null ? Colors.black : (widget.booking == true ? Colors.green : redColor)),
)) ))
): Container(), ): Container(),
PermsService.getPerm(Perms.WORKFLOW_BOOKING) ? Tooltip( message: "book", child: InkWell( mouseCursor: SystemMouseCursors.click, PermsService.getPerm(Perms.WORKFLOW_BOOKING) ? Tooltip( message: "book", child: InkWell( mouseCursor: SystemMouseCursors.click,
@@ -507,7 +507,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
setState(() { save(formKeys); }); setState(() { save(formKeys); });
}, child: Container( margin: const EdgeInsets.only(top: 5, bottom: 10, left: 10, right: 10), }, child: Container( margin: const EdgeInsets.only(top: 5, bottom: 10, left: 10, right: 10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5),
border: Border.all(color: dash.error != null ? Colors.red : ( PermsService.getPerm(Perms.WORKFLOW_BOOKING) ?(widget.valid ? Colors.green : Colors.black) : Colors.grey ))), border: Border.all(color: dash.error != null ? Colors.red : (widget.valid ? Colors.green : Colors.black) )),
width: 200, height: 30, width: 200, height: 30,
child: Icon(Icons.schedule_send, color: dash.error != null ? Colors.red : (widget.valid ? Colors.green : Colors.black)), child: Icon(Icons.schedule_send, color: dash.error != null ? Colors.red : (widget.valid ? Colors.green : Colors.black)),
)) ))

View File

@@ -38,7 +38,7 @@ class StorageProcessingLinkFormsWidgetState extends State<StorageProcessingLinkF
@override Widget build(BuildContext context) { @override Widget build(BuildContext context) {
List<Widget> children = [ List<Widget> children = [
Padding( padding: const EdgeInsets.only(top: 10), const Padding( padding: const EdgeInsets.only(top: 10),
child: Text("<ENV VARIABLES>", child: Text("<ENV VARIABLES>",
style: const TextStyle(fontSize: 13, fontWeight: FontWeight.bold), textAlign: TextAlign.center)), style: const TextStyle(fontSize: 13, fontWeight: FontWeight.bold), textAlign: TextAlign.center)),
]; ];
@@ -54,9 +54,9 @@ class StorageProcessingLinkFormsWidgetState extends State<StorageProcessingLinkF
int count = 0; int count = 0;
for(var info in widget.item.infos) { for(var info in widget.item.infos) {
count++; count++;
inf.add(Padding( padding: EdgeInsets.only(top: 10, bottom: 5), inf.add(Padding( padding: const EdgeInsets.only(top: 10, bottom: 5),
child : Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ child : Row( crossAxisAlignment: CrossAxisAlignment.center, children: [
Padding(padding: EdgeInsets.only(left: 10, right: 10), child: Text("$count")), Padding(padding: const EdgeInsets.only(left: 10, right: 10), child: Text("$count")),
Container(width: 140, decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1)))) Container(width: 140, decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))))
]))); ])));
for (var key in (info as Map<String, dynamic>).keys) { for (var key in (info as Map<String, dynamic>).keys) {
@@ -112,7 +112,7 @@ class StorageProcessingLinkFormsWidgetState extends State<StorageProcessingLinkF
...children, ...children,
Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Row( mainAxisAlignment: MainAxisAlignment.center, children: [
InkWell( onTap: () { InkWell( onTap: () {
widget.item.infos.add({ widget.item.infos.add(<String, dynamic> {
"write": false, "write": false,
"source": null, "source": null,
"destination": null, "destination": null,
@@ -125,7 +125,7 @@ class StorageProcessingLinkFormsWidgetState extends State<StorageProcessingLinkF
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5),
border: Border.all(color: Colors.grey, width: 1)), border: Border.all(color: Colors.grey, width: 1)),
width: 125, height: 30, width: 125, height: 30,
child: Row( mainAxisAlignment: MainAxisAlignment.center, child: const Row( mainAxisAlignment: MainAxisAlignment.center,
children: [ Padding( padding: EdgeInsets.only(right: 5), child: Icon(Icons.add, color: Colors.black,)), children: [ Padding( padding: EdgeInsets.only(right: 5), child: Icon(Icons.add, color: Colors.black,)),
Text("link infos", Text("link infos",
style: TextStyle( color: Colors.black))]), style: TextStyle( color: Colors.black))]),

View File

@@ -19,13 +19,15 @@ class SubExposeFormsWidget extends StatefulWidget {
class SubExposeFormsWidgetState extends State<SubExposeFormsWidget> { class SubExposeFormsWidgetState extends State<SubExposeFormsWidget> {
@override Widget build(BuildContext context) { @override Widget build(BuildContext context) {
return Column( children : [ return Column( children : [
Container( margin: const EdgeInsets.only(left: 10, right: 10, top: 5), Container( margin: const EdgeInsets.only(left: 10, right: 10, top: 15),
decoration: BoxDecoration(border: Border.all(color: Colors.grey, width: 1)), decoration: const BoxDecoration(border: Border( top: BorderSide(color: Colors.grey, width: 1))),
width: 180 width: 180
), ),
SubTextInputWidget(subkey: "reference port", readOnly: widget.readOnly, SubTextInputWidget(subkey: "reference port", readOnly: widget.readOnly,
initialValue: widget.item.port != null ? '${widget.item.port}' : null, initialValue: widget.item.port != null ? '${widget.item.port}' : null,
width: widget.width, empty: widget.empty, change: (value) { width: 180,
empty: widget.empty,
change: (value) {
try { try {
widget.item.port = int.parse(value); widget.item.port = int.parse(value);
Future.delayed(const Duration(seconds: 2), () { Future.delayed(const Duration(seconds: 2), () {

View File

@@ -3,6 +3,7 @@ import 'package:oc_front/main.dart';
import 'package:oc_front/models/response.dart'; import 'package:oc_front/models/response.dart';
import 'package:oc_front/pages/shared.dart'; import 'package:oc_front/pages/shared.dart';
// ignore: must_be_immutable
class ShallowDropdownInputWidget extends StatefulWidget { class ShallowDropdownInputWidget extends StatefulWidget {
double? width; double? width;
double? height; double? height;
@@ -30,10 +31,10 @@ class ShallowDropdownInputWidget extends StatefulWidget {
bool deletion = false; bool deletion = false;
ShallowDropdownInputWidget ({ Key? key, this.width, this.current, required this.all, this.prefixIcon, ShallowDropdownInputWidget ({ super.key, this.width, this.current, required this.all, this.prefixIcon,
this.iconLoad, this.iconRemove, this.hint, this.filled, this.hintColor, this.color, this.height, this.iconLoad, this.iconRemove, this.hint, this.filled, this.hintColor, this.color, this.height,
this.tooltipLoad, this.tooltipRemove, this.deletion = false, this.maptoDropdown, this.label, this.tooltipLoad, this.tooltipRemove, this.deletion = false, this.maptoDropdown, this.label,
required this.type, this.canLoad, this.canRemove, this.load, this.remove, this.change }): super(key: key); required this.type, this.canLoad, this.canRemove, this.load, this.remove, this.change });
@override ShallowDropdownInputWidgetState createState() => ShallowDropdownInputWidgetState(); @override ShallowDropdownInputWidgetState createState() => ShallowDropdownInputWidgetState();
} }
class ShallowDropdownInputWidgetState extends State<ShallowDropdownInputWidget> { class ShallowDropdownInputWidgetState extends State<ShallowDropdownInputWidget> {

View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:oc_front/main.dart'; import 'package:oc_front/main.dart';
import 'package:oc_front/pages/shared.dart'; import 'package:oc_front/pages/shared.dart';
// ignore: must_be_immutable
class ShallowTextInputWidget extends StatefulWidget { class ShallowTextInputWidget extends StatefulWidget {
double? width; double? width;
CollaborativeAreaType type = CollaborativeAreaType.workspace; CollaborativeAreaType type = CollaborativeAreaType.workspace;
@@ -31,11 +32,11 @@ class ShallowTextInputWidget extends StatefulWidget {
String? attr; String? attr;
ShallowTextInputWidget ({ Key? key, this.width, this.current, this.attr, this.readOnly = false, this.alignment = MainAxisAlignment.start, ShallowTextInputWidget ({ super.key, this.width, this.current, this.attr, this.readOnly = false, this.alignment = MainAxisAlignment.start,
this.iconLoad, this.iconRemove, this.hint, this.forms = const [], this.loadStr, this.iconLoad, this.iconRemove, this.hint, this.forms = const [], this.loadStr,
this.tooltipLoad = "", this.tooltipRemove = "", this.tooltipLoad = "", this.tooltipRemove = "",
this.filled, this.hintColor, this.color, this.filled, this.hintColor, this.color,
required this.type, this.canLoad, this.canRemove, this.load, this.remove, this.change }): super(key: key); required this.type, this.canLoad, this.canRemove, this.load, this.remove, this.change });
@override ShallowTextInputWidgetState createState() => ShallowTextInputWidgetState(); @override ShallowTextInputWidgetState createState() => ShallowTextInputWidgetState();
Map<String, dynamic> serialize() { Map<String, dynamic> serialize() {

View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// ignore: must_be_immutable
class SubDropdownInputWidget extends StatefulWidget { class SubDropdownInputWidget extends StatefulWidget {
String subkey; String subkey;
double width; double width;

View File

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:oc_front/widgets/dialog/alert.dart'; import 'package:oc_front/widgets/dialog/alert.dart';
// ignore: must_be_immutable
class SubTextInputWidget extends StatefulWidget { class SubTextInputWidget extends StatefulWidget {
String subkey; String subkey;
String? initialValue; String? initialValue;
@@ -12,10 +13,9 @@ class SubTextInputWidget extends StatefulWidget {
bool readOnly = false; bool readOnly = false;
bool copyLabel = false; bool copyLabel = false;
void Function(String) change = (value) {}; void Function(String) change = (value) {};
SubTextInputWidget ({ Key? key, SubTextInputWidget ({ super.key,
required this.subkey, this.readOnly = false, this.noLabel = false, this.copyLabel = false, required this.subkey, this.readOnly = false, this.noLabel = false, this.copyLabel = false,
this.initialValue, required this.width, required this.empty, required this.change }): this.initialValue, required this.width, required this.empty, required this.change });
super(key: key);
@override SubTextInputWidgetState createState() => SubTextInputWidgetState(); @override SubTextInputWidgetState createState() => SubTextInputWidgetState();
} }
class SubTextInputWidgetState extends State<SubTextInputWidget> { class SubTextInputWidgetState extends State<SubTextInputWidget> {
@@ -24,12 +24,13 @@ class SubTextInputWidgetState extends State<SubTextInputWidget> {
if (widget.readOnly && widget.initialValue == null) { if (widget.readOnly && widget.initialValue == null) {
return Container(); return Container();
} }
TextEditingController ctrl = TextEditingController(text: widget.initialValue);
return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Tooltip( message: widget.subkey, return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Tooltip( message: widget.subkey,
child: Container( margin: EdgeInsets.only(top: widget.empty ? 0 : 15), child: Container( margin: EdgeInsets.only(top: widget.empty ? 0 : 15),
width: widget.width - (widget.readOnly ? 40 : 0), height: 30, width: widget.width - (widget.readOnly ? 40 : 0), height: 30,
child: TextFormField( textAlign: TextAlign.start, child: TextFormField( textAlign: TextAlign.start,
enabled: !widget.readOnly, enabled: !widget.readOnly,
initialValue: widget.initialValue, controller: ctrl,
onChanged: widget.change, onChanged: widget.change,
style: const TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
decoration: InputDecoration( decoration: InputDecoration(

View File

@@ -4,7 +4,6 @@ import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/models/response.dart'; import 'package:oc_front/models/response.dart';
import 'package:oc_front/pages/shared.dart'; import 'package:oc_front/pages/shared.dart';
import 'package:oc_front/widgets/inputs/shallow_dropdown_input.dart'; import 'package:oc_front/widgets/inputs/shallow_dropdown_input.dart';
import 'package:oc_front/widgets/inputs/sub_dropdown_input%20.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class ItemWidget extends StatefulWidget { class ItemWidget extends StatefulWidget {
@@ -15,25 +14,26 @@ class ItemWidget extends StatefulWidget {
class ItemWidgetState extends State<ItemWidget> { class ItemWidgetState extends State<ItemWidget> {
@override Widget build(BuildContext context) { @override Widget build(BuildContext context) {
List<Widget> widgets = [ List<Widget> widgets = [
Container( margin: EdgeInsets.only(bottom: 20), Container( margin: const EdgeInsets.only(bottom: 20),
decoration: BoxDecoration(border: Border(bottom: BorderSide(color: midColor))), decoration: BoxDecoration(border: Border(bottom: BorderSide(color: midColor))),
width: getMainWidth(context) / 2, width: getMainWidth(context) / 2,
child: Center(child: Padding( padding: EdgeInsets.only(bottom: 20), child: const Center(child: Padding( padding: EdgeInsets.only(bottom: 20),
child: Text("RESOURCE INFORMATIONS", style: TextStyle(fontSize: 18, color: Colors.grey, fontWeight: FontWeight.w500))))) child: Text("RESOURCE INFORMATIONS", style: TextStyle(fontSize: 18, color: Colors.grey, fontWeight: FontWeight.w500)))))
]; ];
var infos = widget.item.infos(); var infos = widget.item.infos();
var count = 0; var count = 0;
for (var info in infos.keys) { for (var info in infos.keys) {
count++; count++;
widgets.add(Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [ widgets.add(Padding( padding: const EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("${info.toUpperCase().replaceAll("_", " ")} :", style: TextStyle(fontSize: 15, color: Colors.grey))), Padding( padding: const EdgeInsets.only(left: 50, right: 10), child : Text("${info.toUpperCase().replaceAll("_", " ")} :",
style: const TextStyle(fontSize: 15, color: Colors.grey))),
Text("${infos[info] is bool ? (infos[info] == true ? "yes" : "no") : infos[info] ?? "unknown"}", Text("${infos[info] is bool ? (infos[info] == true ? "yes" : "no") : infos[info] ?? "unknown"}",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 15, color: Colors.black, fontWeight: FontWeight.w500)) style: const TextStyle(fontSize: 15, color: Colors.black, fontWeight: FontWeight.w500))
]))); ])));
} }
if (count == 0 ) { if (count == 0 ) {
widgets.add(Center(child: Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [ widgets.add(const Center(child: Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("NO INFORMATION", style: TextStyle(fontSize: 15, color: Colors.grey))), Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("NO INFORMATION", style: TextStyle(fontSize: 15, color: Colors.grey))),
])))); ]))));
} }
@@ -43,7 +43,7 @@ class ItemWidgetState extends State<ItemWidget> {
dpItems.add(Shallow(id: "$i", name: instance.name ?? "")); dpItems.add(Shallow(id: "$i", name: instance.name ?? ""));
} }
if (dpItems.isNotEmpty) { if (dpItems.isNotEmpty) {
widgetsInstance.add(Center( child: Padding(padding: EdgeInsets.only(bottom: 15), child: widgetsInstance.add(Center( child: Padding(padding: const EdgeInsets.only(bottom: 15), child:
ShallowDropdownInputWidget( all: () async => dpItems, width: (getWidth(context) / 2) - 25, ShallowDropdownInputWidget( all: () async => dpItems, width: (getWidth(context) / 2) - 25,
label: "instances", type: CollaborativeAreaType.resource, height: 65, label: "instances", type: CollaborativeAreaType.resource, height: 65,
current: "${widget.item.selectedInstance}", change: (value) { current: "${widget.item.selectedInstance}", change: (value) {
@@ -54,21 +54,27 @@ class ItemWidgetState extends State<ItemWidget> {
} }
if (widget.item.instances.length > widget.item.selectedInstance) { if (widget.item.instances.length > widget.item.selectedInstance) {
var instance = widget.item.instances[widget.item.selectedInstance]; var instance = widget.item.instances[widget.item.selectedInstance];
widgetsInstance.add(Container(height: 20, width: getWidth(context) / 2,)); widgetsInstance.add(SizedBox(height: 20, width: getWidth(context) / 2,));
var count = 0; var count = 0;
for (var info in instance.infos().keys) { for (var info in instance.infos().keys) {
if (instance.infos()[info] == null || instance.infos()[info] is List || instance.infos()[info] is Map) { continue; } if (instance.infos()[info] == null || instance.infos()[info] is List || instance.infos()[info] is Map) { continue; }
count++; count++;
widgetsInstance.add(Center(child: Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [ widgetsInstance.add(Center(child: Padding( padding: const EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("${info.toUpperCase().replaceAll("_", " ")} :", style: TextStyle(fontSize: 15, color: Colors.grey))), Padding( padding: const EdgeInsets.only(left: 50, right: 10),
child : Text("${info.toUpperCase().replaceAll("_", " ")} :",
style: const TextStyle(fontSize: 15, color: Colors.grey))),
Text("${instance.infos()[info] is bool ? (instance.infos()[info] == true ? "yes" : "no") : instance.infos()[info] ?? "unknown"}", Text("${instance.infos()[info] is bool ? (instance.infos()[info] == true ? "yes" : "no") : instance.infos()[info] ?? "unknown"}",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 15, color: Colors.black, fontWeight: FontWeight.w500)) style: const TextStyle(fontSize: 15, color: Colors.black, fontWeight: FontWeight.w500))
])))); ]))));
} }
if (count == 0 ) { if (count == 0 ) {
widgetsInstance.add(Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [ widgetsInstance.add(const Padding(
Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("NO INSTANCE INFORMATION", style: TextStyle(fontSize: 15, color: Colors.grey))), padding: EdgeInsets.symmetric(vertical: 5),
child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10),
child : Text("NO INSTANCE INFORMATION",
style: TextStyle(fontSize: 15, color: Colors.grey))),
]))); ])));
} }
} }
@@ -87,7 +93,7 @@ class ItemWidgetState extends State<ItemWidget> {
border: Border(bottom: BorderSide(color: midColor))), border: Border(bottom: BorderSide(color: midColor))),
padding: const EdgeInsets.symmetric(vertical: 30, horizontal: 50), padding: const EdgeInsets.symmetric(vertical: 30, horizontal: 50),
child: Text(widget.item.description!.length > 350 ? "${widget.item.description!.substring(0, 347)}..." : widget.item.description!, child: Text(widget.item.description!.length > 350 ? "${widget.item.description!.substring(0, 347)}..." : widget.item.description!,
style: TextStyle(fontSize: 15, color: Colors.grey, fontWeight: FontWeight.w500))), style: const TextStyle(fontSize: 15, color: Colors.grey, fontWeight: FontWeight.w500))),
Row( children: [ Row( children: [
Container(padding: const EdgeInsets.symmetric(vertical: 20), Container(padding: const EdgeInsets.symmetric(vertical: 20),
height: getHeight(context) - 300, height: getHeight(context) - 300,

View File

@@ -1,5 +1,3 @@
import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_flow_chart/flutter_flow_chart.dart'; import 'package:flutter_flow_chart/flutter_flow_chart.dart';
import 'package:oc_front/main.dart'; import 'package:oc_front/main.dart';
@@ -43,7 +41,7 @@ class ShallowItemRowWidgetState extends State<ShallowItemRowWidget> {
child: Row( children: [ child: Row( children: [
Padding( padding: const EdgeInsets.only(right: 5), Padding( padding: const EdgeInsets.only(right: 5),
child: widget.edit == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click, child: widget.edit == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () => widget.edit!(widget.item.getID() + "~" + widget.item.getName()), child: const Icon(Icons.edit, color: Colors.grey,))), onTap: () => widget.edit!( "${widget.item.getID()}~${widget.item.getName()}"), child: const Icon(Icons.edit, color: Colors.grey,))),
Padding( padding: const EdgeInsets.only(right: 5), Padding( padding: const EdgeInsets.only(right: 5),
child: widget.delete == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click, child: widget.delete == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () => widget.delete!(widget.item.getID()), child: const Icon(Icons.delete, color: Colors.grey,))), onTap: () => widget.delete!(widget.item.getID()), child: const Icon(Icons.delete, color: Colors.grey,))),
@@ -52,21 +50,19 @@ class ShallowItemRowWidgetState extends State<ShallowItemRowWidget> {
Column( children: [ Column( children: [
widget.low || widget.icon == null ? Container( padding: const EdgeInsets.only(left: 10),) : Container( padding: const EdgeInsets.all(10), widget.low || widget.icon == null ? Container( padding: const EdgeInsets.only(left: 10),) : Container( padding: const EdgeInsets.all(10),
constraints: BoxConstraints(maxWidth: widget.contextWidth, minWidth: widget.contextWidth), constraints: BoxConstraints(maxWidth: widget.contextWidth, minWidth: widget.contextWidth),
child: Icon( widget.icon!, size: widget.contextWidth / 1.9, color: const Color(0xFFF67C0B9),)), child: Icon( widget.icon!, size: widget.contextWidth / 1.9, color: const Color(0xfff67c0b9),)),
Container( Padding(padding: widget.contextWidth != getMainWidth(context) ?
child: Padding(padding: widget.contextWidth != getMainWidth(context) ? const EdgeInsets.symmetric(horizontal: 10) : const EdgeInsets.symmetric(horizontal: 20),
const EdgeInsets.symmetric(horizontal: 10) : const EdgeInsets.symmetric(horizontal: 20), child: Column(crossAxisAlignment: CrossAxisAlignment.start,
child: Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, children: [
mainAxisAlignment: MainAxisAlignment.center, children: [ Row( children: [
Row( children: [ Expanded( child: Center( child: Text(widget.item.getName().toUpperCase(),
Expanded( child: Center( child: Text(widget.item.getName().toUpperCase(), style: const TextStyle(fontSize: 15,
style: const TextStyle(fontSize: 15, overflow: TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis, fontWeight: FontWeight.w600, color: Colors.grey)),
fontWeight: FontWeight.w600, color: Colors.grey)), ))
)) ]),
]), ],)
],)
)
), ),
]) ])
])))); ]))));
@@ -76,6 +72,7 @@ class ShallowItemRowWidgetState extends State<ShallowItemRowWidget> {
} }
} }
// ignore: must_be_immutable
class ShallowItemFlowDataRowWidget extends StatefulWidget { class ShallowItemFlowDataRowWidget extends StatefulWidget {
bool readOnly = false; bool readOnly = false;
double contextWidth = 0; double contextWidth = 0;
@@ -114,7 +111,7 @@ class ShallowItemFlowDataRowWidgetState extends State<ShallowItemFlowDataRowWidg
child: Row( children: [ child: Row( children: [
Padding( padding: const EdgeInsets.only(right: 5), Padding( padding: const EdgeInsets.only(right: 5),
child: widget.edit == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click, child: widget.edit == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () => widget.edit!(widget.item.getID() + "~" + widget.item.getName()), child: const Icon(Icons.edit, color: Colors.grey,))), onTap: () => widget.edit!("${widget.item.getID()}~${widget.item.getName()}"), child: const Icon(Icons.edit, color: Colors.grey,))),
Padding( padding: const EdgeInsets.only(right: 5), Padding( padding: const EdgeInsets.only(right: 5),
child: widget.delete == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click, child: widget.delete == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () => widget.delete!(widget.item.getID()), child: const Icon(Icons.delete, color: Colors.grey,))), onTap: () => widget.delete!(widget.item.getID()), child: const Icon(Icons.delete, color: Colors.grey,))),
@@ -126,21 +123,19 @@ class ShallowItemFlowDataRowWidgetState extends State<ShallowItemFlowDataRowWidg
Column( children: [ Column( children: [
widget.low || widget.icon == null ? Container( padding: const EdgeInsets.only(left: 10),) : Container( padding: const EdgeInsets.all(10), widget.low || widget.icon == null ? Container( padding: const EdgeInsets.only(left: 10),) : Container( padding: const EdgeInsets.all(10),
constraints: BoxConstraints(maxWidth: widget.contextWidth, minWidth: widget.contextWidth), constraints: BoxConstraints(maxWidth: widget.contextWidth, minWidth: widget.contextWidth),
child: Icon( widget.icon!, size: widget.contextWidth / 1.9, color: const Color(0xFFF67C0B9),)), child: Icon( widget.icon!, size: widget.contextWidth / 1.9, color: const Color(0xfff67c0b9),)),
Container( Padding(padding: widget.contextWidth != getMainWidth(context) ?
child: Padding(padding: widget.contextWidth != getMainWidth(context) ? const EdgeInsets.symmetric(horizontal: 10) : const EdgeInsets.symmetric(horizontal: 20),
const EdgeInsets.symmetric(horizontal: 10) : const EdgeInsets.symmetric(horizontal: 20), child: Column(crossAxisAlignment: CrossAxisAlignment.start,
child: Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, children: [
mainAxisAlignment: MainAxisAlignment.center, children: [ Row( children: [
Row( children: [ Expanded( child: Center( child: Text(widget.item.getName().toUpperCase(),
Expanded( child: Center( child: Text(widget.item.getName().toUpperCase(), style: const TextStyle(fontSize: 15,
style: const TextStyle(fontSize: 15, overflow: TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis, fontWeight: FontWeight.w600, color: Colors.grey)),
fontWeight: FontWeight.w600, color: Colors.grey)), ))
)) ]),
]), ],)
],)
)
), ),
]) ])
])))); ]))));

View File

@@ -10,12 +10,13 @@ import 'package:oc_front/core/services/specialized_services/logs_service.dart';
bool isLoading = true; bool isLoading = true;
Map<String, bool> valid = {}; Map<String, bool> valid = {};
// ignore: must_be_immutable
class LogsWidget extends StatefulWidget { class LogsWidget extends StatefulWidget {
String? level; String? level;
String search = ""; String search = "";
WorkflowExecution? exec; WorkflowExecution? exec;
List<Log> logs = []; List<Log> logs = [];
LogsWidget ({ Key? key, this.search = "", this.level, this.exec }): super(key: key); LogsWidget ({ super.key, this.search = "", this.level, this.exec });
@override LogsWidgetState createState() => LogsWidgetState(); @override LogsWidgetState createState() => LogsWidgetState();
} }
@@ -27,8 +28,8 @@ class LogsWidgetState extends State<LogsWidget> {
try { setState(() { }); try { setState(() { });
} catch (e) { /**/ } } catch (e) { /**/ }
}); });
return Container( height: getMainHeight(context) - 100, return SizedBox( height: getMainHeight(context) - 100,
child: Center( child: CircularProgressIndicator()) ); child: const Center( child: CircularProgressIndicator()) );
} }
if (widget.exec == null) { if (widget.exec == null) {
return Container(); return Container();
@@ -53,11 +54,7 @@ class LogsWidgetState extends State<LogsWidget> {
end = (DateTime.parse(widget.exec!.startDate!).add( const Duration(days: 14)).microsecondsSinceEpoch).toString(); end = (DateTime.parse(widget.exec!.startDate!).add( const Duration(days: 14)).microsecondsSinceEpoch).toString();
} }
} catch(e) { /* */ } } catch(e) { /* */ }
Future.delayed(const Duration(minutes: 1), () { return FutureBuilder(future: LogsService().search(null, [], {
try { setState(() {});
} catch (e) { /**/ }
});
return FutureBuilder(future: LogsService().search(context, [], {
"workflow_execution_id": widget.exec!.id, "workflow_execution_id": widget.exec!.id,
"start": start, "start": start,
"end": end "end": end
@@ -77,12 +74,12 @@ class LogsWidgetState extends State<LogsWidget> {
List<LogWidget> itemRows = logs.where((element) => (element.message?.toLowerCase().contains(widget.search.toLowerCase()) ?? true) List<LogWidget> itemRows = logs.where((element) => (element.message?.toLowerCase().contains(widget.search.toLowerCase()) ?? true)
&& (widget.level?.contains(element.level ?? "") ?? true) ).map((e) => LogWidget(item: e)).toList(); && (widget.level?.contains(element.level ?? "") ?? true) ).map((e) => LogWidget(item: e)).toList();
if (isLoading) { if (isLoading) {
return Container( height: getMainHeight(context) - 100, return SizedBox( height: getMainHeight(context) - 100,
child: Center( child: CircularProgressIndicator()) ); child: const Center( child: CircularProgressIndicator()) );
} }
return Stack( children: [ return Stack( children: [
SingleChildScrollView( child: itemRows.isEmpty ? SingleChildScrollView( child: itemRows.isEmpty ?
Container( height: getMainHeight(context) - 100, SizedBox( height: getMainHeight(context) - 100,
child: const Center( child: Text("no log registered", style: TextStyle(color: Colors.grey, fontSize: 25 ),))) child: const Center( child: Text("no log registered", style: TextStyle(color: Colors.grey, fontSize: 25 ),)))
: Column( children: [...itemRows, Container(height: 50,) ] ) ), : Column( children: [...itemRows, Container(height: 50,) ] ) ),
]); ]);
@@ -92,10 +89,11 @@ class LogsWidgetState extends State<LogsWidget> {
} }
} }
// ignore: must_be_immutable
class LogWidget extends StatefulWidget { class LogWidget extends StatefulWidget {
final Log item; final Log item;
bool expanded = false; bool expanded = false;
LogWidget ({ Key? key, required this.item }): super(key: key); LogWidget ({ super.key, required this.item });
@override LogWidgetState createState() => LogWidgetState(); @override LogWidgetState createState() => LogWidgetState();
} }
class LogWidgetState extends State<LogWidget> { class LogWidgetState extends State<LogWidget> {

View File

@@ -52,9 +52,20 @@ class ScheduleWidgetState extends State<ScheduleWidget> {
var str = "${date.toIso8601String()}Z"; var str = "${date.toIso8601String()}Z";
if (data[str] == null) { data[str] = []; } if (data[str] == null) { data[str] = []; }
data[str]!.add(element); data[str]!.add(element);
data[str]!.sort((a, b) => DateTime.parse(a.startDate!).compareTo(DateTime.parse(b.startDate!))); data[str]!.sort((a, b) => DateTime.parse(a.startDate!).compareTo(DateTime.parse(b.startDate!)));
} }
} }
List<WorkflowExecution> vals = [];
for (var val in data.values) {
vals.addAll(val);
}
if (vals.isNotEmpty) {
try {
Future.delayed(const Duration(minutes: 1), () {
setState(() {});
});
} catch (e) { /* */ }
}
bool isInfo = getMainWidth(context) <= 600 && selected != null && widget.isBox; bool isInfo = getMainWidth(context) <= 600 && selected != null && widget.isBox;
double w = selected != null && widget.isBox ? getMainWidth(context) - menuSize : getMainWidth(context); double w = selected != null && widget.isBox ? getMainWidth(context) - menuSize : getMainWidth(context);
List<Widget> children = []; List<Widget> children = [];
@@ -199,11 +210,11 @@ class ScheduleWidgetState extends State<ScheduleWidget> {
borderSide: BorderSide(color: midColor, width: 0)), borderSide: BorderSide(color: midColor, width: 0)),
), ),
items: [ items: [
DropdownMenuItem(value: "debug,warning,error,info", child: Row( children: [ Container( width: 10, height: 15, color: Colors.grey), Text(" all", style: TextStyle(fontSize: 12, color: Colors.black)) ])), DropdownMenuItem(value: "debug,warning,error,info", child: Row( children: [ Container( width: 10, height: 15, color: Colors.grey), const Text(" all", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "debug", child: Row( children: [ Container( width: 10, height: 15, color: Colors.blue), Text(" debug", style: TextStyle(fontSize: 12, color: Colors.black)) ])), DropdownMenuItem(value: "debug", child: Row( children: [ Container( width: 10, height: 15, color: Colors.blue), const Text(" debug", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "warning", child: Row( children: [ Container( width: 10, height: 15, color: Colors.orange), Text(" warning", style: TextStyle(fontSize: 12, color: Colors.black)) ])), DropdownMenuItem(value: "warning", child: Row( children: [ Container( width: 10, height: 15, color: Colors.orange), const Text(" warning", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "error", child: Row( children: [ Container( width: 10, height: 15, color: redColor), Text(" error", style: TextStyle(fontSize: 12, color: Colors.black)) ])), DropdownMenuItem(value: "error", child: Row( children: [ Container( width: 10, height: 15, color: redColor), const Text(" error", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "info", child: Row( children: [ Container( width: 10, height: 15, color: Colors.green), Text(" info", style: TextStyle(fontSize: 12, color: Colors.black)) ])), DropdownMenuItem(value: "info", child: Row( children: [ Container( width: 10, height: 15, color: Colors.green), const Text(" info", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
], ],
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {

View File

@@ -1,5 +1,4 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:oc_front/core/sections/header/header.dart';
import 'package:oc_front/main.dart'; import 'package:oc_front/main.dart';
import 'package:oc_front/models/workflow.dart'; import 'package:oc_front/models/workflow.dart';
import 'package:oc_front/widgets/sheduler_items/schedule.dart'; import 'package:oc_front/widgets/sheduler_items/schedule.dart';

View File

@@ -34,7 +34,6 @@ class SchedulerItemWidgetState extends State<SchedulerItemWidget> {
selected = selected != element || ev.startDate != selectedReal ? element : null; selected = selected != element || ev.startDate != selectedReal ? element : null;
widget.parent!.widget.selectedID = selected; widget.parent!.widget.selectedID = selected;
selectedReal = selected == null ? null : ev.startDate; selectedReal = selected == null ? null : ev.startDate;
print("there");
if (selectedReal == null) { if (selectedReal == null) {
widget.parent!.widget.isDayPlanner = true; widget.parent!.widget.isDayPlanner = true;
} }

View File

@@ -9,7 +9,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter_flow_chart/flutter_flow_chart.dart'; import 'package:flutter_flow_chart/flutter_flow_chart.dart';
import 'package:flutter_flow_chart/src/flow_chart_menu.dart'; import 'package:flutter_flow_chart/src/flow_chart_menu.dart';
import 'package:flutter_flow_chart/src/flow_chart_selected_menu.dart'; import 'package:flutter_flow_chart/src/flow_chart_selected_menu.dart';
import 'package:flutter_flow_chart/src/ui/draw_arrow.dart';
import 'package:flutter_flow_chart/src/ui/segment_handler.dart'; import 'package:flutter_flow_chart/src/ui/segment_handler.dart';
/// Listener definition for a new connection /// Listener definition for a new connection
@@ -163,7 +162,6 @@ class Dashboard extends ChangeNotifier {
} }
void copyFromMap(Map<String, dynamic> map) { void copyFromMap(Map<String, dynamic> map) {
debugPrintStack(stackTrace: StackTrace.current, label: 'my_label', maxFrames: 5);
defaultArrowStyle = ArrowStyle.values[map['arrowStyle'] as int? ?? 0]; defaultArrowStyle = ArrowStyle.values[map['arrowStyle'] as int? ?? 0];
defaultDashSpace = map['defaultDashSpace'] as double? ?? 0; defaultDashSpace = map['defaultDashSpace'] as double? ?? 0;
defaultDashWidth = map['defaultDashWidth'] as double? ?? 0; defaultDashWidth = map['defaultDashWidth'] as double? ?? 0;
@@ -373,7 +371,7 @@ class Dashboard extends ChangeNotifier {
bool noHistory = false; bool noHistory = false;
void addToHistory() { void addToHistory() {
if (noHistory) { if (noHistory) {
Future.delayed(Duration(seconds: 2), () { Future.delayed(const Duration(seconds: 2), () {
noHistory = false; noHistory = false;
}); });
return; return;
@@ -381,7 +379,7 @@ class Dashboard extends ChangeNotifier {
if (tempHistory.length >= 50) { tempHistory.removeAt(0); } if (tempHistory.length >= 50) { tempHistory.removeAt(0); }
tempHistory.add(toMap()); tempHistory.add(toMap());
history = tempHistory.map((e) => e).toList(); history = tempHistory.map((e) => e).toList();
Future.delayed(Duration(seconds: 1), () { Future.delayed(const Duration(seconds: 1), () {
chartMenuKey.currentState?.setState(() { }); chartMenuKey.currentState?.setState(() { });
}); });
} }
@@ -843,7 +841,6 @@ class Dashboard extends ChangeNotifier {
} }
if (found == 0) { if (found == 0) {
debugPrint('Element with $destId id not found!');
return; return;
} }
if (notify) { if (notify) {

View File

@@ -26,6 +26,7 @@ abstract class FlowData {
FlowData deserialize(Map<String, dynamic> data); FlowData deserialize(Map<String, dynamic> data);
} }
// ignore: must_be_immutable
class FlowChart<T extends FlowData> extends StatefulWidget { class FlowChart<T extends FlowData> extends StatefulWidget {
FlowChart({ FlowChart({
required this.dashboard, required this.dashboard,
@@ -60,7 +61,7 @@ class FlowChart<T extends FlowData> extends StatefulWidget {
this.menuExtension, this.menuExtension,
this.itemLeftBottomBadges, this.itemLeftBottomBadges,
this.itemrightTopBadges, this.itemrightTopBadges,
}) {} });
final String? current; final String? current;
final List<String> categories; final List<String> categories;
final double width; final double width;
@@ -170,7 +171,7 @@ class FlowChart<T extends FlowData> extends StatefulWidget {
/// Trigger for the scale change /// Trigger for the scale change
final void Function(double scale)? onScaleUpdate; final void Function(double scale)? onScaleUpdate;
bool dashboardSelected = true;
@override @override
State<FlowChart> createState() => FlowChartState<T>(); State<FlowChart> createState() => FlowChartState<T>();
} }
@@ -182,6 +183,7 @@ class HoverMenuController {
currentState?.hideSubMenu(); currentState?.hideSubMenu();
} }
} }
// ignore: must_be_immutable
class HoverMenu extends StatefulWidget { class HoverMenu extends StatefulWidget {
final Widget title; final Widget title;
final double? width; final double? width;
@@ -191,12 +193,12 @@ class HoverMenu extends StatefulWidget {
HoverMenu({ HoverMenu({
Key? key, super.key,
required this.title, required this.title,
this.items = const [], this.items = const [],
this.width, this.width,
this.controller, this.controller,
}) : super(key: key); });
@override @override
HoverMenuState createState() => HoverMenuState(); HoverMenuState createState() => HoverMenuState();
@@ -296,9 +298,9 @@ class HoverMenuState extends State<HoverMenu> {
} }
} }
bool isCtrl = false;
class FlowChartState<T extends FlowData> extends State<FlowChart> { class FlowChartState<T extends FlowData> extends State<FlowChart> {
var node = FocusNode(); var node = FocusNode();
bool isCtrl = false;
@override @override
void initState() { void initState() {
node.requestFocus(); node.requestFocus();
@@ -316,24 +318,31 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
if (!widget.dashboard.isOpened && widget.onDashboardAlertOpened != null ) { if (!widget.dashboard.isOpened && widget.onDashboardAlertOpened != null ) {
if (widget.dashboard.id != null) { if (widget.dashboard.id != null) {
widget.dashboard.isOpened = true; widget.dashboard.isOpened = true;
Future.delayed(Duration(milliseconds: 100), () => widget.dashboard.load!(widget.dashboard.id!) ); Future.delayed(const Duration(milliseconds: 100), () => widget.dashboard.load!(widget.dashboard.id!) );
} else { } else {
Future.delayed(Duration(milliseconds: 100), () { try {
if (!widget.dashboard.inDialog) { Future.delayed(const Duration(milliseconds: 100), () {
widget.dashboard.inDialog = true; if (!widget.dashboard.inDialog) {
showDialog( widget.dashboard.inDialog = true;
barrierDismissible: false, showDialog(
context: context, builder: (context) { barrierDismissible: false,
return AlertDialog( // ignore: use_build_context_synchronously
titlePadding: EdgeInsets.zero, context: context, builder: (context) {
insetPadding: EdgeInsets.zero, return AlertDialog(
backgroundColor: Colors.white, titlePadding: EdgeInsets.zero,
shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(0)), insetPadding: EdgeInsets.zero,
title: widget.onDashboardAlertOpened!(context, widget.dashboard)); backgroundColor: Colors.white,
shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(0)),
}); title: widget.onDashboardAlertOpened!(context, widget.dashboard));
}
}); });
}
});
} catch (e) {
widget.dashboard.id = null;
widget.dashboard.name = "";
widget.dashboard.isOpened = false;
}
} }
} else { } else {
widget.dashboard.isOpened = true; widget.dashboard.isOpened = true;
@@ -358,66 +367,79 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
autofocus: true, autofocus: true,
onKeyEvent: (event) { onKeyEvent: (event) {
bool change = false; bool change = false;
if (event.logicalKey == LogicalKeyboardKey.controlLeft) { if (widget.dashboardSelected) {
isCtrl = event is KeyDownEvent || event is KeyRepeatEvent; if (event.logicalKey == LogicalKeyboardKey.controlLeft && event is KeyDownEvent) {
} isCtrl = true;
/*if ((event is KeyDownEvent || event.logicalKey == LogicalKeyboardKey.keyZ) && isCtrl) { }
widget.dashboard.back(); if (event.logicalKey == LogicalKeyboardKey.controlLeft && event is KeyUpEvent) {
} isCtrl = false;
if ((event is KeyDownEvent || event.logicalKey == LogicalKeyboardKey.keyY) && isCtrl) { }
widget.dashboard.forward(); if ((event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.keyZ) && isCtrl) {
}*/ widget.dashboard.back();
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.add) { }
change = true; if ((event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.keyY) && isCtrl) {
for (var el in widget.dashboard.elementSelected) { widget.dashboard.forward();
widget.dashboard.addElement(FlowElement<T>( }
element: el.element as T, if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.add) {
dashboard: widget.dashboard, change = true;
id: const Uuid().v4(), for (var el in widget.dashboard.elementSelected) {
position: el.position + const Offset(100, 100), widget.dashboard.addElement(FlowElement<T>(
size: el.size, element: el.element as T,
text: el.text, dashboard: widget.dashboard,
widget: el.widget, id: const Uuid().v4(),
kind: el.kind, position: el.position + const Offset(100, 100),
handlers: el.handlers, size: el.size,
handlerSize: el.handlerSize, text: el.text,
), context); widget: el.widget,
} kind: el.kind,
} handlers: el.handlers,
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.delete) { handlerSize: el.handlerSize,
change = true; ), context);
widget.dashboard.removeElements((element) {
if (element.isSelected) {
widget.dashboard.arrows.removeWhere( (e) => e.toID.contains(element.id) || e.fromID.contains(element.id));
}
return element.isSelected;
}, context);
for (var arrow in widget.dashboard.arrowsSelected) {
for (var el in widget.dashboard.elements.where((element) => element.id == arrow.fromID.split("_")[0])) {
el.next.removeAt(int.parse(arrow.fromID.split("_")[1]));
} }
} }
widget.dashboard.removeArrows( (el) => el.isSelected, context ); if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.delete) {
} change = true;
if (change) { widget.dashboard.removeElements((element) {
DrawingArrow.instance.notifyListeners(); if (element.isSelected) {
widget.dashboard.chartKey.currentState?.setState(() { }); widget.dashboard.arrows.removeWhere( (e) => e.toID.contains(element.id) || e.fromID.contains(element.id));
node.requestFocus(); }
return element.isSelected;
}, context);
for (var arrow in widget.dashboard.arrowsSelected) {
for (var el in widget.dashboard.elements.where((element) => element.id == arrow.fromID.split("_")[0])) {
el.next.removeAt(int.parse(arrow.fromID.split("_")[1]));
}
}
widget.dashboard.removeArrows( (el) => el.isSelected, context );
}
if (change) {
DrawingArrow.instance.notifyListeners();
widget.dashboard.chartKey.currentState?.setState(() { });
node.requestFocus();
}
} }
}, },
child: ClipRect( child: ClipRect(
child: Stack( child: Stack(
clipBehavior: Clip.none, clipBehavior: Clip.none,
children: [ children: [
Stack(children: [ Stack(children: [
// Draw the grid // Draw the grid
Container( child: DragTarget<T>( DragTarget<T>(
builder: ( builder: (
BuildContext context, BuildContext context,
List<dynamic> accepted, List<dynamic> accepted,
List<dynamic> rejected, List<dynamic> rejected,
) { ) {
return SizedBox( return MouseRegion(
onEnter: (ev) {
print("sqfdsfd");
widget.dashboardSelected = true;
},
onExit: (ev) {
widget.dashboardSelected = false;
},
child: SizedBox(
width: widget.width, width: widget.width,
height: widget.height, height: widget.height,
child: ChartWidget<T>( child: ChartWidget<T>(
@@ -438,7 +460,7 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
onHandlerPressed: widget.onHandlerLongPressed, onHandlerPressed: widget.onHandlerLongPressed,
onHandlerLongPressed: widget.onHandlerLongPressed, onHandlerLongPressed: widget.onHandlerLongPressed,
onPivotSecondaryPressed: widget.onPivotSecondaryPressed, onPivotSecondaryPressed: widget.onPivotSecondaryPressed,
)); )));
}, },
onAcceptWithDetails: (DragTargetDetails<T> details) { onAcceptWithDetails: (DragTargetDetails<T> details) {
var e = details.data; var e = details.data;
@@ -468,24 +490,24 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
); );
widget.dashboard.addElement(el, context); widget.dashboard.addElement(el, context);
}, },
))] )]
), ),
widget.dashboard.isMenu ? Positioned(top: 50, child: FlowChartSelectedMenu( widget.dashboard.isMenu ? Positioned(top: 50, child: FlowChartSelectedMenu(
key: widget.dashboard.selectedMenuKey, key: widget.dashboard.selectedMenuKey,
dashboard: widget.dashboard, dashboard: widget.dashboard,
height: widget.height - 50) ) : Container(), height: widget.height - 50)) : Container(),
widget.dashboard.isInfo ? Positioned(top: 50, right: 0, child: widget.dashboard.isInfo ? Positioned(top: 50, right: 0, child:
FlowChartLeftMenu<T>( FlowChartLeftMenu<T>(
key: widget.dashboard.selectedLeftMenuKey, key: widget.dashboard.selectedLeftMenuKey,
dashboard: widget.dashboard, dashboard: widget.dashboard,
menuExtension: widget.menuExtension, menuExtension: widget.menuExtension,
categories: widget.categories, categories: widget.categories,
height: widget.height, height: widget.height,
innerMenuWidth: widget.innerMenuWidth, innerMenuWidth: widget.innerMenuWidth,
itemWidth: widget.itemWidth, itemWidth: widget.itemWidth,
draggableItemBuilder: widget.draggableItemBuilder as List<T> Function(String cat), draggableItemBuilder: widget.draggableItemBuilder as List<T> Function(String cat),
getDraggable: getDraggable, getDraggable: getDraggable,
)) : Container() )) : Container()
]) ])
)); ));
} }
@@ -565,8 +587,9 @@ class _DrawingArrowWidgetState extends State<DrawingArrowWidget> {
} }
} }
// ignore: must_be_immutable
class ChartWidget<T extends FlowData> extends StatefulWidget { class ChartWidget<T extends FlowData> extends StatefulWidget {
ChartWidget ({ Key? key, ChartWidget ({ super.key,
required this.flowChart, required this.flowChart,
this.onElementPressed, this.onElementPressed,
this.onElementSecondaryTapped, this.onElementSecondaryTapped,
@@ -586,7 +609,7 @@ class ChartWidget<T extends FlowData> extends StatefulWidget {
required this.dashboard, required this.dashboard,
this.onNewConnection, this.onNewConnection,
this.menuWidget, this.menuWidget,
}) : super(key: key); });
FlowChartState flowChart; FlowChartState flowChart;
@@ -722,33 +745,38 @@ class ChartWidgetState<T extends FlowData> extends State<ChartWidget> {
final gridKey = GlobalKey(); final gridKey = GlobalKey();
var tapDownPos = Offset.zero; var tapDownPos = Offset.zero;
var secondaryTapDownPos = Offset.zero; var secondaryTapDownPos = Offset.zero;
for (int i = 0; i < widget.dashboard.elements.length; i++) for (int i = 0; i < widget.dashboard.elements.length; i++) {
widget.dashboard.elements[i].next.removeWhere((element) => widget.dashboard.elements[i].next.removeWhere((element) =>
widget.dashboard.findElementIndexById(element.destElementId) < 0); widget.dashboard.findElementIndexById(element.destElementId) < 0);
}
return Stack( children: [ return Stack( children: [
Positioned.fill( Positioned.fill(
child: GestureDetector( child: GestureDetector(
onTapDown: (details) { onTapDown: (details) {
hoverImportant = false; hoverImportant = false;
tapDownPos = details.localPosition; tapDownPos = details.localPosition;
for (var arr in widget.dashboard.arrows) { for (var arr in widget.dashboard.arrows) {
if (arr.isLine(tapDownPos)) { if (arr.isLine(tapDownPos)) {
hoverImportant = true; hoverImportant = true;
for (var arr in widget.dashboard.arrows) {
arr.isSelected = false;
}
arr.isSelected = !arr.isSelected; arr.isSelected = !arr.isSelected;
for (var sel in widget.dashboard.elements) { for (var sel in widget.dashboard.elements) {
sel.isSelected = false; sel.isSelected = false;
} }
Future.delayed(Duration(milliseconds: 100), () { Future.delayed(const Duration(milliseconds: 100), () {
widget.dashboard.selectedMenuKey.currentState?.setState(() {}); widget.dashboard.selectedMenuKey.currentState?.setState(() {});
DrawingArrow.instance.notifyListeners(); DrawingArrow.instance.notifyListeners();
}); });
break;
} }
} }
if (!hoverImportant) { if (!hoverImportant) {
for (var sel in widget.dashboard.elements) { sel.isSelected = false; } for (var sel in widget.dashboard.elements) { sel.isSelected = false; }
for (var sel in widget.dashboard.arrows) { sel.isSelected = false; } for (var sel in widget.dashboard.arrows) { sel.isSelected = false; }
Future.delayed(Duration(milliseconds: 100), () { Future.delayed(const Duration(milliseconds: 100), () {
widget.dashboard.selectedMenuKey.currentState?.setState(() {}); widget.dashboard.selectedMenuKey.currentState?.setState(() {});
DrawingArrow.instance.notifyListeners(); DrawingArrow.instance.notifyListeners();
}); });
@@ -816,9 +844,9 @@ class ChartWidgetState<T extends FlowData> extends State<ChartWidget> {
for (int i = 0; i < widget.dashboard.elements.length; i++) for (int i = 0; i < widget.dashboard.elements.length; i++)
ElementWidget<T>( ElementWidget<T>(
key: UniqueKey(), key: UniqueKey(),
bottomLeftBadge: widget.flowChart.widget.itemLeftBottomBadges != null ? bottomLeftBadge: widget.flowChart.widget.itemLeftBottomBadges != null && widget.dashboard.elements[i].element != null ?
widget.flowChart.widget.itemLeftBottomBadges!(widget.dashboard.elements[i].element as T) : null, widget.flowChart.widget.itemLeftBottomBadges!(widget.dashboard.elements[i].element as T) : null,
topRightBadge: widget.flowChart.widget.itemrightTopBadges != null ? topRightBadge: widget.flowChart.widget.itemrightTopBadges != null && widget.dashboard.elements[i].element != null ?
widget.flowChart.widget.itemrightTopBadges!(widget.dashboard.elements[i].element as T) : null, widget.flowChart.widget.itemrightTopBadges!(widget.dashboard.elements[i].element as T) : null,
dashboard: widget.dashboard, dashboard: widget.dashboard,
element: widget.dashboard.elements.elementAt(i), element: widget.dashboard.elements.elementAt(i),

View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_flow_chart/flutter_flow_chart.dart'; import 'package:flutter_flow_chart/flutter_flow_chart.dart';
// ignore: must_be_immutable
class FlowChartLeftMenu<T extends FlowData> extends StatefulWidget { class FlowChartLeftMenu<T extends FlowData> extends StatefulWidget {
Dashboard dashboard; Dashboard dashboard;
List<String> categories; List<String> categories;
@@ -39,10 +40,10 @@ class FlowChartLeftMenuState<T extends FlowData> extends State<FlowChartLeftMenu
: Theme( : Theme(
data: Theme.of(context).copyWith(dividerColor: widget.dashboard.midDashColor), data: Theme.of(context).copyWith(dividerColor: widget.dashboard.midDashColor),
child: ExpansionTile( child: ExpansionTile(
collapsedShape: RoundedRectangleBorder( collapsedShape: const RoundedRectangleBorder(
side: BorderSide.none, side: BorderSide.none,
), ),
shape: RoundedRectangleBorder( shape: const RoundedRectangleBorder(
side: BorderSide.none, side: BorderSide.none,
), ),
initiallyExpanded: true, initiallyExpanded: true,
@@ -70,16 +71,16 @@ class FlowChartLeftMenuState<T extends FlowData> extends State<FlowChartLeftMenu
); );
} }
return Container( return Container(
height: widget.height, height: widget.height,
color: widget.dashboard.midDashColor, color: widget.dashboard.midDashColor,
child: Stack( children: [ child: Stack( children: [
Container( Container(
width: widget.innerMenuWidth, width: widget.innerMenuWidth,
height: 50, height: 50,
decoration: BoxDecoration(border: Border( decoration: BoxDecoration(border: Border(
bottom: BorderSide(color: Colors.grey.shade400), bottom: BorderSide(color: Colors.grey.shade400),
right: BorderSide(color: widget.dashboard.midDashColor), right: BorderSide(color: widget.dashboard.midDashColor),
left: BorderSide(color: Colors.white))), left: const BorderSide(color: Colors.white))),
child: TextFormField( child: TextFormField(
style: const TextStyle(color: Colors.black, fontSize: 15), style: const TextStyle(color: Colors.black, fontSize: 15),
cursorColor: widget.dashboard.dashColor, cursorColor: widget.dashboard.dashColor,
@@ -91,7 +92,7 @@ class FlowChartLeftMenuState<T extends FlowData> extends State<FlowChartLeftMenu
fillColor: widget.dashboard.midDashColor, fillColor: widget.dashboard.midDashColor,
filled: true, filled: true,
contentPadding: const EdgeInsets.only(left: 50, right: 50, top: 15, bottom: 15), contentPadding: const EdgeInsets.only(left: 50, right: 50, top: 15, bottom: 15),
hintStyle: TextStyle( hintStyle: const TextStyle(
color: Colors.grey, color: Colors.grey,
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w400 fontWeight: FontWeight.w400
@@ -101,7 +102,7 @@ class FlowChartLeftMenuState<T extends FlowData> extends State<FlowChartLeftMenu
) )
), ),
Container( Container(
margin: EdgeInsets.only(top: 50), margin: const EdgeInsets.only(top: 50),
height: widget.height - 100, height: widget.height - 100,
constraints: BoxConstraints(minWidth: widget.itemWidth), constraints: BoxConstraints(minWidth: widget.itemWidth),
width: widget.dashboard.isMenu ? widget.innerMenuWidth : 0, width: widget.dashboard.isMenu ? widget.innerMenuWidth : 0,

View File

@@ -23,19 +23,19 @@ class FlowChartMenuState extends State<FlowChartMenu> {
return Row( mainAxisAlignment: MainAxisAlignment.end, children : [ Container( // SHORTCUT return Row( mainAxisAlignment: MainAxisAlignment.end, children : [ Container( // SHORTCUT
width: widget.width, width: widget.width,
height: 50, height: 50,
padding: EdgeInsets.only(left: 20), padding: const EdgeInsets.only(left: 20),
color: widget.dashboard.dashColor, color: widget.dashboard.dashColor,
child: Row( children : [ Expanded(flex: 2, child: Row( children: [ child: Row( children : [ Expanded(flex: 2, child: Row( children: [
widget.chart.widget.flowChart.widget.onDashboardAlertOpened == null ? Container() : Container( widget.chart.widget.flowChart.widget.onDashboardAlertOpened == null ? Container() : Container(
decoration: BoxDecoration( decoration: const BoxDecoration(
border: Border(right: BorderSide(color: Colors.white, width: 1)) border: Border(right: BorderSide(color: Colors.white, width: 1))
), ),
child: Row( children: [ child: Row( children: [
Tooltip( message: "open file", child:Container( child: Tooltip( message: "open file", child: Padding( padding: const EdgeInsets.only(right: 15),
Padding( padding: EdgeInsets.only(right: 15),
child: InkWell( mouseCursor: SystemMouseCursors.click, child: InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () { onTap: () {
widget.dashboard.name = "graph_${DateTime.now().toString().replaceAll(" ", "_").substring(0, DateTime.now().toString().length - 7)}"; widget.dashboard.id = null;
widget.dashboard.name = "";
widget.dashboard.isOpened = true; widget.dashboard.isOpened = true;
if (!widget.dashboard.inDialog) { if (!widget.dashboard.inDialog) {
widget.dashboard.inDialog = true; widget.dashboard.inDialog = true;
@@ -52,7 +52,7 @@ class FlowChartMenuState extends State<FlowChartMenu> {
}); });
} }
}, },
child: Icon(Icons.folder, color: Colors.white))))), child: Icon(Icons.folder, color: Colors.white)))),
])), ])),
InkWell( mouseCursor: SystemMouseCursors.click, child: Container( InkWell( mouseCursor: SystemMouseCursors.click, child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
@@ -240,12 +240,12 @@ class FlowChartMenuState extends State<FlowChartMenu> {
])), ])),
Expanded( Expanded(
child: Padding( child: Text("current workflow : ${widget.dashboard.name}", overflow: TextOverflow.ellipsis, child: Padding( padding: const EdgeInsets.symmetric(horizontal: 20),
style: TextStyle(color: Colors.white, fontSize: 14), textAlign: TextAlign.start), child: Text("current workflow : ${widget.dashboard.name}", overflow: TextOverflow.ellipsis,
padding: EdgeInsets.symmetric(horizontal: 20))), style: const TextStyle(color: Colors.white, fontSize: 14), textAlign: TextAlign.start))),
])), ])),
widget.menuExtension != null && widget.chart.widget.flowChart.widget.width > 600 ? Container( widget.menuExtension != null && widget.chart.widget.flowChart.widget.width > 600 ? Container(
decoration: BoxDecoration( decoration: const BoxDecoration(
border: Border(left: BorderSide(color: Colors.white, width: 1)) border: Border(left: BorderSide(color: Colors.white, width: 1))
), ),
child: widget.menuExtension child: widget.menuExtension

View File

@@ -6,6 +6,7 @@ import 'package:flutter_colorpicker/flutter_colorpicker.dart';
import 'package:number_text_input_formatter/number_text_input_formatter.dart'; import 'package:number_text_input_formatter/number_text_input_formatter.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
// ignore: must_be_immutable
class FlowChartSelectedMenu extends StatefulWidget { class FlowChartSelectedMenu extends StatefulWidget {
Dashboard dashboard; Dashboard dashboard;
double height = 100; double height = 100;
@@ -21,12 +22,13 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
width: 200, width: 200,
height: widget.height, height: widget.height,
color: widget.dashboard.midDashColor, color: widget.dashboard.midDashColor,
child: SingleChildScrollView( child: Column( children: [ ...widget.dashboard.infoItemWidget != null ? child: SingleChildScrollView( child: Column( children: [
...widget.dashboard.infoItemWidget != null ?
widget.dashboard.infoItemWidget!(widget.dashboard.elementSelected.first.element, widget.dashboard.elementSelected.first.id) : [], widget.dashboard.infoItemWidget!(widget.dashboard.elementSelected.first.element, widget.dashboard.elementSelected.first.id) : [],
widget.dashboard.arrowsSelected.isNotEmpty || widget.dashboard.elementSelected.isNotEmpty ? Container( widget.dashboard.arrowsSelected.isNotEmpty || widget.dashboard.elementSelected.isNotEmpty ? Container(
width: 200, width: 200,
margin: EdgeInsets.only(top: 15), margin: const EdgeInsets.only(top: 15),
decoration: BoxDecoration(border: Border( decoration: const BoxDecoration(border: Border(
top: BorderSide(color: Colors.grey, width: 1))), top: BorderSide(color: Colors.grey, width: 1))),
child: Column(crossAxisAlignment: CrossAxisAlignment.center, children: [ child: Column(crossAxisAlignment: CrossAxisAlignment.center, children: [
Tooltip( message: "remove", Tooltip( message: "remove",
@@ -38,13 +40,13 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
} }
return element.isSelected; return element.isSelected;
}, context); }, context);
Future.delayed(Duration(milliseconds: 100), () { Future.delayed( const Duration(milliseconds: 100), () {
widget.dashboard.flutterChartKey.currentState?.setState(() { }); widget.dashboard.flutterChartKey.currentState?.setState(() { });
}); });
}, child: Container( margin: EdgeInsets.all(10), }, child: Container( margin: const EdgeInsets.all(10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)),
width: 200, height: 30, width: 200, height: 30,
child: Icon(Icons.delete_outline, color: Colors.black), child: const Icon(Icons.delete_outline, color: Colors.black),
)) ))
), ),
Tooltip( message: "copy", Tooltip( message: "copy",
@@ -52,17 +54,17 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
onTap: () { onTap: () {
for (var sel in widget.dashboard.elementSelected) { for (var sel in widget.dashboard.elementSelected) {
var el =FlowElement.fromMap(widget.dashboard, sel.toMap()); var el =FlowElement.fromMap(widget.dashboard, sel.toMap());
el.id = Uuid().v8(); el.id = const Uuid().v8();
widget.dashboard.addElement(FlowElement.fromMap(widget.dashboard, sel.toMap()), context); widget.dashboard.addElement(FlowElement.fromMap(widget.dashboard, sel.toMap()), context);
widget.dashboard.elements.last.position += Offset(50, 50); widget.dashboard.elements.last.position += const Offset(50, 50);
} }
Future.delayed(Duration(milliseconds: 100), () { Future.delayed( const Duration(milliseconds: 100), () {
widget.dashboard.chartKey.currentState?.setState(() { }); widget.dashboard.chartKey.currentState?.setState(() { });
}); });
}, child: Container( margin: EdgeInsets.only(left: 10, right: 10, bottom: 10), }, child: Container( margin: const EdgeInsets.only(left: 10, right: 10, bottom: 10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)),
width: 200, height: 30, width: 200, height: 30,
child: Icon(Icons.copy, color: Colors.black), child: const Icon(Icons.copy, color: Colors.black),
)) ))
), ),
]) ])
@@ -79,9 +81,8 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
widget.dashboard.infoLinkWidget!(widget.dashboard.arrowsSelected.first) : Container(), widget.dashboard.infoLinkWidget!(widget.dashboard.arrowsSelected.first) : Container(),
widget.dashboard.arrowsSelected.isNotEmpty || widget.dashboard.elementSelected.isNotEmpty ? Container( widget.dashboard.arrowsSelected.isNotEmpty || widget.dashboard.elementSelected.isNotEmpty ? Container(
width: 200, width: 200,
margin: EdgeInsets.only(top: 15), margin: const EdgeInsets.only(top: 15),
decoration: BoxDecoration(border: Border( decoration: const BoxDecoration(border: Border(top: BorderSide(color: Colors.grey, width: 1))),
top: BorderSide(color: Colors.grey, width: 1))),
child: Column(crossAxisAlignment: CrossAxisAlignment.center, children: [ child: Column(crossAxisAlignment: CrossAxisAlignment.center, children: [
Tooltip( message: "remove", Tooltip( message: "remove",
child: InkWell( mouseCursor: SystemMouseCursors.click, child: InkWell( mouseCursor: SystemMouseCursors.click,
@@ -92,13 +93,13 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
} }
return element.isSelected; return element.isSelected;
}, context); }, context);
Future.delayed(Duration(milliseconds: 100), () { Future.delayed( const Duration(milliseconds: 100), () {
widget.dashboard.flutterChartKey.currentState?.setState(() { }); widget.dashboard.flutterChartKey.currentState?.setState(() { });
}); });
}, child: Container( margin: EdgeInsets.all(10), }, child: Container( margin: const EdgeInsets.all(10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)),
width: 200, height: 30, width: 200, height: 30,
child: Icon(Icons.delete_outline, color: Colors.black), child: const Icon(Icons.delete_outline, color: Colors.black),
)) ))
), ),
]) ])
@@ -118,22 +119,25 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
height: widget.height, height: widget.height,
color: widget.dashboard.midDashColor, color: widget.dashboard.midDashColor,
child: Column( children: [ child: Column( children: [
Container( padding: EdgeInsets.all(10), width: 200, height: 60, Container( padding: const EdgeInsets.all(10), width: 200, height: 60,
decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))), decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [
Text("STYLE ${widget.dashboard.elementSelected.isNotEmpty ? "ELEMENT" : "ARROW"}", style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold), textAlign: TextAlign.center), Text("STYLE ${widget.dashboard.elementSelected.isNotEmpty ? "ELEMENT" : "ARROW"}",
Text("<${widget.dashboard.arrowsSelected.isEmpty && widget.dashboard.elementSelected.isEmpty ? "general" : "selected"}>", style: TextStyle(fontSize: 12), textAlign: TextAlign.center), style: const TextStyle(fontSize: 15, fontWeight: FontWeight.bold), textAlign: TextAlign.center),
Text("<${widget.dashboard.arrowsSelected.isEmpty && widget.dashboard.elementSelected.isEmpty ? "general" : "selected"}>",
style: const TextStyle(fontSize: 12), textAlign: TextAlign.center),
])), ])),
SizedBox( width: 200, height: widget.height - 60, child: SingleChildScrollView( child: Column( children: [ SizedBox( width: 200, height: widget.height - 60, child: SingleChildScrollView( child: Column( children: [
widget.dashboard.elementSelected.isNotEmpty ? Container() : Container( padding: EdgeInsets.symmetric(horizontal: 10, vertical: 20), widget.dashboard.elementSelected.isNotEmpty ? Container() : Container(
decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 20),
decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Column( children: [ child: Column( children: [
Row( children: [ Row( children: [
InkWell( mouseCursor: SystemMouseCursors.click, InkWell( mouseCursor: SystemMouseCursors.click,
child: Padding( padding: EdgeInsets.only(left: 10, right: 10), child: Padding( padding: const EdgeInsets.only(left: 10, right: 10),
child: PopupMenuButton<ArrowDash>( child: PopupMenuButton<ArrowDash>(
tooltip: "line defaults", tooltip: "line defaults",
constraints: BoxConstraints(maxWidth: 100), constraints: const BoxConstraints(maxWidth: 100),
initialValue: null, initialValue: null,
onSelected: (ArrowDash value) { onSelected: (ArrowDash value) {
if (widget.dashboard.elementSelected.isEmpty) { if (widget.dashboard.elementSelected.isEmpty) {
@@ -199,14 +203,14 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
dashSpace: widget.dashboard.defaultDashSpace, dashSpace: widget.dashboard.defaultDashSpace,
color: Colors.black color: Colors.black
), ),
SizedBox(height: 25, width: 10), const SizedBox(height: 25, width: 10),
Icon(Icons.arrow_drop_down, size: 10, color: Colors.black) ]) const Icon(Icons.arrow_drop_down, size: 10, color: Colors.black) ])
), ),
) )
), ),
PopupMenuButton<void>( PopupMenuButton<void>(
tooltip: "color picker", tooltip: "color picker",
constraints: BoxConstraints(maxWidth: 664), constraints: const BoxConstraints(maxWidth: 664),
initialValue: null, initialValue: null,
onSelected: (void value) {}, onSelected: (void value) {},
itemBuilder: (BuildContext context) => <PopupMenuEntry<void>>[ itemBuilder: (BuildContext context) => <PopupMenuEntry<void>>[
@@ -222,12 +226,12 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
], ],
child: Row( children: [ child: Row( children: [
Container(width: 15, height: 15, color: widget.dashboard.defaultColor), Container(width: 15, height: 15, color: widget.dashboard.defaultColor),
SizedBox(height: 25, width: 5), const SizedBox(height: 25, width: 5),
Icon(Icons.arrow_drop_down, size: 10, color: Colors.black) ]) const Icon(Icons.arrow_drop_down, size: 10, color: Colors.black) ])
), ),
Tooltip( message: "stroke width", Tooltip( message: "stroke width",
child: Container( child: Container(
margin: EdgeInsets.only(left: 10), margin: const EdgeInsets.only(left: 10),
width: 55, height: 25, width: 55, height: 25,
child: TextFormField( textAlign: TextAlign.center, child: TextFormField( textAlign: TextAlign.center,
readOnly: widget.dashboard.defaultDashWidth <= 0, readOnly: widget.dashboard.defaultDashWidth <= 0,
@@ -239,8 +243,8 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
} }
setState(() { widget.dashboard.defaultStroke = double.parse(value); }); setState(() { widget.dashboard.defaultStroke = double.parse(value); });
}, },
style: TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
decoration: InputDecoration( decoration: const InputDecoration(
fillColor: Colors.white, fillColor: Colors.white,
filled: true, filled: true,
labelText: "stroke", labelText: "stroke",
@@ -266,7 +270,7 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
]), ]),
Row(children: [ Row(children: [
InkWell( mouseCursor: SystemMouseCursors.click, child: Padding( InkWell( mouseCursor: SystemMouseCursors.click, child: Padding(
padding: EdgeInsets.only(left: 10, top: 10, right: 10), padding: const EdgeInsets.only(left: 10, top: 10, right: 10),
child: PopupMenuButton<ArrowStyle>( child: PopupMenuButton<ArrowStyle>(
initialValue: null, initialValue: null,
onSelected: (ArrowStyle value) { onSelected: (ArrowStyle value) {
@@ -279,7 +283,7 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
}, },
tooltip: "line styles", tooltip: "line styles",
itemBuilder: (BuildContext context) => <PopupMenuEntry<ArrowStyle>>[ itemBuilder: (BuildContext context) => <PopupMenuEntry<ArrowStyle>>[
PopupMenuItem<ArrowStyle>( const PopupMenuItem<ArrowStyle>(
value: ArrowStyle.segmented, value: ArrowStyle.segmented,
child: Row( children: [ child: Row( children: [
Icon(Icons.turn_slight_left), Icon(Icons.turn_slight_left),
@@ -287,7 +291,7 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
child: Text('straight', textAlign: TextAlign.center,)) child: Text('straight', textAlign: TextAlign.center,))
]), ]),
), ),
PopupMenuItem<ArrowStyle>( const PopupMenuItem<ArrowStyle>(
value: ArrowStyle.curve, value: ArrowStyle.curve,
child: Row( children: [ child: Row( children: [
Icon(Icons.roundabout_left), Icon(Icons.roundabout_left),
@@ -295,7 +299,7 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
child: Text('curved', textAlign: TextAlign.center,)) child: Text('curved', textAlign: TextAlign.center,))
]), ]),
), ),
PopupMenuItem<ArrowStyle>( const PopupMenuItem<ArrowStyle>(
value: ArrowStyle.rectangular, value: ArrowStyle.rectangular,
child: Row( children: [ child: Row( children: [
Icon(Icons.turn_sharp_left_outlined), Icon(Icons.turn_sharp_left_outlined),
@@ -307,13 +311,13 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
child: child:
Row( children: [ Icon(widget.dashboard.defaultArrowStyle == ArrowStyle.segmented ? Icons.turn_slight_left : widget.dashboard.defaultArrowStyle == ArrowStyle.curve ? Icons.roundabout_left : Icons.turn_sharp_left_outlined Row( children: [ Icon(widget.dashboard.defaultArrowStyle == ArrowStyle.segmented ? Icons.turn_slight_left : widget.dashboard.defaultArrowStyle == ArrowStyle.curve ? Icons.roundabout_left : Icons.turn_sharp_left_outlined
, color: Colors.black), , color: Colors.black),
Icon(Icons.arrow_drop_down, size: 10, color: Colors.black) ]) const Icon(Icons.arrow_drop_down, size: 10, color: Colors.black) ])
) )
) )
), ),
Tooltip( message: "space dash", Tooltip( message: "space dash",
child: Container( child: Container(
margin: EdgeInsets.only(top: 10), margin: const EdgeInsets.only(top: 10),
width: 105 / 2, height: 25, width: 105 / 2, height: 25,
child: TextFormField( textAlign: TextAlign.center, child: TextFormField( textAlign: TextAlign.center,
readOnly: widget.dashboard.defaultDashWidth <= 0, readOnly: widget.dashboard.defaultDashWidth <= 0,
@@ -325,14 +329,14 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
} }
setState(() { widget.dashboard.defaultDashWidth = double.parse(value); }); setState(() { widget.dashboard.defaultDashWidth = double.parse(value); });
}, },
style: TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
decoration: InputDecoration( decoration: InputDecoration(
fillColor: widget.dashboard.defaultDashWidth <= 0 ? widget.dashboard.midDashColor : Colors.white, fillColor: widget.dashboard.defaultDashWidth <= 0 ? widget.dashboard.midDashColor : Colors.white,
filled: true, filled: true,
labelText: "dash", labelText: "dash",
labelStyle: TextStyle(fontSize: 10), labelStyle: const TextStyle(fontSize: 10),
border: OutlineInputBorder(), border: const OutlineInputBorder(),
contentPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
), ),
inputFormatters: [ inputFormatters: [
NumberTextInputFormatter( NumberTextInputFormatter(
@@ -351,7 +355,7 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
))), ))),
Tooltip( message: "space width", Tooltip( message: "space width",
child: Container( child: Container(
margin: EdgeInsets.only(left: 10, top: 10), margin: const EdgeInsets.only(left: 10, top: 10),
width: 105 / 2, height: 25, width: 105 / 2, height: 25,
child: TextFormField( textAlign: TextAlign.center, child: TextFormField( textAlign: TextAlign.center,
initialValue: "${widget.dashboard.defaultDashSpace}", initialValue: "${widget.dashboard.defaultDashSpace}",
@@ -362,14 +366,14 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
} }
setState(() { widget.dashboard.defaultDashSpace = double.parse(value); }); setState(() { widget.dashboard.defaultDashSpace = double.parse(value); });
}, },
style: TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
decoration: InputDecoration( decoration: InputDecoration(
fillColor: widget.dashboard.defaultDashWidth <= 0 ? widget.dashboard.midDashColor : Colors.white, fillColor: widget.dashboard.defaultDashWidth <= 0 ? widget.dashboard.midDashColor : Colors.white,
filled: true, filled: true,
labelText: "space", labelText: "space",
labelStyle: TextStyle(fontSize: 10), labelStyle: const TextStyle(fontSize: 10),
border: OutlineInputBorder(), border: const OutlineInputBorder(),
contentPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
), ),
inputFormatters: [ inputFormatters: [
NumberTextInputFormatter( NumberTextInputFormatter(
@@ -389,12 +393,12 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
]), ]),
])), ])),
widget.dashboard.elementSelected.isNotEmpty ? Container() : widget.dashboard.elementSelected.isNotEmpty ? Container() :
Container( padding: EdgeInsets.only(left: 10, right: 10, bottom: 20, top: 15), Container( padding: const EdgeInsets.only(left: 10, right: 10, bottom: 20, top: 15),
decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))), decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Column( children: [ child: Column( children: [
Row( mainAxisAlignment: MainAxisAlignment.center, children : [ Row( mainAxisAlignment: MainAxisAlignment.center, children : [
InkWell( mouseCursor: SystemMouseCursors.click, InkWell( mouseCursor: SystemMouseCursors.click,
child: Padding( padding: EdgeInsets.symmetric(horizontal: 10), child: Padding( padding: const EdgeInsets.symmetric(horizontal: 10),
child: PopupMenuButton<ArrowDirection>( child: PopupMenuButton<ArrowDirection>(
initialValue: null, initialValue: null,
onSelected: (ArrowDirection value) { onSelected: (ArrowDirection value) {
@@ -407,7 +411,7 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
}, },
tooltip: widget.dashboard.defaultArrowDirection == ArrowDirection.forward ? 'forward' : widget.dashboard.defaultArrowDirection == ArrowDirection.backward ? 'backward' : 'bidirectionnal', tooltip: widget.dashboard.defaultArrowDirection == ArrowDirection.forward ? 'forward' : widget.dashboard.defaultArrowDirection == ArrowDirection.backward ? 'backward' : 'bidirectionnal',
itemBuilder: (BuildContext context) => <PopupMenuEntry<ArrowDirection>>[ itemBuilder: (BuildContext context) => <PopupMenuEntry<ArrowDirection>>[
PopupMenuItem<ArrowDirection>( const PopupMenuItem<ArrowDirection>(
value: ArrowDirection.forward, value: ArrowDirection.forward,
child: Row( children: [ child: Row( children: [
Icon(Icons.arrow_forward), Icon(Icons.arrow_forward),
@@ -415,7 +419,7 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
child: Text('forward', textAlign: TextAlign.center,)) child: Text('forward', textAlign: TextAlign.center,))
]), ]),
), ),
PopupMenuItem<ArrowDirection>( const PopupMenuItem<ArrowDirection>(
value: ArrowDirection.backward, value: ArrowDirection.backward,
child: Row( children: [ child: Row( children: [
Icon(Icons.arrow_back), Icon(Icons.arrow_back),
@@ -423,7 +427,7 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
child: Text('curved', textAlign: TextAlign.center,)) child: Text('curved', textAlign: TextAlign.center,))
]), ]),
), ),
PopupMenuItem<ArrowDirection>( const PopupMenuItem<ArrowDirection>(
value: ArrowDirection.bidirectionnal, value: ArrowDirection.bidirectionnal,
child: Row( children: [ child: Row( children: [
Icon(Icons.sync_alt_outlined), Icon(Icons.sync_alt_outlined),
@@ -435,16 +439,16 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
child: child:
Row( children: [ Row( children: [
Icon(widget.dashboard.defaultArrowDirection == ArrowDirection.forward ? Icons.arrow_forward : widget.dashboard.defaultArrowDirection == ArrowDirection.backward ? Icons.arrow_back : Icons.sync_alt_outlined, color: Colors.black), Icon(widget.dashboard.defaultArrowDirection == ArrowDirection.forward ? Icons.arrow_forward : widget.dashboard.defaultArrowDirection == ArrowDirection.backward ? Icons.arrow_back : Icons.sync_alt_outlined, color: Colors.black),
Padding( padding: EdgeInsets.symmetric(horizontal: 10), Padding( padding: const EdgeInsets.symmetric(horizontal: 10),
child: Text(widget.dashboard.defaultArrowDirection == ArrowDirection.forward ? 'forward' : widget.dashboard.defaultArrowDirection == ArrowDirection.backward ? 'backward' : 'bidirectionnal')), child: Text(widget.dashboard.defaultArrowDirection == ArrowDirection.forward ? 'forward' : widget.dashboard.defaultArrowDirection == ArrowDirection.backward ? 'backward' : 'bidirectionnal')),
Icon(Icons.arrow_drop_down, size: 10, color: Colors.black) ]) const Icon(Icons.arrow_drop_down, size: 10, color: Colors.black) ])
),) ),)
), ),
]), ]),
Row(children: [ Row(children: [
Tooltip( message: "forward size", Tooltip( message: "forward size",
child: Container( child: Container(
margin: EdgeInsets.only(top: 10), margin: const EdgeInsets.only(top: 10),
width: 150, height: 25, width: 150, height: 25,
child: TextFormField( textAlign: TextAlign.center, child: TextFormField( textAlign: TextAlign.center,
initialValue: "${widget.dashboard.defaultForwardWidth}", initialValue: "${widget.dashboard.defaultForwardWidth}",
@@ -467,14 +471,14 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
} }
}); });
}, },
style: TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
decoration: InputDecoration( decoration: InputDecoration(
fillColor: widget.dashboard.defaultDashWidth <= 0 ? widget.dashboard.midDashColor : Colors.white, fillColor: widget.dashboard.defaultDashWidth <= 0 ? widget.dashboard.midDashColor : Colors.white,
filled: true, filled: true,
labelText: "forward size", labelText: "forward size",
labelStyle: TextStyle(fontSize: 10), labelStyle: const TextStyle(fontSize: 10),
border: OutlineInputBorder(), border: const OutlineInputBorder(),
contentPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
), ),
inputFormatters: [ inputFormatters: [
NumberTextInputFormatter( NumberTextInputFormatter(
@@ -491,12 +495,12 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
], ],
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
))), ))),
Padding( padding: EdgeInsets.only(top: 10, left: 5), child: Icon(Icons.arrow_forward, color: Colors.black)) const Padding( padding: EdgeInsets.only(top: 10, left: 5), child: Icon(Icons.arrow_forward, color: Colors.black))
]), ]),
Row(children: [ Row(children: [
Tooltip( message: "back size", Tooltip( message: "back size",
child: Container( child: Container(
margin: EdgeInsets.only(top: 10), margin: const EdgeInsets.only(top: 10),
width: 150, height: 25, width: 150, height: 25,
child: TextFormField( textAlign: TextAlign.center, child: TextFormField( textAlign: TextAlign.center,
initialValue: "${widget.dashboard.defaultBackWidth}", initialValue: "${widget.dashboard.defaultBackWidth}",
@@ -519,14 +523,14 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
} }
}); });
}, },
style: TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
decoration: InputDecoration( decoration: InputDecoration(
fillColor: widget.dashboard.defaultDashWidth <= 0 ? widget.dashboard.midDashColor : Colors.white, fillColor: widget.dashboard.defaultDashWidth <= 0 ? widget.dashboard.midDashColor : Colors.white,
filled: true, filled: true,
labelText: "back size", labelText: "back size",
labelStyle: TextStyle(fontSize: 10), labelStyle: const TextStyle(fontSize: 10),
border: OutlineInputBorder(), border: const OutlineInputBorder(),
contentPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
), ),
inputFormatters: [ inputFormatters: [
NumberTextInputFormatter( NumberTextInputFormatter(
@@ -543,12 +547,12 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
], ],
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
))), ))),
Padding( padding: EdgeInsets.only(top: 10, left: 5), child: Icon(Icons.arrow_back, color: Colors.black)) const Padding( padding: EdgeInsets.only(top: 10, left: 5), child: Icon(Icons.arrow_back, color: Colors.black))
]) ])
])), ])),
widget.dashboard.arrowsSelected.isNotEmpty || widget.dashboard.elementSelected.isNotEmpty ? Container( widget.dashboard.arrowsSelected.isNotEmpty || widget.dashboard.elementSelected.isNotEmpty ? Container(
width: 200, width: 200,
decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))), decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Column(crossAxisAlignment: CrossAxisAlignment.center, children: [ child: Column(crossAxisAlignment: CrossAxisAlignment.center, children: [
Tooltip( message: "remove", Tooltip( message: "remove",
child: InkWell( mouseCursor: SystemMouseCursors.click, child: InkWell( mouseCursor: SystemMouseCursors.click,
@@ -559,13 +563,13 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
} }
return element.isSelected; return element.isSelected;
}, context); }, context);
Future.delayed(Duration(milliseconds: 100), () { Future.delayed(const Duration(milliseconds: 100), () {
widget.dashboard.flutterChartKey.currentState?.setState(() { }); widget.dashboard.flutterChartKey.currentState?.setState(() { });
}); });
}, child: Container( margin: EdgeInsets.all(10), }, child: Container( margin: const EdgeInsets.all(10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)),
width: 200, height: 30, width: 200, height: 30,
child: Icon(Icons.delete_outline, color: Colors.black), child: const Icon(Icons.delete_outline, color: Colors.black),
)) ))
), ),
Tooltip( message: "copy", Tooltip( message: "copy",
@@ -573,15 +577,15 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
onTap: () { onTap: () {
for (var sel in widget.dashboard.elementSelected) { for (var sel in widget.dashboard.elementSelected) {
widget.dashboard.addElement(FlowElement.fromMap(widget.dashboard, sel.toMap()), context); widget.dashboard.addElement(FlowElement.fromMap(widget.dashboard, sel.toMap()), context);
widget.dashboard.elements.last.position += Offset(50, 50); widget.dashboard.elements.last.position += const Offset(50, 50);
} }
Future.delayed(Duration(milliseconds: 100), () { Future.delayed( const Duration(milliseconds: 100), () {
widget.dashboard.chartKey.currentState?.setState(() { }); widget.dashboard.chartKey.currentState?.setState(() { });
}); });
}, child: Container( margin: EdgeInsets.only(left: 10, right: 10, bottom: 10), }, child: Container( margin: const EdgeInsets.only(left: 10, right: 10, bottom: 10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)),
width: 200, height: 30, width: 200, height: 30,
child: Icon(Icons.copy, color: Colors.black), child: const Icon(Icons.copy, color: Colors.black),
)) ))
), ),
]) ])
@@ -594,15 +598,15 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
Container( // SHORTCUT Container( // SHORTCUT
width: 200, height: 50, width: 200, height: 50,
decoration: BoxDecoration(color: widget.dashboard.midDashColor, decoration: BoxDecoration(color: widget.dashboard.midDashColor,
border: Border(bottom: BorderSide(color: Colors.grey, width: 1))), border: const Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Row( children: [ child: Row( children: [
Tooltip( message: "dashboard information", Tooltip( message: "dashboard information",
child: InkWell( onTap: () => setState(() {widget.isDashboardInfo = true; }), child: InkWell( onTap: () => setState(() {widget.isDashboardInfo = true; }),
mouseCursor: SystemMouseCursors.click, mouseCursor: SystemMouseCursors.click,
child: Container( alignment: Alignment.center, child: Container( alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 10),
color: widget.isDashboardInfo ? Colors.grey : widget.dashboard.midDashColor, color: widget.isDashboardInfo ? Colors.grey : widget.dashboard.midDashColor,
width: 200 / 2, child: Icon(Icons.info, color: Colors.white)) width: 200 / 2, child: const Icon(Icons.info, color: Colors.white))
) )
), ),
Tooltip( Tooltip(
@@ -610,17 +614,19 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
child: InkWell( onTap: () => setState(() {widget.isDashboardInfo = false; }), child: InkWell( onTap: () => setState(() {widget.isDashboardInfo = false; }),
mouseCursor: SystemMouseCursors.click, mouseCursor: SystemMouseCursors.click,
child: Container( alignment: Alignment.center, child: Container( alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 10),
color: !widget.isDashboardInfo ? Colors.grey : widget.dashboard.midDashColor, color: !widget.isDashboardInfo ? Colors.grey : widget.dashboard.midDashColor,
width: 200 / 2, child: Icon(Icons.format_paint, color: Colors.white)), width: 200 / 2, child: const Icon(Icons.format_paint, color: Colors.white)),
) )
) )
] ]
) )
), ),
widget.dashboard.error != null ? Container( width: 200, color: Colors.red, padding: EdgeInsets.all(10), widget.dashboard.error != null ? Container( width: 200,
color: Colors.red,
padding: const EdgeInsets.all(10),
child: Center( child: Text(widget.dashboard.error!, child: Center( child: Text(widget.dashboard.error!,
style: TextStyle(color: Colors.white, fontSize: 15), textAlign: TextAlign.center))) : Container(), style: const TextStyle(color: Colors.white, fontSize: 15), textAlign: TextAlign.center))) : Container(),
w w
]); ]);
} }

View File

@@ -3,8 +3,6 @@ import 'dart:convert';
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'dart:math' as math; import 'dart:math' as math;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_flow_chart/flutter_flow_chart.dart'; import 'package:flutter_flow_chart/flutter_flow_chart.dart';
import 'package:flutter_flow_chart/src/ui/segment_handler.dart'; import 'package:flutter_flow_chart/src/ui/segment_handler.dart';
@@ -257,6 +255,7 @@ class DrawingArrow extends ChangeNotifier {
/// Draw arrow from [srcElement] to [destElement] /// Draw arrow from [srcElement] to [destElement]
/// using [arrowParams] parameters /// using [arrowParams] parameters
// ignore: must_be_immutable
class DrawArrow extends StatefulWidget { class DrawArrow extends StatefulWidget {
ChartWidgetState flow; ChartWidgetState flow;
/// ///
@@ -377,14 +376,15 @@ class DrawArrowState extends State<DrawArrow> {
} }
} }
// ignore: must_be_immutable
class GraphParamsWidget extends StatefulWidget { class GraphParamsWidget extends StatefulWidget {
ChartWidgetState comp; ChartWidgetState comp;
bool isShowed = false; bool isShowed = false;
Offset? position; Offset? position;
FlowElement element; FlowElement element;
int index; int index;
GraphParamsWidget({ Key? key, required this.element, required this.comp, GraphParamsWidget({ super.key, required this.element, required this.comp,
required this.index }): super(key: key); required this.index });
@override GraphParamsWidgetState createState() => GraphParamsWidgetState(); @override GraphParamsWidgetState createState() => GraphParamsWidgetState();
} }
class GraphParamsWidgetState extends State<GraphParamsWidget> { class GraphParamsWidgetState extends State<GraphParamsWidget> {
@@ -393,32 +393,32 @@ class GraphParamsWidgetState extends State<GraphParamsWidget> {
top: (widget.position?.dy ?? 0) - 5, left: (widget.position?.dx ?? 0) - 5, top: (widget.position?.dy ?? 0) - 5, left: (widget.position?.dx ?? 0) - 5,
child: MouseRegion( cursor: SystemMouseCursors.click, child: MouseRegion( cursor: SystemMouseCursors.click,
onHover: (event) => setState(() { widget.isShowed = true; }), onHover: (event) => setState(() { widget.isShowed = true; }),
child: Container(
child: Row(children: [ child: Row(children: [
IconButton(onPressed: () { IconButton(onPressed: () {
widget.comp.setState(() { widget.comp.setState(() {
widget.comp.widget.dashboard.removeArrows((el) => el.fromID == "${widget.element.id}${widget.index}", context); widget.comp.widget.dashboard.removeArrows((el) => el.fromID == "${widget.element.id}${widget.index}", context);
widget.element.next.removeAt(widget.index); widget.element.next.removeAt(widget.index);
}); });
}, icon: Icon(Icons.delete)) }, icon: const Icon(Icons.delete))
],)))); ],)));
} }
} }
// ignore: must_be_immutable
class ArrowInfoWidget extends StatefulWidget { class ArrowInfoWidget extends StatefulWidget {
Dashboard dashboard; Dashboard dashboard;
ArrowInfoWidget ({ Key? key, required this.dashboard }): super(key: key); ArrowInfoWidget ({ super.key, required this.dashboard });
@override ArrowInfoWidgetState createState() => ArrowInfoWidgetState(); @override ArrowInfoWidgetState createState() => ArrowInfoWidgetState();
} }
class ArrowInfoWidgetState extends State<ArrowInfoWidget> { class ArrowInfoWidgetState extends State<ArrowInfoWidget> {
@override Widget build(BuildContext context) { @override Widget build(BuildContext context) {
return SingleChildScrollView( child: Column(children: [ return SingleChildScrollView( child: Column(children: [
Container(height: 50, Container(height: 50,
decoration: BoxDecoration(color: widget.dashboard.midDashColor, border: Border(bottom: BorderSide(color: Colors.grey, width: 1))), decoration: BoxDecoration(color: widget.dashboard.midDashColor, border: const Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Center( child: Text("<Arrow> Style", style: TextStyle(fontSize: 20)))), child: const Center( child: Text("<Arrow> Style", style: TextStyle(fontSize: 20)))),
Container(height: 50, Container(height: 50,
decoration: BoxDecoration(color: widget.dashboard.midDashColor, border: Border(bottom: BorderSide(color: Colors.grey, width: 1))), decoration: BoxDecoration(color: widget.dashboard.midDashColor, border: const Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Row(children: [],) child: const Row(children: [],)
), ),
],) ); ],) );
} }
@@ -443,7 +443,7 @@ class ArrowPainter extends CustomPainter {
}) : pivots = pivots ?? []; }) : pivots = pivots ?? [];
List<dynamic> env; List<dynamic> env;
List<dynamic> infos; List<dynamic> infos = [];
ArrowParams params; ArrowParams params;
String toID; String toID;
String fromID; String fromID;
@@ -744,8 +744,28 @@ class ArrowPainter extends CustomPainter {
return _dashedPathProperties.path; return _dashedPathProperties.path;
} }
bool isLine(Offset point) {
bool isLine(Offset position) { final metrics = path.computeMetrics(forceClosed: false);
for (final metric in metrics) {
final length = metric.length;
const steps = 100;
for(int i = 0; i <= steps; i++) {
final distance = length * i / steps;
final tangent = metric.getTangentForOffset(distance);
if (tangent != null) {
final position = tangent.position;
if ((position - point).distance <= 10) {
return true;
}
}
}
}
return false;
}
/*
bool isLine(Offset position, String name) {
position = Offset(position.dx, position.dy + 10);
print("${position.dx} ${position.dy}");
for (double i=-5; i < 5; i++) { for (double i=-5; i < 5; i++) {
for (double y=-5; y < 5; y++) { for (double y=-5; y < 5; y++) {
var pos = position + Offset(i, y); var pos = position + Offset(i, y);
@@ -756,7 +776,7 @@ class ArrowPainter extends CustomPainter {
} }
return false; return false;
} }
*/
@override @override
bool? hitTest(Offset position) { bool? hitTest(Offset position) {
/* graphkey?.currentState?.widget.isShowed = isLine(position); /* graphkey?.currentState?.widget.isShowed = isLine(position);

View File

@@ -136,32 +136,27 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
if (widget.element.widget == null) { element = RectangleWidget(element: widget.element); if (widget.element.widget == null) { element = RectangleWidget(element: widget.element);
} else { element = AnyWidget(element: widget.element); } } else { element = AnyWidget(element: widget.element); }
} }
var tapLocation = Offset.zero; var tapLocation = Offset.zero;
var secondaryTapDownPos = Offset.zero; var secondaryTapDownPos = Offset.zero;
Widget w = InkWell(
Widget w = GestureDetector(
onTapDown: (details) => tapLocation = details.globalPosition, onTapDown: (details) => tapLocation = details.globalPosition,
onSecondaryTapDown: (details) => onSecondaryTapDown: (details) =>
secondaryTapDownPos = details.globalPosition, secondaryTapDownPos = details.globalPosition,
onTap: () { onTap: () {
setState(() { setState(() {
if (!(widget.dashboard.flutterChartKey.currentState?.isCtrl ?? true)) { if (!isCtrl) {
for (var element in widget.dashboard.elements) { for (var element in widget.dashboard.elements) {
element.isSelected = false; element.isSelected = false;
element.dashboard.chartKey.currentState?. setState(() { }); element.dashboard.chartKey.currentState?. setState(() { });
widget.dashboard.selectedMenuKey.currentState?. setState(() { }); widget.dashboard.selectedMenuKey.currentState?. setState(() { });
} }
} }
Future.delayed(Duration(milliseconds: 100), () { DrawingArrow.instance.notifyListeners();
DrawingArrow.instance.notifyListeners(); widget.isHovered = false;
widget.element.isSelected = !widget.element.isSelected; widget.element.isSelected = !widget.element.isSelected;
for (var sel in widget.dashboard.arrows) { sel.isSelected = false; } for (var sel in widget.dashboard.arrows) { sel.isSelected = false; }
widget.dashboard.selectedMenuKey.currentState?. setState(() { }); widget.dashboard.selectedMenuKey.currentState?. setState(() { });
});
}); });
widget.onElementPressed?.call(context, tapLocation);
}, },
onSecondaryTap: () { onSecondaryTap: () {
widget.onElementSecondaryTapped?.call(context, secondaryTapDownPos); widget.onElementSecondaryTapped?.call(context, secondaryTapDownPos);
@@ -169,9 +164,9 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
onLongPress: () { onLongPress: () {
widget.onElementLongPressed?.call(context, tapLocation); widget.onElementLongPressed?.call(context, tapLocation);
}, },
onSecondaryLongPress: () { /*onSecondaryLongPress: () {
widget.onElementSecondaryLongTapped?.call(context, secondaryTapDownPos); widget.onElementSecondaryLongTapped?.call(context, secondaryTapDownPos);
}, },*/
child: Listener( child: Listener(
onPointerDown: (event) { onPointerDown: (event) {
delta = event.localPosition; delta = event.localPosition;
@@ -182,7 +177,7 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
childWhenDragging: const SizedBox.shrink(), childWhenDragging: const SizedBox.shrink(),
feedback: Material( feedback: Material(
color: Colors.transparent, color: Colors.transparent,
child: Padding( padding: EdgeInsets.all(6), child: Padding( padding: const EdgeInsets.all(6),
child: Container( child: Container(
decoration: BoxDecoration(border: Border.all( color: Colors.red, width: 2)), decoration: BoxDecoration(border: Border.all( color: Colors.red, width: 2)),
width: widget.element.size.width - 12, width: widget.element.size.width - 12,
@@ -198,7 +193,7 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
onHandlerLongPressed: widget.onHandlerLongPressed, onHandlerLongPressed: widget.onHandlerLongPressed,
onHandlerSecondaryLongTapped: widget.onHandlerSecondaryLongTapped, onHandlerSecondaryLongTapped: widget.onHandlerSecondaryLongTapped,
child: Container( child: Container(
margin: EdgeInsets.all(10), // why some change margin: const EdgeInsets.all(10), // why some change
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all(color: widget.element.isSelected ? Colors.red : widget.dashboard.midDashColor, border: Border.all(color: widget.element.isSelected ? Colors.red : widget.dashboard.midDashColor,
width: widget.element.isSelected ? 2 : 1), width: widget.element.isSelected ? 2 : 1),
@@ -267,7 +262,7 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
children: (!widget.isHovered ? [] : [ children: (!widget.isHovered ? [] : [
IconButton(tooltip: "remove element", onPressed: () { IconButton(tooltip: "remove element", onPressed: () {
widget.dashboard.removeElement(widget.element, context); widget.dashboard.removeElement(widget.element, context);
}, icon: Icon(Icons.delete_outline)), }, icon: const Icon(Icons.delete_outline)),
IconButton(tooltip: "copy element", onPressed: () { IconButton(tooltip: "copy element", onPressed: () {
FlowElement<T> newElement = FlowElement<T>( FlowElement<T> newElement = FlowElement<T>(
element: widget.element.element as T?, element: widget.element.element as T?,
@@ -278,7 +273,7 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
widget: widget.element.widget, widget: widget.element.widget,
); );
widget.dashboard.addElement(newElement, context); widget.dashboard.addElement(newElement, context);
}, icon: Icon(Icons.copy, size: 20)), }, icon: const Icon(Icons.copy, size: 20)),
])) ]))
), ),
]) ])

View File

@@ -195,7 +195,6 @@ class _GridBackgroundPainter extends CustomPainter {
@override @override
bool shouldRepaint(_GridBackgroundPainter oldDelegate) { bool shouldRepaint(_GridBackgroundPainter oldDelegate) {
debugPrint('shouldRepaint ${oldDelegate.dx} $dx ${oldDelegate.dy} $dy');
return oldDelegate.dx != dx || oldDelegate.dy != dy; return oldDelegate.dx != dx || oldDelegate.dy != dy;
} }
} }

View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
/// The arrow tip. /// The arrow tip.
// ignore: must_be_immutable
class HandlerWidget extends StatelessWidget { class HandlerWidget extends StatelessWidget {
/// ///
HandlerWidget({ HandlerWidget({

View File

@@ -4,6 +4,7 @@ import 'package:flutter_flow_chart/src/ui/element_widget.dart';
import 'package:flutter_flow_chart/src/ui/handler_widget.dart'; import 'package:flutter_flow_chart/src/ui/handler_widget.dart';
/// The widget to press and drag to resize the element /// The widget to press and drag to resize the element
// ignore: must_be_immutable
class ResizeWidget extends StatefulWidget { class ResizeWidget extends StatefulWidget {
Widget? bottomLeftBadge; Widget? bottomLeftBadge;
Widget? bottomRightBadge; Widget? bottomRightBadge;
@@ -23,7 +24,7 @@ class ResizeWidget extends StatefulWidget {
super.key, super.key,
}); });
Color handlerColor = Color.fromRGBO(38, 166, 154, 1); Color handlerColor = const Color.fromRGBO(38, 166, 154, 1);
final ElementWidgetState comp; final ElementWidgetState comp;
/// ///
final Dashboard dashboard; final Dashboard dashboard;

View File

@@ -2,9 +2,8 @@
WORKSPACE_HOST='http://localhost:8089/oc' WORKSPACE_HOST='http://localhost:8089/oc'
WORKFLOW_HOST='http://localhost:8088/oc' WORKFLOW_HOST='http://localhost:8088/oc'
ITEM_HOST='http://localhost:8087/oc' CATALOG_HOST='http://localhost:8087/oc'
SCHEDULER_HOST='http://localhost:8090/oc' SCHEDULER_HOST='http://localhost:8090/oc'
LOGS_HOST='http://localhost:3100'
PEER_HOST='http://localhost:8093/oc' PEER_HOST='http://localhost:8093/oc'
COLLABORATIVE_AREA_HOST='http://localhost:8091/oc' COLLABORATIVE_AREA_HOST='http://localhost:8091/oc'
AUTH_HOST='http://localhost:8094/oc' AUTH_HOST='http://localhost:8094/oc'
@@ -12,4 +11,4 @@ DATACENTER_HOST='http://localhost:8092/oc'
AUTH_MODE=true AUTH_MODE=true
flutter run -d linux --dart-define=AUTH_MODE=$AUTH_MODE --dart-define=DATACENTER_HOST=$DATACENTER_HOST --dart-define=AUTH_HOST=$AUTH_HOST --dart-define=WORKSPACE_HOST=$WORKSPACE_HOST --dart-define=WORKFLOW_HOST=$WORKFLOW_HOST --dart-define=PEER_HOST=$PEER_HOST --dart-define=COLLABORATIVE_AREA_HOST=$COLLABORATIVE_AREA_HOST --dart-define=SCHEDULER_HOST=$SCHEDULER_HOST --dart-define=LOGS_HOST=$LOGS_HOST --dart-define=ITEM_HOST=$ITEM_HOST flutter run -d linux --dart-define=AUTH_MODE=$AUTH_MODE --dart-define=DATACENTER_HOST=$DATACENTER_HOST --dart-define=AUTH_HOST=$AUTH_HOST --dart-define=WORKSPACE_HOST=$WORKSPACE_HOST --dart-define=WORKFLOW_HOST=$WORKFLOW_HOST --dart-define=PEER_HOST=$PEER_HOST --dart-define=COLLABORATIVE_AREA_HOST=$COLLABORATIVE_AREA_HOST --dart-define=SCHEDULER_HOST=$SCHEDULER_HOST --dart-define=CATALOG_HOST=$CATALOG_HOST

4
local_run_traefik.sh Executable file
View File

@@ -0,0 +1,4 @@
#!/bin/bash
AUTH_MODE=true
flutter run -d linux --dart-define=AUTH_MODE=$AUTH_MODE

View File

@@ -411,26 +411,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.5" version: "10.0.0"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.5" version: "2.0.1"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.1" version: "2.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@@ -483,18 +483,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.11.1" version: "0.8.0"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.15.0" version: "1.11.0"
mgrs_dart: mgrs_dart:
dependency: transitive dependency: transitive
description: description:
@@ -824,10 +824,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.2" version: "0.6.1"
timezone: timezone:
dependency: transitive dependency: transitive
description: description:
@@ -896,10 +896,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "14.2.5" version: "13.0.0"
web: web:
dependency: transitive dependency: transitive
description: description:
@@ -912,10 +912,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: win32 name: win32
sha256: e1d0cc62e65dc2561f5071fcbccecf58ff20c344f8f3dc7d4922df372a11df1f sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.7.1" version: "5.5.0"
win32_registry: win32_registry:
dependency: transitive dependency: transitive
description: description:
@@ -949,5 +949,5 @@ packages:
source: hosted source: hosted
version: "6.5.0" version: "6.5.0"
sdks: sdks:
dart: ">=3.5.0 <=3.7.12" dart: ">=3.3.4 <=3.7.12"
flutter: ">=3.19.0" flutter: ">=3.19.0"

View File

@@ -98,7 +98,6 @@ flutter:
- assets/images/logo.svg - assets/images/logo.svg
- assets/images/icon.svg - assets/images/icon.svg
- assets/config/front.json - assets/config/front.json
- assets/config/front_k8s.json
# To add assets to your application, add an assets section, like this: # To add assets to your application, add an assets section, like this:
# assets: # assets:
# - images/a_dot_burr.jpeg # - images/a_dot_burr.jpeg