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

[RELEASE] v1.2 #38

Merged
merged 41 commits into from
Mar 7, 2024
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
082dee7
header color 구분
LSMJJAng Feb 28, 2024
b3d9bcb
sideBar Active 상태 useState 적용 및 색상 변경
LSMJJAng Feb 28, 2024
0189334
Merge pull request #12 from Team-OYA/feat-OYA-228-헤더색상변경
LSMJJAng Feb 28, 2024
fd771fc
[FEAT] 관리자 웹 수정 (#13)
sangminee Feb 29, 2024
54548c5
대시보드 기초 구조 생성 및 현황 view생성
LSMJJAng Mar 1, 2024
a6c04ff
[FEAT] 로그인 기능 추가 (#14)
sangminee Mar 1, 2024
5c68f3a
[FEAT] 팝업스토어 순위 적용 및 게시글 목록 기초 생성
LSMJJAng Mar 1, 2024
8eeab2e
내 팝업스토어 게시글 목록 생성
LSMJJAng Mar 1, 2024
72a60f7
[FEAT] Statistics Chart 적용
LSMJJAng Mar 2, 2024
811a3c0
Merge branch 'develop' into feat-OYA-231-사업체-대시보드구현
LSMJJAng Mar 2, 2024
81bde53
Merge pull request #15 from Team-OYA/feat-OYA-231-사업체-대시보드구현
LSMJJAng Mar 2, 2024
e2b7404
[FEAT]axios baseApi 세팅
LSMJJAng Mar 2, 2024
cf94488
Merge pull request #16 from Team-OYA/feat-OYA-256-Base-Api
LSMJJAng Mar 2, 2024
a2a8cbe
[FEAT] user, admin Base Api 분리
LSMJJAng Mar 2, 2024
fbd3aef
authApi 실제서버 기반 URL로 변경
LSMJJAng Mar 2, 2024
a63b60f
[FEAT] 디테일 변경 (#17)
sangminee Mar 2, 2024
0861580
Merge branch 'develop' of https://github.com/Team-OYA/web-business in…
LSMJJAng Mar 2, 2024
5b54344
[FEAT]BaseApi class명 수정 및 통계 수정 및 데이터 적용
LSMJJAng Mar 2, 2024
547cceb
[FEAT] 대시보드 통신 구현
LSMJJAng Mar 2, 2024
82afc7f
Merge pull request #18 from Team-OYA/feat-OYA-255-대시보드-통신구현
LSMJJAng Mar 2, 2024
291b949
[FEAT] 토스페이 결제 기능 구현 (#19)
kyukong Mar 3, 2024
4201cb8
[REFACTOR] 사업계획서 제안 및 광고 신청 시 이미지 업로드 기능 구현 (#20)
kyukong Mar 3, 2024
e56b117
[REFACTOR] 내비바 페이지 연결 및 디자인 일부 수정 (#21)
kyukong Mar 3, 2024
9eeef41
[FEATURE] 채팅 기능 (#22)
sangminee Mar 3, 2024
6eb2ee7
[FEATURE] not defined 해결 (#24)
sangminee Mar 3, 2024
2ef6e47
[REFACTOR] 각종 에러 수정
LSMJJAng Mar 4, 2024
cf3ed05
Merge pull request #26 from Team-OYA/feat-OYA-255-대시보드-통신구현
LSMJJAng Mar 4, 2024
649adbf
Merge branch 'main' into develop
LSMJJAng Mar 4, 2024
b595eac
Merge branch 'main' into develop
kyukong Mar 4, 2024
07e2a77
[REFACTOR] 결제 수단 버튼 추가 및 디자인 세부 수정 (#28)
kyukong Mar 4, 2024
ddd54b9
[REFACTOR] Home 이미지 bg 추가
LSMJJAng Mar 4, 2024
217c520
[Refactor] 펭지ㅣ 이동 버튼 수정
LSMJJAng Mar 5, 2024
b2f548c
Merge pull request #29 from Team-OYA/feat-OYA-234-메인페이지생성
LSMJJAng Mar 5, 2024
011bbff
[Refactor] 로그인view수정, 표시 favicon 변경
LSMJJAng Mar 5, 2024
93d5f32
Merge pull request #31 from Team-OYA/feat-OYA-234-메인페이지생성
LSMJJAng Mar 5, 2024
b912dab
Merge branch 'main' into develop
LSMJJAng Mar 5, 2024
673cf8e
[FEAUTRE] 문의하기 수정 (#33)
sangminee Mar 5, 2024
7289806
Merge branch 'main' into develop
kyukong Mar 6, 2024
0e2aea7
[FIX] 광고 팝업스토어 게시글 조회 시 잘못된 아이디 매핑 수정 (#35)
kyukong Mar 6, 2024
986b999
[FEATURE] 채팅 UI 수정 (#36)
sangminee Mar 7, 2024
5dc4024
[FEAT] 채팅리스트 조회 ui 변경 (#37)
sangminee Mar 7, 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
Prev Previous commit
Next Next commit
[REFACTOR] Home 이미지 bg 추가
LSMJJAng committed Mar 4, 2024
commit ddd54b91bec0ba4a72076dd67dff19d1e9f0f98f
Binary file added src/assets/images/img_bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 6 additions & 5 deletions src/components/common/Button/OutlineCircleDisabledButton.js
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import { useNavigate } from 'react-router-dom';
* @since 2024.02.25
* @author 김유빈
*/
function OutlineCircleDisabledButton({ text, herf , info}) {
function OutlineCircleDisabledButton({ text, href , info}) {

/**
* useNavigate 컴포넌트로 페이지 이동시 값 전달 추가
@@ -17,14 +17,15 @@ function OutlineCircleDisabledButton({ text, herf , info}) {
*/
const navigate = useNavigate();
const handleClick = () => {
navigate(herf, { state: { buttonText: text, ...info } });
console.log(info);
navigate(href, { state: { buttonText: text, ...info } });
};

return (
<button type="button"
className="text-main-color-700 border border-main-color-700
focus:ring-4 focus:outline-none focus:ring-main-color-300 font-medium text-sm px-5 py-2.5
text-center me-2 mb-2 dark:border-main-color-500 dark:text-main-color-500
className="text-white border-2 border-white
focus:ring-4 focus:outline-none focus:ring-main-color-300 font-medium text-sm px-8 py-2.5
text-center mx-4 mb-2 dark:border-main-color-500 dark:text-main-color-500
dark:focus:ring-main-color-800 rounded-full disabled"
onClick={handleClick}>
{text}
33 changes: 20 additions & 13 deletions src/pages/common/home.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import OutlineCircleDisabledButton from "../../components/common/Button/OutlineCircleDisabledButton";
import React from "react";
import BgImage from "../../assets/images/img_bg.jpg";

/**
* Home 페이지 제작
@@ -9,21 +10,27 @@ import React from "react";
*/
const Home = () => {
return (
<div className="login bg-white">
<section>
<div className="login bg-cover bg-center relative" style={{ backgroundImage: `url(${BgImage})` }}>
<div className="overlay" style={{
position: 'absolute',
top: 0,
left: 0,
width: '100%',
height: '100%',
backgroundColor: 'rgba(0, 0, 0, 0.5)',
zIndex: 1,
pointerEvents: 'none', // 이 부분을 추가
}}></div>
<section style={{ position: 'relative', zIndex: 2 }}>
<div className="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
<div
className="w-full rounded-lg md:mt-0 sm:max-w-md xl:p-0">
<div className="p-6 space-y-4 md:space-y-6 sm:p-8">
<h1 className="text-center text-xl font-bold leading-tight tracking-tight text-main-color-600 md:text-2xl">
<div className="w-full rounded-lg md:mt-0 sm:max-w-md xl:p-0" style={{ position: 'relative' }}>
<div className="p-6 space-y-4 md:space-y-6 sm:p-8 z-40">
<h1 className="text-center font-bold leading-tight tracking-tight text-white text-5xl">
THE POP
</h1>
<p className="text-center text-main-color-600">
현대백화점 팝업스토어 관리 플랫폼
</p>
<div className="flex flex-col items-center justify-center md-8">
<OutlineCircleDisabledButton text = "관리자 페이지" herf="/login/admin" info="관리자 페이지에서 유저 관리를 진행해 보세요."/>
<OutlineCircleDisabledButton text = "사업체 페이지" herf="/login/business" info="사업체 페이지에서 사업계획서 및 팝업 관리를 진행해 보세요."/>
<div className="flex flex-row items-center justify-center pt-8 z-50">
<OutlineCircleDisabledButton text="관리자 페이지" href="/login/admin" info="관리자 페이지에서 유저 관리를 진행해 보세요."/>
<OutlineCircleDisabledButton text="사업체 페이지" href="/login/business" info="사업체 페이지에서 사업계획서 및 팝업 관리를 진행해 보세요."/>
</div>
</div>
</div>
@@ -33,4 +40,4 @@ const Home = () => {
);
}

export default Home;
export default Home;