From 0eb19148cda86b5a0be8d6f4eef400813607051e Mon Sep 17 00:00:00 2001 From: thesujai Date: Wed, 4 Oct 2023 15:53:14 +0530 Subject: [PATCH 01/14] Info page done --- .../plugins/device/assets/src/views/DeviceInfoPage.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue b/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue index 6727bfc97f7..83d1900fcd1 100644 --- a/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue +++ b/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue @@ -81,7 +81,7 @@ import { mapGetters, mapState } from 'vuex'; import TechnicalTextBlock from 'kolibri-common/components/AppError/TechnicalTextBlock'; import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings'; - import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin'; + import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; import DeviceAppBarPage from './DeviceAppBarPage'; import { deviceString } from './commonDeviceStrings'; import DeviceNameModal from './DeviceNameModal'; @@ -98,7 +98,13 @@ DeviceNameModal, TechnicalTextBlock, }, - mixins: [commonCoreStrings, responsiveWindowMixin], + mixins: [commonCoreStrings], + setup(){ + const windowIsSmall=useKResponsiveWindow(); + return{ + windowIsSmall, + }; + }, data() { return { advancedShown: false, From ba838e4552798a899edd80d1f4eb43e551e5ecf3 Mon Sep 17 00:00:00 2001 From: thesujai Date: Wed, 4 Oct 2023 18:34:53 +0530 Subject: [PATCH 02/14] lint fixes --- kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue b/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue index 83d1900fcd1..67e2b69cee1 100644 --- a/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue +++ b/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue @@ -99,9 +99,9 @@ TechnicalTextBlock, }, mixins: [commonCoreStrings], - setup(){ - const windowIsSmall=useKResponsiveWindow(); - return{ + setup() { + const windowIsSmall = useKResponsiveWindow(); + return { windowIsSmall, }; }, From e2e8a3a7e4d7d19a372443eb2a176374c82f1b25 Mon Sep 17 00:00:00 2001 From: thesujai Date: Thu, 5 Oct 2023 13:15:23 +0530 Subject: [PATCH 03/14] header with options done --- .../device/assets/src/views/HeaderWithOptions.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kolibri/plugins/device/assets/src/views/HeaderWithOptions.vue b/kolibri/plugins/device/assets/src/views/HeaderWithOptions.vue index 83c2b72bddf..04e366ca342 100644 --- a/kolibri/plugins/device/assets/src/views/HeaderWithOptions.vue +++ b/kolibri/plugins/device/assets/src/views/HeaderWithOptions.vue @@ -24,11 +24,16 @@