From 32a0508a124f548a38b70edc0695d1d66c814fc4 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Fri, 22 Jul 2022 02:34:10 +0200
Subject: [PATCH] build with nightly on dockerhub, not ghcr

---
 .github/workflows/dockerbuild.yaml      | 52 ++++++++++++-------------
 frontend/src/components/Searchfield.js  | 12 +++---
 frontend/src/components/WelcomeForm.jsx |  4 +-
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index 9416ba50..b12d4701 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -41,34 +41,14 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       
-      #- name: Login to DockerHub
-      #  uses: docker/login-action@v2
-      #  with:
-      #    username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #    password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      #- name: Dockerhub Build and push 
-      #  id: docker_build_dockerhub
-      #  uses: docker/build-push-action@v2
-      #  env:
-      #    BUILDX_NO_DEFAULT_LOAD: true
-      #  with:
-      #    context: ${{ matrix.path }}/
-      #    file: ${{ matrix.path }}/Dockerfile          
-      #    platforms: linux/amd64,linux/arm64
-      #    #,linux/386 - no node image I guess?
-      #    push: true
-      #    tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:${{ matrix.version }}
-
-      - name: Login to Ghcr 
+      - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          registry: ghcr.io
-          username: frikky
-          password: ${{ secrets.GHCR_PW }} 
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Ghcr Build and push
-        id: docker_build
+      - name: Dockerhub Build and push 
+        id: docker_build_dockerhub
         uses: docker/build-push-action@v2
         env:
           BUILDX_NO_DEFAULT_LOAD: true
@@ -76,8 +56,28 @@ jobs:
           context: ${{ matrix.path }}/
           file: ${{ matrix.path }}/Dockerfile          
           platforms: linux/amd64,linux/arm64
+          #,linux/386 - no node image I guess?
           push: true
-          tags: frikky/shuffle-${{ matrix.app }}:nightly
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:nightly
+
+      #- name: Login to Ghcr 
+      #  uses: docker/login-action@v2
+      #  with:
+      #    registry: ghcr.io
+      #    username: frikky
+      #    password: ${{ secrets.GHCR_PW }} 
+
+      #- name: Ghcr Build and push
+      #  id: docker_build
+      #  uses: docker/build-push-action@v2
+      #  env:
+      #    BUILDX_NO_DEFAULT_LOAD: true
+      #  with:
+      #    context: ${{ matrix.path }}/
+      #    file: ${{ matrix.path }}/Dockerfile          
+      #    platforms: linux/amd64,linux/arm64
+      #    push: true
+      #    tags: frikky/shuffle-${{ matrix.app }}:nightly
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/frontend/src/components/Searchfield.js b/frontend/src/components/Searchfield.js
index 385600f7..b27afbc4 100644
--- a/frontend/src/components/Searchfield.js
+++ b/frontend/src/components/Searchfield.js
@@ -208,7 +208,7 @@ const SearchField = props => {
 
 							// <a rel="noopener noreferrer" href="https://www.algolia.com/" target="_blank" style={{textDecoration: "none", color: "white"}}>
 							return (
-								<Link key={hit.objectID} to={{ pathname: isCloud ? parsedUrl : `/workflows/${hit.objectID}` }} rel="noopener noreferrer" style={{textDecoration: "none", color: "white",}} onClick={(event) => {
+								<Link key={hit.objectID} to={{ pathname: parsedUrl }} rel="noopener noreferrer" style={{textDecoration: "none", color: "white",}} onClick={(event) => {
 									//console.log("CLICK")
 									setSearchOpen(true)
 
@@ -221,7 +221,7 @@ const SearchField = props => {
 									aa('sendEvents', [
 										{
 											eventType: 'click',
-											eventName: 'Product Clicked',
+											eventName: 'Workflow Clicked',
 											index: 'workflows',
 											objectIDs: [hit.objectID],
 											timestamp: timestamp,
@@ -400,7 +400,7 @@ const SearchField = props => {
 							parsedUrl += `?queryID=${hit.__queryID}`
 
 							return (
-								<Link key={hit.objectID} to={{ pathname: isCloud ? parsedUrl : `/apps/${hit.objectID}` }} style={{textDecoration: "none", color: "white",}} onClick={(event) => {
+								<Link key={hit.objectID} to={{ pathname: parsedUrl }} style={{textDecoration: "none", color: "white",}} onClick={(event) => {
 									console.log("CLICK")
 									setSearchOpen(true)
 
@@ -413,12 +413,13 @@ const SearchField = props => {
 									aa('sendEvents', [
 										{
 											eventType: 'click',
-											eventName: 'Product Clicked',
+											eventName: 'App Clicked',
 											index: 'appsearch',
 											objectIDs: [hit.objectID],
 											timestamp: timestamp,
 											queryID: hit.__queryID,
 											positions: [hit.__position],
+											userToken: userdata === undefined || userdata === null || userdata.id === undefined ? "unauthenticated" : userdata.id,
 										}
 									])
 
@@ -563,12 +564,13 @@ const SearchField = props => {
 								aa('sendEvents', [
 									{
 										eventType: 'click',
-										eventName: 'Product Clicked',
+										eventName: 'Document Clicked',
 										index: 'documentation',
 										objectIDs: [hit.objectID],
 										timestamp: timestamp,
 										queryID: hit.__queryID,
 										positions: [hit.__position],
+										userToken: userdata === undefined || userdata === null || userdata.id === undefined ? "unauthenticated" : userdata.id,
 									}
 								])
 
diff --git a/frontend/src/components/WelcomeForm.jsx b/frontend/src/components/WelcomeForm.jsx
index ef05f66f..63247e20 100644
--- a/frontend/src/components/WelcomeForm.jsx
+++ b/frontend/src/components/WelcomeForm.jsx
@@ -598,11 +598,11 @@ const WelcomeForm = (props) => {
                         <Button onClick={handleReset}>Reset</Button>
                         <script>
                             setTimeout(function() {
-                            	navigate("/getting-started")
+                            	navigate("/workflows")
 														}, 5000);
                         </script>
                         <Button>
-													<Link style={{color: "#f86a3e", }} to="/getting-started" className="btn btn-primary">
+													<Link style={{color: "#f86a3e", }} to="/workflows" className="btn btn-primary">
 														Getting Started
 													</Link>
 												</Button>