diff --git a/ui/lib/modules/dashboard/controller.dart b/ui/lib/modules/dashboard/controller.dart index 63a6b3a..5674453 100644 --- a/ui/lib/modules/dashboard/controller.dart +++ b/ui/lib/modules/dashboard/controller.dart @@ -9,7 +9,7 @@ class DashboardController extends GetxController { Rx tasks = Tasks.fromList([]).obs; Rx taskDetail = TaskDetail.fromMap({}).obs; RxString filters = ''.obs; - RxBool showDetail = true.obs; + RxBool showDetail = false.obs; RxString detailTaskId = ''.obs; final String query = r''' diff --git a/ui/lib/modules/dashboard/task_detail/base_information_pane.dart b/ui/lib/modules/dashboard/task_detail/base_information_pane.dart index 9446dfc..5af8541 100644 --- a/ui/lib/modules/dashboard/task_detail/base_information_pane.dart +++ b/ui/lib/modules/dashboard/task_detail/base_information_pane.dart @@ -101,7 +101,7 @@ class BaseInformationPane extends StatelessWidget { children: [ getPane( [ - getTitle('source library settings'), + getTitle('Source library settings'), SizedBox(height: 20,), Row( children: [ @@ -109,8 +109,8 @@ class BaseInformationPane extends StatelessWidget { Expanded( flex: 1, child: getContent( - 'target library', - textContent: 'local files - FS', + 'Target library', + textContent: 'Local files - FS', ), ), Expanded( @@ -126,7 +126,7 @@ class BaseInformationPane extends StatelessWidget { ), getPane( [ - getTitle('target library settings'), + getTitle('Target library settings'), SizedBox(height: 20,), Row( children: [ @@ -134,14 +134,14 @@ class BaseInformationPane extends StatelessWidget { Expanded( flex: 1, child: getContent( - 'target library', - textContent: 'local files - FS' + 'Target library', + textContent: 'Local files - FS' ), ), Expanded( flex: 2, child: getContent( - 'identity', + 'Identity', customWidet: TextButton( style: ButtonStyle( foregroundColor: MaterialStateProperty.resolveWith(getForeGroundColor), @@ -151,7 +151,7 @@ class BaseInformationPane extends StatelessWidget { Get.dialog(IdentityDialog()); }, child: Text( - 'QingStor - identity 1', + 'QingStor - Services 1', style: TextStyle( decoration: TextDecoration.underline, ) @@ -168,7 +168,7 @@ class BaseInformationPane extends StatelessWidget { Expanded( flex: 1, child: getContent( - 'bucket name', + 'Bucket name', textContent: 'QingStor bucket name', ), ), @@ -185,7 +185,7 @@ class BaseInformationPane extends StatelessWidget { ), getPane( [ - getTitle('other settings'), + getTitle('Other settings'), SizedBox(height: 20,), Row( children: [ @@ -193,7 +193,7 @@ class BaseInformationPane extends StatelessWidget { Expanded( flex: 1, child: getContent( - 'task type', + 'Task type', textContent: 'One - time task', ), ), diff --git a/ui/lib/modules/dashboard/task_detail/identity_dialog.dart b/ui/lib/modules/dashboard/task_detail/identity_dialog.dart index 6e1610d..5794d2f 100644 --- a/ui/lib/modules/dashboard/task_detail/identity_dialog.dart +++ b/ui/lib/modules/dashboard/task_detail/identity_dialog.dart @@ -13,7 +13,7 @@ class IdentityDialog extends StatelessWidget { @override Widget build(BuildContext context) { return CommonDialog( - title: 'QingStor - identity 1'.tr, + title: 'QingStor - Services 1'.tr, width: 800, content: Container( width: 320, @@ -26,7 +26,7 @@ class IdentityDialog extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ SelectableText( - 'credential', + 'Credential', style: TextStyle( fontFamily: 'Roboto', fontWeight: FontWeight.w500, @@ -70,7 +70,7 @@ class IdentityDialog extends StatelessWidget { ), SizedBox(height: 20,), SelectableText( - 'endpoint', + 'Endpoint', style: TextStyle( fontFamily: 'Roboto', fontWeight: FontWeight.w500, diff --git a/ui/lib/modules/dashboard/task_detail/index.dart b/ui/lib/modules/dashboard/task_detail/index.dart index db2c40d..7ec1af0 100644 --- a/ui/lib/modules/dashboard/task_detail/index.dart +++ b/ui/lib/modules/dashboard/task_detail/index.dart @@ -14,7 +14,7 @@ class TaskDetail extends GetView { return Column( children: [ ReturnToList( - title: "Return Tasks List".tr, + title: "Return tasks tist".tr, onTap: () { controller.showDetail(false); controller.detailTaskId(''); diff --git a/ui/lib/modules/dashboard/task_detail/return_task_list.dart b/ui/lib/modules/dashboard/task_detail/return_task_list.dart index 2d42164..fe8e754 100644 --- a/ui/lib/modules/dashboard/task_detail/return_task_list.dart +++ b/ui/lib/modules/dashboard/task_detail/return_task_list.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import '../../../common/colors.dart'; @@ -15,28 +16,37 @@ class ReturnToList extends StatelessWidget { Widget build(BuildContext context) { return Padding( padding: EdgeInsets.only(bottom: 10), - child: GestureDetector( - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - margin: EdgeInsets.only(top: 3, right: 8), - child: Icon(IconData(0xe607, fontFamily: 'tpIcon'), size: 20,), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + MouseRegion( + cursor: SystemMouseCursors.click, + child: GestureDetector( + child: Container( + margin: EdgeInsets.only(top: 3, right: 8), + child: Icon(IconData(0xe607, fontFamily: 'tpIcon'), size: 20,), + ), + onTap: () => onTap(), ), - SelectableText( - title, - style: TextStyle( - fontSize: 14, - fontFamily: 'Roboto', - fontWeight: FontWeight.normal, - fontStyle: FontStyle.normal, - color: regularFontColor, + ), + MouseRegion( + cursor: SystemMouseCursors.click, + child: GestureDetector( + child: Text( + title, + style: TextStyle( + fontSize: 14, + fontFamily: 'Roboto', + fontWeight: FontWeight.normal, + fontStyle: FontStyle.normal, + color: regularFontColor, + ), ), + onTap: () => onTap(), ), - ], - ), - onTap: () => onTap(), + ), + ], ), ); } diff --git a/ui/lib/modules/dashboard/task_detail/task_description.dart b/ui/lib/modules/dashboard/task_detail/task_description.dart index c6fbb08..a883148 100644 --- a/ui/lib/modules/dashboard/task_detail/task_description.dart +++ b/ui/lib/modules/dashboard/task_detail/task_description.dart @@ -47,7 +47,7 @@ class TaskDescription extends GetView { crossAxisAlignment: CrossAxisAlignment.start, children: [ SelectableText('DM Task - 1', style: Theme.of(context).textTheme.headline2), - SelectableText('task ID：DM 2021041223', style: Theme.of(context).textTheme.bodyText2), + SelectableText('Task id：DM 2021041223', style: Theme.of(context).textTheme.bodyText2), ], ), SizedBox(width: 30,), @@ -95,7 +95,7 @@ class TaskDescription extends GetView { crossAxisAlignment: CrossAxisAlignment.start, children: [ SelectableText( - 'Task Progress'.tr, + 'Task progress'.tr, style: TextStyle( fontFamily: 'Roboto', fontStyle: FontStyle.normal, @@ -104,7 +104,7 @@ class TaskDescription extends GetView { color: headlineFontColor, ), ), - SizedBox(height: 14,), + SizedBox(height: 7,), ProgressBar( ratio: 0.4, barWidth: 480, diff --git a/ui/lib/modules/dashboard/task_detail/task_information.dart b/ui/lib/modules/dashboard/task_detail/task_information.dart index e92c28b..1437dab 100644 --- a/ui/lib/modules/dashboard/task_detail/task_information.dart +++ b/ui/lib/modules/dashboard/task_detail/task_information.dart @@ -17,11 +17,11 @@ class TaskInformation extends GetView { List TabsList = [ TabPane( - tabTitle: 'Base Information'.tr, + tabTitle: 'Base information'.tr, pane: BaseInformationPane() ), TabPane( - tabTitle: 'Real - Time Log'.tr, + tabTitle: 'Real - time log'.tr, pane: TimeLogPane( logTitle: 'Unit Test (1.16, macos-latest)', description: 'Successed on 18 Mar in 53s', diff --git a/ui/lib/modules/identity/create_identity_dialog/form.dart b/ui/lib/modules/identity/create_identity_dialog/form.dart index 15ba3e5..92ca306 100644 --- a/ui/lib/modules/identity/create_identity_dialog/form.dart +++ b/ui/lib/modules/identity/create_identity_dialog/form.dart @@ -51,7 +51,7 @@ class CreateIdentityForm extends GetView { ), SizedBox(height: 22), SelectableText( - 'Identity Name'.tr, + 'Services Name'.tr, style: TextStyle( color: regularFontColor, fontSize: 12, diff --git a/ui/lib/modules/identity/create_identity_dialog/index.dart b/ui/lib/modules/identity/create_identity_dialog/index.dart index 6e92685..ebd93fa 100644 --- a/ui/lib/modules/identity/create_identity_dialog/index.dart +++ b/ui/lib/modules/identity/create_identity_dialog/index.dart @@ -30,7 +30,7 @@ class CreateIdentityDialog extends StatelessWidget { @override Widget build(BuildContext context) { return CommonDialog( - title: 'Create Identity'.tr, + title: 'Create Services'.tr, width: 400, content: Container( width: 400, diff --git a/ui/lib/modules/identity/index.dart b/ui/lib/modules/identity/index.dart index e704a85..2080639 100644 --- a/ui/lib/modules/identity/index.dart +++ b/ui/lib/modules/identity/index.dart @@ -23,7 +23,7 @@ class Identity extends GetView { children: [ PageDescription( icon: IconData(0xe60b, fontFamily: 'tpIcon'), - title: 'Identities'.tr, + title: 'Services'.tr, subtitle: "Support Binding One Or More Cloud Service Accounts / API Key" .tr, @@ -31,10 +31,10 @@ class Identity extends GetView { Obx(() => controller.identities.value.length() == 0 ? EmptyEntryList( icon: IconData(0xe60b, fontFamily: 'tpIcon'), - title: 'The Identity List Is Empty'.tr, + title: 'The Services List Is Empty'.tr, subTitle: - 'Please Click The Button Below To Create Identity'.tr, - buttonText: 'Create Identity'.tr, + 'Please Click The Button Below To Create Services'.tr, + buttonText: 'Create Services'.tr, onClick: () => Get.dialog(CreateIdentityDialog( getIdentities: controller.getIdentities)), ) diff --git a/ui/lib/modules/identity/panel.dart b/ui/lib/modules/identity/panel.dart index 6f0b6f3..828031d 100644 --- a/ui/lib/modules/identity/panel.dart +++ b/ui/lib/modules/identity/panel.dart @@ -50,9 +50,9 @@ class IdentityPanel extends GetView { MoreActions( onSelected: (String option) { Get.dialog(Confirm( - title: "Are You Sure To Delete This Identity?".tr, + title: "Are You Sure To Delete This Services?".tr, description: - "After Deleting, It Will Not Affect The Created Tasks, But It Will Not Appear In The Identity List And The Identity Option Of The Created Task." + "After Deleting, It Will Not Affect The Created Tasks, But It Will Not Appear In The Services List And The Services Option Of The Created Task." .tr, onConfirm: () { controller.deleteIdentity(identity).then((result) { @@ -64,7 +64,7 @@ class IdentityPanel extends GetView { PopupMenuItem( value: "delete", height: 32.0, - child: Text("Delete Identity".tr, + child: Text("Delete Services".tr, style: TextStyle( fontSize: 12.0, color: regularFontColor, diff --git a/ui/lib/modules/identity/toolbar.dart b/ui/lib/modules/identity/toolbar.dart index 3390724..391de99 100644 --- a/ui/lib/modules/identity/toolbar.dart +++ b/ui/lib/modules/identity/toolbar.dart @@ -15,7 +15,7 @@ class Toolbar extends GetView { children: [ Button( icon: Icons.add, - child: Text("Create Identity".tr), + child: Text("Create Services".tr), type: ButtonType.primary, onPressed: () => Get.dialog( CreateIdentityDialog(getIdentities: controller.getIdentities)), @@ -23,7 +23,7 @@ class Toolbar extends GetView { SizedBox(width: 20), Obx( () => SelectableText( - '${controller.identities.value.length()} Identities', + '${controller.identities.value.length()} Services', style: TextStyle( color: regularFontColor, fontSize: 12, diff --git a/ui/lib/modules/layout/navigators.dart b/ui/lib/modules/layout/navigators.dart index bb826b4..8b2b8a2 100644 --- a/ui/lib/modules/layout/navigators.dart +++ b/ui/lib/modules/layout/navigators.dart @@ -49,7 +49,7 @@ class Navigators extends StatelessWidget { SideLink(title: "Tasks".tr, icon: IconData(0xe600, fontFamily: 'tpIcon'), path: Routes.main), SideLink(title: "Agents".tr, icon: IconData(0xe608, fontFamily: 'tpIcon'), path: Routes.agents), SideLink( - title: "Identities".tr, + title: "Services".tr, icon: IconData(0xe60b, fontFamily: 'tpIcon'), path: Routes.identities, ),