From 4a737cbe4507e0d0a042871725a310eb4307a766 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 13 Feb 2019 07:14:23 -0500
Subject: Add reusable BasicUserCard and UserList components

---
 src/components/basic_user_card/basic_user_card.js  | 28 +++++++
 src/components/basic_user_card/basic_user_card.vue | 94 ++++++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 src/components/basic_user_card/basic_user_card.js
 create mode 100644 src/components/basic_user_card/basic_user_card.vue

(limited to 'src/components/basic_user_card')

diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js
new file mode 100644
index 00000000..a8441446
--- /dev/null
+++ b/src/components/basic_user_card/basic_user_card.js
@@ -0,0 +1,28 @@
+import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
+const BasicUserCard = {
+  props: [
+    'user'
+  ],
+  data () {
+    return {
+      userExpanded: false
+    }
+  },
+  components: {
+    UserCardContent,
+    UserAvatar
+  },
+  methods: {
+    toggleUserExpanded () {
+      this.userExpanded = !this.userExpanded
+    },
+    userProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
+    }
+  }
+}
+
+export default BasicUserCard
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
new file mode 100644
index 00000000..37f810ed
--- /dev/null
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="card">
+    <router-link :to="userProfileLink(user)">
+      <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
+    </router-link>
+    <div class="usercard" v-if="userExpanded">
+      <user-card-content :user="user" :switcher="false"></user-card-content>
+    </div>
+    <div class="name-and-screen-name" v-else>
+      <div :title="user.name" class="user-name">
+        <span v-if="user.name_html" v-html="user.name_html"></span>
+        <span v-else>{{ user.name }}</span>
+      </div>
+      <div class="user-link-action">
+        <router-link class='user-screen-name' :to="userProfileLink(user)">
+          @{{user.screen_name}}
+        </router-link>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./basic_user_card.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.name-and-screen-name {
+  margin-left: 0.7em;
+  margin-top:0.0em;
+  text-align: left;
+  width: 100%;
+  .user-name {
+    display: flex;
+    justify-content: space-between;
+
+    img {
+      object-fit: contain;
+      height: 16px;
+      width: 16px;
+      vertical-align: middle;
+    }
+  }
+  
+  .user-link-action {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+
+    button {
+      margin-top: 3px;
+    }
+  }
+}
+
+.card {
+  display: flex;
+  flex: 1 0;
+  padding-top: 0.6em;
+  padding-right: 1em;
+  padding-bottom: 0.6em;
+  padding-left: 1em;
+  border-bottom: 1px solid;
+  margin: 0;
+  border-bottom-color: $fallback--border;
+	border-bottom-color: var(--border, $fallback--border);
+
+  .avatar {
+    padding: 0;
+  }
+}
+
+.usercard {
+  width: fill-available;
+  margin: 0.2em 0 0 0.7em;
+  border-radius: $fallback--panelRadius;
+  border-radius: var(--panelRadius, $fallback--panelRadius);
+  border-style: solid;
+  border-color: $fallback--border;
+  border-color: var(--border, $fallback--border);
+  border-width: 1px;
+  overflow: hidden;
+
+  .panel-heading {
+    background: transparent;
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  p {
+    margin-bottom: 0;
+  }
+}
+</style>
-- 
cgit v1.2.3-70-g09d2


From 5d6e1864a5602505dedf519ef5f8e64cf19ee158 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 13 Feb 2019 14:31:02 -0500
Subject: Update BasicUserCard template and add a slot for customization

---
 src/components/basic_user_card/basic_user_card.vue | 115 ++++++++++-----------
 1 file changed, 57 insertions(+), 58 deletions(-)

(limited to 'src/components/basic_user_card')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 37f810ed..7cbf647c 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -1,20 +1,25 @@
 <template>
-  <div class="card">
+  <div class="user-card">
     <router-link :to="userProfileLink(user)">
       <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
     </router-link>
-    <div class="usercard" v-if="userExpanded">
+    <div class="user-card-expanded-content" v-if="userExpanded">
       <user-card-content :user="user" :switcher="false"></user-card-content>
     </div>
-    <div class="name-and-screen-name" v-else>
-      <div :title="user.name" class="user-name">
-        <span v-if="user.name_html" v-html="user.name_html"></span>
-        <span v-else>{{ user.name }}</span>
+    <div class="user-card-collapsed-content" v-else>
+      <div class="user-card-primary-area">
+        <div :title="user.name" class="user-name">
+          <span v-if="user.name_html" v-html="user.name_html"></span>
+          <span v-else>{{ user.name }}</span>
+        </div>
+        <div>
+          <router-link class='user-screen-name' :to="userProfileLink(user)">
+            @{{user.screen_name}}
+          </router-link>
+        </div>
       </div>
-      <div class="user-link-action">
-        <router-link class='user-screen-name' :to="userProfileLink(user)">
-          @{{user.screen_name}}
-        </router-link>
+      <div class="user-card-secondary-area">
+        <slot name="secondary-area"></slot>
       </div>
     </div>
   </div>
@@ -25,35 +30,7 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.name-and-screen-name {
-  margin-left: 0.7em;
-  margin-top:0.0em;
-  text-align: left;
-  width: 100%;
-  .user-name {
-    display: flex;
-    justify-content: space-between;
-
-    img {
-      object-fit: contain;
-      height: 16px;
-      width: 16px;
-      vertical-align: middle;
-    }
-  }
-  
-  .user-link-action {
-    display: flex;
-    align-items: flex-start;
-    justify-content: space-between;
-
-    button {
-      margin-top: 3px;
-    }
-  }
-}
-
-.card {
+.user-card {
   display: flex;
   flex: 1 0;
   padding-top: 0.6em;
@@ -65,30 +42,52 @@
   border-bottom-color: $fallback--border;
 	border-bottom-color: var(--border, $fallback--border);
 
-  .avatar {
-    padding: 0;
+  &-collapsed-content {
+    margin-left: 0.7em;
+    margin-top:0.0em;
+    text-align: left;
+    flex: 1;
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
   }
-}
 
-.usercard {
-  width: fill-available;
-  margin: 0.2em 0 0 0.7em;
-  border-radius: $fallback--panelRadius;
-  border-radius: var(--panelRadius, $fallback--panelRadius);
-  border-style: solid;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-  border-width: 1px;
-  overflow: hidden;
+  &-primary-area {
+    flex: 1;
+    .user-name {
+      img {
+        object-fit: contain;
+        height: 16px;
+        width: 16px;
+        vertical-align: middle;
+      }
+    }
+  }
 
-  .panel-heading {
-    background: transparent;
-    flex-direction: column;
-    align-items: stretch;
+  &-secondary-area {
+    flex: none;
   }
 
-  p {
-    margin-bottom: 0;
+  &-expanded-content {
+    flex: 1;
+    margin: 0.2em 0 0 0.7em;
+    border-radius: $fallback--panelRadius;
+    border-radius: var(--panelRadius, $fallback--panelRadius);
+    border-style: solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+    border-width: 1px;
+    overflow: hidden;
+
+    .panel-heading {
+      background: transparent;
+      flex-direction: column;
+      align-items: stretch;
+    }
+
+    p {
+      margin-bottom: 0;
+    }
   }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 46e1f3034788640c57953fbca0e5423dc771b9a9 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Feb 2019 11:22:01 -0500
Subject: Fix indent

---
 src/components/basic_user_card/basic_user_card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/basic_user_card')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 7cbf647c..e09b06ce 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -40,7 +40,7 @@
   border-bottom: 1px solid;
   margin: 0;
   border-bottom-color: $fallback--border;
-	border-bottom-color: var(--border, $fallback--border);
+  border-bottom-color: var(--border, $fallback--border);
 
   &-collapsed-content {
     margin-left: 0.7em;
-- 
cgit v1.2.3-70-g09d2


From 5bd36c6476a8a41a3678c7a32e3eb206d57e5c4a Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Feb 2019 11:28:05 -0500
Subject: Remove needless css

---
 src/components/basic_user_card/basic_user_card.vue | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/components/basic_user_card')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index e09b06ce..4ede15e9 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -44,7 +44,6 @@
 
   &-collapsed-content {
     margin-left: 0.7em;
-    margin-top:0.0em;
     text-align: left;
     flex: 1;
     display: flex;
-- 
cgit v1.2.3-70-g09d2