Baetti

.github/workflows/baetti-folder-check.yml

@@ -0,0 +1,24 @@
+name: baetti folder enforcement
+
+on:
+  push:
+    branches:
+      - baetti
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  verify-folder:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Check baetti branch modifies only baetti folder
+        run: |
+          if git diff --name-only HEAD^ HEAD | grep -v '^baetti/'; then
+            echo "❌ Error: 'baetti' 브랜치에서는 'baetti/' 폴더 외 파일 수정 금지"
+            exit 1
+          fi
+          echo "✅ OK: baetti 폴더만 수정됨."

gonny/MegaBox/MegaBox.xcodeproj/xcuserdata/bagbyeongseon.xcuserdatad/xcschemes/xcschememanagement.plist → baetti/MEGABOX/MEGABOX.xcodeproj/xcuserdata/junghwan.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,7 +4,7 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>MegaBox.xcscheme_^#shared#^_</key>
+		<key>MEGABOX.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>

gogo/MEGABOX/MEGABOX/MEGABOX/CameraImagePicker/ImagePicker.swift → baetti/MEGABOX/MEGABOX/ImagePicker.swift

@@ -2,22 +2,23 @@
 //  ImagePicker.swift
 //  MEGABOX
 //
-//  Created by 고석현 on 11/25/25.
-
+//  Created by 박정환 on 11/30/25.
+//
 
 import SwiftUI
 import PhotosUI
 
 struct ImagePicker: UIViewControllerRepresentable {
     @Environment(\.dismiss) var dismiss
-    @Binding var selectedImage: UIImage?
+    @Binding var image: UIImage?
+    var selectedLimit: Int
 
     func makeUIViewController(context: Context) -> PHPickerViewController {
         var config = PHPickerConfiguration(photoLibrary: PHPhotoLibrary.shared())
-        config.selectionLimit = 1
+        config.selectionLimit = selectedLimit
         config.filter = .images
 
-        let picker = PHPickerViewController(configuration: config)
+            let picker = PHPickerViewController(configuration: config)
         picker.delegate = context.coordinator
         return picker
     }
@@ -38,12 +39,12 @@ struct ImagePicker: UIViewControllerRepresentable {
         func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
             parent.dismiss()
 
-            guard let result = results.first else { return }
-
-            result.itemProvider.loadObject(ofClass: UIImage.self) { object, error in
-                if let image = object as? UIImage {
-                    DispatchQueue.main.async {
-                        self.parent.selectedImage = image
+            for result in results {
+                result.itemProvider.loadObject(ofClass: UIImage.self) { object, error in
+                    if let image = object as? UIImage {
+                        DispatchQueue.main.async {
+                            self.parent.image = image
+                        }
                     }
                 }
             }

baetti/MEGABOX/MEGABOX/View/LoginView.swift

@@ -25,7 +25,6 @@ struct LoginView: View {
         VStack {
             navigationBar
             Spacer()
-
 
             InputSection
                 .padding(.bottom, 75)
@@ -64,12 +63,6 @@ struct LoginView: View {
                 .font(.medium16)
                 .foregroundColor(.gray03)
                 .padding(.bottom, 4)
-
-
-            Divider()
-                .padding(.bottom, 40)
-
-
 
             Divider()
                 .padding(.bottom, 40)

baetti/MEGABOX/MEGABOX/View/MemberInfoView.swift

@@ -11,6 +11,8 @@ struct MemberInfoView: View {
     @Environment(NavigationRouter.self) var router
 
     @AppStorage("nickname") private var nickname: String = ""
+    @State private var showImagePicker = false
+    @State private var profileImage: UIImage? = nil
 
     var body: some View {
         VStack {
@@ -27,55 +29,73 @@ struct MemberInfoView: View {
 
             Spacer()
         }
+        .sheet(isPresented: $showImagePicker) {
+            ImagePicker(image: $profileImage, selectedLimit: 1)
+        }
         .padding(.horizontal, 14)
-        .padding(.top, 103)
+        .padding(.top, 29)
     }
 
 
     //상단 헤더
     private var MemberHeader: some View {
-        VStack(alignment: .leading) {
-            HStack(spacing: 0) {
-                Text(nickname)
-                    .font(.bold24)
-                Text("님")
-                    .font(.bold24)
-                    .padding(.trailing, 5)
-
-                Text("WELCOME")
-                    .font(.medium14)
-                    .foregroundColor(.white)
-                    .padding(.horizontal, 8)
-                    .padding(.vertical, 4)
-                    .background(
-                        RoundedRectangle(cornerRadius: 6, style: .continuous)
-                            .fill(Color.tag)
-                    )
-                Spacer()
-
-                Button {
-                    // 회원정보 버튼 액션 자리
-                    router.push(.profile)
-                } label: {
-                    Text("회원정보")
-                        .font(.semiBold14)
-                        .foregroundStyle(.white)
-                        .padding(.horizontal, 11)
+        HStack(alignment: .center, spacing: 14) {
+            Circle()
+                .fill(.gray)
+                .frame(width: 50, height: 50)
+                .overlay {
+                    if let profileImage {
+                        Image(uiImage: profileImage)
+                            .resizable()
+                            .scaledToFill()
+                            .clipShape(Circle())
+                    }
+                }
+                .onLongPressGesture(minimumDuration: 1) {
+                    showImagePicker = true
+                }
+            VStack(alignment: .leading) {
+                HStack(spacing: 0) {
+                    Text(nickname)
+                        .font(.bold24)
+                    Text("님")
+                        .font(.bold24)
+                        .padding(.trailing, 5)
+                    
+                    Text("WELCOME")
+                        .font(.medium14)
+                        .foregroundColor(.white)
+                        .padding(.horizontal, 8)
                         .padding(.vertical, 4)
-                        .background(Capsule().fill(Color.gray07))
+                        .background(
+                            RoundedRectangle(cornerRadius: 6, style: .continuous)
+                                .fill(Color.tag)
+                        )
+                    Spacer()
+
+                    Button {
+                        router.push(.profile)
+                    } label: {
+                        Text("회원정보")
+                            .font(.semiBold14)
+                            .foregroundStyle(.white)
+                            .padding(.horizontal, 11)
+                            .padding(.vertical, 4)
+                            .background(Capsule().fill(Color.gray07))
+                    }
+                    .padding(.vertical, 6)
                 }
-                .padding(.vertical, 6)
-            }
-
-            HStack {
-                Text("멤버십 포인트")
-                    .font(.semiBold14)
-                    .foregroundColor(.gray04)
-                Text("500P")
-                    .font(.medium14)
-                    .foregroundColor(.black)
 
-                Spacer()
+                HStack {
+                    Text("멤버십 포인트")
+                        .font(.semiBold14)
+                        .foregroundColor(.gray04)
+                    Text("500P")
+                        .font(.medium14)
+                        .foregroundColor(.black)
+
+                    Spacer()
+                }
             }
         }
     }

baetti/MEGABOX/MEGABOX/ViewModel/ReservationViewModel.swift

@@ -247,7 +247,7 @@ final class ReservationViewModel: ObservableObject {
             } ?? []
             dict[theater] = showtimes
         }
-ㅈ
+
         return dict
     }
 }