Skip to content

Commit af54996

Browse files
authored
Merge pull request #336 from Seluj78/325-profile-page
325 profile page
2 parents 12f2c05 + a36475c commit af54996

31 files changed

+696
-41
lines changed

frontend/src/assets/css/tailwind.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,18 @@
482482
.slider-dropdown:focus {
483483
outline:none;
484484
}
485+
486+
.settings-button-choice {
487+
@apply border-gray-300;
488+
@apply rounded-lg;
489+
@apply border;
490+
@apply px-4;
491+
@apply py-2;
492+
@apply w-auto;
493+
@apply cursor-pointer;
494+
@apply text-sm;
495+
@apply text-center;
496+
}
485497
}
486498

487499
@tailwind utilities;

frontend/src/assets/dots.png

3.18 KB
Loading
11.4 KB
Loading
-31.5 KB
Loading

frontend/src/components/app/onboarding/ImageUpload.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<div class="auth-sub-container-error mt-8" v-if="image.error">
88
<h1 class="auth-sub-container-error-message">{{image.error}}</h1>
99
</div>
10-
<button v-if="!image.uploaded" class="relative onboarding-sub-container-upload-button w-full my-8">
11-
<input class="cursor-pointer opacity-0 absolute top-0 left-0 w-full h-full rounded-md" type="file" v-on:change="selectFile()" ref="file">
10+
<button v-if="!image.uploaded" class="overflow-hidden relative onboarding-sub-container-upload-button w-full my-8">
11+
<input style="padding-left: 100%;" class="cursor-pointer opacity-0 absolute top-0 left-0 w-full h-full rounded-md" type="file" v-on:change="selectFile()" ref="file">
1212
<img src="../../../assets/onboarding/cloud.png" class="w-8 mx-auto">
1313
</button>
1414
<div v-if="image.uploaded" class="relative overflow-hidden bg-transparent rounded-md w-full my-10" style="padding-bottom: 70%">

frontend/src/components/app/onboarding/Introduction.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default {
1515
props: ['slide'],
1616
methods: {
1717
nextSlide() {
18-
this.$emit('nextSlide');
18+
this.$emit('next-slide');
1919
},
2020
},
2121
};

frontend/src/components/app/onboarding/Location.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
subheader: 'Would you like to share your location to get potential matches closer to you?',
99
options: ['yes', 'no'],
1010
buttonText: slide.buttonText}"
11-
v-on:saveInput="saveLocation"></SingleChoice>
11+
v-on:save-input="saveLocation"></SingleChoice>
1212
</template>
1313

1414
<script>
@@ -41,21 +41,21 @@ export default {
4141
const { latitude } = position.coords;
4242
const { longitude } = position.coords;
4343
this.locationData = { lat: latitude, lng: longitude, ip: '0.0.0.0' };
44-
this.$emit('nextSlide');
44+
this.$emit('next-slide');
4545
},
4646
async locationDenied() {
4747
let ipRequest = await fetch('https://api.ipify.org?format=json');
4848
ipRequest = await ipRequest.json();
4949
const { ip } = ipRequest;
5050
this.locationData = { ip };
51-
this.$emit('nextSlide');
51+
this.$emit('next-slide');
5252
},
5353
async sendLocation() {
5454
await this.$http.put('/profile/edit/geolocation', this.locationData);
5555
},
5656
},
5757
mounted() {
58-
this.bus.$on('sendUserLocationToBackend', this.sendLocation);
58+
this.bus.$on('send-user-location-to-backend', this.sendLocation);
5959
},
6060
};
6161
</script>

frontend/src/components/app/onboarding/MainAndSecondaryImagesUpload.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default {
4242
this.bus.$emit('clearForNextImage');
4343
this.imageIndex += 1;
4444
} else {
45-
this.$emit('nextSlide');
45+
this.$emit('next-slide');
4646
this.sendImagesToBackend();
4747
}
4848
},

frontend/src/components/app/onboarding/MultipleChoice.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default {
4040
}),
4141
methods: {
4242
saveInput() {
43-
this.$emit('saveInput', this.slide.key, this.optionSelected);
43+
this.$emit('save-input', this.slide.key, this.optionSelected);
4444
this.optionSelected = [];
4545
},
4646
select(...args) {

frontend/src/components/app/onboarding/SelectionButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default {
4545
},
4646
},
4747
mounted() {
48-
this.bus.$on('deselectIfNot', this.deselectIfNot);
48+
this.bus.$on('deselect-if-not', this.deselectIfNot);
4949
},
5050
};
5151
</script>

0 commit comments

Comments
 (0)