From 5103d8537c55124ce3b4da1328ac749876a78804 Mon Sep 17 00:00:00 2001 From: ChaeyeonYang <69382168+chaeyeon-yang@users.noreply.github.com> Date: Wed, 28 Sep 2022 21:31:21 +0900 Subject: [PATCH] Docs: modify file structure --- There-iOS/There-iOS.xcodeproj/project.pbxproj | 40 +++ There-iOS/There-iOS/KakaoAuthVM.swift | 4 +- .../EtcView/Cell/FundTableViewCell.swift | 29 ++ .../EtcView/Cell/SettingTableViewCell.swift | 67 +++++ .../MainView/EtcView/ChargeHistoryView.swift | 8 + .../EtcView/ChargingListViewController.swift | 3 +- .../MainView/EtcView/ChargingView.swift | 8 + .../MainView/EtcView/MoreViewController.swift | 264 ------------------ .../EtcView/PurchaseHistoryView.swift | 8 + .../MainView/EtcView/View/EtcView.swift | 15 + .../LoginView/LoginDataModel.swift | 2 +- .../LoginView/LoginViewController.swift | 5 +- .../SignUpView/SignUpDataModel.swift | 2 +- .../EditView/EditProfileViewController.swift | 1 + 14 files changed, 186 insertions(+), 270 deletions(-) create mode 100644 There-iOS/There-iOS/MainView/EtcView/Cell/FundTableViewCell.swift create mode 100644 There-iOS/There-iOS/MainView/EtcView/Cell/SettingTableViewCell.swift create mode 100644 There-iOS/There-iOS/MainView/EtcView/ChargeHistoryView.swift create mode 100644 There-iOS/There-iOS/MainView/EtcView/ChargingView.swift create mode 100644 There-iOS/There-iOS/MainView/EtcView/PurchaseHistoryView.swift create mode 100644 There-iOS/There-iOS/MainView/EtcView/View/EtcView.swift diff --git a/There-iOS/There-iOS.xcodeproj/project.pbxproj b/There-iOS/There-iOS.xcodeproj/project.pbxproj index 4685003..d137da3 100644 --- a/There-iOS/There-iOS.xcodeproj/project.pbxproj +++ b/There-iOS/There-iOS.xcodeproj/project.pbxproj @@ -34,6 +34,12 @@ 077A292128AF9C5A00E77BF6 /* SearchDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 077A292028AF9C5A00E77BF6 /* SearchDetailViewController.swift */; }; 077A292428AF9E7100E77BF6 /* EditProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 077A292328AF9E7100E77BF6 /* EditProfileViewController.swift */; }; 077A292628AFA9FA00E77BF6 /* EditAuthorNoteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 077A292528AFA9FA00E77BF6 /* EditAuthorNoteViewController.swift */; }; + 0783884D28E46F1400071B3F /* EtcView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0783884C28E46F1400071B3F /* EtcView.swift */; }; + 0783884F28E4703E00071B3F /* SettingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0783884E28E4703E00071B3F /* SettingTableViewCell.swift */; }; + 0783885128E471A300071B3F /* FundTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0783885028E471A300071B3F /* FundTableViewCell.swift */; }; + 0783885328E471DA00071B3F /* ChargingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0783885228E471DA00071B3F /* ChargingView.swift */; }; + 0783885528E471EC00071B3F /* ChargeHistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0783885428E471EC00071B3F /* ChargeHistoryView.swift */; }; + 0783885728E4729800071B3F /* PurchaseHistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0783885628E4729800071B3F /* PurchaseHistoryView.swift */; }; 079C894528AE1F2A00B45C7E /* CustomChatCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 079C894428AE1F2A00B45C7E /* CustomChatCell.swift */; }; 07A4F68628A12104006D24FE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A4F68528A12104006D24FE /* AppDelegate.swift */; }; 07A4F68828A12104006D24FE /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A4F68728A12104006D24FE /* SceneDelegate.swift */; }; @@ -109,6 +115,12 @@ 077A292028AF9C5A00E77BF6 /* SearchDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchDetailViewController.swift; sourceTree = ""; }; 077A292328AF9E7100E77BF6 /* EditProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfileViewController.swift; sourceTree = ""; }; 077A292528AFA9FA00E77BF6 /* EditAuthorNoteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditAuthorNoteViewController.swift; sourceTree = ""; }; + 0783884C28E46F1400071B3F /* EtcView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EtcView.swift; sourceTree = ""; }; + 0783884E28E4703E00071B3F /* SettingTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingTableViewCell.swift; sourceTree = ""; }; + 0783885028E471A300071B3F /* FundTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FundTableViewCell.swift; sourceTree = ""; }; + 0783885228E471DA00071B3F /* ChargingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChargingView.swift; sourceTree = ""; }; + 0783885428E471EC00071B3F /* ChargeHistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChargeHistoryView.swift; sourceTree = ""; }; + 0783885628E4729800071B3F /* PurchaseHistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseHistoryView.swift; sourceTree = ""; }; 079C894428AE1F2A00B45C7E /* CustomChatCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomChatCell.swift; sourceTree = ""; }; 07A4F68228A12104006D24FE /* There-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "There-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 07A4F68528A12104006D24FE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -215,6 +227,23 @@ path = EditView; sourceTree = ""; }; + 0783884A28E46EF600071B3F /* View */ = { + isa = PBXGroup; + children = ( + 0783884C28E46F1400071B3F /* EtcView.swift */, + ); + path = View; + sourceTree = ""; + }; + 0783884B28E46F0200071B3F /* Cell */ = { + isa = PBXGroup; + children = ( + 0783884E28E4703E00071B3F /* SettingTableViewCell.swift */, + 0783885028E471A300071B3F /* FundTableViewCell.swift */, + ); + path = Cell; + sourceTree = ""; + }; 07A4F67928A12104006D24FE = { isa = PBXGroup; children = ( @@ -309,7 +338,12 @@ 07A4F6B128A1227F006D24FE /* EtcView */ = { isa = PBXGroup; children = ( + 0783884B28E46F0200071B3F /* Cell */, + 0783884A28E46EF600071B3F /* View */, 074EF97C28A130A200D93ABC /* MoreViewController.swift */, + 0783885428E471EC00071B3F /* ChargeHistoryView.swift */, + 0783885628E4729800071B3F /* PurchaseHistoryView.swift */, + 0783885228E471DA00071B3F /* ChargingView.swift */, 07E9A5C628AE4DC10034BE34 /* ChargeViewController.swift */, 077A291C28AF8DA000E77BF6 /* ChargingListViewController.swift */, ); @@ -524,9 +558,12 @@ 07A4F6AD28A12243006D24FE /* APIConstants.swift in Sources */, 07CF639528A910E60082DB45 /* KakaoAuthVM.swift in Sources */, 079C894528AE1F2A00B45C7E /* CustomChatCell.swift in Sources */, + 0783885528E471EC00071B3F /* ChargeHistoryView.swift in Sources */, + 0783884D28E46F1400071B3F /* EtcView.swift in Sources */, 07A4F6AF28A12253006D24FE /* NetworkResult.swift in Sources */, 07A4F6A528A121F1006D24FE /* CustomTabBar.swift in Sources */, 07A4F68A28A12104006D24FE /* ViewController.swift in Sources */, + 0783885328E471DA00071B3F /* ChargingView.swift in Sources */, 07149CEB28A13690000B894F /* PostViewController.swift in Sources */, 074EF97528A1301600D93ABC /* CollectionTableViewCell.swift in Sources */, 07A4F6A928A12216006D24FE /* UIButton+.swift in Sources */, @@ -535,6 +572,7 @@ 074EF96C28A12EAD00D93ABC /* LoginViewController.swift in Sources */, 074EF96828A12E7400D93ABC /* LoginDataModel.swift in Sources */, 074EF96628A12E5100D93ABC /* InitialViewController.swift in Sources */, + 0783885128E471A300071B3F /* FundTableViewCell.swift in Sources */, 07A4F6B728A122B7006D24FE /* MainTabBarController.swift in Sources */, 074EF97B28A1308200D93ABC /* ViewPager.swift in Sources */, 077A292428AF9E7100E77BF6 /* EditProfileViewController.swift in Sources */, @@ -544,6 +582,7 @@ 07A4F68628A12104006D24FE /* AppDelegate.swift in Sources */, 074EF96228A12E1000D93ABC /* SearchViewController.swift in Sources */, 074EF96E28A12ED300D93ABC /* SignUpViewController.swift in Sources */, + 0783884F28E4703E00071B3F /* SettingTableViewCell.swift in Sources */, 073116C028B6168700C126B7 /* HistoryViewController.swift in Sources */, 077A292128AF9C5A00E77BF6 /* SearchDetailViewController.swift in Sources */, 074EF98728A1316700D93ABC /* ProfileDataView.swift in Sources */, @@ -556,6 +595,7 @@ 077A291D28AF8DA000E77BF6 /* ChargingListViewController.swift in Sources */, 077A292628AFA9FA00E77BF6 /* EditAuthorNoteViewController.swift in Sources */, 07A4F6B928A122CE006D24FE /* NavigationViewController.swift in Sources */, + 0783885728E4729800071B3F /* PurchaseHistoryView.swift in Sources */, 07E9A5C528AE4BAE0034BE34 /* ChattingRoomViewControlelr.swift in Sources */, 07A4F6BB28A12300006D24FE /* ChatViewController.swift in Sources */, 074EF97228A12F1900D93ABC /* SignUpDataModel.swift in Sources */, diff --git a/There-iOS/There-iOS/KakaoAuthVM.swift b/There-iOS/There-iOS/KakaoAuthVM.swift index 79bc628..083808d 100644 --- a/There-iOS/There-iOS/KakaoAuthVM.swift +++ b/There-iOS/There-iOS/KakaoAuthVM.swift @@ -17,6 +17,7 @@ class KakaoAuthVM: ObservableObject { static var password: String? static var email: String? static var accessToken: String! + @Published var success: Bool = false @Published var isLoggedIn: Bool = false @@ -55,7 +56,8 @@ class KakaoAuthVM: ObservableObject { //do something _ = oauthToken continuation.resume(returning: true) - self.getUsrInfo() +// LoginViewController.clickedKakao(status: success) +// self.getUsrInfo() } } } diff --git a/There-iOS/There-iOS/MainView/EtcView/Cell/FundTableViewCell.swift b/There-iOS/There-iOS/MainView/EtcView/Cell/FundTableViewCell.swift new file mode 100644 index 0000000..1202d04 --- /dev/null +++ b/There-iOS/There-iOS/MainView/EtcView/Cell/FundTableViewCell.swift @@ -0,0 +1,29 @@ +// +// FundTableViewCell.swift +// There-iOS +// +// Created by 양채연 on 2022/09/28. +// + +import Foundation +import UIKit + +class FundTableViewCell: UITableViewCell { + + private lazy var setting: UILabel = { + let label = UILabel() + label.font = .systemFont(ofSize: 20.0, weight: .light) + label.text = "알림 및 소리" + label.textColor = .black + + return label + }() + + private lazy var settingBtn: UIButton = { + let btn = UIButton() + btn.setImage(systemName: "chevron.forward") + + return btn + }() + +} diff --git a/There-iOS/There-iOS/MainView/EtcView/Cell/SettingTableViewCell.swift b/There-iOS/There-iOS/MainView/EtcView/Cell/SettingTableViewCell.swift new file mode 100644 index 0000000..cc026b5 --- /dev/null +++ b/There-iOS/There-iOS/MainView/EtcView/Cell/SettingTableViewCell.swift @@ -0,0 +1,67 @@ +// +// SettingTableViewCell.swift +// There-iOS +// +// Created by 양채연 on 2022/09/28. +// + +import UIKit + + +final class SettingTableViewCell: UITableViewCell { + + // MARK: - Property + + + private lazy var chargingAmountView: UIView = { + let view = UIView() + view.backgroundColor = UIColor.rgb(red: 255, green: 222, blue: 1) + + return view + }() + + + private lazy var chargingTitle: UILabel = { + let title = UILabel() + title.font = .systemFont(ofSize: 20.0, weight: .light) + title.text = "충전금액" + title.textColor = .black + + + return title + }() + + private lazy var chargingMoney: UILabel = { + let title = UILabel() + title.font = .systemFont(ofSize: 40.0, weight: .medium) + title.text = "100,000원" + title.textColor = .black + + return title + }() + + + private lazy var chargingBtn: UIButton = { + let btn = CustomButton(text: "충전하기", bgColor: .white, titleColor: .darkGray, imageName: "") + btn.titleLabel?.font = UIFont.systemFont(ofSize: 17) + btn.widthAnchor.constraint(equalToConstant: 100).isActive = true + btn.heightAnchor.constraint(equalToConstant: 35).isActive = true + btn.layer.borderWidth = 0 + btn.layer.cornerRadius = 17.0 + + + return btn + }() + + private lazy var purchaseHistoryBtn: UIButton = { + let btn = CustomButton(text: "구매내역", bgColor: .white, titleColor: .darkGray, imageName: "") + btn.titleLabel?.font = UIFont.systemFont(ofSize: 17) + btn.widthAnchor.constraint(equalToConstant: 100).isActive = true + btn.heightAnchor.constraint(equalToConstant: 35).isActive = true + btn.layer.borderWidth = 0 + btn.layer.cornerRadius = 17.0 + + return btn + }() + +} diff --git a/There-iOS/There-iOS/MainView/EtcView/ChargeHistoryView.swift b/There-iOS/There-iOS/MainView/EtcView/ChargeHistoryView.swift new file mode 100644 index 0000000..bb37511 --- /dev/null +++ b/There-iOS/There-iOS/MainView/EtcView/ChargeHistoryView.swift @@ -0,0 +1,8 @@ +// +// ChargedView.swift +// There-iOS +// +// Created by 양채연 on 2022/09/28. +// + +import Foundation diff --git a/There-iOS/There-iOS/MainView/EtcView/ChargingListViewController.swift b/There-iOS/There-iOS/MainView/EtcView/ChargingListViewController.swift index 3556d85..ae2456f 100644 --- a/There-iOS/There-iOS/MainView/EtcView/ChargingListViewController.swift +++ b/There-iOS/There-iOS/MainView/EtcView/ChargingListViewController.swift @@ -41,8 +41,9 @@ class ChargingListViewController: UIViewController { tableView.snp.makeConstraints { $0.edges.equalToSuperview() - } + + } } diff --git a/There-iOS/There-iOS/MainView/EtcView/ChargingView.swift b/There-iOS/There-iOS/MainView/EtcView/ChargingView.swift new file mode 100644 index 0000000..789bed0 --- /dev/null +++ b/There-iOS/There-iOS/MainView/EtcView/ChargingView.swift @@ -0,0 +1,8 @@ +// +// ChargingView.swift +// There-iOS +// +// Created by 양채연 on 2022/09/28. +// + +import Foundation diff --git a/There-iOS/There-iOS/MainView/EtcView/MoreViewController.swift b/There-iOS/There-iOS/MainView/EtcView/MoreViewController.swift index b11e608..9d8a66e 100644 --- a/There-iOS/There-iOS/MainView/EtcView/MoreViewController.swift +++ b/There-iOS/There-iOS/MainView/EtcView/MoreViewController.swift @@ -18,270 +18,6 @@ class MoreViewController: UIViewController { self.view.backgroundColor = bgColor navigationItem.title = "더보기" } - - // MARK: - Property - - - private lazy var chargingAmountView: UIView = { - let view = UIView() - view.backgroundColor = UIColor.rgb(red: 255, green: 222, blue: 1) - - return view - }() - - - private lazy var chargingTitle: UILabel = { - let title = UILabel() - title.font = .systemFont(ofSize: 20.0, weight: .light) - title.text = "충전금액" - title.textColor = .black - - - return title - }() - - private lazy var chargingMoney: UILabel = { - let title = UILabel() - title.font = .systemFont(ofSize: 40.0, weight: .medium) - title.text = "100,000원" - title.textColor = .black - - return title - }() - - - private lazy var chargingBtn: UIButton = { - let btn = CustomButton(text: "충전하기", bgColor: .white, titleColor: .darkGray, imageName: "") - btn.titleLabel?.font = UIFont.systemFont(ofSize: 17) - btn.widthAnchor.constraint(equalToConstant: 100).isActive = true - btn.heightAnchor.constraint(equalToConstant: 35).isActive = true - btn.layer.borderWidth = 0 - btn.layer.cornerRadius = 17.0 - - - return btn - }() - - private lazy var purchaseHistoryBtn: UIButton = { - let btn = CustomButton(text: "구매내역", bgColor: .white, titleColor: .darkGray, imageName: "") - btn.titleLabel?.font = UIFont.systemFont(ofSize: 17) - btn.widthAnchor.constraint(equalToConstant: 100).isActive = true - btn.heightAnchor.constraint(equalToConstant: 35).isActive = true - btn.layer.borderWidth = 0 - btn.layer.cornerRadius = 17.0 - - return btn - }() - - private lazy var setting: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 20.0, weight: .light) - label.text = "설정" - label.textColor = .black - - return label - }() - - private lazy var settingBtn: UIButton = { - let btn = UIButton() - btn.setImage(systemName: "chevron.forward") - - return btn - }() - - private lazy var settingView: UIView = { - let view = UIView() - - view.backgroundColor = UIColor.yellow - view.layer.borderWidth = 3 - view.layer.borderColor = UIColor.black.cgColor - - - return view - }() - - private lazy var customerService: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 20.0, weight: .light) - label.text = "고객센터" - label.textColor = .black - - return label - }() - - private lazy var customerServiceBtn: UIButton = { - let btn = UIButton() - btn.setImage(systemName: "chevron.forward") - - return btn - }() - - private lazy var customerServiceView: UIView = { - let view = UIView() - - view.backgroundColor = UIColor.yellow - view.layer.borderWidth = 3 - view.layer.borderColor = UIColor.black.cgColor - - - return view - }() - - private lazy var contactUs: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 20.0, weight: .light) - label.text = "문의하기" - label.textColor = .black - - return label - }() - - private lazy var contactUsBtn: UIButton = { - let btn = UIButton() - btn.setImage(systemName: "chevron.forward") - - return btn - }() - - private lazy var contactUsView: UIView = { - let view = UIView() - - view.backgroundColor = UIColor.yellow - view.layer.borderWidth = 3 - view.layer.borderColor = UIColor.black.cgColor - - - return view - }() - - - // MARK: - Function - - - @objc - private func clickedCharge() { - let charge = ChargeViewController(bgColor: UIColor.white) - - navigationController?.pushViewController(charge, animated: false) - } - - - func setup() { - [ - chargingTitle, - chargingMoney, - chargingBtn, - purchaseHistoryBtn - - ].forEach { chargingAmountView.addSubview($0) } - - chargingAmountView.snp.makeConstraints { - $0.leading.equalToSuperview() - $0.trailing.equalToSuperview() - $0.top.equalToSuperview().offset(90) - $0.height.equalTo(220) - } - - chargingTitle.snp.makeConstraints { - $0.leading.equalToSuperview().offset(25) - $0.top.equalToSuperview().offset(47) - } - - chargingMoney.snp.makeConstraints { - $0.leading.equalTo(chargingTitle) - $0.top.equalTo(chargingTitle).offset(28) - } - - chargingBtn.snp.makeConstraints { - $0.leading.equalTo(chargingTitle) - $0.top.equalTo(chargingMoney).offset(80) - } - - purchaseHistoryBtn.snp.makeConstraints { - $0.leading.equalTo(chargingBtn.snp.trailing).offset(20) - $0.top.equalTo(chargingBtn) - } - - settingView.snp.makeConstraints { - $0.leading.equalToSuperview() - $0.top.equalTo(chargingAmountView.snp.bottom).offset(20) - } - - [ - setting, - settingBtn - ].forEach{settingView.addSubview($0)} - - setting.snp.makeConstraints { - $0.leading.equalTo(chargingTitle) - $0.top.equalTo(chargingAmountView.snp.bottom).offset(20) - } - settingBtn.snp.makeConstraints { - $0.leading.equalTo(setting.snp.trailing).offset(310) - $0.top.equalTo(settingView.snp.top) - } - - // customer - - customerServiceView.snp.makeConstraints { - $0.leading.equalToSuperview() - $0.top.equalTo(setting.snp.bottom).offset(30) - } - - [ - customerService, - customerServiceBtn - ].forEach{customerServiceView.addSubview($0)} - - customerService.snp.makeConstraints { - $0.leading.equalTo(chargingTitle) - $0.top.equalTo(settingView.snp.bottom).offset(50) - } - customerServiceBtn.snp.makeConstraints{ - $0.leading.equalTo(customerService.snp.trailing).offset(275) - $0.top.equalTo(customerService.snp.top) - } - - // contact - - contactUsView.snp.makeConstraints { - $0.leading.equalToSuperview() - $0.top.equalTo(customerServiceView.snp.bottom).offset(30) - } - - [ - contactUs, - contactUsBtn - ].forEach{contactUsView.addSubview($0)} - - contactUs.snp.makeConstraints { - $0.leading.equalTo(chargingTitle) - $0.top.equalTo(customerServiceView.snp.bottom).offset(50) - } - contactUsBtn.snp.makeConstraints{ - $0.leading.equalTo(contactUs.snp.trailing).offset(275) - $0.top.equalTo(contactUs.snp.top) - } - - - } - - - override func viewDidLoad() { - super.viewDidLoad() - - [ - chargingAmountView, - settingView, - customerServiceView, - contactUsView - - ].forEach{view.addSubview($0)} - - chargingBtn.addTarget(self, action: #selector(clickedCharge), for: .touchUpInside) - setup() - - } } diff --git a/There-iOS/There-iOS/MainView/EtcView/PurchaseHistoryView.swift b/There-iOS/There-iOS/MainView/EtcView/PurchaseHistoryView.swift new file mode 100644 index 0000000..ed72b3e --- /dev/null +++ b/There-iOS/There-iOS/MainView/EtcView/PurchaseHistoryView.swift @@ -0,0 +1,8 @@ +// +// PurchaseHistoryView.swift +// There-iOS +// +// Created by 양채연 on 2022/09/28. +// + +import Foundation diff --git a/There-iOS/There-iOS/MainView/EtcView/View/EtcView.swift b/There-iOS/There-iOS/MainView/EtcView/View/EtcView.swift new file mode 100644 index 0000000..4bde6f0 --- /dev/null +++ b/There-iOS/There-iOS/MainView/EtcView/View/EtcView.swift @@ -0,0 +1,15 @@ +// +// EtcView.swift +// There-iOS +// +// Created by 양채연 on 2022/09/28. +// + +import UIKit + +class EtcView: UIView { + + + + +} diff --git a/There-iOS/There-iOS/MainView/InitialView/LoginView/LoginDataModel.swift b/There-iOS/There-iOS/MainView/InitialView/LoginView/LoginDataModel.swift index 921c8ed..ec6e2ec 100644 --- a/There-iOS/There-iOS/MainView/InitialView/LoginView/LoginDataModel.swift +++ b/There-iOS/There-iOS/MainView/InitialView/LoginView/LoginDataModel.swift @@ -21,7 +21,7 @@ struct LoginData: Codable { struct LoginResult: Codable { let jwt: String - let userIndx: Int + let userIdx: Int } diff --git a/There-iOS/There-iOS/MainView/InitialView/LoginView/LoginViewController.swift b/There-iOS/There-iOS/MainView/InitialView/LoginView/LoginViewController.swift index d70fcf1..5c0027f 100644 --- a/There-iOS/There-iOS/MainView/InitialView/LoginView/LoginViewController.swift +++ b/There-iOS/There-iOS/MainView/InitialView/LoginView/LoginViewController.swift @@ -12,7 +12,6 @@ import Alamofire import Combine - class LoginViewController: UIViewController { // 공통 인스턴스에 있는 통신하는 메서드를 호출해서 받은 데이터를 실질적으로 가공함 @@ -113,9 +112,11 @@ class LoginViewController: UIViewController { } @objc - private func clickedKakao() { + private func clickedKakao(status: Bool) { print("Kakao Login btn clicked") kakaoAuthVM.kakaoLogin() + + } diff --git a/There-iOS/There-iOS/MainView/InitialView/SignUpView/SignUpDataModel.swift b/There-iOS/There-iOS/MainView/InitialView/SignUpView/SignUpDataModel.swift index c9f2a92..0f7b2a2 100644 --- a/There-iOS/There-iOS/MainView/InitialView/SignUpView/SignUpDataModel.swift +++ b/There-iOS/There-iOS/MainView/InitialView/SignUpView/SignUpDataModel.swift @@ -15,7 +15,7 @@ struct SignUpResponse: Codable { // 회원가입 성공 시 data가 넘어오고, 실패 시 data가 안넘어옴 } -struct SignUpData: Codable { +struct SignUpData: Codable { let name: String let email: String let password: String diff --git a/There-iOS/There-iOS/MainView/ProfileView/EditView/EditProfileViewController.swift b/There-iOS/There-iOS/MainView/ProfileView/EditView/EditProfileViewController.swift index 9749fda..0cbbd19 100644 --- a/There-iOS/There-iOS/MainView/ProfileView/EditView/EditProfileViewController.swift +++ b/There-iOS/There-iOS/MainView/ProfileView/EditView/EditProfileViewController.swift @@ -245,3 +245,4 @@ private extension EditProfileViewController{ } +