Skip to content

Commit

Permalink
Merge branch 'DEVELOPMENT_v2' into UI/colorChanges
Browse files Browse the repository at this point in the history
  • Loading branch information
@slaaiblaar
slaaiblaar committed Oct 22, 2023
2 parents e4cf2ff + 165d84a commit b9e757a
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 48 deletions.
2 changes: 1 addition & 1 deletion libs/api/notifications/feature/src/commands/notify-approval-change.handler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class NotifyApprovalChangeHandler implements ICommandHandler<NotifyApprov
if(status == StatusEnum.ON_MARKET){
return {
head: "Your listing has been approved",
body: "Your listing at " + address + " is now visible to other users and you will be able to review its engagement"
body: "Your listing at " + address + " is now visible to other users and you will be able to review its engagement. Please allow for a few minutes for us to calculate the listing's area score and gather nearby points of interest."
}
}

Expand Down
1 change: 0 additions & 1 deletion libs/app/core/feature/src/core.routing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ const routes: Routes = [
},
{
path: 'search',
canActivate: [profileCompletionGuard],
loadChildren: () => import('@properproperty/app/search/feature').then( m => m.SearchPageModule)
},
{
Expand Down
6 changes: 3 additions & 3 deletions libs/app/create-listing/feature/src/create-listing.page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</div>
<div class="drag-drop-area" (click)="fileInput.click()">
<ion-icon name="add-circle-outline" class="icon-on-top"></ion-icon>
<ion-label class="house-text">Click here or drag and drop images of your property<span class="required-indicator" *ngIf="!photos.length">*</span></ion-label>
<ion-label class="house-text">Click here to add an image of your property<span class="required-indicator" *ngIf="!photos.length">*</span></ion-label>

</div>
</ion-col>
Expand Down Expand Up @@ -129,7 +129,7 @@
<ion-col width="6">
<ion-row class="dropdown">
<ion-col size="6" class="label-col">
<ion-label class="house-text">Listing Price<span class="required-indicator"
<ion-label class="house-text">Listing Price (ZAR)<span class="required-indicator"
*ngIf="!price">*</span></ion-label>
</ion-col>
<ion-col size="6" class="label-col">
Expand Down Expand Up @@ -406,7 +406,7 @@
</div>
<div class="drag-drop-area" (click)="fileInput.click()">
<ion-icon name="add-circle-outline" class="icon-on-top"></ion-icon>
<ion-label class="imageText">Click here or drag and drop an image</ion-label>
<ion-label class="imageText">Click here to add an image</ion-label>
</div>
</ion-col>
</ion-row>
Expand Down
4 changes: 2 additions & 2 deletions libs/app/create-listing/feature/src/create-listing.page.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
}

.uploaded-image img {
width: 100%;
height: 100%;
width: 200px;
height: 200px;
}

.uploaded-image ion-icon {
Expand Down
2 changes: 1 addition & 1 deletion libs/app/create-listing/feature/src/create-listing.page.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ export class CreateListingPage {
if (this.address && this.price && this.pos_type && this.env_type && this.prop_type
&& this.furnish_type && this.orientation && this.floor_size && this.erf_size
&& this.bathrooms && this.bedrooms && this.parking) {
const info = "Address: " + this.address + "\n " + "Price: " + this.price + "\n " + "Possession type: " + this.pos_type + "\n " + "Environment type: " + this.env_type + "\n " + "Property type: " + this.prop_type + "\n " + "Furnishing state: " + this.furnish_type + "\n " + "Orientation of the house: " + this.orientation + "\n " + "Floor size: " + this.floor_size + "\n " + "Property size: " + this.erf_size + "\n " + "Number of bathrooms: " + this.bathrooms + "\n " + "Number of bedrooms" + this.bedrooms + "\n " + "Number of parking spots: " + this.parking + "\n";
const info = "Address: " + this.address + "\n " + "Price: " + this.price + " ZAR\n " + "Possession type: " + this.pos_type + "\n " + "Environment type: " + this.env_type + "\n " + "Property type: " + this.prop_type + "\n " + "Furnishing state: " + this.furnish_type + "\n " + "Orientation of the house: " + this.orientation + "\n " + "Floor size: " + this.floor_size + "square meters\n " + "Property size: " + this.erf_size + "square meters\n " + "Number of bathrooms: " + this.bathrooms + "\n " + "Number of bedrooms" + this.bedrooms + "\n " + "Number of parking spots: " + this.parking + "\n";
+ "Features: " + feats + "\n";

const response = await this.openAIService.getHeadingAndDesc("Give me a description of a property with the following information: \n" + info
Expand Down
16 changes: 10 additions & 6 deletions libs/app/listing/feature/src/listing.page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@
</ion-grid>
</div>
<div class="swiper-container-wrapper">
<ion-buttons *ngIf="list.photos.length > 1" slot="start" class="swiper-button1" #one>
<ion-button style="height: 100px" (click)="goPrev()" #one>
<ion-buttons slot="start" class="swiper-button1" #one>
<ion-button *ngIf="list.photos.length>1" style="height: 100px" (click)="goPrev()" #one>
<!-- <img src="assets/icon/arrow1.svg" #back alt="swiper-back"/> -->
<ion-icon class="swiper-icon" name="chevron-back-outline"></ion-icon>
</ion-button>
</ion-buttons>
Expand All @@ -52,12 +53,13 @@
slides-per-view="1"
class="swiper-container"
>
<swiper-slide *ngFor="let picture of list.photos">
<swiper-slide *ngFor="let picture of list.photos" class="uploaded-image">
<img alt="img" src="{{picture}}" onerror="this.src='assets/no-propertyfound.png'"/>
</swiper-slide>
</swiper-container>
<ion-buttons *ngIf="list.photos.length > 1"slot="end" class="swiper-button2" #two>
<ion-button
*ngIf="list.photos.length>1"
id="next-button"
style="height: 100px;"
(click)="goNext($event)"
Expand Down Expand Up @@ -347,7 +349,9 @@
<div
style="border-radius: 50%; border: 1px solid black; width: 100%; height: 100%; background-image: url({{profilePic}}); background-size: cover; background-position-x: center; background-position-y: center;"
id="profilePic2"
></div>
>

</div>
</ion-avatar>
</ion-col>
<ion-col style="border-left: 1px solid #0dae4f;">
Expand Down Expand Up @@ -439,7 +443,7 @@
</ion-item>

<ion-button
style="border-radius: 30px; width: 100%; margin: 0 auto"
style="width: 100%; margin: 0 auto"
(click)="calculateMortgage()"
>Calculate</ion-button
>
Expand Down Expand Up @@ -912,7 +916,7 @@ <h3>Average engagement per user:</h3>
</ion-item>

<ion-button
style="border-radius: 30px; width: 100%; margin: 0 auto"
style=" width: 100%; margin: 0 auto"
(click)="calculateMortgage()"
>Calculate</ion-button
>
Expand Down
13 changes: 8 additions & 5 deletions libs/app/listing/feature/src/listing.page.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
align-items: center;
}

// .uploaded-image img {
// width: 100%;
// }

.swiper-container {
position: relative;
Expand Down Expand Up @@ -116,7 +119,7 @@ swiper-slide {
swiper-slide img {
width: auto;
height: 600px;
border-radius: 20px;
// border-radius: 20px;
margin: auto;
display: flex;
}
Expand Down Expand Up @@ -387,7 +390,7 @@ ion-col {
width: 100%;
height: 13px;
background-color: rgb(150, 150, 150);
border-radius: 5px;
// border-radius: 5px;
margin-bottom: 5px;
}

Expand All @@ -397,7 +400,7 @@ ion-col {
left: 0;
height: 100%;
background-color: green;
border-radius: 5px;
// border-radius: 5px;
transition: width 0.3s ease-in-out;
}

Expand All @@ -411,7 +414,7 @@ ion-col {
left: 0;
height: 100%;
background-color: red;
border-radius: 5px;
// border-radius: 5px;
transition: width 0.3s ease-in-out;
}

Expand All @@ -421,7 +424,7 @@ ion-col {
left: 0;
height: 100%;
background-color: #ffcc00;
border-radius: 5px;
// border-radius: 5px;
transition: width 0.3s ease-in-out;
}

Expand Down
50 changes: 25 additions & 25 deletions libs/app/search/feature/src/search.page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,39 +213,50 @@

<ion-col size="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">Parking</ion-label>
<select class="dropdown" style="width: 40%" [(ngModel)]="parking" (ionChange)="filterProperties()">
<ion-label class="filter-text">Bedrooms</ion-label>
<select class="dropdown" style="width: 40%" [(ngModel)]="bed">
<option value="null">Any</option>
<option value="1">1+</option>
<option value="2">2+</option>
<option value="3">3+</option>
<option value="4">4+</option>
<option value="5">5+</option>
<option value="6">6+</option>
<option value="7">7+</option>
<option value="8">8+</option>
</select>
</ion-item>
</ion-col>


<ion-col size="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">Bedrooms</ion-label>
<select class="dropdown" style="width: 40%" [(ngModel)]="bed">
<ion-label class="filter-text">Parking</ion-label>
<select class="dropdown" style="width: 40%" [(ngModel)]="parking" (ionChange)="filterProperties()">
<option value="null">Any</option>
<option value="1">1+</option>
<option value="2">2+</option>
<option value="3">3+</option>
<option value="4">4+</option>
<option value="5">5+</option>
<option value="6">6+</option>
<option value="7">7+</option>
<option value="8">8+</option>
</select>
</ion-item>
</ion-col>


</ion-row>
<ion-row>

<ion-col size="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">Buy/Rent</ion-label>
<select class="dropdown" style="width: 40%" [(ngModel)]="activeTab" (ionChange)="changeTab()">
<option value="Any">All</option>
<option value="Sell">Buy</option>
<option value="Rent">Rent</option>
</select>
</ion-item>
</ion-col>

<ion-col size="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">Environment</ion-label>
Expand Down Expand Up @@ -275,7 +286,9 @@
</select>
</ion-item>
</ion-col>


</ion-row>
<ion-row>
<ion-col size="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">Water Score</ion-label>
Expand All @@ -293,9 +306,7 @@
</select>
</ion-item>
</ion-col>

</ion-row>
<ion-row>

<ion-col size="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">Crime Score</ion-label>
Expand Down Expand Up @@ -331,6 +342,8 @@
</ion-item>
</ion-col>

</ion-row>
<ion-row>
<ion-col size="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">School Score</ion-label>
Expand All @@ -349,19 +362,6 @@
</ion-item>
</ion-col>

</ion-row>
<ion-row>
<ion-col size="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">Sell/Let</ion-label>
<select class="dropdown" style="width: 40%" [(ngModel)]="activeTab" (ionChange)="changeTab()">
<option value="Any">Any</option>
<option value="Sell">Buy</option>
<option value="Rent">Rent</option>
</select>
</ion-item>
</ion-col>

<ion-col lines="4">
<ion-item lines="none" class="filter">
<ion-label class="filter-text">Min Erf(m<sup>2</sup>)</ion-label>
Expand Down
7 changes: 3 additions & 4 deletions libs/app/search/feature/src/search.page.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,10 +806,9 @@ checkErfRange(lower:boolean){
changeTab(): void {
// Reset the selected filters and search query when changing tabs
this.prop_type = '';
this.price_min = 0;
this.price_max = 0;
this.bed = 0;
this.searchQuery = '';
this.property_price_values.lower = 0;
this.property_price_values.upper = 99999999;
this.bed = null;
this.features = [];
this.filterProperties();
}
Expand Down

0 comments on commit b9e757a

Please sign in to comment.