Merge pull request #7 from xebia-france/talk2-schedule2-2-removal

♻️ refactor(schedule, talk): remove `2` suffix (`Schedule2`, `Talk2`) leftover occurence from a previous refactoring

src/App.vue

@@ -20,7 +20,7 @@
   import Error from '@/components/Error.vue';
   import Loading from '@/components/Loading.vue';
   import Legend from '@/components/Legend.vue';
-  import { ScheduleEvent } from '@/schedule/schedule2';
+  import { ScheduleEvent } from '@/schedule/schedule';
 
   export default Vue.extend({
     components: { Loading, Error, Header, Footer, Legend },

src/components/Talk2.vue → src/components/Talk.vue

@@ -18,7 +18,7 @@ import moment from 'moment';
 import Vue from 'vue';
 
 export default Vue.extend({
-  name: 'Talk2',
+  name: 'Talk',
   props: ['talk'],
   computed: {
     start: function () {

src/router/index.ts

@@ -1,13 +1,13 @@
 import Vue from 'vue';
 import VueRouter, { RouteConfig } from 'vue-router';
-import Schedule2 from '@/views/Schedule2.vue';
+import Schedule from '@/views/Schedule.vue';
 
 Vue.use(VueRouter);
 
 const routes: Array<RouteConfig> = [
   {
     path: '/',
-    component: Schedule2
+    component: Schedule
   },
   {
     path: '/:id',

src/schedule/schedule2.test.ts → src/schedule/schedule.test.ts

@@ -1,6 +1,6 @@
-import { computeSchedule } from '@/schedule/schedule2';
+import { computeSchedule } from '@/schedule/schedule';
 
-describe('Schedule2', () => {
+describe('Schedule', () => {
   it('should calculate height and top based on duration and fromTime', () => {
     // GIVEN
     const schedule = [

src/views/Schedule2.test.ts → src/views/Schedule.test.ts

@@ -1,9 +1,9 @@
 import {createLocalVue, shallowMount} from "@vue/test-utils";
-import Schedule2 from "@/views/Schedule2.vue";
-import {ScheduleEvent} from "@/schedule/schedule2";
+import Schedule from "@/views/Schedule.vue";
+import {ScheduleEvent} from "@/schedule/schedule";
 import MockDate from 'mockdate';
 
-describe("Schedule2", () => {
+describe("Schedule", () => {
 
   let component: any;
 
@@ -35,7 +35,7 @@ describe("Schedule2", () => {
       }
     ];
     const localVue = createLocalVue();
-    const wrapper = shallowMount(Schedule2, {
+    const wrapper = shallowMount(Schedule, {
       localVue,
       propsData: {schedule}
     });

src/views/Schedule2.vue → src/views/Schedule.vue

@@ -7,7 +7,7 @@
     >
       <div class="now-bar" :style="{top: nowBarOffset + 'px'}"></div>
       <template v-for="(column, index) in combinedSchedule">
-        <Talk2
+        <Talk
           class="talk"
           :class="item.kind"
           v-for="item in column"
@@ -23,12 +23,12 @@
 <script lang="ts">
 import Vue from 'vue';
 import moment from 'moment';
-import { computeSchedule, UiScheduleEvent } from '@/schedule/schedule2';
-import Talk2 from '@/components/Talk2.vue';
+import { computeSchedule, UiScheduleEvent } from '@/schedule/schedule';
+import Talk from '@/components/Talk.vue';
 
 export default Vue.extend({
-  name: 'Schedule2',
-  components: { Talk2 },
+  name: 'Schedule',
+  components: { Talk },
   props: ['schedule'],
   data() {
     return {