Merge branch 'feature/Test-Streaming' of...

Merge branch 'feature/Test-Streaming' of http://mc-git.com/mydressin/mydressin-front into feature/Test-Streaming

.env

@@ -4,6 +4,9 @@ NEXT_PUBLIC_HOST_API=https://api-dev-minimal-v510.vercel.app
 NEXT_PUBLIC_HOST_API_URL=http://15.237.175.171:8080
 NEXT_PUBLIC_WEB_SOCKET_URL=http://15.237.175.171:8080/ws
 
+NEXT_PUBLIC_HOST_API_URL=http://15.237.175.171:8080
+NEXT_PUBLIC_WEB_SOCKET_URL=http://15.237.175.171:8080/ws
+
 # ASSETS
 NEXT_PUBLIC_ASSETS_API=https://api-dev-minimal-v510.vercel.app
 

.gitlab-ci.yml

@@ -2,6 +2,7 @@ stages:
   - build
   - deploy
   - notify_discord
+  - notify_discord
 
 
 build_test:
@@ -18,6 +19,11 @@ build_test:
 deploy:
   stage: deploy
   image: docker:20.10.16
+  services:
+    - docker:dind
+  variables:
+    DOCKER_DRIVER: overlay2
+  image: docker:20.10.16
   services:
     - docker:dind
   variables:
@@ -31,6 +37,14 @@ deploy:
     - ssh-keyscan ${PLESK_HOST_REC} >> ~/.ssh/known_hosts
     - docker info
     - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+    - mkdir -p ~/.ssh
+    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa_gitlab_nopass_mc_vps
+    - chmod 600 ~/.ssh/id_rsa_gitlab_nopass_mc_vps
+    - eval $(ssh-agent -s)
+    - ssh-add ~/.ssh/id_rsa_gitlab_nopass_mc_vps
+    - ssh-keyscan ${PLESK_HOST_REC} >> ~/.ssh/known_hosts
+    - docker info
+    - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
   script:
     - echo "Building Docker image..."
     - docker build -t ${DOCKER_IMAGE_PATH}:rec .

package.json

@@ -63,6 +63,8 @@
     "react-router-dom": "^6.22.3",
     "react-stomp": "^5.1.0",
     "react-stomp-hooks": "^3.0.0",
+    "react-stomp": "^5.1.0",
+    "react-stomp-hooks": "^3.0.0",
     "rehype-highlight": "^7.0.0",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
@@ -78,6 +80,7 @@
   "devDependencies": {
     "@types/autosuggest-highlight": "^3.2.3",
     "@types/json2csv": "^5.0.7",
+    "@types/json2csv": "^5.0.7",
     "@types/node": "20.11.30",
     "@types/nprogress": "^0.2.3",
     "@types/react": "18.2.70",

src/app/dashboard/page.tsx

-import HomeView from '@/shared/sections/home/view';
-
-// ----------------------------------------------------------------------
+import  AllLivesView  from '@/shared/sections/lives/all-lives/view'
 
 export const metadata = {
-  title: 'Dashboard: Home',
+    title: 'Dashboard: Live List',
 };
 
-export default function Page() {
-  return <HomeView />;
+export default function LivesListPage() {
+    return <AllLivesView />;
 }

src/shared/api/server.ts

 import { HOST_API_URL } from '@/config-global';
 import axios, { AxiosRequestConfig } from 'axios';
-import { comment } from 'postcss';
-import { shippingClassesList } from '../_mock/_shipping';
 
 
-export const HOST_API = 'http://15.237.175.171:8080';
+
 
 export const axiosInstance = axios.create({ baseURL: HOST_API_URL });