From 5f8af344c8ad7d55fc7c93a8dbd4b06348b95295 Mon Sep 17 00:00:00 2001
From: hamdy <hamdy.a.farag@gmail.com>
Date: Wed, 18 Nov 2020 16:15:40 +0200
Subject: [PATCH] fixes

---
 gridsome.config.js           |   2 +-
 gridsome.server.js           |   1 +
 src/pages/People.vue         |   1 -
 src/pages/Search.vue         |   1 -
 src/templates/Author.vue     | 139 -----------------------------------
 src/templates/Membership.vue |   1 -
 src/templates/Person.vue     |  69 +++++++++--------
 src/templates/Project.vue    |  23 +++---
 8 files changed, 50 insertions(+), 187 deletions(-)
 delete mode 100644 src/templates/Author.vue

diff --git a/gridsome.config.js b/gridsome.config.js
index 5d8c0fb1e..f34eb997f 100644
--- a/gridsome.config.js
+++ b/gridsome.config.js
@@ -69,7 +69,7 @@ module.exports = {
                         typeName: 'Membership',
                         create: true
                     },
-                    
+                    project_ids: 'Project'
                 },
             }
         },
diff --git a/gridsome.server.js b/gridsome.server.js
index 0cd7a3c9b..554ea1a56 100644
--- a/gridsome.server.js
+++ b/gridsome.server.js
@@ -41,6 +41,7 @@ module.exports = function (api) {
 
 
     if (options.internal.typeName === 'Person') {
+      options.project_ids = (typeof options.project_ids === 'string') ? options.project_ids.split(',').map(string => string.trim()) : options.project_ids;
       options.memberships = (typeof options.memberships === 'string') ? options.memberships.split(',').map(string => string.trim()) : options.memberships;
       options.countries = (typeof options.countries === 'string') ? options.countries.split(',').map(string => string.trim()) : options.countries;
       options.cities = (typeof options.cities === 'string') ? options.cities.split(',').map(string => string.trim()) : options.cities;
diff --git a/src/pages/People.vue b/src/pages/People.vue
index 157fdbff2..dee6c594a 100644
--- a/src/pages/People.vue
+++ b/src/pages/People.vue
@@ -28,7 +28,6 @@ query {
         bio
         linkedin
         websites
-        project_ids
         countries
         cities
         image(width:800)
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
index 28bbb5259..2a51da2a7 100644
--- a/src/pages/Search.vue
+++ b/src/pages/Search.vue
@@ -70,7 +70,6 @@ query {
         bio
         linkedin
         websites
-        project_ids
         countries
         cities
         image(width:800)
diff --git a/src/templates/Author.vue b/src/templates/Author.vue
deleted file mode 100644
index c33d4de14..000000000
--- a/src/templates/Author.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <Layout :hideHeader="true" :disableScroll="true">
-    <div class="container sm:pxi-0 mx-auto overflow-x-hidden pt-24">
-      <div class="flex flex-row flex-wrap items-center mx-4 sm:mx-0">
-        <div class="w-full md:w-1/6 mx-auto sm:mx-0">
-          <g-image
-            :src="$page.author.image"
-            class="rounded-full bg-gray-200 w-32 h-32 border-4 border-gray-400 mx-auto md:mx-0"
-          ></g-image>
-        </div>
-        <div class="w-full md:w-5/6 text-center md:text-left md:pl-8 lg:pl-0">
-          <h1 class="pb-0 mb-0 mt-0 text-4xl font-medium">{{ $page.author.name }}</h1>
-          
-          <p class="text-gray-700 text-xl" v-if="$page.author.bio">{{ $page.author.bio }}</p>
-          <div class="author-social">
-            {{ $page.author.belongsTo.totalCount }} Projects
-            &nbsp;&middot;&nbsp;
-            <!-- <a
-              :href="$page.author.facebook"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="text-gray-400 hover:text-black"
-            >
-              <font-awesome :icon="['fab', 'facebook']" />
-            </a>
-            &nbsp;
-            <a
-              :href="$page.author.twitter"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="text-gray-400 hover:text-black"
-            >
-              <font-awesome :icon="['fab', 'twitter']" />
-            </a>
-            &nbsp; -->
-            <a
-              :href="$page.author.linkedin"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="text-gray-400 hover:text-black"
-            >
-              <font-awesome :icon="['fab', 'linkedin']" />
-            </a>
-          </div>
-        </div>
-      </div>
-
-      <div class="pt-8 border-b mx-4 sm:-mx-4"></div>
-
-        <section class="post-content container mx-auto relative font-serif text-gray-700">
-          <div class="post-content-text text-xl" v-html="$page.author.content"></div>
-        </section>
-
-      <div class="pt-8 border-b mx-4 sm:-mx-4"></div>
-
-      <div class="flex flex-wrap pt-8 pb-8 mx-4 sm:-mx-4">
-        <PostListItem
-          v-for="edge in $page.author.belongsTo.edges"
-          :key="edge.node.id"
-          :record="edge.node"
-        />
-      </div>
-
-      <div class="pagination flex justify-center mb-8">
-        <Pagination
-          :baseUrl="$page.author.path"
-          :currentPage="$page.author.belongsTo.pageInfo.currentPage"
-          :totalPages="$page.author.belongsTo.pageInfo.totalPages"
-          :maxVisibleButtons="5"
-          v-if="$page.author.belongsTo.pageInfo.totalPages > 1"
-        />
-      </div>
-    </div>
-  </Layout>
-</template>
-
-<page-query>
-  query($id: ID!, $page:Int) {
-    author(id: $id) {
-      name
-      path
-      bio
-      image(width:150, height:150)
-      facebook
-      twitter
-      linkedin
-      content
-      belongsTo(perPage: 5, page: $page) @paginate {
-        totalCount
-        pageInfo {
-          totalPages
-          currentPage
-        }
-        edges {
-          node {
-            ... on Blog {
-              title
-              excerpt
-              image(width:800)
-              path
-              timeToRead
-              humanTime : created(format:"DD MMM YYYY")
-              datetime : created
-              author {
-                id
-                name
-                image(width:64, height:64, fit:inside)
-                path
-              }
-            }
-          }
-        }
-      }
-    }  
-  }
-</page-query>
-
-<script>
-import PostListItem from "~/components/PostListItem.vue";
-import Pagination from "~/components/Pagination.vue";
-
-export default {
-  components: {
-    Pagination,
-    PostListItem
-  },
-  computed: {
-    postLabel: function() {
-      var pluralize = require("pluralize");
-      return pluralize("post", this.$page.author.belongsTo.totalCount);
-    }
-  },
-  metaInfo() {
-    return {
-      title: this.$page.author.name
-    };
-  }
-};
-</script>
\ No newline at end of file
diff --git a/src/templates/Membership.vue b/src/templates/Membership.vue
index a7a0361f4..7973fe3b7 100644
--- a/src/templates/Membership.vue
+++ b/src/templates/Membership.vue
@@ -61,7 +61,6 @@
               excerpt
               linkedin
               websites
-              project_ids
               countries
               cities
               private
diff --git a/src/templates/Person.vue b/src/templates/Person.vue
index 3c96ca854..29483f245 100644
--- a/src/templates/Person.vue
+++ b/src/templates/Person.vue
@@ -25,27 +25,32 @@
             {{ $page.person.bio }}
           </p>
           <div class="author-social">
-            {{ $page.person.belongsTo.totalCount }} Projects
-            &nbsp;&middot;&nbsp;
-            <!-- <a
-              :href="$page.person.facebook"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="text-gray-400 hover:text-black"
-            >
-              <font-awesome :icon="['fab', 'facebook']" />
-            </a>
-            &nbsp;
-            <a
-              :href="$page.person.twitter"
-              target="_blank"
-              rel="noopener noreferrer"
-              class="text-gray-400 hover:text-black"
-            >
-              <font-awesome :icon="['fab', 'twitter']" />
-            </a>
-            &nbsp; -->
+            
           </div>
+                <section>
+        <div class="avatars">
+          <div class="flex items-center">
+            <div class="flex justify-between items-center">
+              <ul class="list-none flex author-list m-0">
+                <li
+                  v-for="project in $page.person.project_ids"
+                  :key="project.id"
+                  class="author-list-item"
+                >
+                  <g-link :to="project.path" v-tooltip="project.title">
+                    <g-image
+                      :src="project.logo"
+                      :alt="project.title"
+                      class="w-8 h-8 rounded-full bg-gray-200 border-2 border-white"
+                    />
+                  </g-link>
+                </li>
+              </ul>
+            </div>
+            
+          </div>
+        </div>
+      </section>
         </div>
       </div>
 
@@ -70,21 +75,13 @@
         />
       </div>
 
-      <div class="pagination flex justify-center mb-8">
-        <Pagination
-          :baseUrl="$page.person.path"
-          :currentPage="$page.person.belongsTo.pageInfo.currentPage"
-          :totalPages="$page.person.belongsTo.pageInfo.totalPages"
-          :maxVisibleButtons="5"
-          v-if="$page.person.belongsTo.pageInfo.totalPages > 1"
-        />
-      </div>
+   
     </div>
   </Layout>
 </template>
 
 <page-query>
-  query($id: ID!, $page:Int) {
+  query($id: ID!) {
     person(id: $id) {
         path
         content
@@ -95,16 +92,21 @@
           title
           path
         }
+        project_ids{
+          id
+          title
+          path
+          logo
+        }
         bio
         excerpt
         linkedin
         websites
-        project_ids
         countries
         cities
         private
         image(width:150, height:150)
-        belongsTo(perPage: 5, page: $page) @paginate {
+        belongsTo {
         totalCount
         pageInfo {
           totalPages
@@ -113,6 +115,7 @@
         edges {
           node {
             ... on Blog {
+              id
               title
               excerpt
               image(width:800)
@@ -128,9 +131,11 @@
               }
             },
             ... on Project {
+              id
               title
               excerpt
               image(width:800)
+              logo
               path
               humanTime : startdate(format:"DD MMM YYYY")
               datetime : created
diff --git a/src/templates/Project.vue b/src/templates/Project.vue
index 7d1ba7809..2822d2b9b 100644
--- a/src/templates/Project.vue
+++ b/src/templates/Project.vue
@@ -114,21 +114,13 @@
           </div>
         </div>
       </section>
-      <div class="pagination flex justify-center mb-8">
-        <Pagination
-          :baseUrl="$page.project.path"
-          :currentPage="$page.project.belongsTo.pageInfo.currentPage"
-          :totalPages="$page.project.belongsTo.pageInfo.totalPages"
-          :maxVisibleButtons="5"
-          v-if="$page.project.belongsTo.pageInfo.totalPages > 1"
-        />
-      </div>
+      
     </div>
   </Layout>
 </template>
 
 <page-query>
-  query($id: ID!, $page:Int) {
+  query($id: ID!) {
     project(id: $id) {
       id
       title
@@ -166,8 +158,8 @@
       }
       rank
       excerpt
-      content
-      belongsTo(perPage: 5, page: $page) @paginate {
+      
+      belongsTo {
         totalCount
         pageInfo {
           totalPages
@@ -180,6 +172,13 @@
               name
               image(width:64, height:64, fit:inside)
               path
+              project_ids{
+                  id
+                  title
+                  path
+                  logo
+                  image
+              }
             }
           }
         }