Merge branch 'LB-47' into 'BULL-529'

LB -47: Uneven vertical margins for MY CURRICULUM SCHEDULE

See merge request platform-one/products/bullhorn/launchboard-fe!67

package-lock.json

@@ -176,6 +176,12 @@
           "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -558,7 +564,18 @@
         "lodash": {
           "version": "4.17.21",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         }
       }
@@ -1575,8 +1592,7 @@
         "lodash": {
           "version": "4.17.21",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-          "dev": true
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         },
         "source-map": {
           "version": "0.5.7",
@@ -13041,6 +13057,12 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
     "lodash.defaultsdeep": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",

src/components/CurriculumSchedule.vue

 <template>
-  <div class="curriculum-schedule">
+  <v-container class="curriculum-schedule text-left px-2">
     <v-skeleton-loader :loading="loading" type="paragraph@5" class="w-100">
       <v-card v-if="emptyString">
         <v-card-title>You currently don't have any classes! </v-card-title>
         <v-card-text>Your scheduled classes will appear here.</v-card-text>
       </v-card>
-      <v-container class="px-6">
+      <v-container class="px-6" v-else>
         <div
           v-for="(item, index) in schedule"
           :key="index"
@@ -31,7 +31,7 @@
         </div>
       </v-container>
     </v-skeleton-loader>
-  </div>
+  </v-container>
 </template>
 
 <script>
@@ -45,9 +45,8 @@ export default {
   async mounted() {
     try {
       this.loading = true;
-      this.schedule = await ScheduleService.getScheduleForUser();
-      console.log("schedule");
-      console.log(this.schedule);
+      const response = await ScheduleService.getScheduleForUser();
+      this.schedule = response.registrations;
       if (this.schedule.length === 0) {
         this.emptyString = true;
       }

tests/unit/components/CurriculumSchedule.spec.js

@@ -8,7 +8,7 @@ describe("CurriculumSchedule", () => {
     const mockSchedule = [{ name: "course1" }, { name: "course2" }];
     ScheduleService.getScheduleForUser = jest
       .fn()
-      .mockResolvedValue(mockSchedule);
+      .mockResolvedValue({ registrations: mockSchedule });
 
     const wrapper = shallowMount(CurriculumSchedule);
     expect(wrapper.vm.loading).toEqual(true);
@@ -30,7 +30,9 @@ describe("CurriculumSchedule", () => {
   });
 
   it("should set emptyString to true", async () => {
-    ScheduleService.getScheduleForUser = jest.fn().mockResolvedValue([]);
+    ScheduleService.getScheduleForUser = jest
+      .fn()
+      .mockResolvedValue({ registrations: [] });
 
     const wrapper = shallowMount(CurriculumSchedule);
     expect(wrapper.vm.loading).toEqual(true);