My events on Profile

LiamTX · Sep 1, 2020 · 7f8ba18 · 7f8ba18
1 parent 927782e
commit 7f8ba18
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/public/index.html b/public/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="pt">
   <head>
-    <meta charset="utf-8">
+    <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">

diff --git a/src/components/cpmCard.vue b/src/components/cpmCard.vue
@@ -6,10 +6,15 @@
             <v-app-bar color="white" class="d-flex align-center" dense>
 
                 <v-avatar size="36">
-                    <v-img :src="user_avatar"></v-img>
+                    <v-img :src="card.user.avatar"></v-img>
                 </v-avatar>
 
                 <div class="ml-3">{{card.name}}</div>
+
+                |
+
+                <div class="ml-3">{{card.user.name}}</div>
+
 
                 <div class="ml-3">{{card.eventDate}}</div>
 
@@ -25,15 +30,19 @@
                 <p>{{card.description}}</p>
             </v-card-text>
 
-            <v-card-subtitle>
+            <!-- <v-card-subtitle>
                 <p>Criado em {{card.createdAt}}</p>
-            </v-card-subtitle>
+            </v-card-subtitle> -->
 
             <v-expansion-panels>
                 <v-expansion-panel>
                     <v-expansion-panel-header>Comentários</v-expansion-panel-header>
                         <v-expansion-panel-content v-for="(comment, i) in card.comments" :key="i">
-                            {{comment.user}}: {{comment.comment}}
+                            <!-- {{comment.user}}: {{comment.comment}} -->
+                        <!-- <v-avatar size="35">
+                            <v-img :src="user.avatar"></v-img>
+                        </v-avatar> -->
+                            {{comment.user.name}}: {{comment.comment}}
                         </v-expansion-panel-content>
                 </v-expansion-panel>
             </v-expansion-panels>
@@ -46,7 +55,7 @@
 <script>
 export default {
     name: 'Card',
-    props: ['cardData', 'user_avatar'],
+    props: ['cardData'],
     data() {
         return {
             card: this.cardData

diff --git a/src/views/private/Profile.vue b/src/views/private/Profile.vue
@@ -2,7 +2,7 @@
   <div>
     <Toolbar />
 
-    <h1 class="alg-txt-c">EDITAR INFORMAÇÔES</h1>
+    <h1 class="alg-txt-c">SUAS INFORMAÇÔES</h1>
 
     <div>
       <v-card class="p10 ac" max-width="600">
@@ -11,6 +11,7 @@
             <v-list-item-content>
               <!-- <div class="overline mb-4">OVERLINE</div> -->
               <v-list-item-title class="headline mb-1">{{user_data.name}}</v-list-item-title>
+              <hr>
               <v-list-item-subtitle>{{user_data.email}}</v-list-item-subtitle>
               <v-list-item-subtitle>{{user_data.whatsapp}}</v-list-item-subtitle>
             </v-list-item-content>
@@ -33,7 +34,7 @@
         <h2 class="alg-txt-s mt-5">SEUS EVENTOS</h2>
 
         <div v-for="event in events" :key="event.id">
-          <EventCard class="mt-4" :cardData="event" :user_avatar="user_data.avatar"/>
+          <EventCard class="mt-4" :cardData="event"/>
         </div>