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.

Sign up for GitHub

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

Jump to bottom

React #35

Merged
merged 29 commits into from
Nov 22, 2023
Merged

React #35

merged 29 commits into from
Nov 22, 2023

Commits on Oct 11, 2023

  1. add: first directory

    @beoldshoe
    beoldshoe committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    5947c26 View commit details
    Browse the repository at this point in the history

  2. add: create test file

    @beoldshoe
    beoldshoe committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    be5c32c View commit details
    Browse the repository at this point in the history

  3. delete

    @beoldshoe
    beoldshoe committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    520252a View commit details
    Browse the repository at this point in the history

  4. add: 초기 프로젝트 세팅

    @beoldshoe
    beoldshoe committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    daa5c0c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4 from noFlowWater/hs/init 

    Hs/init
    @beoldshoe
    beoldshoe committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    eb7fd64 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. feat: 1차 홈페이지 구현

    @ohyatt
    ohyatt committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    fc0fe9c View commit details
    Browse the repository at this point in the history

  2. remove: .DS_store

    @ohyatt
    ohyatt committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    0c95ea5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #20 from noFlowWater/ms/homepage 

    Ms/homepage 1차 구현사항 병합.
    @ohyatt
    ohyatt committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    c887edd View commit details
    Browse the repository at this point in the history

  4. feat:관리자/사용자 파일 구분

    @beoldshoe
    beoldshoe committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    d93398d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #21 from noFlowWater/hs/admin_menu 

    feat:관리자/사용자 파일 구분
    @beoldshoe
    beoldshoe committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    c0ad166 View commit details
    Browse the repository at this point in the history

  6. feat: 사용자 모드 페이지 구현

    @ohyatt
    ohyatt committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    1be3a8a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #22 from noFlowWater/ms/user_menu 

    feat: 사용자 모드 페이지 구현
    @ohyatt
    ohyatt committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    20e311a View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. refactor:adminNavBar 수정

    @beoldshoe
    beoldshoe committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    12f78ca View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from noFlowWater/hs/routes 

    refactor:adminNavBar 수정
    @beoldshoe
    beoldshoe committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    8f2f8ca View commit details
    Browse the repository at this point in the history

  3. feat: deploy.sh, icon.png 파일 추가

    @ohyatt
    ohyatt committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    3beb28c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #24 from noFlowWater/ms/deploy 

    feat: deploy.sh, icon.png 파일 추가
    @ohyatt
    ohyatt committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    8bdbbe7 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. feat: webOS 설치 설정

    @ohyatt
    ohyatt committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    781f9b0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from noFlowWater/ms/modify 

    feat: webOS 설치 설정
    @ohyatt
    ohyatt committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    740878e View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. feat: 관리자 메뉴 등록 컴포넌트 1차 추가(수정 제외)

    @beoldshoe
    beoldshoe committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    e303746 View commit details
    Browse the repository at this point in the history

  2. feat: 관리자 메뉴 등록 컴포넌트 2차 추가(수정 제외)

    @beoldshoe
    beoldshoe committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    e19e8be View commit details
    Browse the repository at this point in the history

  3. Merge pull request #26 from noFlowWater/hs/admin_reg 

    feat: 관리자 메뉴 등록 컴포넌트 2차 추가(수정 제외)
    @beoldshoe
    beoldshoe committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    95dd0b9 View commit details
    Browse the repository at this point in the history

  4. feat: 사용자 알러지 선택 모달 컴포넌트 추가 및 테스트용 알러지 이미지 추가

    @ohyatt
    ohyatt committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    3655fb6 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. feat: 사용자 메뉴페이지 NavBar 컴포넌트 수정 및 서버 연동 코드 추가

    @ohyatt
    ohyatt committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    716c728 View commit details
    Browse the repository at this point in the history

  2. feat : 사용자 메뉴 페이지 화면 분할(UserMenu 컴포넌트,UserCart 컴포넌트 추가)

    @ohyatt
    ohyatt committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    cd99b20 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. refactor: 관리자 메뉴 페이지 2차 수정(수정 페이지 추가)

    @beoldshoe
    beoldshoe committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    65a2058 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #28 from noFlowWater/hs/admin_menu 

    refactor: 관리자 메뉴 페이지 2차 수정(수정 페이지 추가)
    @beoldshoe
    beoldshoe committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    f18650b View commit details
    Browse the repository at this point in the history

  3. feat : 이미지 폴더 경로 수정

    @ohyatt
    ohyatt committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    a71a231 View commit details
    Browse the repository at this point in the history

  4. fix: comfict 수정

    @ohyatt
    ohyatt committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    de847a0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #29 from noFlowWater/ms/user_menu 

    User메뉴 구현 머지.
    @ohyatt
    ohyatt committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    7fa2081 View commit details
    Browse the repository at this point in the history