From 18934410d4c32a064af2160bfe8ca360f5a0a1a9 Mon Sep 17 00:00:00 2001
From: heikkkk <henrik.teksle.sandok@hotmail.no>
Date: Thu, 2 May 2024 11:04:58 +0200
Subject: [PATCH] refactor: remove 'Component' from folder name
---
.../{LeaderboardComponents => Leaderboard}/Leaderboard.vue | 0
.../__tests__/Leaderboard.spec.ts | 6 +++---
src/components/{NewsComponents => News}/NewsComponent.vue | 0
.../__tests__/NewsComponent.spec.ts | 2 +-
.../{SavingGoalComponents => SavingGoal}/SavingGoal.vue | 6 +++---
.../SavingGoalCreate.vue | 0
.../{SavingGoalComponents => SavingGoal}/SavingGoalList.vue | 0
.../SavingGoalRoadmap.vue | 0
src/views/Leaderboard/LeaderboardView.vue | 2 +-
src/views/News/NewsView.vue | 2 +-
src/views/SavingGoal/RoadmapView.vue | 2 +-
11 files changed, 10 insertions(+), 10 deletions(-)
rename src/components/{LeaderboardComponents => Leaderboard}/Leaderboard.vue (100%)
rename src/components/{LeaderboardComponents => Leaderboard}/__tests__/Leaderboard.spec.ts (91%)
rename src/components/{NewsComponents => News}/NewsComponent.vue (100%)
rename src/components/{NewsComponents => News}/__tests__/NewsComponent.spec.ts (89%)
rename src/components/{SavingGoalComponents => SavingGoal}/SavingGoal.vue (90%)
rename src/components/{SavingGoalComponents => SavingGoal}/SavingGoalCreate.vue (100%)
rename src/components/{SavingGoalComponents => SavingGoal}/SavingGoalList.vue (100%)
rename src/components/{SavingGoalComponents => SavingGoal}/SavingGoalRoadmap.vue (100%)
diff --git a/src/components/LeaderboardComponents/Leaderboard.vue b/src/components/Leaderboard/Leaderboard.vue
similarity index 100%
rename from src/components/LeaderboardComponents/Leaderboard.vue
rename to src/components/Leaderboard/Leaderboard.vue
diff --git a/src/components/LeaderboardComponents/__tests__/Leaderboard.spec.ts b/src/components/Leaderboard/__tests__/Leaderboard.spec.ts
similarity index 91%
rename from src/components/LeaderboardComponents/__tests__/Leaderboard.spec.ts
rename to src/components/Leaderboard/__tests__/Leaderboard.spec.ts
index cc604b7..93b3f9d 100644
--- a/src/components/LeaderboardComponents/__tests__/Leaderboard.spec.ts
+++ b/src/components/Leaderboard/__tests__/Leaderboard.spec.ts
@@ -2,9 +2,9 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
import { mount } from '@vue/test-utils';
import { createRouter, createMemoryHistory } from 'vue-router';
import { createPinia, setActivePinia } from 'pinia';
-import Leaderboard from '@/components/LeaderboardComponents/Leaderboard.vue';
-import { useUserInfoStore } from '@/stores/UserStore';
-import router from '@/router/index';
+import Leaderboard from '../Leaderboard.vue';
+import { useUserInfoStore } from '../../../stores/UserStore';
+import router from '../../../router';
describe('Leaderboard', () => {
diff --git a/src/components/NewsComponents/NewsComponent.vue b/src/components/News/NewsComponent.vue
similarity index 100%
rename from src/components/NewsComponents/NewsComponent.vue
rename to src/components/News/NewsComponent.vue
diff --git a/src/components/NewsComponents/__tests__/NewsComponent.spec.ts b/src/components/News/__tests__/NewsComponent.spec.ts
similarity index 89%
rename from src/components/NewsComponents/__tests__/NewsComponent.spec.ts
rename to src/components/News/__tests__/NewsComponent.spec.ts
index ac57f8a..14c4a98 100644
--- a/src/components/NewsComponents/__tests__/NewsComponent.spec.ts
+++ b/src/components/News/__tests__/NewsComponent.spec.ts
@@ -1,6 +1,6 @@
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
import { mount } from '@vue/test-utils';
-import MyComponent from '@/components/NewsComponents/NewsComponent.vue'; // Adjust the import path according to your setup
+import MyComponent from '../NewsComponent.vue'; // Adjust the import path according to your setup
global.fetch = vi.fn(() =>
Promise.resolve(
diff --git a/src/components/SavingGoalComponents/SavingGoal.vue b/src/components/SavingGoal/SavingGoal.vue
similarity index 90%
rename from src/components/SavingGoalComponents/SavingGoal.vue
rename to src/components/SavingGoal/SavingGoal.vue
index 40d65c8..3644980 100644
--- a/src/components/SavingGoalComponents/SavingGoal.vue
+++ b/src/components/SavingGoal/SavingGoal.vue
@@ -1,7 +1,7 @@
<script lang="ts">
-import SavingGoalList from "@/components/SavingGoalComponents/SavingGoalList.vue";
-import SavingGoalRoadmap from "@/components/SavingGoalComponents/SavingGoalRoadmap.vue";
-import SavingGoalCreate from "@/components/SavingGoalComponents/SavingGoalCreate.vue";
+import SavingGoalList from "@/components/SavingGoal/SavingGoalList.vue";
+import SavingGoalRoadmap from "@/components/SavingGoal/SavingGoalRoadmap.vue";
+import SavingGoalCreate from "@/components/SavingGoal/SavingGoalCreate.vue";
import type {GoalDTO} from "@/api";
import {GoalService} from "@/api";
diff --git a/src/components/SavingGoalComponents/SavingGoalCreate.vue b/src/components/SavingGoal/SavingGoalCreate.vue
similarity index 100%
rename from src/components/SavingGoalComponents/SavingGoalCreate.vue
rename to src/components/SavingGoal/SavingGoalCreate.vue
diff --git a/src/components/SavingGoalComponents/SavingGoalList.vue b/src/components/SavingGoal/SavingGoalList.vue
similarity index 100%
rename from src/components/SavingGoalComponents/SavingGoalList.vue
rename to src/components/SavingGoal/SavingGoalList.vue
diff --git a/src/components/SavingGoalComponents/SavingGoalRoadmap.vue b/src/components/SavingGoal/SavingGoalRoadmap.vue
similarity index 100%
rename from src/components/SavingGoalComponents/SavingGoalRoadmap.vue
rename to src/components/SavingGoal/SavingGoalRoadmap.vue
diff --git a/src/views/Leaderboard/LeaderboardView.vue b/src/views/Leaderboard/LeaderboardView.vue
index d22af95..241502e 100644
--- a/src/views/Leaderboard/LeaderboardView.vue
+++ b/src/views/Leaderboard/LeaderboardView.vue
@@ -45,7 +45,7 @@
<script setup lang="ts">
import { onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
-import Leaderboard from '@/components/LeaderboardComponents/Leaderboard.vue';
+import Leaderboard from '@/components/Leaderboard/Leaderboard.vue';
import { LeaderboardService } from '@/api';
let streakLeaderboardData = ref([] as any);
diff --git a/src/views/News/NewsView.vue b/src/views/News/NewsView.vue
index bdfb7c6..1a33560 100644
--- a/src/views/News/NewsView.vue
+++ b/src/views/News/NewsView.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import NewsComponent from "@/components/NewsComponents/NewsComponent.vue";
+import NewsComponent from "@/components/News/NewsComponent.vue";
</script>
diff --git a/src/views/SavingGoal/RoadmapView.vue b/src/views/SavingGoal/RoadmapView.vue
index cdf6553..67921dc 100644
--- a/src/views/SavingGoal/RoadmapView.vue
+++ b/src/views/SavingGoal/RoadmapView.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import SavingGoal from "@/components/SavingGoalComponents/SavingGoal.vue";
+import SavingGoal from "@/components/SavingGoal/SavingGoal.vue";
</script>
<template>
--
GitLab