Skip to content

Commit

Permalink
feat: improve architecture
Browse files Browse the repository at this point in the history
  • Loading branch information
VachetVirginie committed Jul 1, 2023
1 parent 0b86866 commit 238d26a
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 27 deletions.
24 changes: 1 addition & 23 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,10 @@
import { createApp } from "vue";
import {
createRouter, createWebHistory
} from "vue-router";

import App from "./App.vue";
import Playlist from "./views/PlaylistView.vue";
import Video from "./views/VideoView.vue";
import ListOfPlaylists from "./views/ListOfPlaylist.vue";

import store from "./store";
import "./assets/index.css";
import { YoutubeVue3 } from "youtube-vue3";

const routes = [{
path: "/", component: ListOfPlaylists
},
{
path: "/playlist/:id", component: Playlist
},
{
path: "/video/:id", component: Video
},];

const router = createRouter({
history: createWebHistory(),
routes,
});

import router from "./router/router";

const app = createApp(App);
app.use(router);
Expand Down
23 changes: 23 additions & 0 deletions src/router/router.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import {
createRouter, createWebHistory
} from "vue-router";
import Playlist from "../views/PlaylistView.vue";
import Video from "../views/VideoView.vue";
import ListOfPlaylists from "../views/ListOfPlaylist.vue";

const routes = [{
path: "/", component: ListOfPlaylists,
},
{
path: "/playlist/:id", component: Playlist
},
{
path: "/video/:id", component: Video
},];

const router = createRouter({
history: createWebHistory(),
routes,
});

export default router;
2 changes: 1 addition & 1 deletion src/utils/usePlaylists.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export async function getPlaylists() {
}
}

export async function fetchPlaylist(videos, nextPageToken, isLoading, routeParams) {
export async function getPlaylistItems(videos, nextPageToken, isLoading, routeParams) {
try {
isLoading.value = true;

Expand Down
6 changes: 3 additions & 3 deletions src/views/PlaylistView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<script setup>
import VideoCard from "../components/VideoCard.vue";
import { useStore } from "vuex";
import { fetchPlaylist } from "@/utils/usePlaylists";
import { getPlaylistItems } from "@/utils/usePlaylists";
import {
ref, onMounted, computed
} from "vue";
Expand All @@ -36,12 +36,12 @@ const playlistName = computed(() => store.state.playlistName);
const loadMoreVideos = () => {
if (nextPageToken.value) {
fetchPlaylist(videos, nextPageToken, isLoading, router.params.id);
getPlaylistItems(videos, nextPageToken, isLoading, router.params.id);
}
};
onMounted(() => {
fetchPlaylist(videos, nextPageToken, isLoading, router.params.id);
getPlaylistItems(videos, nextPageToken, isLoading, router.params.id);
});
</script>
<style scoped>
Expand Down

0 comments on commit 238d26a

Please sign in to comment.