Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
be8f5b5
template add
Mar 21, 2024
d18b274
창고 관리 페이지 html 수정1
Mar 21, 2024
4d15dca
창고 관리 페이지 html 수정2
Mar 21, 2024
7ebcc29
F-창고 관리vue 0.1.0
Mar 22, 2024
cd32b7d
창고별 재고목록 개발 start
Mar 22, 2024
c8cfd27
F_LOGIN_0.1.0-LoginPage-로그인기능구현
CoffeerLatte Mar 22, 2024
d0f329b
0.1.0 창고별 재고출력X
Mar 22, 2024
fe15a22
[Chore]
ae-chae Mar 22, 2024
ec128da
창고,창고별재고목록 완료
Mar 22, 2024
618178d
[Design] add template
ae-chae Mar 23, 2024
b465247
thymeleaf 경로 문제로 현재 경로에 있는 templates를 삭제하고 기존 경로로 옮깁니다.
CoffeerLatte Mar 25, 2024
d4e8f79
Add login template
CoffeerLatte Mar 25, 2024
1b12487
Add .gitignore, add vue template
CoffeerLatte Mar 25, 2024
7f1d6a9
Merge branch 'registerPage/0.1.0/J' of github.com:team4-order/4team_f…
CoffeerLatte Mar 25, 2024
9ad47af
Delete node_modules directory
CoffeerLatte Mar 25, 2024
c47e77a
Merge branch 'registerPage/0.1.0/J' of github.com:team4-order/4team_f…
CoffeerLatte Mar 25, 2024
7bfe53d
v0.1.0 3개 기본화면 완료
Mar 25, 2024
1be730b
delete all previous files(templates)
CoffeerLatte Mar 26, 2024
3c470de
Fix line endings
ae-chae Mar 26, 2024
2b90c8d
update 24-03-26 / connecting with backend(jwt)
CoffeerLatte Mar 26, 2024
ad2de77
[Feat] 거래처 목록 페이지 추가
qkralsgml78 Mar 27, 2024
db82410
[Fix] 충돌 수정
qkralsgml78 Mar 27, 2024
f60f778
데이터 출력 완료
qkralsgml78 Mar 27, 2024
5c82d47
dev 0.1.1버전으로 새로 팜
qkralsgml78 Mar 27, 2024
a19e330
[Fix] fix l-table template
ae-chae Mar 27, 2024
50ee0e1
Merge branch 'template/0.1.5/Y' into dev/0.1.1
ae-chae Mar 27, 2024
20ed262
Add login & register functions
CoffeerLatte Mar 27, 2024
56d585d
Changed Logo
CoffeerLatte Mar 27, 2024
3b8f5cc
창고목록 그래프 완료
Mar 27, 2024
ee446c8
[Add] /buyer header 추가
ae-chae Mar 27, 2024
99636ec
social login in progress
CoffeerLatte Mar 27, 2024
021669f
[Chore]
ae-chae Mar 27, 2024
ba003c2
[Feat] 거래처별 창고기능 시작
Mar 27, 2024
ae25ef3
[Feat] 거래처 창고관리 완성
Mar 27, 2024
b13e228
[Feat] 정산, 거래처 관리 페이지 추가
qkralsgml78 Mar 28, 2024
8bc38f4
24-03-28 social login 버튼 및 다이렉션 구현 완료. 로그인 성공 후 secure 페이지 다이렉션 구현 중
CoffeerLatte Mar 28, 2024
b39e798
[Chore]
ae-chae Mar 28, 2024
92585ce
commit changes
CoffeerLatte Mar 28, 2024
5746705
[Feat] 총재고 디자인중...
Mar 28, 2024
6f3ac7b
[Feat] 총 재고목록 디자인
Mar 29, 2024
c33f925
공급처 리스트,공급처 상세페이지 완
Mar 29, 2024
5275568
[Feat] 공급처관리
Mar 29, 2024
7d37214
[Feat] 데이터 저장해 spring으로 넘기는 작업 구현 중
qkralsgml78 Mar 29, 2024
d4024bc
[Fix] components/Table.vue 충돌 수정
qkralsgml78 Mar 29, 2024
721fa0f
[Feat] 중간정리
Mar 29, 2024
7c6353b
[Feat] ui수정
Mar 29, 2024
65a1935
[Add]기업 정산현황 확인 페이지 구현 중
qkralsgml78 Mar 31, 2024
a8f106a
commit changes
CoffeerLatte Apr 1, 2024
34abb2a
new login try
CoffeerLatte Apr 1, 2024
a2ba0ff
[Add] 고객 정산 페이지, 기업 정산페이지 틀 구현 완료
qkralsgml78 Apr 1, 2024
d8ad0df
[Add] order apply
ae-chae Apr 2, 2024
e362e5f
[Feat] 지도 구현 중
qkralsgml78 Apr 2, 2024
d274ada
04-03 push
CoffeerLatte Apr 3, 2024
3956d13
[Feat] 과일차트 수정중..
Apr 3, 2024
855624b
[Add] 창고별 주문
ae-chae Apr 3, 2024
27de006
[Feat] 배송현환 페이지 1차 끝
Apr 3, 2024
59cfaef
commit 24-04-04 changes
CoffeerLatte Apr 4, 2024
0acee94
commit update 24-04-04
CoffeerLatte Apr 4, 2024
ceb383d
[Feat] 기업, 거래처 정산 페이지 수정 및 기능 추가
qkralsgml78 Apr 5, 2024
0802ced
[Feat] 민성커밋..
ae-chae Apr 5, 2024
7bf4735
commit changes 24-04-05
CoffeerLatte Apr 5, 2024
25683b0
[Feat] 04-11
Apr 5, 2024
4308fcb
[Feat] map load success
qkralsgml78 Apr 7, 2024
1004f79
[Fix]
ae-chae Apr 7, 2024
bb5eb92
[Feat] 보내는 창고 주소, 받는 판매처 주소 load success
qkralsgml78 Apr 7, 2024
5b170c9
[Chore]
ae-chae Apr 8, 2024
bebba5f
complete core actions
CoffeerLatte Apr 8, 2024
cd4558c
[Feat] 지도의 길찾기 경로 load
qkralsgml78 Apr 8, 2024
af4d235
[Add] 주문 vue
ae-chae Apr 8, 2024
fd99d80
[Chore]
ae-chae Apr 8, 2024
0458696
apply css
CoffeerLatte Apr 8, 2024
9b02781
[Chore]
ae-chae Apr 8, 2024
3515506
[Chore]
ae-chae Apr 8, 2024
5a2a5a2
[Chore]
ae-chae Apr 8, 2024
3de7d8a
commit final login vue
CoffeerLatte Apr 9, 2024
af38fd8
pull main
CoffeerLatte Apr 9, 2024
8da614f
Merge pull request #17 from team4-order/customer/0.2.1/P
qkralsgml78 Apr 9, 2024
2e22a46
[Fix] axios 오류 수정
qkralsgml78 Apr 9, 2024
423f6fb
change error logic
CoffeerLatte Apr 9, 2024
6b0690a
commit bug fix
CoffeerLatte Apr 9, 2024
bc59e5b
modified navigate bar
CoffeerLatte Apr 9, 2024
4f7c188
[Add] 지도 수정 중
qkralsgml78 Apr 9, 2024
f041d96
[Add] main dashboard
ae-chae Apr 9, 2024
971c190
[Feat] 체크박스 전체 체크 기능 추가
qkralsgml78 Apr 11, 2024
033f49e
[Feat] 기업 정산페이지 체크박스 기능 추가
qkralsgml78 Apr 11, 2024
928b946
[Fix] + 버튼 기능 수정
ae-chae Apr 11, 2024
60c72dc
[Fix]
Apr 11, 2024
3777dc8
[Feat] 부가적인 기능 추가 완료
qkralsgml78 Apr 11, 2024
a1b676d
[Add]
ae-chae Apr 12, 2024
83339c2
[Add] map 기능 구현 완료
qkralsgml78 Apr 12, 2024
7a5d2da
[Fix] 기업페이지 전체 선택 기능 수정
qkralsgml78 Apr 12, 2024
0820312
[Add] 검색 기능 수정
qkralsgml78 Apr 12, 2024
9e8b9e5
[Add] 고객 promp 수정
qkralsgml78 Apr 12, 2024
210611e
[Add] 기업, 고객 정산페이지 기능 수정
qkralsgml78 Apr 12, 2024
46d08d2
[Set] 셋팅
qkralsgml78 Apr 15, 2024
51018bb
[Add]
ae-chae Apr 15, 2024
af41b99
commit bug
CoffeerLatte Apr 15, 2024
ea00ad6
[Fix] routes, DashboardLayout 충돌 해결
qkralsgml78 Apr 15, 2024
7033a79
Merge pull request #26 from team4-order/dashboard/0.1.4/Y
qkralsgml78 Apr 15, 2024
e15a825
머지를 위한 commit
CoffeerLatte Apr 15, 2024
e95a811
delete tmeplate
CoffeerLatte Apr 15, 2024
968830a
test
CoffeerLatte Apr 15, 2024
103e114
머지용 커밋
Apr 15, 2024
72d69ff
머지용 commit
CoffeerLatte Apr 15, 2024
96a89f6
[Set] 통합 테스트02
qkralsgml78 Apr 15, 2024
3425653
Merge pull request #30 from team4-order/registerPage/0.1.2/J
CoffeerLatte Apr 15, 2024
dcaf0ba
change file name
CoffeerLatte Apr 15, 2024
831eba0
[Add]
ae-chae Apr 15, 2024
63e4ce9
[Add]
ae-chae Apr 15, 2024
6a7ee8f
[Fix]
qkralsgml78 Apr 15, 2024
9b8e08d
Merge pull request #32 from team4-order/dashboard/0.1.5/Y
qkralsgml78 Apr 15, 2024
b458fe9
edit readme
CoffeerLatte Apr 15, 2024
2468305
[Fix]
qkralsgml78 Apr 15, 2024
504841f
Merge pull request #21 from team4-order/customer/0.2.2/P
qkralsgml78 Apr 15, 2024
b20c825
pr용 스페이스 추가
CoffeerLatte Apr 15, 2024
fe88ec6
commit
CoffeerLatte Apr 15, 2024
d6728c9
[Fix]
qkralsgml78 Apr 15, 2024
f78ee2a
Merge pull request #35 from team4-order/dashboard/0.1.7/Y
qkralsgml78 Apr 15, 2024
76c6fd7
test
CoffeerLatte Apr 15, 2024
acaedab
Merge branch 'dev/0.2.1' into dashboard/test
CoffeerLatte Apr 15, 2024
4d8a3fd
Merge branch 'dev/0.2.1' into c_delivery/0.1.3/K
Seull1 Apr 15, 2024
c72f096
Merge pull request #33 from team4-order/c_delivery/0.1.3/K
Seull1 Apr 15, 2024
e7a53f3
Merge pull request #36 from team4-order/dashboard/test
CoffeerLatte Apr 15, 2024
9a8e417
Merge pull request #10 from team4-order/dev/0.1.1
qkralsgml78 Apr 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
8 changes: 8 additions & 0 deletions .idea/.gitignore

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

9 changes: 9 additions & 0 deletions .idea/4team_final_MainVue.iml

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

6 changes: 6 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# 4team front Repo
front 메인 레포

front 메인 레포!


### 다들 규칙 확인하시고 시작하세요!!
=======

### 다들 규칙 확인하시고 시작하세요!!!

=======

### 다들 규칙 확인하시고 시작하세요!!!

| git 컨벤션 규칙 |
|----------------|
Expand Down
3 changes: 3 additions & 0 deletions vue-light-bootstrap-dashboard-master/.babelrc:Zone.Identifier
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
1 change: 1 addition & 0 deletions vue-light-bootstrap-dashboard-master/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VUE_APP_KAKAO_API_KEY=c682c2bbf9e88fe356aa4a178d0f3e6e
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
50 changes: 50 additions & 0 deletions vue-light-bootstrap-dashboard-master/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

.DS_Store
node_modules/
package-lock.json
Expand All @@ -10,7 +11,56 @@ test/unit/coverage

# Editor directories and files
.idea
## Mac

# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

## Vue.js

.DS_Store
node_modules
/dist

# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln

*.sw?
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
3 changes: 3 additions & 0 deletions vue-light-bootstrap-dashboard-master/.npmrc:Zone.Identifier
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=C:\Users\Playdata\Downloads\vue-light-bootstrap-dashboard-master.zip
Loading