From 93b5cb61612672570bed03ef7ec01ed1a29743e5 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 23 Apr 2025 11:44:39 +0530 Subject: [PATCH 01/22] feat: zen mode --- frontend/src/pages/Lesson.vue | 327 ++++++++++++++++++++-------------- frontend/src/utils/index.js | 2 +- 2 files changed, 190 insertions(+), 139 deletions(-) diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue index 01216a07..972572df 100644 --- a/frontend/src/pages/Lesson.vue +++ b/frontend/src/pages/Lesson.vue @@ -4,7 +4,16 @@ class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5" > - +
+ + + + +
@@ -33,146 +42,154 @@
- -
-
-
- {{ lesson.data.title }} -
-
- - - - - - - - - - - - -
-
- -
- - - - -
+
-
- {{ __('Instructor Notes') }} +
+
+ {{ lesson.data.title }} +
+
+ + + + + + + + + + + + +
+
+ +
+ + + +
-
-
- -
-
-
-
-
- -
-
- + v-if=" + lesson.data.instructor_content && + JSON.parse(lesson.data.instructor_content)?.blocks?.length > 1 && + allowInstructorContent() + " + class="bg-surface-gray-2 p-3 rounded-md mt-6" + > +
+ {{ __('Instructor Notes') }} +
+
+
+
+ +
+
+
+
+
+ +
+
+ +
@@ -202,7 +219,13 @@
+ diff --git a/frontend/src/pages/JobDetail.vue b/frontend/src/pages/JobDetail.vue index 6c8fb519..e3247113 100644 --- a/frontend/src/pages/JobDetail.vue +++ b/frontend/src/pages/JobDetail.vue @@ -20,7 +20,7 @@ @@ -62,7 +62,7 @@
@@ -75,7 +75,7 @@ class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-5 md:gap-y-5" >
- +
{{ __('Organisation') }} @@ -86,9 +86,9 @@
- +
- + {{ __('Location') }} @@ -97,9 +97,9 @@
- +
- + {{ __('Category') }} @@ -108,9 +108,9 @@
- +
- + {{ __('Posted on') }} @@ -122,9 +122,9 @@ v-if="applicationCount.data" class="flex items-center space-x-4" > - +
- + {{ __('Applications Received') }} diff --git a/frontend/src/pages/JobCreation.vue b/frontend/src/pages/JobForm.vue similarity index 91% rename from frontend/src/pages/JobCreation.vue rename to frontend/src/pages/JobForm.vue index ba35148f..e4f5468f 100644 --- a/frontend/src/pages/JobCreation.vue +++ b/frontend/src/pages/JobForm.vue @@ -13,7 +13,7 @@
{{ __('Job Details') }}
-
+
-
- - -
-
+
{{ __('Company Details') }}
-
+
+
+ + +
@@ -317,7 +317,7 @@ const breadcrumbs = computed(() => { }, { label: props.jobName == 'new' ? 'New Job' : 'Edit Job', - route: { name: 'JobCreation' }, + route: { name: 'JobForm' }, }, ] return crumbs diff --git a/frontend/src/pages/Jobs.vue b/frontend/src/pages/Jobs.vue index 044a7191..b1d0d13d 100644 --- a/frontend/src/pages/Jobs.vue +++ b/frontend/src/pages/Jobs.vue @@ -10,7 +10,7 @@ -
- {{ __('Find the perfect job for you') }} +
+ {{ __('{0} Open Jobs').format(jobCount) }}
-
+
Date: Thu, 24 Apr 2025 18:22:00 +0530 Subject: [PATCH 06/22] feat: country filter in job list --- frontend/src/components/BatchCard.vue | 2 +- frontend/src/components/JobCard.vue | 16 +-- frontend/src/pages/JobDetail.vue | 17 +++- frontend/src/pages/Jobs.vue | 99 +++++++++++-------- .../job_opportunity/job_opportunity.json | 14 ++- lms/lms/api.py | 1 + lms/patches.txt | 3 +- .../v2_0/update_job_city_and_country.py | 28 ++++++ 8 files changed, 122 insertions(+), 58 deletions(-) create mode 100644 lms/patches/v2_0/update_job_city_and_country.py diff --git a/frontend/src/components/BatchCard.vue b/frontend/src/components/BatchCard.vue index fe9d7b01..46b3095b 100644 --- a/frontend/src/components/BatchCard.vue +++ b/frontend/src/components/BatchCard.vue @@ -1,6 +1,6 @@