From f30ae03d9c33d8c4a6d5753e67b820e5b4b78d91 Mon Sep 17 00:00:00 2001
From: feruzm <fmiboy@gmail.com>
Date: Tue, 3 Sep 2024 07:35:38 +0530
Subject: [PATCH] config changes, new branch

---
 .github/workflows/staging.yml                 | 22 +++------
 .idea/workspace.xml                           | 45 +++++++++----------
 src/config/.gitignore                         |  2 +-
 ...fig.template.json => config.template.json} |  0
 src/config/index.tsx                          |  2 +-
 .../global-store/modules/config-module.ts     |  2 +-
 6 files changed, 31 insertions(+), 42 deletions(-)
 rename src/config/{ecency-config.template.json => config.template.json} (100%)

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 960f745b3..0b80467be 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -2,13 +2,13 @@ name: Staging CI/CD
 on:
   push:
     branches:
-      - development
+      - develop
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
     steps:
     - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
@@ -41,7 +41,7 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          tags: ecency/vision:development
+          tags: ecency/vision-next:develop
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
@@ -53,30 +53,22 @@ jobs:
     - name: SSH and deploy node app
       uses: appleboy/ssh-action@master
       env:
-        USE_PRIVATE: ${{secrets.USE_PRIVATE}}
-        REDIS_HOST_PASSWORD: ${{secrets.REDIS_HOST_PASSWORD}}
         PRIVATE_API_ADDR: ${{secrets.PRIVATE_API_ADDR}}
         PRIVATE_API_AUTH: ${{secrets.PRIVATE_API_AUTH}}
         HIVESIGNER_CLIENT_SECRET: ${{secrets.HIVESIGNER_CLIENT_SECRET}}
-        SEARCH_API_ADDR: ${{secrets.SEARCH_API_ADDR}}
-        SEARCH_API_SECRET: ${{secrets.SEARCH_API_SECRET}}
         API_PORT: ${{secrets.API_PORT}}
       with:
         host: ${{ secrets.SSH_STAGING_HOST }}
         username: ${{ secrets.SSH_USERNAME }}
         key: ${{ secrets.SSH_KEY }}
         port: ${{ secrets.SSH_PORT }}
-        envs: USE_PRIVATE,REDIS_HOST_PASSWORD,PRIVATE_API_ADDR,PRIVATE_API_AUTH,HIVESIGNER_CLIENT_SECRET,SEARCH_API_ADDR,SEARCH_API_SECRET,API_PORT
+        envs: PRIVATE_API_ADDR,PRIVATE_API_AUTH,HIVESIGNER_CLIENT_SECRET,API_PORT
         script: |
-          export USE_PRIVATE=$USE_PRIVATE
-          export REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD
           export PRIVATE_API_ADDR=$PRIVATE_API_ADDR
           export PRIVATE_API_AUTH=$PRIVATE_API_AUTH
           export HIVESIGNER_CLIENT_SECRET=$HIVESIGNER_CLIENT_SECRET
-          export SEARCH_API_ADDR=$SEARCH_API_ADDR
-          export SEARCH_API_SECRET=$SEARCH_API_SECRET
           export API_PORT=$API_PORT
-          cd ~/vision-staging
-          git pull origin development
-          docker pull ecency/vision:development
+          cd ~/vision-next
+          git pull origin develop
+          docker pull ecency/vision-next:develop
           docker-compose up -d
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cccfacc60..9fba64dec 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,15 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="567b3f09-0d14-4afd-b660-f387a4319347" name="Changes" comment="Fixed balance fetching in gift modal">
+      <change beforePath="$PROJECT_DIR$/.github/workflows/staging.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/staging.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/api/queries/drafts-query.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/queries/drafts-query.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/api/queries/fragments-query.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/queries/fragments-query.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/api/queries/gallery-images-query.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/queries/gallery-images-query.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/api/queries/schedules-query.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/queries/schedules-query.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/features/shared/drafts/drafts-list.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/features/shared/drafts/drafts-list.tsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/features/shared/fragments/fragments-list.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/features/shared/fragments/fragments-list.tsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/features/shared/gallery/gallery-list.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/features/shared/gallery/gallery-list.tsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/features/shared/schedules/schedules-list.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/features/shared/schedules/schedules-list.tsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/config/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/src/config/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/config/ecency-config.template.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/config/config.template.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/config/index.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/config/index.tsx" afterDir="false" />
     </list>
     <list id="c0010c83-5fb5-4c60-99a2-f005b2ed038b" name="dont" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -89,7 +85,8 @@
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "WebServerToolWindowFactoryState": "false",
     "code.cleanup.on.save": "true",
-    "git-widget-placeholder": "main",
+    "dart.analysis.tool.window.visible": "false",
+    "git-widget-placeholder": "develop",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "/Users/ildartimerbaev/Work2/ecency-vision-nextjs/src/app",
     "node.js.detected.package.eslint": "true",
@@ -105,13 +102,13 @@
     "npm.dev.executor": "Run",
     "npm.start.executor": "Run",
     "npm.test.executor": "Run",
-    "prettierjs.PrettierConfiguration.Package": "/Users/ildartimerbaev/Work2/ecency-vision-nextjs/node_modules/prettier",
+    "prettierjs.PrettierConfiguration.Package": "/Users/fm/pjs/ecency-vision/node_modules/prettier",
     "project.structure.last.edited": "Project",
     "project.structure.proportion": "0.0",
     "project.structure.side.proportion": "0.0",
     "rearrange.code.on.save": "true",
     "settings.editor.selected.configurable": "actions.on.save",
-    "ts.external.directory.path": "/Users/ildartimerbaev/Work2/ecency-vision-nextjs/node_modules/typescript/lib",
+    "ts.external.directory.path": "/Users/fm/pjs/ecency-vision/node_modules/typescript/lib",
     "vue.rearranger.settings.migration": "true"
   },
   "keyToStringList": {
@@ -147,19 +144,6 @@
     </key>
   </component>
   <component name="RunManager" selected="npm.dev">
-    <configuration default="true" type="JetRunConfigurationType">
-      <module name="ecency-vision-next" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
-      <module name="ecency-vision-next" />
-      <option name="filePath" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Comment.handles keyboard shortcuts" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
@@ -186,6 +170,19 @@
       </test-names>
       <method v="2" />
     </configuration>
+    <configuration default="true" type="JetRunConfigurationType">
+      <module name="ecency-vision-next" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
+      <module name="ecency-vision-next" />
+      <option name="filePath" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
       <package-json value="$PROJECT_DIR$/package.json" />
       <command value="run" />
diff --git a/src/config/.gitignore b/src/config/.gitignore
index 7af865c73..d344ba6b0 100644
--- a/src/config/.gitignore
+++ b/src/config/.gitignore
@@ -1 +1 @@
-ecency-config.json
\ No newline at end of file
+config.json
diff --git a/src/config/ecency-config.template.json b/src/config/config.template.json
similarity index 100%
rename from src/config/ecency-config.template.json
rename to src/config/config.template.json
diff --git a/src/config/index.tsx b/src/config/index.tsx
index 9f1c770bc..2f22f7ad2 100644
--- a/src/config/index.tsx
+++ b/src/config/index.tsx
@@ -1,4 +1,4 @@
-import config from "./ecency-config.json";
+import config from "./config.json";
 import { ComponentType, memo, PropsWithChildren, ReactNode } from "react";
 import { QueryClient, useMutation, UseMutationOptions } from "@tanstack/react-query";
 import type { DefaultError } from "@tanstack/query-core";
diff --git a/src/core/global-store/modules/config-module.ts b/src/core/global-store/modules/config-module.ts
index 4e7c400c2..c9a38cf5f 100644
--- a/src/core/global-store/modules/config-module.ts
+++ b/src/core/global-store/modules/config-module.ts
@@ -1,4 +1,4 @@
-import config from "../../../config/ecency-config.json";
+import config from "../../../config/config.json";
 
 export function createConfigState() {
   if (!config.visionConfig) {