send json

SkalskiP · cuongho2 · Apr 17, 2022 · Apr 17, 2022 · Apr 17, 2022 · Apr 17, 2022
commit e6b4a53e94f552bae8df2a08aa72a6457dd38cfb
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,73 +1,83 @@
 {
-  "name": "make-sense",
-  "version": "1.0.0",
-  "private": true,
-  "dependencies": {
-    "@material-ui/core": "^4.12.3",
-    "@tensorflow-models/coco-ssd": "^2.2.2",
-    "@tensorflow-models/posenet": "^2.2.2",
-    "@tensorflow/tfjs": "^3.8.0",
-    "@tensorflow/tfjs-backend-cpu": "^3.9.0",
-    "@tensorflow/tfjs-backend-webgl": "^3.9.0",
-    "@tensorflow/tfjs-core": "^3.9.0",
-    "@tensorflow/tfjs-node": "^3.9.0",
-    "@types/jest": "27.0.1",
-    "@types/node": "16.7.6",
-    "@types/react": "17.0.19",
-    "@types/react-dom": "17.0.9",
-    "classnames": "^2.3.1",
-    "file-saver": "^2.0.5",
-    "jszip": "^3.7.1",
-    "lodash": "^4.17.21",
-    "mobile-detect": "^1.4.5",
-    "moment": "^2.29.1",
-    "node-sass": "^6.0.1",
-    "react": "^16.8.6",
-    "react-custom-scrollbars": "^4.2.1",
-    "react-dom": "^17.0.2",
-    "react-dropzone": "^11.3.4",
-    "react-redux": "^7.2.4",
-    "react-scripts": "^4.0.3",
-    "react-select": "^5.3.0",
-    "react-spinners": "^0.11.0",
-    "redux": "^4.1.1",
-    "typescript": "4.4.2",
-    "uuid": "^8.3.2"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "test:coverage": "npm test -- --coverage",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {
-    "@types/file-saver": "^2.0.3",
-    "@types/lodash": "^4.14.172",
-    "@types/react-custom-scrollbars": "^4.0.8",
-    "@types/react-redux": "^7.1.18",
-    "@types/uuid": "^8.3.1",
-    "prettier": "^2.3.2",
-    "@redux-devtools/core": "^3.9.0",
-    "tslint": "^6.1.3",
-    "tslint-react": "^5.0.0"
-  }
+    "name": "make-sense",
+    "version": "1.0.0",
+    "private": true,
+    "dependencies": {
+        "@material-ui/core": "^4.12.3",
+        "@tensorflow-models/coco-ssd": "^2.2.2",
+        "@tensorflow-models/posenet": "^2.2.2",
+        "@tensorflow/tfjs": "^3.8.0",
+        "@tensorflow/tfjs-backend-cpu": "^3.9.0",
+        "@tensorflow/tfjs-backend-webgl": "^3.9.0",
+        "@tensorflow/tfjs-core": "^3.9.0",
+        "@tensorflow/tfjs-node": "^3.9.0",
+        "@types/jest": "27.0.1",
+        "@types/node": "16.7.6",
+        "@types/react": "17.0.19",
+        "@types/react-dom": "17.0.9",
+        "axios": "^0.27.1",
+        "classnames": "^2.3.1",
+        "file-saver": "^2.0.5",
+        "jszip": "^3.7.1",
+        "lodash": "^4.17.21",
+        "mobile-detect": "^1.4.5",
+        "moment": "^2.29.1",
+        "node-sass": "^6.0.1",
+        "react": "^16.8.6",
+        "react-custom-scrollbars": "^4.2.1",
+        "react-dom": "^17.0.2",
+        "react-dropzone": "^11.3.4",
+        "react-redux": "^7.2.4",
+        "react-scripts": "^4.0.3",
+        "react-select": "^5.3.0",
+        "react-spinners": "^0.11.0",
+        "redux": "^4.1.1",
+        "redux-thunk": "^2.4.1",
+        "typescript": "4.4.2",
+        "uuid": "^8.3.2"
+    },
+    "scripts": {
+        "start": "react-scripts start",
+        "build": "react-scripts build",
+        "test": "react-scripts test",
+        "test:coverage": "npm test -- --coverage",
+        "eject": "react-scripts eject"
+    },
+    "eslintConfig": {
+        "plugins": [
+            "react-hooks"
+        ],
+        "extends": [
+            "react-app",
+            "react-app/jest"
+        ],
+        "rules": {
+            "react-hooks/rules-of-hooks": "error",
+            "react-hooks/exhaustive-deps": "warn"
+        }
+    },
+    "browserslist": {
+        "production": [
+            ">0.2%",
+            "not dead",
+            "not op_mini all"
+        ],
+        "development": [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 safari version"
+        ]
+    },
+    "devDependencies": {
+        "@redux-devtools/core": "^3.9.0",
+        "@types/file-saver": "^2.0.3",
+        "@types/lodash": "^4.14.172",
+        "@types/react-custom-scrollbars": "^4.0.8",
+        "@types/react-redux": "^7.1.18",
+        "@types/uuid": "^8.3.1",
+        "eslint-plugin-react-hooks": "^4.4.0",
+        "prettier": "^2.3.2",
+        "tslint": "^6.1.3",
+        "tslint-react": "^5.0.0"
+    }
 }
diff --git a/public/ico/cloud-upload.png b/public/ico/cloud-upload.png
diff --git a/public/ico/cloud-uploading.png b/public/ico/cloud-uploading.png
diff --git a/src/data/enums/PopupWindowType.ts b/src/data/enums/PopupWindowType.ts
@@ -9,5 +9,6 @@ export enum PopupWindowType {
     INSERT_LABEL_NAMES = 'INSERT_LABEL_NAMES',
     EXIT_PROJECT = 'EXIT_PROJECT',
     LOADER = 'LOADER',
-    LABEL_INFO = 'LABEL_INFO'
+    LABEL_INFO = 'LABEL_INFO',
+    LOGIN = 'LOGIN'
 }
diff --git a/src/logic/export/RectLabelsExporter.ts b/src/logic/export/RectLabelsExporter.ts
@@ -18,6 +18,7 @@ import {ISize} from '../../interfaces/ISize';
 import {NumberUtil} from '../../utils/NumberUtil';
 import {RectUtil} from '../../utils/RectUtil';
 import {IRect} from '../../interfaces/IRect';
+import {AuthSelector} from '../../store/selectors/AuthSelector';
 
 export class RectLabelsExporter {
     public static export(exportFormatType: AnnotationFormatType): void {
@@ -253,7 +254,7 @@ export class RectLabelsExporter {
         }
     }
 
-    private static wrapRectLabelsIntoJSON(imageData: ImageData): RectJSON {
+    public static wrapRectLabelsIntoJSON(imageData: ImageData): RectJSON {
         if (imageData.labelRects.length === 0 || !imageData.loadStatus)
             return null;
 
@@ -280,7 +281,7 @@ export class RectLabelsExporter {
         const json: RectJSON = {
             //@ts-ignore
             img_path: imageData.fileData.path,
-            writer_id: 'userID',
+            writer_id: AuthSelector.getUserID(),
             version: 1,
             human_info: imageData.humans.map((human) => ({
                 human_id: convertHumanId(human.uuid),

diff --git a/src/services/API.ts b/src/services/API.ts
@@ -0,0 +1,85 @@
+import {string} from '@tensorflow/tfjs-core';
+import axios from 'axios';
+import {Settings} from '../settings/Settings';
+import {AuthSelector} from '../store/selectors/AuthSelector';
+
+export class APIService {
+    private static token = null;
+
+    public static setToken = (token: string) => (this.token = token);
+
+    public static login = async ({
+        email,
+        password
+    }: {
+        email: string;
+        password: string;
+    }) => {
+        return await axios({
+            method: 'post',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            url: `${Settings.API_PREFIX}/login`,
+            // data: JSON.stringify({
+            //     id: 'test002@showniq.com',
+            //     password: 'ocmg123@'
+            // })
+            data: {id: email, password}
+        });
+    };
+
+    public static fetchImages = async ({
+        offset,
+        limit
+    }: {
+        offset: number;
+        limit: number;
+    }) => {
+        if (!this.token) {
+            throw Error('Token is required');
+        }
+        return await axios({
+            method: 'get',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${this.token}`
+            },
+            url: `${Settings.API_PREFIX}/labeler/images`,
+            params: {limit, offset}
+        });
+    };
+
+    public static updateImage = async ({
+        imageId,
+        json
+    }: {
+        imageId: string;
+        json: string;
+    }) => {
+        const token = AuthSelector.getToken();
+        console.log('token = ', token);
+        console.log('json = ', json);
+        console.log('imageId = ', imageId);
+        if (!token) {
+            throw Error('Token is required');
+        }
+        if (!imageId) {
+            throw Error('ImageId is required');
+        }
+        if (!json) {
+            throw Error('JSON is required');
+        }
+        return await axios({
+            method: 'put',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${token}`
+            },
+            url: `${Settings.API_PREFIX}/labeler/images/${imageId}`,
+            data: {
+                json
+            }
+        });
+    };
+}
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -0,0 +1,9 @@
+export type APIImageData = {
+    image_id: string;
+    image_url: string;
+    style_list: {
+        seq: string;
+        name: string;
+    }[];
+    json?: string;
+};
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
@@ -69,4 +69,7 @@ export class Settings {
         '#ff95c8',
         '#ff37c7'
     ];
+
+    public static readonly API_PREFIX =
+        'https://dev.ocmg.vn/fs-app/api/backoffice';
 }
diff --git a/src/store/Actions.ts b/src/store/Actions.ts
@@ -43,5 +43,8 @@ export enum Action {
 
     // NOTIFICATIONS
     SUBMIT_NEW_NOTIFICATION = '@@SUBMIT_NEW_NOTIFICATION',
-    DELETE_NOTIFICATION_BY_ID = '@@DELETE_NOTIFICATION_BY_ID'
+    DELETE_NOTIFICATION_BY_ID = '@@DELETE_NOTIFICATION_BY_ID',
+
+    // AUTH
+    UPDATE_AUTH_DATA = '@@UPDATE_AUTH_DATA'
 }
diff --git a/src/store/auth/actionCreators.ts b/src/store/auth/actionCreators.ts
@@ -0,0 +1,11 @@
+import {AuthActionTypes, AuthData} from './types';
+import {Action} from '../Actions';
+
+export function updateAuthData(authData: AuthData): AuthActionTypes {
+    return {
+        type: Action.UPDATE_AUTH_DATA,
+        payload: {
+            authData
+        }
+    };
+}