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

메인 반영 테스트 #44

Merged
merged 55 commits into from
Nov 24, 2024
Merged

메인 반영 테스트 #44

merged 55 commits into from
Nov 24, 2024

Commits on Nov 16, 2024

  1. docs: 이슈 및 PR 템플릿 생성

    @maylh
    maylh committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    0d471de View commit details
    Browse the repository at this point in the history

  2. feat: 테스트용 브랜치

    @ocahs9
    ocahs9 committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    3ea7ede View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2024

  1. init: GlobalStyle, theme 세팅 및 stylelint 설정

    @Minn-Choi
    Minn-Choi committed Nov 17, 2024
    Configuration menu
    Copy the full SHA
    582e0eb View commit details
    Browse the repository at this point in the history

  2. fix: 테스트용으로 설정한 배경 삭제

    @Minn-Choi
    Minn-Choi committed Nov 17, 2024
    Configuration menu
    Copy the full SHA
    4cd7c7f View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2024

  1. init: pr open시 리뷰어 자동 지정 세팅

    @maylh
    maylh committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    961758c View commit details
    Browse the repository at this point in the history

  2. init: CI 초기 세팅

    @maylh
    maylh committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    65ecfc0 View commit details
    Browse the repository at this point in the history

  3. init: pr, issue open시 라벨 자동 지정 세팅

    @maylh
    maylh committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    a004f31 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8 from SOPT-all/feat/#5/setGithubAction 

    Feat/#5/set GitHub action
    @ocahs9
    ocahs9 authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    37401f0 View commit details
    Browse the repository at this point in the history

  5. Rename autoLabeling.yml to autoLabel.yml

    @ocahs9
    ocahs9 authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    f81afb2 View commit details
    Browse the repository at this point in the history

  6. Update labeler.yml

    @ocahs9
    ocahs9 authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    07f931b View commit details
    Browse the repository at this point in the history

  7. Update labeler.yml

    @ocahs9
    ocahs9 authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    8cd7038 View commit details
    Browse the repository at this point in the history

  8. Feat 라벨링이 계속 되던 에러 해결

    @ocahs9
    ocahs9 authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    4648db5 View commit details
    Browse the repository at this point in the history

  9. fix: 이슈 템플릿 라벨 삭제

    @maylh
    maylh committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    017951e View commit details
    Browse the repository at this point in the history

  10. init: eslint, prettier 초기 세팅

    @zzz-myam
    zzz-myam committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    f7ef72d View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. fix: 라벨러 코멘트 수정

    @maylh
    maylh committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    7dba9e4 View commit details
    Browse the repository at this point in the history

  2. remove: autoReviewer 파일 삭제

    @maylh
    maylh committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    7bfc631 View commit details
    Browse the repository at this point in the history

  3. docs: 이슈 템플릿 수정

    @maylh
    maylh committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    877dc30 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4 from SOPT-all/feat/#3/initialStyleSetting 

    init: GlobalStyle, theme 세팅 및 stylelint 설정
    @ocahs9
    ocahs9 authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    89a80ea View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2024

  1. fix: yarn.lock과 yarn/install-state.gz 충돌 

    해결
    @zzz-myam
    zzz-myam committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    c2fcc3b View commit details
    Browse the repository at this point in the history

  2. chore: console.log시 경고 업데이트

    @zzz-myam
    zzz-myam committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    bfd2e14 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2024

  1. Merge pull request #23 from SOPT-all/feat/#19/eslintUpdate 

    [chore/#19] console.log시 경고 업데이트
    @ocahs9
    ocahs9 authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    63b0e3c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #22 from SOPT-all/feat/#19/initialSettingUpdate 

    [fix/#19] yarn.lock 충돌 문제 해결
    @ocahs9
    ocahs9 authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    3d818c4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feat/#19/initialSetting' of https://github.com/SOPT-all… 

    …/35-COLLABORATION-WEB-ALADIN into feat/#19/initialSetting
    @ocahs9
    ocahs9 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    9393c50 View commit details
    Browse the repository at this point in the history

  4. 충돌 처리

    @ocahs9
    ocahs9 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    150b6a0 View commit details
    Browse the repository at this point in the history

  5. eslint, prettier 적용 보류

    @ocahs9
    ocahs9 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    09f4506 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #20 from SOPT-all/feat/#19/initialSetting 

    [init/#20] eslint, prettier 초기 세팅
    @ocahs9
    ocahs9 authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    adacd06 View commit details
    Browse the repository at this point in the history

  7. fix: eslint, prettier 적용되도록 수정

    @ocahs9
    ocahs9 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    60da27d View commit details
    Browse the repository at this point in the history

  8. feat: 장바구니 주문 버튼 구현

    @maylh
    maylh committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    eb511a4 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #28 from SOPT-all/fix/#25/eslintPrettier 

    [Fix/#25] eslint, prettier 적용되도록 수정
    @ocahs9
    ocahs9 authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    2147692 View commit details
    Browse the repository at this point in the history

  10. feat: 장바구니용 페이지 작성

    @ocahs9
    ocahs9 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    b8122ac View commit details
    Browse the repository at this point in the history

  11. feat: 파일생성

    @zzz-myam
    zzz-myam committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    b3b8079 View commit details
    Browse the repository at this point in the history

  12. chore: 병합 충돌 해결

    @zzz-myam
    zzz-myam committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    15e6963 View commit details
    Browse the repository at this point in the history

  13. feat: 장바구니 btn_cart_small 구현ㅓ

    @maylh
    maylh committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    6072be8 View commit details
    Browse the repository at this point in the history

  14. fix: rem 반영 안되는 오류 해결

    @maylh
    maylh committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    6e48ff5 View commit details
    Browse the repository at this point in the history

  15. feat: 체크박스 버튼 구현

    @maylh
    maylh committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    2746d8e View commit details
    Browse the repository at this point in the history

  16. Merge pull request #29 from SOPT-all/feat/#26/orderBtn 

    [feat/#26] 장바구니 주문 버튼 구현
    @maylh
    maylh authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    3eb96a0 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #32 from SOPT-all/feat/#31/btnCartSmall 

    [feat/#31] 장바구니 btn_cart_small 컴포넌트 구현
    @maylh
    maylh authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    372224f View commit details
    Browse the repository at this point in the history

  18. feat: Header의 top 부분 구현 완료

    @ocahs9
    ocahs9 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    58e5d20 View commit details
    Browse the repository at this point in the history

  19. feat: home section 6 구현 완료

    @zzz-myam
    zzz-myam committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    7628891 View commit details
    Browse the repository at this point in the history

  20. feat: 헤더 뷰 및 기본적인 기능 퍼블리싱, 구현

    @ocahs9
    ocahs9 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    2a55bf3 View commit details
    Browse the repository at this point in the history

  21. feat: 드롭다운, 관련된 인터랙션 구현 완료

    @ocahs9
    ocahs9 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    4ad80f0 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2024

  1. chore: 수정 테스트

    @ocahs9
    ocahs9 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    c70cfbc View commit details
    Browse the repository at this point in the history

  2. fix: map함수 사용 등 코드리뷰 반영

    @zzz-myam
    zzz-myam committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    8548d7e View commit details
    Browse the repository at this point in the history

  3. chore: 설정 변경(빌드 되도록)

    @ocahs9
    ocahs9 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    691c42b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/SOPT-all/35-COLLABORATIO… 

    …N-WEB-ALADIN into develop
    @ocahs9
    ocahs9 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    a54e233 View commit details
    Browse the repository at this point in the history

  5. fix: 빌드와 관련된 내용들 ignore

    @ocahs9
    ocahs9 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    2bec15a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of https://github.com/SOPT-all/35-COLLABORATIO… 

    …N-WEB-ALADIN into feat/#30/headerAndDropDown
    @ocahs9
    ocahs9 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    bf19438 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into feat/#27/homeSection6Scroll

    @zzz-myam
    zzz-myam committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    4340cc9 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2024

  1. fix: 충돌해결

    @zzz-myam
    zzz-myam committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    3e91f8d View commit details
    Browse the repository at this point in the history

  2. feat: 충돌 처리

    @ocahs9
    ocahs9 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    18f352c View commit details
    Browse the repository at this point in the history

  3. 충돌처리2

    @ocahs9
    ocahs9 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    25a0af6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feat/#33/checkboxBtn' of https://github.com/SOPT-all/35… 

    …-COLLABORATION-WEB-ALADIN into feat/#33/checkboxBtn
    @ocahs9
    ocahs9 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    97d6fa4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #34 from SOPT-all/feat/#33/checkboxBtn 

    [feat/#33] 체크박스 컴포넌트 구현
    @ocahs9
    ocahs9 authored Nov 23, 2024
    Configuration menu
    Copy the full SHA
    1bc5a56 View commit details
    Browse the repository at this point in the history

  6. 충돌 해결

    @ocahs9
    ocahs9 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    9b458c8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #37 from SOPT-all/feat/#30/headerAndDropDown 

    [Feat/#30] 헤더와 드롭다운 퍼블리싱 및 기능 구현
    @ocahs9
    ocahs9 authored Nov 23, 2024
    Configuration menu
    Copy the full SHA
    e4be9fe View commit details
    Browse the repository at this point in the history