From 8cf2fef48d6071538f5fb9ecf4833f21245cb40e Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sat, 4 Sep 2021 16:01:46 +0200
Subject: [PATCH] rewrite some things to composition

---
 .../src/App.vue                               | 26 ++---
 .../src/components/UI/BaseSearch.vue          | 22 +++--
 .../src/components/projects/ProjectsList.vue  | 86 +++++++++-------
 .../src/components/users/UserItem.vue         | 15 +--
 .../src/components/users/UserList.vue         | 97 +++++++++++--------
 5 files changed, 144 insertions(+), 102 deletions(-)

diff --git a/2021-09-04_composition-13-demo-starting-project/src/App.vue b/2021-09-04_composition-13-demo-starting-project/src/App.vue
index 571f451..c765314 100644
--- a/2021-09-04_composition-13-demo-starting-project/src/App.vue
+++ b/2021-09-04_composition-13-demo-starting-project/src/App.vue
@@ -6,6 +6,7 @@
 </template>
 
 <script>
+import { ref, reactive } from 'vue';
 import USER_DATA from './dummy-data.js';
 
 import UserList from './components/users/UserList.vue';
@@ -14,19 +15,22 @@ import ProjectsList from './components/projects/ProjectsList.vue';
 export default {
   components: {
     UserList,
-    ProjectsList,
+    ProjectsList
   },
-  data() {
+  setup() {
+    var selectedUser = ref(null);
+    const activeUsers = reactive(USER_DATA);
+
+    function selectUser(uid) {
+      selectedUser = activeUsers.find(usr => usr.id === uid);
+    }
+
     return {
-      selectedUser: null,
-      activeUsers: USER_DATA,
+      activeUsers,
+      selectUser,
+      selectedUser
     };
-  },
-  methods: {
-    selectUser(uid) {
-      this.selectedUser = this.activeUsers.find((usr) => usr.id === uid);
-    },
-  },
+  }
 };
 </script>
 
@@ -64,4 +68,4 @@ button.selected {
   background-color: #00006b;
   color: white;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/2021-09-04_composition-13-demo-starting-project/src/components/UI/BaseSearch.vue b/2021-09-04_composition-13-demo-starting-project/src/components/UI/BaseSearch.vue
index 00e939d..46aa031 100644
--- a/2021-09-04_composition-13-demo-starting-project/src/components/UI/BaseSearch.vue
+++ b/2021-09-04_composition-13-demo-starting-project/src/components/UI/BaseSearch.vue
@@ -1,6 +1,11 @@
 <template>
   <form>
-    <input type="search" @input="search" :value="searchTerm" placeholder="Filter items" />
+    <input
+      type="search"
+      @input="search"
+      :value="searchTerm"
+      placeholder="Filter items"
+    />
   </form>
 </template>
 
@@ -8,11 +13,14 @@
 export default {
   props: ['searchTerm'],
   emits: ['search'],
-  methods: {
-    search(event) {
-      this.$emit('search', event.target.value);
-    },
-  },
+  setup(context) {
+    function search(event) {
+      context.emit('search', event.target.value);
+    }
+    return {
+      search
+    };
+  }
 };
 </script>
 
@@ -30,4 +38,4 @@ input:focus {
   border-color: #00006b;
   background-color: #eeeeff;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/2021-09-04_composition-13-demo-starting-project/src/components/projects/ProjectsList.vue b/2021-09-04_composition-13-demo-starting-project/src/components/projects/ProjectsList.vue
index ff3fa04..81bd65b 100644
--- a/2021-09-04_composition-13-demo-starting-project/src/components/projects/ProjectsList.vue
+++ b/2021-09-04_composition-13-demo-starting-project/src/components/projects/ProjectsList.vue
@@ -1,9 +1,17 @@
 <template>
-  <base-container v-if="user">
+  <base-container v-if="userSearch">
     <h2>{{ user.fullName }}: Projects</h2>
-    <base-search v-if="hasProjects" @search="updateSearch" :search-term="enteredSearchTerm"></base-search>
+    <base-search
+      v-if="hasProjects"
+      @search="updateSearch"
+      :search-term="enteredSearchTerm"
+    ></base-search>
     <ul v-if="hasProjects">
-      <project-item v-for="prj in availableProjects" :key="prj.id" :title="prj.title"></project-item>
+      <project-item
+        v-for="prj in availableProjects"
+        :key="prj.id"
+        :title="prj.title"
+      ></project-item>
     </ul>
     <h3 v-else>No projects found.</h3>
   </base-container>
@@ -13,49 +21,55 @@
 </template>
 
 <script>
+import { ref, computed, watch } from 'vue';
 import ProjectItem from './ProjectItem.vue';
 
 export default {
   components: {
-    ProjectItem,
+    ProjectItem
   },
   props: ['user'],
-  data() {
-    return {
-      enteredSearchTerm: '',
-      activeSearchTerm: '',
-    };
-  },
-  computed: {
-    hasProjects() {
-      return this.user.projects && this.availableProjects.length > 0;
-    },
-    availableProjects() {
-      if (this.activeSearchTerm) {
-        return this.user.projects.filter((prj) =>
-          prj.title.includes(this.activeSearchTerm)
+  setup(props) {
+    const activeSearchTerm = ref('');
+    const enteredSearchTerm = ref('');
+
+    const hasProjects = computed(function() {
+      return props.user.projects && availableProjects.value.length > 0;
+    });
+    const availableProjects = computed(function() {
+      if (activeSearchTerm.value) {
+        return props.user.projects.filter(prj =>
+          prj.title.includes(activeSearchTerm)
         );
       }
-      return this.user.projects;
-    },
-  },
-  methods: {
-    updateSearch(val) {
-      this.enteredSearchTerm = val;
-    },
-  },
-  watch: {
-    enteredSearchTerm(val) {
+      return props.user.projects;
+    });
+
+    watch(enteredSearchTerm, function(val) {
       setTimeout(() => {
-        if (val === this.enteredSearchTerm) {
-          this.activeSearchTerm = val;
+        if (val === enteredSearchTerm.value) {
+          activeSearchTerm.value = val;
         }
       }, 300);
-    },
-    user() {
-      this.enteredSearchTerm = '';
-    },
-  },
+    });
+
+    function updateSearch(val) {
+      enteredSearchTerm.value = val;
+    }
+
+    function userSearch() {
+      enteredSearchTerm.value = '';
+    }
+
+    return {
+      enteredSearchTerm,
+      activeSearchTerm,
+      hasProjects,
+      availableProjects,
+      updateSearch,
+      userSearch
+    };
+  }
 };
 </script>
 
@@ -65,4 +79,4 @@ ul {
   margin: 0;
   padding: 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/2021-09-04_composition-13-demo-starting-project/src/components/users/UserItem.vue b/2021-09-04_composition-13-demo-starting-project/src/components/users/UserItem.vue
index bc49503..4bf8079 100644
--- a/2021-09-04_composition-13-demo-starting-project/src/components/users/UserItem.vue
+++ b/2021-09-04_composition-13-demo-starting-project/src/components/users/UserItem.vue
@@ -9,11 +9,14 @@
 export default {
   props: ['id', 'userName'],
   emits: ['list-projects'],
-  methods: {
-    viewProjects() {
-      this.$emit('list-projects', this.id);
-    },
-  },
+  setup(context) {
+    function viewProjects() {
+      context.emit('list-projects', this.id);
+    }
+    return {
+      viewProjects
+    };
+  }
 };
 </script>
 
@@ -28,4 +31,4 @@ li {
 li h3 {
   margin: 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/2021-09-04_composition-13-demo-starting-project/src/components/users/UserList.vue b/2021-09-04_composition-13-demo-starting-project/src/components/users/UserList.vue
index f8d3546..db09f1a 100644
--- a/2021-09-04_composition-13-demo-starting-project/src/components/users/UserList.vue
+++ b/2021-09-04_composition-13-demo-starting-project/src/components/users/UserList.vue
@@ -1,10 +1,17 @@
 <template>
   <base-container>
     <h2>Active Users</h2>
-    <base-search @search="updateSearch" :search-term="enteredSearchTerm"></base-search>
+    <base-search
+      @search="updateSearch"
+      :search-term="enteredSearchTerm"
+    ></base-search>
     <div>
-      <button @click="sort('asc')" :class="{selected: sorting === 'asc'}">Sort Ascending</button>
-      <button @click="sort('desc')" :class="{selected: sorting === 'desc'}">Sort Descending</button>
+      <button @click="sort('asc')" :class="{ selected: sorting === 'asc' }">
+        Sort Ascending
+      </button>
+      <button @click="sort('desc')" :class="{ selected: sorting === 'desc' }">
+        Sort Descending
+      </button>
     </div>
     <ul>
       <user-item
@@ -19,66 +26,72 @@
 </template>
 
 <script>
+import { ref, computed, watch } from 'vue';
 import UserItem from './UserItem.vue';
 
 export default {
   components: {
-    UserItem,
+    UserItem
   },
   props: ['users'],
-  data() {
-    return {
-      enteredSearchTerm: '',
-      activeSearchTerm: '',
-      sorting: null,
-    };
-  },
-  computed: {
-    availableUsers() {
+  setup(props) {
+    var enteredSearchTerm = ref('');
+    const activeSearchTerm = ref('');
+    var sorting = ref(null);
+
+    const availableUsers = computed(function() {
       let users = [];
-      if (this.activeSearchTerm) {
-        users = this.users.filter((usr) =>
-          usr.fullName.includes(this.activeSearchTerm)
+      if (activeSearchTerm.value) {
+        users = props.users.filter(usr =>
+          usr.fullName.includes(activeSearchTerm.value)
         );
-      } else if (this.users) {
-        users = this.users;
+      } else if (props.users) {
+        users = props.users;
       }
       return users;
-    },
-    displayedUsers() {
-      if (!this.sorting) {
-        return this.availableUsers;
+    });
+    const displayedUsers = computed(function() {
+      if (!sorting.value) {
+        return availableUsers;
       }
-      return this.availableUsers.slice().sort((u1, u2) => {
-        if (this.sorting === 'asc' && u1.fullName > u2.fullName) {
+      return availableUsers.value.slice().sort((u1, u2) => {
+        if (sorting.value === 'asc' && u1.fullName > u2.fullName) {
           return 1;
-        } else if (this.sorting === 'asc') {
+        } else if (sorting.value === 'asc') {
           return -1;
-        } else if (this.sorting === 'desc' && u1.fullName > u2.fullName) {
+        } else if (sorting.value === 'desc' && u1.fullName > u2.fullName) {
           return -1;
         } else {
           return 1;
         }
       });
-    },
-  },
-  methods: {
-    updateSearch(val) {
-      this.enteredSearchTerm = val;
-    },
-    sort(mode) {
-      this.sorting = mode;
-    },
-  },
-  watch: {
-    enteredSearchTerm(val) {
+    });
+
+    watch(enteredSearchTerm, function(val) {
       setTimeout(() => {
-        if (val === this.enteredSearchTerm) {
-          this.activeSearchTerm = val;
+        if (val === enteredSearchTerm.value) {
+          activeSearchTerm.value = val;
         }
       }, 300);
+    });
+
+    function updateSearch(val) {
+      enteredSearchTerm = val;
     }
-  },
+    function sort(mode) {
+      sorting = mode;
+    }
+
+    return {
+      enteredSearchTerm,
+      activeSearchTerm,
+      sorting,
+      availableUsers,
+      displayedUsers,
+      updateSearch,
+      sort
+    };
+  }
 };
 </script>
 
@@ -88,4 +101,4 @@ ul {
   margin: 0;
   padding: 0;
 }
-</style>
\ No newline at end of file
+</style>