diff --git a/public/index.html b/public/index.html index 4123528..1c6505c 100644 --- a/public/index.html +++ b/public/index.html @@ -1,17 +1,24 @@ - - - - - - <%= htmlWebpackPlugin.options.title %> - - - -
- - - + + + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + + +
+ + + + \ No newline at end of file diff --git a/src/abstraction/repository/FileRepository.js b/src/abstraction/repository/FileRepository.js index 1d8ebe5..d9d4ee2 100644 --- a/src/abstraction/repository/FileRepository.js +++ b/src/abstraction/repository/FileRepository.js @@ -1,6 +1,6 @@ import axios from "axios"; import url from "@/router/url"; -import { getJson, setData } from "../resources/FileResource"; +import { getJson, setData } from "../resources/fileResource"; export default class FileRepository { diff --git a/src/abstraction/repository/bookmarkRepository.js b/src/abstraction/repository/bookmarkRepository.js new file mode 100644 index 0000000..01cfde4 --- /dev/null +++ b/src/abstraction/repository/bookmarkRepository.js @@ -0,0 +1,24 @@ +import axios from "axios"; +import url from '@/router/url'; +import { getArray, setQuery } from "../resources/bookmarkResource"; + +export default class BookmarkRepository { + async indexCourses(data) { + let params = setQuery(data) + let response = await axios.get(url('indexBookmarkCourse'), { params }); + if (response.status === 200) { + return getArray(response.data); + } + } + async indexWorkouts(data) { + let params = setQuery(data) + let response = await axios.get(url('indexBookmarkWorkout'), { params }); + if (response.status === 200) { + return getArray(response.data); + } + } + async deleteBookmark(bookmarkId) { + console.log(bookmarkId); + await axios.delete(url("destroyBookmark", { bookmark: bookmarkId })); + } +} \ No newline at end of file diff --git a/src/abstraction/repository/bookmarksRepository.js b/src/abstraction/repository/bookmarksRepository.js deleted file mode 100644 index 4db8b6d..0000000 --- a/src/abstraction/repository/bookmarksRepository.js +++ /dev/null @@ -1,26 +0,0 @@ -import axios from "axios"; -import url from '@/router/url'; -import { getArray, setQuery } from "../resources/bookmarksResource"; - -export default class BookmarsRepository { - async indexCourses(data) { - let params = setQuery(data) - let response = await axios.get(url('indexCoursesBookmarks'), { params }); - if (response.status === 200) { - return getArray(response.data); - } - } - async indexWorkouts(data) { - let params = setQuery(data) - let response = await axios.get(url('indexWorkoutsBookmarks'), { params }); - if (response.status === 200) { - return getArray(response.data); - } - } - async deleteWorkout(workoutId) { - await axios.delete(url("destroyWorkoutBookmarks", { workout: workoutId })); - } - async deleteProgram(courseId) { - await axios.delete(url("destroyProgramBookmarks", { course: courseId })); - } -} \ No newline at end of file diff --git a/src/abstraction/repository/countriesRepository.js b/src/abstraction/repository/countryRepository.js similarity index 70% rename from src/abstraction/repository/countriesRepository.js rename to src/abstraction/repository/countryRepository.js index 0da1e03..e86cccf 100644 --- a/src/abstraction/repository/countriesRepository.js +++ b/src/abstraction/repository/countryRepository.js @@ -1,8 +1,8 @@ import axios from "axios"; import url from '@/router/url'; -import { getArray } from "../resources/countriesResource"; +import { getArray } from "../resources/countryResource"; -export default class CountriesRepository { +export default class CountryRepository { async index() { let response = await axios.get(url("indexCountries")); if (response.status === 200) { diff --git a/src/abstraction/repository/productCategoriesRepository.js b/src/abstraction/repository/productCategoryRepository.js similarity index 68% rename from src/abstraction/repository/productCategoriesRepository.js rename to src/abstraction/repository/productCategoryRepository.js index 1b0650f..f78efdf 100644 --- a/src/abstraction/repository/productCategoriesRepository.js +++ b/src/abstraction/repository/productCategoryRepository.js @@ -1,7 +1,7 @@ import axios from "axios"; import url from "@/router/url"; -import { getArray } from "../resources/productCategoriesResource"; -export default class ProductCategoriesRepository { +import { getArray } from "../resources/productCategoryResource"; +export default class ProductCategoryRepository { async index() { let response = await axios.get(url("indexProductCategories")); if (response.status === 200) { diff --git a/src/abstraction/repository/programSerieRepository.js b/src/abstraction/repository/programSeriesRepository.js similarity index 78% rename from src/abstraction/repository/programSerieRepository.js rename to src/abstraction/repository/programSeriesRepository.js index 463a815..ab08a88 100644 --- a/src/abstraction/repository/programSerieRepository.js +++ b/src/abstraction/repository/programSeriesRepository.js @@ -1,7 +1,7 @@ import axios from "axios"; import url from "@/router/url"; -import { getArray, getJson, setData } from "../resources/programSerieResource"; -export default class ProgramSerieRepository { +import { getArray, getJson, setData } from "../resources/programSeriesResource"; +export default class ProgramSeriesRepository { async index(courseId) { let response = await axios.get(url("indexSeries", { course: courseId })); if (response.status === 200) { @@ -16,12 +16,12 @@ export default class ProgramSerieRepository { // } async store(data, courseId) { let json = setData(data); - let response = await axios.post(url("storeSerie", { course: courseId }), json); + let response = await axios.post(url("storeSeries", { course: courseId }), json); if (response.status === 201 || response.status === 200) { return getJson(response.data.data); } } async delete(data) { - await axios.delete(url("destroySerie", { serie: data })); + await axios.delete(url("destroySeries", { series: data })); } } \ No newline at end of file diff --git a/src/abstraction/repository/sportCategoriesRepository.js b/src/abstraction/repository/sportCategoryRepository.js similarity index 79% rename from src/abstraction/repository/sportCategoriesRepository.js rename to src/abstraction/repository/sportCategoryRepository.js index fd0fada..2c45a1b 100644 --- a/src/abstraction/repository/sportCategoriesRepository.js +++ b/src/abstraction/repository/sportCategoryRepository.js @@ -1,7 +1,7 @@ import axios from "axios"; import url from "@/router/url"; -import { getArray, getJson } from "../resources/sportCategoriesResource"; -export default class SportCategoriesRepository { +import { getArray, getJson } from "../resources/sportCategoryResource"; +export default class SportCategoryRepository { async index() { let response = await axios.get(url("indexSportCategories")); if (response.status === 200) { diff --git a/src/abstraction/repository/statisticRepository.js b/src/abstraction/repository/statisticRepository.js index a6d00a9..c416e1b 100644 --- a/src/abstraction/repository/statisticRepository.js +++ b/src/abstraction/repository/statisticRepository.js @@ -2,20 +2,20 @@ import axios from "axios"; import url from "@/router/url" import { getJson } from "../resources/statisticResource"; export default class StatisticRepository { - async indexStatisticAdmin() { - let response = await axios.get(url("indexStatisticAdmin")); + async indexAdmin() { + let response = await axios.get(url("indexAdmin")); if (response.status === 200) { return getJson(response.data.data) } } - async indexStatisticTrainer() { - let response = await axios.get(url("indexStatisticTrainer")); + async indexTrainer() { + let response = await axios.get(url("indexTrainer")); if (response.status === 200) { return getJson(response.data.data) } } - async indexStatisticTrainee() { - let response = await axios.get(url("indexStatisticTrainee")); + async indexTrainee() { + let response = await axios.get(url("indexTrainee")); if (response.status === 200) { return getJson(response.data.data) } diff --git a/src/abstraction/repository/userProgramsRepository.js b/src/abstraction/repository/userProgramRepository.js similarity index 71% rename from src/abstraction/repository/userProgramsRepository.js rename to src/abstraction/repository/userProgramRepository.js index 9811070..2b2561a 100644 --- a/src/abstraction/repository/userProgramsRepository.js +++ b/src/abstraction/repository/userProgramRepository.js @@ -1,7 +1,7 @@ import axios from "axios"; import url from "@/router/url" -import { getArray, setQuery } from "../resources/userProgramsResource"; -export default class UserProgramsRepository { +import { getArray, setQuery } from "../resources/userProgramResource"; +export default class UserProgramRepository { async index(data) { let params = setQuery(data); let response = await axios.get(url('indexUserProgram'), { params }); diff --git a/src/abstraction/repository/usersRepository.js b/src/abstraction/repository/userRepository.js similarity index 80% rename from src/abstraction/repository/usersRepository.js rename to src/abstraction/repository/userRepository.js index f3509d4..81db873 100644 --- a/src/abstraction/repository/usersRepository.js +++ b/src/abstraction/repository/userRepository.js @@ -1,8 +1,8 @@ import axios from "axios"; import url from "@/router/url"; -import { getArray, setQuery } from "../resources/usersResource"; +import { getArray, setQuery } from "../resources/userResource"; -export default class UsersRepository { +export default class UserRepository { async indexUsers(data) { let params = setQuery(data) let response = await axios.get(url('indexUsers'), { params }) @@ -10,7 +10,7 @@ export default class UsersRepository { return getArray(response.data) } } - async loadTrainerTrainee(data) { + async indexMyTrainees(data) { let params = setQuery(data) let response = await axios.get(url('indexTrainerTrainee'), { params }) if (response.status === 200) { diff --git a/src/abstraction/repository/workoutCategoriesRepository.js b/src/abstraction/repository/workoutCategoryRepository.js similarity index 70% rename from src/abstraction/repository/workoutCategoriesRepository.js rename to src/abstraction/repository/workoutCategoryRepository.js index ed3e643..bdccb9e 100644 --- a/src/abstraction/repository/workoutCategoriesRepository.js +++ b/src/abstraction/repository/workoutCategoryRepository.js @@ -1,7 +1,7 @@ import axios from "axios"; import url from "@/router/url"; -import { getArray, setQuery } from "../resources/workoutCategoriesResources"; -export default class WorkoutCategoriesRepository { +import { getArray, setQuery } from "../resources/workoutCategoryResources"; +export default class WorkoutCategoryRepository { async index(data) { let params = setQuery(data); let response = await axios.get(url("indexWorkoutCategories"), { params }); diff --git a/src/abstraction/repository/workoutToSerieRepository.js b/src/abstraction/repository/workoutToSeriesRepository.js similarity index 64% rename from src/abstraction/repository/workoutToSerieRepository.js rename to src/abstraction/repository/workoutToSeriesRepository.js index f74f236..b1f451c 100644 --- a/src/abstraction/repository/workoutToSerieRepository.js +++ b/src/abstraction/repository/workoutToSeriesRepository.js @@ -1,14 +1,14 @@ import axios from "axios"; import url from "@/router/url"; import { getJson, getArray, setQuery, setData } from "../resources/workoutResource.js"; -export default class WorkoutToSerieRepository { +export default class WorkoutToSeriesRepository { async index(data) { - let response = await axios.get(url("indexSerieWorkouts", { serie: data.serieId, course: data.courseId })); + let response = await axios.get(url("indexSeriesWorkouts", { series: data.seriesId, course: data.courseId })); if (response.status === 200) { return getArray(response.data); } } - async indexWorkoutToSerie(data) { + async indexWorkoutToSeries(data) { let params = setQuery(data); let response = await axios.get(url("indexClientWorkout"), { params }); if (response.status === 200) { @@ -21,14 +21,14 @@ export default class WorkoutToSerieRepository { return getJson(response.data.data); } } - async store(data, serieId, workoutId) { + async store(data, seriesId, workoutId) { let json = setData(data); - let response = await axios.post(url("joinWorkoutToSerie", { serie: serieId, workout: workoutId }), json); + let response = await axios.post(url("joinWorkoutToSeries", { series: seriesId, workout: workoutId }), json); if (response.status === 201 || response.status === 200) { return response.data; } } async delete(data) { - await axios.delete(url("destroyWorkoutFromSerie", { serie: data.serieId, workout: data.workoutId })); + await axios.delete(url("destroyWorkoutFromSeries", { series: data.seriesId, workout: data.workoutId })); } } \ No newline at end of file diff --git a/src/abstraction/resources/authResource.js b/src/abstraction/resources/authResource.js index 491dfa3..fa66bc6 100644 --- a/src/abstraction/resources/authResource.js +++ b/src/abstraction/resources/authResource.js @@ -1,4 +1,4 @@ -import { getJson as getJsonUser } from './usersResource' +import { getJson as getJsonUser } from './userResource' export const getJson = (data) => ({ token: data.token, user: data.user ? getJsonUser(data.user) : {} diff --git a/src/abstraction/resources/bookmarksResource.js b/src/abstraction/resources/bookmarkResource.js similarity index 100% rename from src/abstraction/resources/bookmarksResource.js rename to src/abstraction/resources/bookmarkResource.js diff --git a/src/abstraction/resources/countriesResource.js b/src/abstraction/resources/countryResource.js similarity index 100% rename from src/abstraction/resources/countriesResource.js rename to src/abstraction/resources/countryResource.js diff --git a/src/abstraction/resources/productCategoriesResource.js b/src/abstraction/resources/productCategoryResource.js similarity index 100% rename from src/abstraction/resources/productCategoriesResource.js rename to src/abstraction/resources/productCategoryResource.js diff --git a/src/abstraction/resources/programSerieWorkoutsResource.js b/src/abstraction/resources/programSerieWorkoutsResource.js deleted file mode 100644 index b70382a..0000000 --- a/src/abstraction/resources/programSerieWorkoutsResource.js +++ /dev/null @@ -1,27 +0,0 @@ -export const getJson = (data) => ({ - "id": data.id, - "name": data.name, - "local_name": data.local_name, - "description": data.description, - "thumbnail": data.thumbnail, - "title": data.title, - "workout_category": { - "id": data.workout_category.id, - "name": data.workout_category.name, - "local_name": data.workout_category.local_name, - "language_id": data.workout_category.language_id - }, - "video": data.video, - "set": data.set, - "per_set": data.per_set, - "trainer_description": data.trainer_description, - "estimate_time": data.estimate_time, - "suggested_time": data.suggested_time, - "suggested_per_set": data.suggested_per_set, - "suggested_set": data.suggested_set -}); - -export const getArray = ({ data }) => { - data = data.map(serie => getJson(serie)); - return { data } -} \ No newline at end of file diff --git a/src/abstraction/resources/programSerieResource.js b/src/abstraction/resources/programSeriesResource.js similarity index 95% rename from src/abstraction/resources/programSerieResource.js rename to src/abstraction/resources/programSeriesResource.js index 10f682f..29431e4 100644 --- a/src/abstraction/resources/programSerieResource.js +++ b/src/abstraction/resources/programSeriesResource.js @@ -19,7 +19,7 @@ export const getJson = (data) => ({ name: data.name }); export const getArray = ({ data }) => { - data = data.map(serie => getJson(serie)); + data = data.map(series => getJson(series)); return { data } } export const setData = (data) => { diff --git a/src/abstraction/resources/sportCategoriesResource.js b/src/abstraction/resources/sportCategoryResource.js similarity index 100% rename from src/abstraction/resources/sportCategoriesResource.js rename to src/abstraction/resources/sportCategoryResource.js diff --git a/src/abstraction/resources/userProgramsResource.js b/src/abstraction/resources/userProgramResource.js similarity index 100% rename from src/abstraction/resources/userProgramsResource.js rename to src/abstraction/resources/userProgramResource.js diff --git a/src/abstraction/resources/usersResource.js b/src/abstraction/resources/userResource.js similarity index 100% rename from src/abstraction/resources/usersResource.js rename to src/abstraction/resources/userResource.js diff --git a/src/abstraction/resources/workoutCategoriesResources.js b/src/abstraction/resources/workoutCategoryResources.js similarity index 100% rename from src/abstraction/resources/workoutCategoriesResources.js rename to src/abstraction/resources/workoutCategoryResources.js diff --git a/src/components/AddProduct/Main.vue b/src/components/AddProduct/Main.vue index cf0d615..9a8c7a6 100644 --- a/src/components/AddProduct/Main.vue +++ b/src/components/AddProduct/Main.vue @@ -218,7 +218,7 @@ diff --git a/src/components/Bookmarks/Workouts/Workouts.vue b/src/components/Bookmarks/Workouts/Workouts.vue index ec3de55..7dca230 100644 --- a/src/components/Bookmarks/Workouts/Workouts.vue +++ b/src/components/Bookmarks/Workouts/Workouts.vue @@ -39,7 +39,7 @@ height="26" icon="WMi-trash" class="custom-btn custom-icon ml-1" - @click.native="deleteBookmarksWorkout(workout.id)" + @click.native="deleteBookmarkWorkout(workout.id)" /> @@ -50,12 +50,16 @@