Skip to content

Commit fdab386

Browse files
authored
Merge pull request #3 from Azo-hub/newFeature
New feature
2 parents ec0f758 + 8b9dba5 commit fdab386

File tree

7 files changed

+50
-14
lines changed

7 files changed

+50
-14
lines changed

src/app/add-property-details-owner/add-property-details-owner.component.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,27 @@ export class AddPropertyDetailsOwnerComponent implements OnInit, OnDestroy, Afte
184184
}
185185

186186

187+
<<<<<<< HEAD
188+
189+
getAllReviewsByProperty(propertyId:number):void {
190+
const formData = new FormData();
191+
formData.append("propertyId", propertyId.toString());
192+
this.subscriptions.push(
193+
this.propertyService.getReviewsByProperty(formData).subscribe(
194+
(response: Review[]) => {
195+
this.reviews = response;
196+
},
197+
198+
(errorResponse: HttpErrorResponse) => {
199+
this.sendNotification(NotificationType.ERROR, errorResponse.error.message);
200+
201+
}
202+
)
203+
);
204+
205+
}
206+
=======
207+
>>>>>>> 953d31befbb0331b74a2a7e6d4d99c661317cc5c
187208

188209

189210
public host = environment.apiUrl;

src/app/app.module.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { BrowserModule } from '@angular/platform-browser';
66
import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
77
import { CarouselModule } from 'ngx-owl-carousel-o';
88
import { AddPropertyDetailsOwnerComponent } from './add-property-details-owner/add-property-details-owner.component';
9-
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
9+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
1010
import { AppRoutingModule } from './app-routing.module';
1111
import { AppComponent } from './app.component';
1212
import { BookingPaymentMethodComponent } from './booking-payment-method/booking-payment-method.component';
@@ -46,7 +46,7 @@ import { RoleTravellerGuard } from './guard/role-traveller.guard';
4646
import { EditPropertyComponent } from './edit-property/edit-property.component';
4747
import { EditUserComponent } from './edit-user/edit-user.component';
4848
import { SupportComponent } from './support/support.component';
49-
import {MatStepperModule} from '@angular/material/stepper';
49+
import { MatStepperModule } from '@angular/material/stepper';
5050
import { PropertyOwnerInfoComponent } from './property-owner-info/property-owner-info.component';
5151
import { ContactPropertyOwnerComponent } from './contact-property-owner/contact-property-owner.component';
5252
import { ReviewComponent } from './review/review.component';
@@ -90,8 +90,8 @@ import { AddNewPaymentMethodComponent } from './add-new-payment-method/add-new-p
9090
PropertyOwnerInfoComponent,
9191
ContactPropertyOwnerComponent,
9292
ReviewComponent,
93-
PaymentMethodComponent,
94-
BillingAddressComponent,
93+
PaymentMethodComponent,
94+
BillingAddressComponent,
9595
AddNewPaymentMethodComponent
9696
],
9797
imports: [
@@ -106,11 +106,11 @@ import { AddNewPaymentMethodComponent } from './add-new-payment-method/add-new-p
106106
FormsModule,
107107
ReactiveFormsModule,
108108
MatStepperModule
109-
109+
110110
],
111-
providers:[DatePipe, AuthenticationService, UserService,NotificationService,
112-
BookingService, PropertyService, AuthenticationTravellerGuard, AuthenticationOwnerGuard,RoleOwnerGuard,RoleTravellerGuard,
113-
{provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi:true,}],
111+
providers: [DatePipe, AuthenticationService, UserService, NotificationService,
112+
BookingService, PropertyService, AuthenticationTravellerGuard, AuthenticationOwnerGuard, RoleOwnerGuard, RoleTravellerGuard,
113+
{ provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true, }],
114114
bootstrap: [AppComponent]
115115
})
116116
export class AppModule { }

src/app/billing-address/billing-address.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ <h2>Billing Address</h2>
8686
<div class="col-sm-3"></div>
8787

8888
</div>
89-
</div>
89+
</div>

src/app/model/payment-method.spec.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { PaymentMethod } from './payment-method';
2+
3+
describe('PaymentMethod', () => {
4+
it('should create an instance', () => {
5+
expect(new PaymentMethod()).toBeTruthy();
6+
});
7+
});

src/app/payment-method/payment-method.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<h2>Payment Method</h2>
88
</div>
99
</div>
10-
1110
<div class="row my-2 mx-2">
1211
<div class="col-sm-12">
1312
<h3>Credit Cards&nbsp;<span class="fa fa-credit-card" style="font-size:20px;"></span>&nbsp;
@@ -115,4 +114,4 @@ <h3>Credit Cards&nbsp;<span class="fa fa-credit-card" style="font-size:20px;"></
115114
<div class="col-md-3"></div>
116115
</div>
117116

118-
</div>
117+
</div>

src/app/property-details/property-details.component.html

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ <h2 class="custom-text-fix">Hosted by <a
346346
routerLink="/propertyOwnerInfo/{{property.propertyOwner.username}}" style="color:inherit;">
347347
{{property.propertyOwner.firstname}}
348348
{{property.propertyOwner.lastname}} </a> </h2>
349-
<!-- <small class="custom-text-fix">
350-
Joined: {{property.propertyOwner.dateJoined | date:'medium'}}</small> -->
349+
<small class="custom-text-fix">
350+
Joined: {{property.propertyOwner.dateJoined | date:'medium'}}</small>
351351

352352
<p><button type="button" class="my-2 property-details-button-fix"
353353
(click)="onClickContactPropertyOwner()">Contact Host</button></p>
@@ -891,6 +891,15 @@ <h2>Reviews</h2>
891891
</div>
892892
</div>
893893

894+
<div class="row">
895+
<div class="col-sm-3"></div>
896+
<div class="col-sm-3"></div>
897+
<div class="col-sm-3"></div>
898+
<div class="col-sm-3">
899+
<a>Add a review</a>
900+
</div>
901+
</div>
902+
894903

895904
</div>
896905
<div class="col-md-4 "></div>

src/app/review/review.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ <h3>{{review.reviewContent}}</h3>
5858
</div>
5959
</div>
6060

61-
</div>
61+
</div>

0 commit comments

Comments
 (0)