Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sn 568 v1 #273

Open
wants to merge 109 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
18194cb
resolve issue #1
choipd Apr 17, 2022
c62d693
Merge pull request #3 from choipd/1-add-human-item-buttons
choipd Apr 17, 2022
69a746d
humans, items added
choipd Apr 17, 2022
66670ca
Merge branch 'develop' into 2-label-header-customize
choipd Apr 17, 2022
5e606f1
라벨 헤더에 구분하는 것 넣기
choipd Apr 17, 2022
e154bdb
Merge pull request #4 from choipd/2-label-header-customize
choipd Apr 17, 2022
af64cbd
tag button
choipd Apr 18, 2022
6549fc3
item attribute select WIP
choipd Apr 18, 2022
fb4fc87
human info 저장하는 기능까지 만들었음
choipd Apr 19, 2022
22ace1e
지울 때 humans, items 에도 반영
choipd Apr 19, 2022
a898a45
export json 추가
choipd Apr 20, 2022
18771da
import annotation 기능 완료
choipd Apr 21, 2022
e3c8ddf
메인 카테고리 변경시 서브카테고리 변경
choipd Apr 21, 2022
e5a25f3
휴먼 선택하면 거기에 맞춰서 ITEM생성시 human_id 맵핑
choipd Apr 21, 2022
37d45ea
Merge pull request #6 from choipd/5-label-attribute-form
choipd Apr 21, 2022
9684733
now we don't need labels.txt
choipd Apr 21, 2022
a47d00b
adding guide images
choipd Apr 25, 2022
e6b4a53
send json
choipd Apr 26, 2022
8f1b972
Guide style integration, importer integration
choipd Apr 26, 2022
d6c572c
save auth data in localstorage
choipd Apr 28, 2022
cac9636
logout
choipd Apr 28, 2022
ba5c750
logout
choipd Apr 28, 2022
b24455a
style name
choipd Apr 28, 2022
9bec859
make subcategory control main
choipd Apr 28, 2022
0cf2707
스타일 코드 다시 맞추는 작업중
choipd May 10, 2022
0ba2cc0
replace style image
choipd May 25, 2022
0c3e5d2
베트남어 지원
choipd May 26, 2022
8d8be5d
label attribute bug fix
choipd May 26, 2022
2a0910f
loading image bug fix
choipd May 27, 2022
51ea77b
add vietnamese in menu text
choipd May 28, 2022
5202e52
첫번째 이미지 로딩 이슈 수정
choipd Jun 4, 2022
f223482
메뉴 구조 정리
choipd Jun 4, 2022
d316c82
보이지 않은 가이드 이미지
choipd Jun 4, 2022
413a8e8
이미지 대소문자 문제 있는 것들 수정
choipd Jun 4, 2022
5dc83aa
파일명 수정
choipd Jun 4, 2022
c3bbb38
default style 적용
choipd Jun 4, 2022
c627d48
add human id unknown
choipd Jun 7, 2022
6e4524f
json 데이터가 object로 들어올 경우 예외처리 추가
choipd Jun 7, 2022
d3292e7
정렬하지 않토록 수정
choipd Jun 9, 2022
2f3d037
make popup draggable
choipd Jun 14, 2022
1f19533
init popup position
choipd Jun 14, 2022
12b0fc7
rect color
choipd Jun 14, 2022
468c7b7
remove logs
choipd Jun 14, 2022
4d32adc
로그아웃 버튼 추가
choipd Jun 14, 2022
90dbacd
선택한 옵션의 샘플 이미지 좀크게 보여주기
choipd Jun 16, 2022
46e6086
mulitple uploading
choipd Jun 16, 2022
f12fbf6
가이드 이미지 간격 조절
choipd Jun 16, 2022
480a366
간격 조정, 버튼 색상 변경
choipd Jun 16, 2022
94183f4
라벨 선택 정도 요약해서 텍스트로 보여주기
choipd Jun 28, 2022
843bc3f
thumnail 적용
choipd Jun 28, 2022
3bc24e3
mesh pattern 추가
choipd Jun 28, 2022
6b6da2b
아이콘 타입으로 보여주기
choipd Jun 28, 2022
5f80ae7
logout bug fix
choipd Jun 28, 2022
7317cbd
아이콘 형식으로 반영
choipd Jun 29, 2022
1e9f631
툴팁으로 메시지 보여주기
choipd Jun 29, 2022
944b98b
correction image types
choipd Jun 30, 2022
9233d9e
resize image
choipd Jun 30, 2022
b07c771
fill mode feature
choipd Jun 30, 2022
e97336f
hide blurry filter
choipd Jun 30, 2022
15e36d0
라벨 UI 레이아웃 변경중
choipd Jul 1, 2022
bd8bc92
베트남어 번역
choipd Jul 1, 2022
901e0ca
style icons WIP
choipd Jul 4, 2022
5ae5bf4
라벨 팝업에서 썸네일 수정
choipd Jul 4, 2022
d92dc00
delete confirm
choipd Jul 4, 2022
236f478
label style
choipd Jul 4, 2022
0d99fed
버그 픽스
choipd Jul 10, 2022
1521c4f
one style constraint
choipd Jul 10, 2022
3c7f484
auto matching style depends on the gender
choipd Jul 10, 2022
3622ca1
udpate new code UI
cuongho2 Jul 21, 2022
47a9676
remove unuse code
cuongho2 Jul 22, 2022
fd878f3
Merge pull request #7 from choipd/cuonghq/newUI
choipd Jul 22, 2022
ea2d27f
config docker file
cuongho2 Jul 22, 2022
21a09df
Merge pull request #8 from choipd/cuonghq/newUI
cuongho2 Jul 22, 2022
6ba971a
logo changed
choipd Jul 22, 2022
ceb05b7
update my config
cuongho2 Jul 22, 2022
f688553
fix icon
cuongho2 Jul 22, 2022
e76d674
fix 4-1 issue
choipd Jul 22, 2022
f619f7c
update code
cuongho2 Jul 22, 2022
4bd7ea7
fix issue 4-2
choipd Jul 22, 2022
3168182
update code
cuongho2 Jul 22, 2022
0a4da45
fix issue 4-3
choipd Jul 22, 2022
d481eb5
update ocde
quoccuong03 Jul 22, 2022
36a187c
wide screen bug fix
choipd Jul 22, 2022
0d319ba
update code
quoccuong03 Jul 22, 2022
7cbdcad
update code
quoccuong03 Jul 22, 2022
f818162
site title change
choipd Jul 22, 2022
d4580d6
update code prod
quoccuong03 Jul 22, 2022
c176a52
update code
quoccuong03 Jul 22, 2022
ae061e6
update
quoccuong03 Jul 22, 2022
b1ba158
update env
quoccuong03 Jul 22, 2022
35bcb2b
canius-lite update
mjfruits1 Jul 28, 2022
6e02015
#9 to workaround gender and style matching issue.
choipd Jul 28, 2022
ae86f73
Merge branch 'develop' of github.com:choipd/make-sense into develop
choipd Jul 28, 2022
0245719
update .env
cuongho2 Aug 23, 2022
eb3372e
BACKOFFICE FE/UI/Labeling Tool: Update UI/UX handle qc_status
cuongho2 Aug 23, 2022
95de497
update fix scss
cuongho2 Aug 23, 2022
283d9bc
update code
cuongho2 Aug 24, 2022
988d625
Merge branch 'develop' into sn-568_v1
cuongho2 Aug 24, 2022
1350ccc
Merge branch 'develop' into sn-568_v1
cuongho2 Aug 24, 2022
93594fd
move qc status and qc comment
cuongho2 Aug 25, 2022
7d35811
reverse format package json
cuongho2 Sep 5, 2022
c7e6ff1
fix bug login when small screen 1440 and comment issue
cuongho2 Sep 5, 2022
9f62a83
change to previous code format
cuongho2 Sep 7, 2022
2f4294b
change format to previous
cuongho2 Sep 7, 2022
d559213
12 lock attributes (#14)
choipd Sep 20, 2022
1be11de
15 visualize task status (#16)
choipd Sep 21, 2022
d8a6581
resolved #17 add summary in the performance popup (#18)
choipd Sep 21, 2022
f380620
resolved #19 (#20)
choipd Sep 27, 2022
a137fdd
fix conflict
cuongho2 Sep 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<!-- REACT_APP_API_ROOT=/labeler -->
REACT_APP_API_URL=https://dev.ocmg.vn/showniq/api/backoffice
REACT_APP_API_ROOT=""
<!-- PUBLIC_URL=/labeler -->
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11.15.0
12
8 changes: 8 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
semi: true,
bracketSpacing: false,
jsxBracketSameLine: true,
singleQuote: true,
trailingComma: 'none',
tabWidth: 4
};
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "pwa-chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}"
}
]
}
20 changes: 20 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Create image based on the official Node image from dockerhub
FROM node:14.17.6 as cache-image
WORKDIR /usr/src/app
# RUN npm install

# Build frontend
FROM cache-image as builder
WORKDIR /usr/src/app
COPY . /usr/src/app

# RUN yarn build
COPY package.json ./
RUN npm install
RUN npm rebuild node-sass
RUN export PUBLIC_URL=http://localhost:3000/labeler
# Build frontend
# FROM cache-image as builder
# WORKDIR /usr/src/app
COPY . .
CMD ["npm", "start"]
62 changes: 62 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// pipeline {
// agent {
// docker {
// image 'node:14-alpine'
// args '-p 3005:3005'
// label 'support_ubuntu_docker'
// }
// }
// environment {
// HOME = '.'
// CI = 'true'
// }
// stages {
// stage('Build') {
// steps {
// // sh 'npm cache clean --force'
// sh 'npm install'
// }
// }

// stage('Deliver') {
// steps {
// sh "chmod +x -R ${env.WORKSPACE}"
// sh './jenkins/scripts/deliver.sh'
// // input message: 'Finished using the web site? (Click "Proceed" to continue)'
// // sh './jenkins/scripts/kill.sh'
// }
// }

// }
// }

pipeline {
// options {
// timeout(time: 1, unit: 'HOURS')
// }
agent {
dockerfile {
filename "Dockerfile"
args '-p 3005:3005'
label "java-docker-slave"
additionalBuildArgs "-t my-custom-node:latest"
}
}
environment {
HOME = '.'
CI = 'true'
}
stages {
stage("Test") {
steps {
sh "chmod +x -R ${env.WORKSPACE}"
sh "docker stop mydocker2"
sh "docker rm mydocker2"
sh "docker run -dit -p 3005:3005 --name=mydocker2 --restart=always my-custom-node "
script {
echo "test"
}
}
}
}
}
108 changes: 99 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading