Skip to content

Commit b814cb0

Browse files
committed
user container adjustements
1 parent f58af08 commit b814cb0

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

frontend/src/components/app/users/User.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<div class="sm:mx-16 lg:mx-32">
44
<NavBar v-bind:currentRoute="'Browse'"></NavBar>
55
<section class="mx-auto">
6-
<div v-on:click="goBack()" class="sort-button ml-auto rounded-md text-lg w-12 mr-4 mb-4">
6+
<div v-on:click="goBack()" class="sort-button py-0 ml-auto rounded-md text-lg w-20 md:w-16 mr-4 sm:mr-0 mb-4">
77
<h1 class="noSelect">←</h1>
88
</div>
99
<div v-if="user" class="md:flex md:items-start">
10-
<UserImages v-bind:images="user.images" class="md:w-1/2 md:order-2 md:rounded-md"></UserImages>
11-
<UserProfile class="md:w-1/2 md:order-1" v-bind:user="user"></UserProfile>
10+
<UserImages v-bind:images="user.images" class="md:w-2/3 md:order-2 sm:rounded md:rounded-r-md md:rounded-l-none"></UserImages>
11+
<UserProfile class="md:w-1/3 md:order-1 md:overflow-scroll md:border md:rounded-l-md" v-bind:user="user"></UserProfile>
1212
</div>
1313
</section>
1414
</div>

frontend/src/components/app/users/UserImages.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ export default {
6868
};
6969
</script>
7070

71-
<style>
71+
<style scoped>
7272
.image-height {
73-
height: 25rem;
73+
height: 75vh;
7474
}
7575
</style>

frontend/src/components/app/users/UserProfile.vue

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,36 @@
11
<template>
22
<!-- eslint-disable -->
3-
<div class="profileContainer md:overflow-scroll">
4-
<div class="text-center text-wrap p-8 md:pt-0 border-b">
3+
<div class="profileContainer">
4+
<div class="text-center text-wrap p-8 border-b">
55
<h1 class="text-gray-matcha text-3xl font-semibold mb-6">{{user.first_name}}, {{user.age}}</h1>
66
<div v-if="!user.is_online" class="flex items-center mt-2 text-left">
77
<img class="w-3 h-3 mr-2" src="../../../assets/recommendations/offline.png">
8-
<h1 class="text-gray-matcha">Last seen {{formattedLastSeenDate}}</h1>
8+
<h1 class="text-gray-600">Last seen {{formattedLastSeenDate}}</h1>
99
</div>
1010
<div v-else class="flex items-center mt-2 text-left">
1111
<img class="w-3 h-3 mr-2" src="../../../assets/recommendations/online.png">
12-
<h1 class="text-gray-matcha">online</h1>
12+
<h1 class="text-gray-600">online</h1>
1313
</div>
1414
<div class="flex items-center mt-2 text-left">
1515
<img src="../../../assets/location.png" class="w-4 h-4 mr-2">
16-
<h1 class="text-gray-matcha">{{Math.floor(user.distance)}} km away</h1>
16+
<h1 class="text-gray-600">{{Math.floor(user.distance)}} km away</h1>
1717
</div>
1818
<div class="flex items-center mt-2 text-left">
1919
<img src="../../../assets/gender.png" class="w-4 h-4 mr-2">
20-
<h1 class="text-gray-matcha"><span class="capitalize">{{user.gender}}</span> looking for {{preferences()}}</h1>
20+
<h1 class="text-gray-600"><span class="capitalize">{{user.gender}}</span> looking for {{preferences()}}</h1>
2121
</div>
2222
</div>
2323
<div class="text-center text-wrap p-8 border-b">
2424
<h1>{{user.bio}}</h1>
2525
<div class="flex flex-wrap justify-center mx-auto mt-6">
2626
<h1 v-for="(interest, index) in userInterests" :key="index"
27-
class="px-4 py-1 border rounded-xl mr-2 mt-2 text-gray-600">{{interest}}</h1>
27+
class="px-4 py-1 border rounded-xl mr-2 mt-2 text-gray-600 text-sm">{{interest}}</h1>
2828
</div>
2929
</div>
3030
<div class="text-center flex mx-auto p-8 border-b">
31-
<div class="w-8/12 border border-purple-matcha py-2 rounded-lg cursor-pointer">
31+
<div class="w-full border border-purple-matcha py-2 rounded-lg cursor-pointer">
3232
<img src="../../../assets/heart.png" class="mx-auto w-8 h-8">
3333
</div>
34-
<div class="w-4/12 border border-purple-matcha py-2 rounded-lg ml-4">
35-
<h1 class="mx-auto text-xl">{{user.heat_score}}</h1>
36-
</div>
3734
</div>
3835
<div class="text-center p-8 border-b cursor-pointer">
3936
<h1 class="uppercase mx-auto">Block user</h1>
@@ -95,7 +92,7 @@ export default {
9592
<style scoped>
9693
@screen md {
9794
.profileContainer {
98-
height: 30rem;
95+
height: 75vh;
9996
}
10097
}
10198
</style>

0 commit comments

Comments
 (0)