latest

bentossell · Oct 30, 2020 · 143d052 · 143d052
1 parent f7e4841
commit 143d052
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 41 deletions.
diff --git a/client/edit-project.js b/client/edit-project.js
@@ -165,15 +165,4 @@ $('.delete-project-button').click(function (event) {
   let data = objectifyForm($('#wf-form-Edit-Project').serializeArray())
   if (!data || !data.slug) return
   deleteProject(data)
-})
-
-function addToolsFromTags(tags) {
-  let toolTags = tagsArray.filter(item => item.type === 'company').map(item => item.value)
-  let userTags = firebaseCollections['user_company'].map(item => item.companyId)
-  console.log({ toolTags, userTags })
-  let newTools = tags.filter(item => toolTags.includes(item) && !userTags.includes(item))
-  console.log(newTools)
-  return newTools.forEach(item => {
-    followCompany(item)
-  })
-}
+})
diff --git a/client/edit-workflow.js b/client/edit-workflow.js
@@ -161,15 +161,4 @@ $('.delete-project-button').click(function (event) {
   let data = objectifyForm($('#wf-form-Edit-Workflow').serializeArray())
   if (!data || !data.id) return
   deleteWorkflow(data)
-})
-
-async function addToolsFromTags(tags) {
-  let toolTags = tagsArray.filter(item => item.type === 'company').map(item => item.value)
-  let userTags = firebaseCollections['user_company'].map(item => item.companyId)
-  console.log({ toolTags, userTags })
-  let newTools = tags.filter(item => toolTags.includes(item) && !userTags.includes(item))
-  console.log(newTools)
-  return newTools.forEach(item => {
-    followCompany(item)
-  })
-}
+})
diff --git a/client/firebase.js b/client/firebase.js
@@ -538,6 +538,17 @@ function updateTutorial(id, object) {
     .catch(error => handleError(error))
 }
 
+async function addToolsFromTags(tags) {
+  let toolTags = searchArray.filter(item => item.type === 'company').map(item => item.id)
+  let userTags = firebaseCollections['user_company'].map(item => item.companyId)
+  console.log({ toolTags, userTags })
+  let newTools = tags.filter(item => toolTags.includes(item) && !userTags.includes(item))
+  console.log(newTools)
+  return newTools.forEach(item => {
+    followCompany(item)
+  })
+}
+
 function getUserImage(userObject) {
   // return `https://firebasestorage.googleapis.com/v0/b/makerpad-94656.appspot.com/o/profile_pictures%2F${username}?alt=media&token=acf25318-5b18-454e-85d5-b3d2e694b04a`
   if (userObject.imageUrl) {

diff --git a/client/markup.js b/client/markup.js
@@ -224,3 +224,13 @@ async function getRandomUsers() {
   })
 }
 
+async function renderTags(target, data, class) {
+  populateSearchArray().then(() => {
+    if (data.tags) data.tags.forEach(tag => {
+      let tagItem = searchArray.find(item => item.id === tag)
+      $(target).append(`
+            <a href="${tagItem.link}" class="${class}">${tag}</a>
+          `)
+    })
+  })
+}
diff --git a/client/projects.js b/client/projects.js
@@ -38,14 +38,7 @@ async function renderProject() {
       if (data.price) $('.project-price-text').text(data.price)
       if (data['sale-url'] || data.price) $('#project-purchase-block').show()
 
-      populateSearchArray().then(() => {
-        if (data.tags) data.tags.forEach(tag => {
-          let tagItem = searchArray.find(item => item.id === tag)
-          $('#project-tags').append(`
-            <a href="${tagItem.link}" class="project-tag">${tag}</a>
-          `)
-        })
-      })
+      renderTags('#project-tags', data, 'project-tag')
 
     })
     .catch(error => handleError(error))

diff --git a/client/workflows.js b/client/workflows.js
@@ -61,15 +61,8 @@ async function renderWorkflow() {
         } catch (error) { }
       }
 
-      getTags()
-        .then(() => {
-          if (data.tags) data.tags.forEach(tag => {
-            let tagItem = tagsArray.find(item => item.value === tag)
-            $('#workflow-tags').append(`
-              <a href="/${tagItem.type}/${tagItem.value}" class="workflow-tag">${tag}</a>
-            `)
-          })
-        })
+      renderTags('#workflow-tags', data, 'workflow-tag')
+
     })
     .catch(error => handleError(error))
 }