Skip to content

Commit

Permalink
hotfix/#126 suyeon 브랜치 병합 및 이슈 사항 적용
Browse files Browse the repository at this point in the history
  • Loading branch information
youz2me committed Jul 6, 2024
1 parent cfd7ce3 commit 6550629
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 3 deletions.
20 changes: 20 additions & 0 deletions KkuMulKum.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
78B9286E2C29402C006D9942 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B9286D2C29402C006D9942 /* SceneDelegate.swift */; };
78B928752C29402E006D9942 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 78B928742C29402E006D9942 /* Assets.xcassets */; };
78B928782C29402E006D9942 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78B928762C29402E006D9942 /* LaunchScreen.storyboard */; };
DD865B642C3920F000C351A2 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD865B632C3920F000C351A2 /* LoginViewController.swift */; };
DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */; };
DDA2EE752C385FB1007C6059 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE742C385FB1007C6059 /* HomeViewController.swift */; };
DDA2EE772C385FC3007C6059 /* GroupListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE762C385FC3007C6059 /* GroupListViewController.swift */; };
Expand Down Expand Up @@ -95,6 +96,7 @@
78B928742C29402E006D9942 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
78B928772C29402E006D9942 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
78B928792C29402E006D9942 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DD865B632C3920F000C351A2 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
DDA2EE742C385FB1007C6059 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
DDA2EE762C385FC3007C6059 /* GroupListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupListViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -210,6 +212,22 @@
path = KkuMulKum;
sourceTree = "<group>";
};
DD865B652C3920F600C351A2 /* Onboarding */ = {
isa = PBXGroup;
children = (
DD865B662C39210E00C351A2 /* Login */,
);
path = Onboarding;
sourceTree = "<group>";
};
DD865B662C39210E00C351A2 /* Login */ = {
isa = PBXGroup;
children = (
DD865B632C3920F000C351A2 /* LoginViewController.swift */,
);
path = Login;
sourceTree = "<group>";
};
DDA2EE7B2C386078007C6059 /* Home */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -258,6 +276,7 @@
DDA2EE7B2C386078007C6059 /* Home */,
DDA2EE7C2C38607F007C6059 /* GroupList */,
DDA2EE7D2C386087007C6059 /* MyPage */,
DD865B652C3920F600C351A2 /* Onboarding */,
);
path = Source;
sourceTree = "<group>";
Expand Down Expand Up @@ -482,6 +501,7 @@
DED5DBF22C34534A006ECE7E /* BaseCollectionReusableView.swift in Sources */,
DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */,
DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */,
DD865B642C3920F000C351A2 /* LoginViewController.swift in Sources */,
DE254AAC2C31192400A4015E /* UILabel+.swift in Sources */,
DE254AB72C3119D000A4015E /* ReuseIdentifiable.swift in Sources */,
DDA2EE752C385FB1007C6059 /* HomeViewController.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion KkuMulKum/Source/GroupList/GroupListViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import UIKit

class GroupListViewController: UIViewController {
class GroupListViewController: BaseViewController {

override func viewDidLoad() {
super.viewDidLoad()
Expand Down
3 changes: 2 additions & 1 deletion KkuMulKum/Source/Home/HomeViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

import UIKit

class HomeViewController: UIViewController {

class HomeViewController: BaseViewController {

override func viewDidLoad() {
super.viewDidLoad()
Expand Down
2 changes: 1 addition & 1 deletion KkuMulKum/Source/MyPage/MyPageViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import UIKit

class MyPageViewController: UIViewController {
class MyPageViewController: BaseViewController {

override func viewDidLoad() {
super.viewDidLoad()
Expand Down
67 changes: 67 additions & 0 deletions KkuMulKum/Source/Onboarding/Login/LoginViewController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
//
// LoginViewController.swift
// KkuMulKum
//
// Created by YOUJIM on 7/6/24.
//

import UIKit
import AuthenticationServices


class LoginViewController: BaseViewController {

override func viewDidLoad() {
super.viewDidLoad()

self.navigationController?.navigationBar.isHidden = true
view.backgroundColor = .yellow
setupAppleLoginButton()
}

func setupAppleLoginButton() {
let button = ASAuthorizationAppleIDButton()
button.addTarget(self, action: #selector(clickAppleLogin), for: .touchUpInside)
button.frame = CGRect(x: 100, y: 100, width: 200, height: 40)
view.addSubview(button)
}

@objc func clickAppleLogin() {
let request = ASAuthorizationAppleIDProvider().createRequest()
request.requestedScopes = [.fullName, .email]

let controller = ASAuthorizationController(authorizationRequests: [request])
controller.delegate = self
controller.presentationContextProvider = self
controller.performRequests()
}
}


// MARK: - ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding

extension LoginViewController: ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding {
func authorizationController(controller: ASAuthorizationController, didCompleteWithAuthorization authorization: ASAuthorization) {
if let credential = authorization.credential as? ASAuthorizationAppleIDCredential {
let idToken = credential.identityToken!
let tokenStr = String(data: idToken, encoding: .utf8)
print(tokenStr ?? "No token string")

guard let code = credential.authorizationCode else { return }
let codeStr = String(data: code, encoding: .utf8)
print(codeStr ?? "No code string")

let user = credential.user
print(user)
}
}

func authorizationController(controller: ASAuthorizationController, didCompleteWithError error: Error) {
print("Authorization failed with error: \(error)")
}

func presentationAnchor(for controller: ASAuthorizationController) -> ASPresentationAnchor {
return self.view.window!
}

}

0 comments on commit 6550629

Please sign in to comment.