From 90c6566e8d6ceca62b037786c773a02f0b38d5b5 Mon Sep 17 00:00:00 2001 From: prahalad Date: Tue, 2 Nov 2021 12:14:34 +0530 Subject: [PATCH] Integrated Faq with Apis --- src/app/faq/faq.component.html | 12 +-- src/app/faq/faq.component.scss | 12 +-- src/app/faq/faq.component.ts | 115 +---------------------------- src/app/orders/orders.component.ts | 38 +++++----- src/app/services/help.service.ts | 2 +- 5 files changed, 33 insertions(+), 146 deletions(-) diff --git a/src/app/faq/faq.component.html b/src/app/faq/faq.component.html index 77cd3b4..5417d65 100644 --- a/src/app/faq/faq.component.html +++ b/src/app/faq/faq.component.html @@ -3,21 +3,17 @@
-
  • -

    {{mockFaq.title}}

    +

    {{allFaq.title}}

    -
    +

    {{question.sub_question}}

    -
    Subheader
    -

    Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similique - eaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias - quidem - corrupti tenetur facilis temporibus error.

    +

    {{question.sub_answer}}

    • \ No newline at end of file diff --git a/src/app/faq/faq.component.scss b/src/app/faq/faq.component.scss index c41cd90..74518af 100644 --- a/src/app/faq/faq.component.scss +++ b/src/app/faq/faq.component.scss @@ -62,26 +62,22 @@ .subquestions{ display: none; - padding: 10px 0; + padding: 5px 0; + border-bottom: 1px solid #efefef; div{ margin: 10px auto; } h3{ - font-size: 18px; - font-weight: 600; - } - h5{ font-size: 16px; font-weight: 600; - padding: 5px 0; - color: var(--brand-grey); - } + } p{ font-size: 12px; text-align: justify; color: var(--brand-grey); + padding-top: 5px; } } } diff --git a/src/app/faq/faq.component.ts b/src/app/faq/faq.component.ts index ae60559..bc1edb7 100644 --- a/src/app/faq/faq.component.ts +++ b/src/app/faq/faq.component.ts @@ -16,122 +16,16 @@ export class FaqComponent implements OnInit { loader: any; selectedQuestions: number = 0; - mockFaqs = [ - { - title: "What are the return guidelines?", - questions: [ - { - sub_question: "Questions1", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions2", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions3", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions4", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions5", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, - ] - },{ - title: "How can I return a Gift?", - questions: [ - { - sub_question: "Questions1", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions2", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions3", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions4", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions5", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, - ] - },{ - title: "Title 1", - questions: [ - { - sub_question: "Questions1", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions2", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions3", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions4", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions5", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, - ] - },{ - title: "Title 1", - questions: [ - { - sub_question: "Questions1", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions2", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions3", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions4", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, { - sub_question: "Questions5", - subHeader: "Headers", - subAnswer: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Ratione molestias similiqueeaque tempore consequuntur, voluptatum quisquam saepe dolore officiis expedita a aut eius alias quidem corrupti tenetur facilis temporibus error', - }, - ] - }, - ] - constructor( private helpService: HelpService, public loadingController: LoadingController, public alertController: AlertController, - private toastService: ToastService, - - - ) { } - ngOnInit() { } + ngOnInit() { + this.getAllfaqs() + } async presentLoading() { this.loader = await this.loadingController.create({ @@ -154,10 +48,9 @@ export class FaqComponent implements OnInit { getAllfaqs() { - this.helpService.allFaqs().then((response) => { + this.helpService.mallFaqs().then((response) => { this.allFaqs = response; this.loader ? this.loader.dismiss() : null; - console.log(this.allFaqs) }, (error) => { this.loader ? this.loader.dismiss() : null console.log(error); diff --git a/src/app/orders/orders.component.ts b/src/app/orders/orders.component.ts index d861603..151febe 100644 --- a/src/app/orders/orders.component.ts +++ b/src/app/orders/orders.component.ts @@ -12,8 +12,8 @@ import { LoadingController } from '@ionic/angular'; styleUrls: ['./orders.component.scss'], }) export class OrdersComponent implements OnInit { - userOrders: any = []; - userInfo: any; + userOrders: any = []; + userInfo: any; userCart: ICart = { orderedlist: [] }; @@ -25,7 +25,7 @@ export class OrdersComponent implements OnInit { tempReview = { app_user: { - user_id: null + user_id: null }, comment: '', rating: null, @@ -42,16 +42,18 @@ export class OrdersComponent implements OnInit { async presentLoading() { this.loader = await this.loadingController.create({ - message: 'Please wait...', - spinner: 'dots', - mode: 'ios' + message: 'Please wait...', + spinner: 'dots', + mode: 'ios' }); await this.loader.present(); } + submitFeedbackForOrder() { this.tempReview.app_user.user_id = this.userInfo.id; + let orderToReview: any = JSON.parse(JSON.stringify(this.selectedOrder)); orderToReview.orderedlist = this.getOrderInUsercardFormat(this.selectedOrder.orderedlist); @@ -67,17 +69,17 @@ export class OrdersComponent implements OnInit { this.tempReview = { app_user: { - user_id: null + user_id: '' }, comment: '', - rating: null, + rating: '', }; this.showAddReview = false; }, () => { this.toastService.presentToast("Failed to send review", "danger"); - }); + }); } getOrderInUsercardFormat(orderedlist: any) { @@ -105,24 +107,24 @@ export class OrdersComponent implements OnInit { this.presentLoading(); - this.orderService.getOrders(this.userInfo.id).then((resp: any)=> { + this.orderService.getOrders(this.userInfo.id).then((resp: any) => { this.userOrders = resp.reverse(); - + this.loader ? this.loader.dismiss() : null; - }, (err) => { + }, (err) => { console.log(err); this.toastService.presentToast("Failed to get orders"); this.loader ? this.loader.dismiss() : null; }); - + this.orderService.getAllOrderStatus().then((data) => { this.allOrderStatus = data; }, (err) => { console.log(err); }) } - + getOrderStatusName(id: number) { try { if (id) { @@ -132,13 +134,13 @@ export class OrdersComponent implements OnInit { } } catch { return '-'; - } + } } - getFormattedDate(date, format) { - return moment(date).format(format); + getFormattedDate(date, format) { + return moment(date).format(format); } - + reOrder(orderedlist: any) { for (let i = 0; i < orderedlist.length; i += 1) { this.userCart.orderedlist.push({ diff --git a/src/app/services/help.service.ts b/src/app/services/help.service.ts index 15c9064..9e618ae 100644 --- a/src/app/services/help.service.ts +++ b/src/app/services/help.service.ts @@ -12,7 +12,7 @@ export class HelpService { private http: HttpClient ) { } - async allFaqs(){ + async mallFaqs(){ const httpOptions={ headers: new HttpHeaders({ 'Access-Control-Allow-Origin': '*',