From a85662ed45077fa7f69f553dcde75cb41061ec99 Mon Sep 17 00:00:00 2001 From: sajjad Date: Mon, 28 Mar 2022 17:05:15 +0430 Subject: [PATCH 1/8] fix --- src/components/Global/Section/Info.vue | 37 ++++++++++++++++++++++++++ src/utils/GlobalComponents.js | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 src/components/Global/Section/Info.vue diff --git a/src/components/Global/Section/Info.vue b/src/components/Global/Section/Info.vue new file mode 100644 index 0000000..6b9589e --- /dev/null +++ b/src/components/Global/Section/Info.vue @@ -0,0 +1,37 @@ + + diff --git a/src/utils/GlobalComponents.js b/src/utils/GlobalComponents.js index 6dd4afc..58c5f6a 100644 --- a/src/utils/GlobalComponents.js +++ b/src/utils/GlobalComponents.js @@ -17,6 +17,7 @@ import SideBar from '../components/Global/Section/SideBar'; import Loading from "../components/Global/Misc/Loading"; import NoItems from "../components/Global/Misc/NoItems"; import DataIterator from "../components/Global/Input/DataIterator.vue"; +import Info from "@/components/Global/Section/Info"; import 'bootstrap'; import 'bootstrap/dist/css/bootstrap.min.css'; import 'bootstrap/dist/js/bootstrap.min.js'; @@ -34,6 +35,7 @@ Vue.component('basic-modal', BasicModal); Vue.component('pagination', Pagination); Vue.component('Chip', Chip); Vue.component('SideBar', SideBar); +Vue.component('Info', Info); Vue.component('data-iterator', DataIterator); Vue.component('loading', Loading); Vue.component('no-items', NoItems); From f711ea1d15744f513fb4d9864e827d929c7363cb Mon Sep 17 00:00:00 2001 From: sajjad Date: Mon, 28 Mar 2022 17:07:33 +0430 Subject: [PATCH 2/8] fix --- src/components/Workouts/Items.vue | 3 ++ src/components/Workouts/Modals/Detail.vue | 53 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 src/components/Workouts/Modals/Detail.vue diff --git a/src/components/Workouts/Items.vue b/src/components/Workouts/Items.vue index bbb7a1b..77924fa 100644 --- a/src/components/Workouts/Items.vue +++ b/src/components/Workouts/Items.vue @@ -52,6 +52,7 @@
+
@@ -59,12 +60,14 @@ import WorkoutItem from "./Item"; import SectionTitle from "../Global/Section/SectionTitle.vue"; import FiltersModal from "./Modals/FiltersModal.vue"; +import DetailModal from "./Modals/Detail.vue"; import { mapGetters, mapActions, mapMutations } from "vuex"; export default { components: { WorkoutItem, SectionTitle, FiltersModal, + DetailModal, }, computed: { ...mapGetters("workouts", [ diff --git a/src/components/Workouts/Modals/Detail.vue b/src/components/Workouts/Modals/Detail.vue new file mode 100644 index 0000000..a622e1f --- /dev/null +++ b/src/components/Workouts/Modals/Detail.vue @@ -0,0 +1,53 @@ + + + From df7701e6b14d788bf64b52da1b5efbbfef965b2c Mon Sep 17 00:00:00 2001 From: sajjad Date: Mon, 28 Mar 2022 17:08:12 +0430 Subject: [PATCH 3/8] fix --- src/components/Workouts/Item.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Workouts/Item.vue b/src/components/Workouts/Item.vue index ed28007..071b06f 100644 --- a/src/components/Workouts/Item.vue +++ b/src/components/Workouts/Item.vue @@ -1,5 +1,5 @@ @@ -20,7 +39,7 @@ export default { type: String, }, subTitle: { - type: String, + type: [String, Number], }, link: { type: String, @@ -30,8 +49,26 @@ export default { }, tag: { type: String, - default: "template", + default: "div", }, }, }; + diff --git a/src/components/ProgramSeries/Items.vue b/src/components/ProgramSeries/Items.vue index 36e208c..94deda6 100644 --- a/src/components/ProgramSeries/Items.vue +++ b/src/components/ProgramSeries/Items.vue @@ -19,7 +19,7 @@ height="54" :text-mode="true" size="xx-large" - @click.native="$_openModal('add_series')" + @click="$_openModal('add_series')" /> diff --git a/src/components/ProgramSeries/Modals/AddSeriesModal.vue b/src/components/ProgramSeries/Modals/AddSeriesModal.vue index 11fa42b..79aa793 100644 --- a/src/components/ProgramSeries/Modals/AddSeriesModal.vue +++ b/src/components/ProgramSeries/Modals/AddSeriesModal.vue @@ -71,7 +71,7 @@ size="large" :is-modal="true" height="29" - @click.native="$_closeModal()" + @click="$_closeModal()" />