diff --git a/components/ProgressCard.vue b/components/ProgressCard.vue index 20238a0..00ed97c 100644 --- a/components/ProgressCard.vue +++ b/components/ProgressCard.vue @@ -44,7 +44,7 @@ \ No newline at end of file diff --git a/components/product-page/attended-courses/Headlines.vue b/components/product-page/attended-courses/Headlines.vue index cddfb3f..13443e9 100644 --- a/components/product-page/attended-courses/Headlines.vue +++ b/components/product-page/attended-courses/Headlines.vue @@ -143,4 +143,9 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/components/product-page/attended-courses/Video.vue b/components/product-page/attended-courses/Video.vue index 428f8b9..6161786 100644 --- a/components/product-page/attended-courses/Video.vue +++ b/components/product-page/attended-courses/Video.vue @@ -19,7 +19,9 @@
-

-
+

تعداد ویدیو ها

-

{{props.props.countOfVideos}}

+

+ {{ props.props[0].countOfVideos }} +

-
+

-

{{props.props.totalFileSize}}

+

+ {{ props.props[0].totalFileSize }} +

-
+

سطح دوره

-

{{props.props.level}}

+

{{ props.props[0].level }}

-
+

-

{{props.props.language}}

+

{{ props.props[0].language }}

-
+

سطح رضایت

-

{{props.props.satisfactionLevel}}

+

+ {{ props.props[0].satisfactionLevel }} +

-

- {{numberFormat(props.props.price)}} + {{ numberFormat(props.props[0].price) }}

تومان

-

- رایگان + رایگان

-
+
\ No newline at end of file diff --git a/layouts/default.vue b/layouts/default.vue index d0cf881..9425e8c 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -397,19 +397,8 @@ const { data, refresh, pending } = await useFetch(() => "/api/course", { watch(search, () => { query.value = { name: search.value }; refresh(); - console.log("data", data.value.courses.length); - //// console.log(search.value.length); -}); -// watch(showSearchBox.value === false, () =>{ -// // showSearchBox.value = null -// console.log('s'); -// }) -// function logClick(isInside) { -// if (isInside) { -// console.log("لاگ صحیح: داخل input کلیک شد."); -// } else { -// showSearchBox.value = false; -// } -// } + +}); + \ No newline at end of file diff --git a/layouts/profile.vue b/layouts/profile.vue index 31bc240..b137880 100644 --- a/layouts/profile.vue +++ b/layouts/profile.vue @@ -1,10 +1,30 @@ @@ -527,7 +535,8 @@ const lastTickets = tickets.data.value.slice(-2); const myCourses = await useFetch("/api/auth/me"); const lastCourses = myCourses.data.value.course.slice(-2); const balance = await useFetch("/api/user/balance"); -console.log(balance.data); +const { authUser } = useAuth(); + definePageMeta({ middleware: "auth", }); diff --git a/pages/account/my-courses.vue b/pages/account/my-courses.vue index ae8f6e1..36017fe 100644 --- a/pages/account/my-courses.vue +++ b/pages/account/my-courses.vue @@ -27,7 +27,7 @@ import ProgressCard from './../../../components/ProgressCard.vue' import {Tabs, Tab} from 'vue3-tabs-component'; const myCourses = await useFetch('/api/auth/me') -console.log(myCourses.data.value.course); + const tab1 = `

diff --git a/pages/account/profile.vue b/pages/account/profile.vue index bd3721e..2e45159 100644 --- a/pages/account/profile.vue +++ b/pages/account/profile.vue @@ -171,26 +171,26 @@ const edit = async (formData) => { } }; async function changePhoto(val) { - console.log("image", val.target.files[0]); + const formData = new FormData(); formData.append('file', val.target.files[0]); formData.append('directoryName', name.value); - console.log('keys', formData.values()); + try { - await $fetch("/api/uploader", { + const dataa = await $fetch("/api/uploader", { method: "POST", - body: formData, + body: formData }); + console.log('dataa',dataa); } catch (error) { - console.log('error client', error); + console.log('error client', error.data.data.message); } // console.log('ss', formData); - // const data = await useFetch("/api/uploader", { - // method: "POST", - // body: formData - // }); - // console.log("done", data.data); +// const data = await useFetch("api/uploader", { +// method: 'POST', +// body: formData +// }); } diff --git a/pages/account/wallet.vue b/pages/account/wallet.vue index dd59ee0..9b2e006 100644 --- a/pages/account/wallet.vue +++ b/pages/account/wallet.vue @@ -10,11 +10,14 @@

    -
  • تراکنشی وجود ندارد !!!

    + --> +
  • +

    {{ item.reason }}

    @@ -184,14 +187,14 @@ import { Tabs, Tab } from "vue3-tabs-component"; const { data, refresh } = await useFetch("/api/user/balance"); const payments = await useFetch("/api/user/payments"); - +const payNum = Math.random() const price = ref(null); const charge = async () => { const toPay = await useFetch("/api/user/add", { method: "POST", body: { amount: price.value, - paymentNumber: "411", + paymentNumber: payNum * Math.random(), reason: "deposit", }, }); diff --git a/server/api/comments/courseHeadline.js b/server/api/comments/courseHeadline.js new file mode 100644 index 0000000..7bf733b --- /dev/null +++ b/server/api/comments/courseHeadline.js @@ -0,0 +1,22 @@ +export default defineEventHandler(async (event) => { + const { public: { apiBase } } = useRuntimeConfig(); + const token = getCookie(event, 'token'); + const body = await readBody(event); +console.log(body); + try { + const data = await $fetch(`${apiBase}/courseHeadlineComment/create`, { + method: 'POST', + headers: { + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` + }, + body + }); + console.log(data); + return data; + } catch (error) { + + return error; + } + +}) \ No newline at end of file diff --git a/server/api/comments/sendcomment.js b/server/api/comments/sendcomment.js index 0df3869..f0e4d90 100644 --- a/server/api/comments/sendcomment.js +++ b/server/api/comments/sendcomment.js @@ -3,8 +3,6 @@ export default defineEventHandler(async (event) => { const token = getCookie(event, 'token'); const body = await readBody(event); const query = getQuery(event); - console.log('c s',body); - console.log(query); try { const data = await $fetch(`${apiBase}/course/${query.id}/comment`, { @@ -15,7 +13,7 @@ export default defineEventHandler(async (event) => { }, body }); - console.log('ser com', data); + return data; } catch (error) { diff --git a/server/api/courseHeadlines.js b/server/api/courseHeadlines.js index b407851..da7d8d5 100644 --- a/server/api/courseHeadlines.js +++ b/server/api/courseHeadlines.js @@ -1,22 +1,15 @@ export default defineEventHandler(async (event) => { const { public: { apiBase } } = useRuntimeConfig(); - const query = getQuery(event); - - - // let page = query.hasOwnProperty('page') ? `page=${query.page}` : ''; -// // let sortBy = query.hasOwnProperty('sortBy') ? `price=${query.price}` : ''; -// let price = query.hasOwnProperty('price') ? `price=${query.price}` : ''; try { - const courseHeadline = await $fetch(`${apiBase}/courseHeadline?courseId=${query.id}`, { + const data = await $fetch(`${apiBase}/courseHeadline?courseId=${query.id}`, { method: 'GET', headers: { 'Accept': 'application/json', 'content-type': 'application/json' } }); - console.log(courseHeadline); - return courseHeadline; + return data; } catch (error) { return error; } diff --git a/server/api/uploader.post.js b/server/api/uploader.js similarity index 79% rename from server/api/uploader.post.js rename to server/api/uploader.js index a196949..b92ba34 100644 --- a/server/api/uploader.post.js +++ b/server/api/uploader.js @@ -11,22 +11,25 @@ export default defineEventHandler(async (event) => { }) - let formDat = new FormData(); - formDat.append('file', fs.createReadStream(files.file[0].filepath)); + var formDat = new FormData(); formDat.append('directoryName', fields.directoryName[0]); + formDat.append('file', fs.createReadStream(files.file[0].filepath)); + // console.log('path',files.file[0].filepath); + // console.log('text',fields.directoryName[0]); try { const data = await $fetch(`${apiBase}/uploader`, { method: 'POST', body: formDat, headers: { 'Accept': 'application/json', + //'Content-Type': 'multipart/form-data', 'Authorization': `Bearer ${token}` }, }); - console.log('uploader data', data); + console.log('uplodar',data); return data; } catch (error) { - console.log('error', error); + return error; } diff --git a/server/api/user/add.post.js b/server/api/user/add.post.js index f1cca68..2e4a9f4 100644 --- a/server/api/user/add.post.js +++ b/server/api/user/add.post.js @@ -2,7 +2,7 @@ export default defineEventHandler(async (event) => { const { public: { apiBase } } = useRuntimeConfig(); const token = getCookie(event, 'token'); const body = await readBody(event); - console.log(body); + try { const data = await $fetch(`${apiBase}/user/add`, { method: 'POST', diff --git a/server/api/user/payments.js b/server/api/user/payments.js index 823a034..e0be840 100644 --- a/server/api/user/payments.js +++ b/server/api/user/payments.js @@ -9,7 +9,7 @@ export default defineEventHandler(async (event) => { 'Authorization': `Bearer ${token}` }, }); -console.log('server', payments); + return payments; } catch (error) { diff --git a/server/api/user/registerCourse.js b/server/api/user/registerCourse.js new file mode 100644 index 0000000..5d258b6 --- /dev/null +++ b/server/api/user/registerCourse.js @@ -0,0 +1,33 @@ +export default defineEventHandler(async (event) => { + const { public: { apiBase } } = useRuntimeConfig(); + const token = getCookie(event, 'token'); + const body = await readBody(event); + console.log(body); + try { + const data = await $fetch(`${apiBase}/user/registerCourse`, { + method: 'POST', + headers: { + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` + }, + body + }); + console.log(data); + return data; + } catch (error) { +console.log('errors',error.data); +if (error.status === 406) { + return{ + status: 406, + message: 'شما در این دوره شرکت کرده اید !!!' + } +}else{ + return{ + status: 500, + message: 'عملیات با مشکل مواجه شد، کمی بعد تلاش کنید.' + } +} + return error; + } + +}) \ No newline at end of file