From 524c5fef1558b34bcf0b747c7647b4fd6dd60c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Fri, 24 Feb 2023 07:57:34 +0800 Subject: Fix file name --- Font-Awesome.qrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Font-Awesome.qrc b/Font-Awesome.qrc index 8f19cc7..8f6adaf 100644 --- a/Font-Awesome.qrc +++ b/Font-Awesome.qrc @@ -5,6 +5,6 @@ Font-Awesome/svgs/solid/user-graduate.svg Font-Awesome/svgs/solid/tv.svg Font-Awesome/svgs/solid/lock.svg - Font-Awesome/svgs/solid/play.svg + Font-Awesome/svgs/solid/circle-play.svg -- cgit v1.2.3 From c33b970adbb2e528857bfe103f8d1f37a2469392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sat, 25 Feb 2023 16:09:55 +0800 Subject: Remove mouse area from counter Counters aren't really clickable on Eduport. Mouse areas can still be added in the Qeduport using app. --- Counter.ui.qml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Counter.ui.qml b/Counter.ui.qml index e6e7318..86cff16 100644 --- a/Counter.ui.qml +++ b/Counter.ui.qml @@ -3,8 +3,6 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 Item { - property alias area: area - Rectangle { color: bgColor radius: 8 @@ -63,10 +61,5 @@ Item { } } } - - MouseArea { - id: area - anchors.fill: parent - } } } -- cgit v1.2.3 From 3c32b0b56902f62569e4074f6a69301c57a69f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sat, 25 Feb 2023 17:52:32 +0800 Subject: Make the counter content centered --- Counter.ui.qml | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/Counter.ui.qml b/Counter.ui.qml index 86cff16..f75b2ce 100644 --- a/Counter.ui.qml +++ b/Counter.ui.qml @@ -7,33 +7,35 @@ Item { color: bgColor radius: 8 anchors { - top: parent.top + fill: parent topMargin: 25.6 - left: parent.left leftMargin: 12.8 - right: parent.right rightMargin: 12.8 - bottom: parent.bottom } - RowLayout { + Item { anchors { - top: parent.top - topMargin: 25.6 - left: parent.left - leftMargin: 25.6 - right: parent.right - rightMargin: 25.6 - bottom: parent.bottom - bottomMargin: 25.6 + fill: parent + margins: 25.6 } Image { + id: image source: icon - sourceSize.height: parent.height + sourceSize.height: column.height * 3 / 4 + fillMode: Image.PreserveAspectFit + x: (parent.width - (width + column.width + 25.6)) / 2 + anchors.verticalCenter: parent.verticalCenter } ColumnLayout { + id: column + spacing: 0 + anchors { + left: image.right + leftMargin: 25.6 + } + FontLoader { id: bold source: "Heebo/Heebo-Bold.ttf" @@ -43,21 +45,25 @@ Item { text: count font { family: bold.name - pixelSize: 21 + pointSize: 20.1 + weight: Font.Bold } + Layout.fillWidth: true } FontLoader { id: medium - source: "Heebo/Heebo-Bold.ttf" + source: "Heebo/Heebo-Medium.ttf" } Label { text: title font { family: medium.name - pixelSize: 15 + pointSize: 15 + weight: Font.Medium } + Layout.fillWidth: true } } } -- cgit v1.2.3 From 79b37a953c031671f0c6d2af19c1017f8cf0ff6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sat, 25 Feb 2023 17:58:01 +0800 Subject: Default delegate for counter --- HomeDefault.ui.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index 4aa79cb..6963803 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -162,6 +162,11 @@ Flickable { bgColor: "#1a17a2b8" } } + + delegate: Counter { + implicitWidth: counter.cellWidth + implicitHeight: counter.cellHeight + } } ColumnLayout { -- cgit v1.2.3 From 152f06a7d11800e79e7b8a6fce8586c4f5ee0c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sat, 25 Feb 2023 21:17:53 +0800 Subject: Counter implicitHeight is used instead Layout.preferredHeight because it can be overridden in the library user app. --- HomeDefault.ui.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index 6963803..c3e8d2f 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -131,7 +131,7 @@ Flickable { : width / 4 cellHeight: 125.6 Layout.fillWidth: true - Layout.preferredHeight: width < 576 + implicitHeight: width < 576 ? cellHeight * count : width < 1200 ? cellHeight * count / 2 : cellHeight -- cgit v1.2.3 From 805f099b7ad2f9197e5a9fe6446a59709ace41a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sat, 25 Feb 2023 21:18:15 +0800 Subject: Fix most popular courses vertical margins --- HomeDefault.ui.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index c3e8d2f..c7ef8b4 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -170,9 +170,10 @@ Flickable { } ColumnLayout { + Layout.topMargin: 64 Layout.leftMargin: 15 Layout.rightMargin: 15 - Layout.bottomMargin: 25.6 + Layout.bottomMargin: 48 Label { text: qsTr("Most Popular Courses") -- cgit v1.2.3 From d5739131a6ec5d89c00ca113b8a663cdd60c20e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 26 Feb 2023 11:14:44 +0800 Subject: Fix banner margins --- HomeDefault.ui.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index c7ef8b4..40008f7 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -26,10 +26,12 @@ Flickable { columns: width < 992 ? 1 : 2 rows: width < 992 ? 2 : 1 Layout.topMargin: 48 - Layout.leftMargin: 51.28 - Layout.rightMargin: 51.28 + Layout.leftMargin: -9 + Layout.rightMargin: -9 ColumnLayout { + Layout.leftMargin: 15 + Layout.rightMargin: 15 FontLoader { id: heebo -- cgit v1.2.3 From d830cc9aeef3ad090878bb1a93debcdf0547ea9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 26 Feb 2023 12:03:05 +0800 Subject: Fix banner margins again --- HomeDefault.ui.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index 40008f7..1b59441 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -25,13 +25,15 @@ Flickable { id: banner columns: width < 992 ? 1 : 2 rows: width < 992 ? 2 : 1 - Layout.topMargin: 48 Layout.leftMargin: -9 Layout.rightMargin: -9 + Layout.bottomMargin: 48 ColumnLayout { + Layout.topMargin: 48 Layout.leftMargin: 15 Layout.rightMargin: 15 + Layout.bottomMargin: 48 FontLoader { id: heebo -- cgit v1.2.3 From 48fc594c2d6a2064e8a296e10679c739cfda12dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 26 Feb 2023 12:03:37 +0800 Subject: Item for banner image container instead of ColumnLayout --- HomeDefault.ui.qml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index 1b59441..5e711a6 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -34,6 +34,8 @@ Flickable { Layout.leftMargin: 15 Layout.rightMargin: 15 Layout.bottomMargin: 48 + Layout.maximumWidth: body.width < 992 + ? body.width : body.width / 2 FontLoader { id: heebo @@ -113,16 +115,18 @@ Flickable { } } - ColumnLayout { + Item { Layout.topMargin: 48 Layout.leftMargin: 24 Layout.rightMargin: 24 + Layout.fillWidth: true + implicitHeight: image.height Image { id: image source: "https://eduport.webestica.com/assets/images/element/07.png" + width: parent.width fillMode: Image.PreserveAspectFit - Layout.fillWidth: true } } } -- cgit v1.2.3 From 1c430072bde627a910a8c6d53ab0714b2f1cb73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 26 Feb 2023 12:23:27 +0800 Subject: Angular on banner --- HomeDefault.ui.qml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index 5e711a6..34f08c6 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -1,6 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 Flickable { property alias counter: counter @@ -122,6 +123,30 @@ Flickable { Layout.fillWidth: true implicitHeight: image.height + DropShadow { + source: angularRectangle + anchors.fill: angularRectangle + color: Qt.rgba(.113, .227, .325, .15) + } + + Rectangle { + id: angularRectangle + radius: 8 + implicitWidth: angularImage.width + 16 + implicitHeight: angularImage.height + 16 + anchors { + top: parent.top + right: parent.right + rightMargin: 24 + } + + Image { + id: angularImage + source: "https://eduport.webestica.com/assets/images/client/angular.svg" + anchors.centerIn: parent + } + } + Image { id: image source: "https://eduport.webestica.com/assets/images/element/07.png" -- cgit v1.2.3 From 01a515adb78c661d90207f0c63fc1fdc63d6511b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 26 Feb 2023 13:47:49 +0800 Subject: Fix popular courses layout --- HomeDefault.ui.qml | 245 +++++++++++++++++++++++++++-------------------------- 1 file changed, 124 insertions(+), 121 deletions(-) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index 34f08c6..d561291 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -208,145 +208,148 @@ Flickable { Layout.rightMargin: 15 Layout.bottomMargin: 48 - Label { - text: qsTr("Most Popular Courses") - color: "#24292d" - horizontalAlignment: Text.AlignHCenter - wrapMode: Text.Wrap - Layout.fillWidth: true - Layout.bottomMargin: 8 - font { - family: heebo.name - pointSize: 22.5 + .020625 * width - } - } + ColumnLayout { + Layout.bottomMargin: 25.6 - Label { - text: qsTr("Choose from hundreds of courses from specialist organizations") - color: "#747579" - horizontalAlignment: Text.AlignHCenter - wrapMode: Text.Wrap - Layout.fillWidth: true - font { - family: doesntEmbed ? "Roboto" - : roboto.name - pointSize: 15 + Label { + text: qsTr("Most Popular Courses") + color: "#24292d" + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap + Layout.fillWidth: true + Layout.bottomMargin: 8 + font { + family: heebo.name + pointSize: 22.5 + .020625 * width + } } - } - } - TabBar { - id: tabs - currentIndex: tabsContent.currentIndex - background: Rectangle{ - color: Qt.rgba(.0235, .416, .788, .1) - radius: 10 - } - horizontalPadding: 16 - verticalPadding: 10 - Layout.fillWidth: true - Layout.bottomMargin: 25.6 - - TabButton { - id: webDesign - text: qsTr("Web Design") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 - } - background: Rectangle { - color: "#066ac9" - radius: 5.2 + Label { + text: qsTr("Choose from hundreds of courses from specialist organizations") + color: "#747579" + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap + Layout.fillWidth: true + font { + family: doesntEmbed ? "Roboto" : roboto.name + pointSize: 15 + } } } - TabButton { - id: development - text: qsTr("Development") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 + TabBar { + id: tabs + currentIndex: tabsContent.currentIndex + background: Rectangle{ + color: Qt.rgba(.0235, .416, .788, .1) + radius: 10 } - background: Rectangle { - color: "#066ac9" - radius: 5.2 - } - } - - TabButton { - id: graphicDesign - text: qsTr("Graphic Design") horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 - } - background: Rectangle { - color: "#066ac9" - radius: 5.2 + verticalPadding: 10 + Layout.fillWidth: true + Layout.bottomMargin: 25.6 + + TabButton { + id: webDesign + text: qsTr("Web Design") + horizontalPadding: 16 + verticalPadding: 8 + anchors { + rightMargin: 8 + bottomMargin: 8 + } + background: Rectangle { + color: "#066ac9" + radius: 5.2 + } } - } - TabButton { - id: marketing - text: qsTr("Marketing") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 + TabButton { + id: development + text: qsTr("Development") + horizontalPadding: 16 + verticalPadding: 8 + anchors { + rightMargin: 8 + bottomMargin: 8 + } + background: Rectangle { + color: "#066ac9" + radius: 5.2 + } } - background: Rectangle { - color: "#066ac9" - radius: 5.2 + + TabButton { + id: graphicDesign + text: qsTr("Graphic Design") + horizontalPadding: 16 + verticalPadding: 8 + anchors { + rightMargin: 8 + bottomMargin: 8 + } + background: Rectangle { + color: "#066ac9" + radius: 5.2 + } } - } - TabButton { - id: finance - text: qsTr("Finance") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 + TabButton { + id: marketing + text: qsTr("Marketing") + horizontalPadding: 16 + verticalPadding: 8 + anchors { + rightMargin: 8 + bottomMargin: 8 + } + background: Rectangle { + color: "#066ac9" + radius: 5.2 + } } - background: Rectangle { - color: "#066ac9" - radius: 5.2 + + TabButton { + id: finance + text: qsTr("Finance") + horizontalPadding: 16 + verticalPadding: 8 + anchors { + rightMargin: 8 + bottomMargin: 8 + } + background: Rectangle { + color: "#066ac9" + radius: 5.2 + } } } - } - StackLayout { - id: tabsContent - currentIndex: tabs.currentIndex - Layout.preferredHeight: popular.height + StackLayout { + id: tabsContent + currentIndex: tabs.currentIndex + Layout.preferredHeight: popular.height - GridView { - id: popular - interactive: false - Layout.fillWidth: true - cellWidth: width < 576 ? width - : width < 768 ? width / 2 - : width < 992 ? width / 3 - : width / 4 - cellHeight: cellWidth * 1.3 - height: width < 576 - ? cellHeight * count - : width < 768 - ? cellHeight - * (count + count % 2) / 2 - : width < 992 - ? cellHeight - * (count + (count + 1) % 3) / 3 - : cellHeight - * (count + (count + 2) % 4) / 4 + GridView { + id: popular + interactive: false + Layout.fillWidth: true + cellWidth: width < 576 ? width + : width < 768 ? width / 2 + : width < 992 ? width / 3 + : width / 4 + cellHeight: cellWidth * 1.3 + height: width < 576 + ? cellHeight * count + : width < 768 + ? cellHeight + * (count + count % 2) / 2 + : width < 992 + ? cellHeight + * (count + (count + 1) % 3) / 3 + : cellHeight + * (count + (count + 2) % 4) / 4 + } } } } -- cgit v1.2.3 From 1bc4c08d0ff16af52bd395bc76c4af0d9e77569f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 26 Feb 2023 14:01:55 +0800 Subject: Repeater for most popular tab buttons --- HomeDefault.ui.qml | 87 ++++++++++-------------------------------------------- 1 file changed, 16 insertions(+), 71 deletions(-) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index d561291..c9dd859 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -249,78 +249,23 @@ Flickable { Layout.fillWidth: true Layout.bottomMargin: 25.6 - TabButton { - id: webDesign - text: qsTr("Web Design") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 - } - background: Rectangle { - color: "#066ac9" - radius: 5.2 - } - } - - TabButton { - id: development - text: qsTr("Development") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 - } - background: Rectangle { - color: "#066ac9" - radius: 5.2 - } - } - - TabButton { - id: graphicDesign - text: qsTr("Graphic Design") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 - } - background: Rectangle { - color: "#066ac9" - radius: 5.2 - } - } - - TabButton { - id: marketing - text: qsTr("Marketing") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 - } - background: Rectangle { - color: "#066ac9" - radius: 5.2 - } - } + Repeater { + model: ["Web Design", "Development", + "Graphic Design", + "Marketing", "Finance"] - TabButton { - id: finance - text: qsTr("Finance") - horizontalPadding: 16 - verticalPadding: 8 - anchors { - rightMargin: 8 - bottomMargin: 8 - } - background: Rectangle { - color: "#066ac9" - radius: 5.2 + TabButton { + text: modelData + horizontalPadding: 16 + verticalPadding: 8 + anchors { + rightMargin: 8 + bottomMargin: 8 + } + background: Rectangle { + color: "#066ac9" + radius: 5.2 + } } } } -- cgit v1.2.3 From 36879d0b289bcd4276d1ebc0e3ab6a0d38e0f59a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 26 Feb 2023 14:12:14 +0800 Subject: Minimum width for popular course tab buttons --- HomeDefault.ui.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HomeDefault.ui.qml b/HomeDefault.ui.qml index c9dd859..438cd8f 100644 --- a/HomeDefault.ui.qml +++ b/HomeDefault.ui.qml @@ -258,6 +258,8 @@ Flickable { text: modelData horizontalPadding: 16 verticalPadding: 8 + width: Math.max(124, + tabs.width / 5) anchors { rightMargin: 8 bottomMargin: 8 -- cgit v1.2.3