Skip to content

Commit

Permalink
Front-end:
Browse files Browse the repository at this point in the history
	- Bug fix: negative values to street number and apartment number
	- Bug fix: link from apartment to its publisher profile
	- Bug fix: required roomates number and total roommates number
	silders - tootal roommates number is always larger then required
	roommates number.
issues: #475 #478 #473
  • Loading branch information
alonttal committed May 27, 2018
1 parent b42b252 commit 09967ee
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ app.post('/users/login', async (req, res) => {
* @updatedBy: Alon Talmor
* @date: 16/04/18
* We should generate a token even if the user is yet to be verified (verification is by mail).
if (!user.isVerified) {
return res.send({ user });
}
Expand Down
2 changes: 1 addition & 1 deletion views/src/components/AppApartmentAd.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<v-card style="min-height:60px">
<div v-if="fetchedPublisher">
<v-list>
<v-list-tile avatar>
<v-list-tile avatar @click="$router.push({ name: 'AppUserProfile', params: { id: publisher._id } })">
<v-list-tile-avatar>
<app-avatar :image="publisher.image" :name="publisher.firstName" :size="40"></app-avatar>
</v-list-tile-avatar>
Expand Down
11 changes: 7 additions & 4 deletions views/src/components/AppPublishApartment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
</v-flex>

<v-flex xs12 sm12 offset-xs1 md2 offset-md0>
<v-text-field ref="number" v-model="payload.address.number" label="Street Number" type="number" single-line :rules="rules.number" validate-on-blur required></v-text-field>
<v-text-field ref="number" v-model="payload.address.number" label="Street Number" type="number" mask="#######" single-line :rules="rules.number" validate-on-blur required></v-text-field>
</v-flex>
<v-flex xs12 sm12 offset-xs1 md2 offset-md0>
<v-text-field v-model="payload.address.apartmentNumber" label="Apartment Number" type="number" single-line></v-text-field>
<v-text-field v-model="payload.address.apartmentNumber" label="Apartment Number" type="number" mask="#######" single-line></v-text-field>
</v-flex>

</v-layout>
Expand Down Expand Up @@ -276,8 +276,11 @@
}
},
watch: {
requiredRoommatesSlide(val) {
this.payload.requiredRoommates = val;
'payload.totalRoommates'(val) {
this.payload.requiredRoommates =
val < this.payload.requiredRoommates ? val : this.payload.requiredRoommates;
},
'payload.requiredRoommates'(val) {
this.payload.totalRoommates =
val > this.payload.totalRoommates ? val : this.payload.totalRoommates;
},
Expand Down

0 comments on commit 09967ee

Please sign in to comment.