Merge remote-tracking branch 'origin/main' into develop

BCSDLab · Sep 2, 2024 · 3540541 · 3540541
2 parents 1e85d04 + b11a86d
commit 3540541
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/reviewer.json b/.github/workflows/reviewer.json
@@ -49,11 +49,6 @@
       "name": "정해성",
       "githubName": "junghaesung79",
       "team" : "campus"
-    },
-    {
-      "name": "김경윤",
-      "githubName": "KimKyungYun",
-      "team" : "campus"
     },
      {
       "name": "김민재",

diff --git a/src/page/Auth/Signup/components/agreeStep/agreeStep.module.scss b/src/page/Auth/Signup/components/agreeStep/agreeStep.module.scss
@@ -22,12 +22,17 @@
   margin-top: 9px;
 
   &__button {
+    width: 100%;
     display: flex;
     align-items: center;
     gap: 6px;
     background-color: #f5f5f5;
     color: #175c8e;
     padding: 12px;
+
+    &:hover {
+      cursor: pointer;
+    }
   }
 
   &__text {
@@ -50,6 +55,10 @@
     background-color: transparent;
     color: #8e8e8e;
     padding: 12px;
+
+    &:hover {
+      cursor: pointer;
+    }
   }
 
   &__content {
@@ -76,6 +85,10 @@
     background-color: transparent;
     color: #8e8e8e;
     padding: 12px;
+
+    &:hover {
+      cursor: pointer;
+    }
   }
 
   &__content {

diff --git a/src/page/Auth/Signup/components/ownerInfoStep/index.tsx b/src/page/Auth/Signup/components/ownerInfoStep/index.tsx
@@ -124,7 +124,8 @@ export default function OwnerInfoStep({ onSearch, setIsStepComplete }: OwnerInfo
                 message: '가게명을 입력해주세요',
               },
               pattern: {
-                value: /^[가-힣a-zA-Z\s]+$/,
+                // eslint-disable-next-line no-useless-escape
+                value: /^[가-힣a-zA-Z\s\-\.\&]+$/,
                 message: '유효한 가게명을 입력해주세요',
               },
             })}

diff --git a/src/page/Auth/Signup/components/ownerInfoStep/ownerInfoStep.module.scss b/src/page/Auth/Signup/components/ownerInfoStep/ownerInfoStep.module.scss
@@ -6,6 +6,8 @@
   flex-direction: column;
   gap: 10px;
   height: calc(100vh - 45vh);
+  padding: 0 1px;
+  box-sizing: border-box;
 
   @include media.media-breakpoint-down(mobile) {
     height: calc(100vh - 40vh);

diff --git a/src/page/Auth/Signup/components/searchShop/searchShop.module.scss b/src/page/Auth/Signup/components/searchShop/searchShop.module.scss
@@ -51,6 +51,10 @@
   border: 1px solid #eee;
   background-color: white;
 
+  &:hover {
+    cursor: pointer;
+  }
+
   &--selected {
     border-radius: 5px;
     border: 1px solid  #175c8e;