Skip to content

Commit baaa1e5

Browse files
author
Nathaly Toledo
committed
Solved conflicts with main branch
2 parents 66caf3f + 95b3b56 commit baaa1e5

5 files changed

Lines changed: 164 additions & 157 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ The backend (API) code is stored in the `server/` directory.
3838

3939
https://user-images.githubusercontent.com/9143339/159093687-6fc90733-0599-445c-b08b-a6378d988e4b.mov
4040

41+
## Contributing
4142
Would you like to become a contributor? Please check out our [contributors guide](.github/CONTRIBUTING.md)! 💝
4243

4344
```shell

src/components/LetterLoad.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</div>
3333
</div>
3434

35-
<v-card-actions>
35+
<v-card-actions class="justify-center">
3636
<v-btn>
3737
<AuthNav />
3838
</v-btn>

src/components/RepresentativeCard.vue

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
<template lang="html">
22
<v-card
33
flat
4-
v-on:click="handleRepClick"
54
:to="{
65
name: 'RepClick',
76
params: { member: member.name }
87
}"
8+
@click="handleRepClick"
99
>
10-
<v-card-title v-text="member.name" class="padding-y-0"></v-card-title>
10+
<v-card-title class="justify-center" v-text="member.name" />
1111
<v-card-subtitle
12+
class="text-center padding-y-0 margin-top-10"
1213
v-text="member.title"
13-
class="text-align-left padding-y-0 margin-top-10"
14-
>
15-
</v-card-subtitle>
14+
/>
1615

1716
<!-- social media icons -->
18-
<div
19-
id="social-media-channel"
20-
class="text-align-left social-media-channel-box"
21-
>
17+
<div id="social-media-channel" class="text-center social-media-channel-box">
2218
<a
2319
v-for="socialMedia in member.socialMediaPages"
2420
:key="socialMedia.type"
@@ -36,36 +32,35 @@
3632
</div>
3733

3834
<v-img
39-
class="text-align-left rep-img"
35+
class="mx-auto text-align-left rep-img"
4036
v-bind="member"
4137
:src="member.photoUrl"
4238
height="75"
4339
width="75"
4440
:position="member.photoCroppingCSS"
45-
>
46-
</v-img>
47-
<v-card-subtitle
48-
v-text="member.address_city"
49-
class="text-align-left rep-img"
50-
></v-card-subtitle>
41+
/>
42+
<v-card-subtitle class="text-center rep-img" v-text="member.address_city" />
5143
</v-card>
5244
</template>
5345

5446
<script lang="js">
5547
import axios from 'axios'
5648
5749
export default {
58-
name: 'representative-card',
50+
name: 'RepresentativeCard',
5951
components: {
6052
},
6153
props: {
62-
member: Object
54+
member: {
55+
type: Object,
56+
required: true
57+
}
6358
},
59+
emits: ['handleRepSelected'],
6460
data() {
6561
return {
6662
}
6763
},
68-
emits: ['handleRepSelected'],
6964
methods: {
7065
async handleRepClick() {
7166
try {

0 commit comments

Comments
 (0)