Compare commits

..

14 Commits
main ... dev

Author SHA1 Message Date
quynhnm
9664de7556 Merge branch 'dev' of gitea.beetai.com:dungnh/Face_Classify_frontend into dev 2023-06-15 16:08:28 +07:00
b3bdabe398 Merge pull request 'link auto login' (#12) from feature/TKA-29- into dev
Reviewed-on: huyt/fsi_project#12
2023-04-07 03:27:49 +00:00
bi
402a5fdf6c pull merge code 2023-04-07 10:26:56 +07:00
bi
054d1aaee0 fix import 2023-04-07 10:24:41 +07:00
bi
57193a598c Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29- 2022-12-23 09:39:02 +07:00
bi
448757495f Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29- 2022-12-22 16:42:25 +07:00
bi
d7f1882cf3 Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29- 2022-12-21 10:12:09 +07:00
bi
cf41426c51 Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29- 2022-12-20 17:15:23 +07:00
bi
83d9259b52 Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29- 2022-12-20 13:45:17 +07:00
bi
6fbe47f5ee Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29- 2022-12-16 16:35:22 +07:00
bi
39e09df490 Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29- 2022-12-16 16:30:44 +07:00
bi
162882a202 Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29- 2022-12-16 16:18:40 +07:00
bi
b9cef59b20 Merge remote-tracking branch 'origin/dev' into feature/TKA-29- 2022-12-16 15:07:58 +07:00
bi
fa795c7a4c push 2022-12-16 15:07:33 +07:00
4 changed files with 6 additions and 4 deletions

View File

@ -1,3 +1,2 @@
REACT_APP_HOST='http://api.face-classify.beetai.com'
REACT_APP_SOURCE_IMG=1
WDS_SOCKET_PORT=0

View File

@ -16,7 +16,7 @@ import { Provider } from 'react-redux';
import store from './store';
import ReactRouter from './router/ReactRouter';
import { BrowserRouter as Router, Link, Route, Switch } from 'react-router-dom';
import AutoLogin from 'components/AutoLogin/AutoLogin';
import AutoLogin from './components/AutoLogin/AutoLogin';

View File

@ -1,5 +1,4 @@
import { Card, Image as ImageAntd } from 'antd';
import Header from 'components/layouts/Header';
import Parser from 'html-react-parser';
import $ from 'jquery';
import React, { Component } from 'react';

View File

@ -1,9 +1,13 @@
version: "2"
services:
app:
container_name: fsi_view
restart: always
build:
context: .
args:
- REACT_APP_HOST=http://api.face-classify.beetai.com
dockerfile: prod.dockerfile
image: registry.beetai.com:5000/fsi_web:1.0
ports:
- "5201:3000"