Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added Icon
Empty file.
37 changes: 33 additions & 4 deletions LGHTSG/LGHTSG.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
F0F6B166299139D900F8835D /* AccountSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0F6B164299139D900F8835D /* AccountSettingViewController.swift */; };
F0F6B167299139D900F8835D /* MyPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0F6B165299139D900F8835D /* MyPageViewController.swift */; };
F0F6B16A29913ADB00F8835D /* UserApiModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0F6B16929913ADB00F8835D /* UserApiModel.swift */; };
F51C6FF529991E8800048DEE /* RankViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51C6FF429991E8800048DEE /* RankViewController.swift */; };
F51C6FF729991EA600048DEE /* RankViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51C6FF629991EA600048DEE /* RankViewCell.swift */; };
F51C6FF92999207000048DEE /* RankingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51C6FF82999207000048DEE /* RankingModel.swift */; };
F51C6FFC299A55A300048DEE /* MarqueeLabel in Frameworks */ = {isa = PBXBuildFile; productRef = F51C6FFB299A55A300048DEE /* MarqueeLabel */; };
F5DAEC00298AD1FA0098A11A /* login.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5DAEBFF298AD1FA0098A11A /* login.swift */; };
F5DAEC02298AD2050098A11A /* email.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5DAEC01298AD2050098A11A /* email.swift */; };
F5DAEC04298AD20E0098A11A /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5DAEC03298AD20E0098A11A /* join.swift */; };
Expand Down Expand Up @@ -159,6 +163,9 @@
F0F6B164299139D900F8835D /* AccountSettingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountSettingViewController.swift; sourceTree = "<group>"; };
F0F6B165299139D900F8835D /* MyPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageViewController.swift; sourceTree = "<group>"; };
F0F6B16929913ADB00F8835D /* UserApiModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserApiModel.swift; sourceTree = "<group>"; };
F51C6FF429991E8800048DEE /* RankViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankViewController.swift; sourceTree = "<group>"; };
F51C6FF629991EA600048DEE /* RankViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankViewCell.swift; sourceTree = "<group>"; };
F51C6FF82999207000048DEE /* RankingModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankingModel.swift; sourceTree = "<group>"; };
F5DAEBFF298AD1FA0098A11A /* login.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = login.swift; sourceTree = "<group>"; };
F5DAEC01298AD2050098A11A /* email.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = email.swift; sourceTree = "<group>"; };
F5DAEC03298AD20E0098A11A /* join.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = join.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -193,6 +200,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F51C6FFC299A55A300048DEE /* MarqueeLabel in Frameworks */,
07120DF3296EDF6E00ABF98F /* Alamofire in Frameworks */,
07120DF6296EDF7A00ABF98F /* SnapKit in Frameworks */,
8E910354CAD5238FB38C267D /* Pods_LGHTSG.framework in Frameworks */,
Expand Down Expand Up @@ -285,6 +293,7 @@
F0F6B15D2991310000F8835D /* UserRoeModel.swift */,
078401C1298A486300CDE061 /* EstatePriceModel.swift */,
07F0D8872993D6D300D3C186 /* TopViewModel.swift */,
F51C6FF82999207000048DEE /* RankingModel.swift */,
);
path = ViewModel;
sourceTree = "<group>";
Expand All @@ -305,6 +314,7 @@
078401CA298A49D500CDE061 /* EstateDetailCell.swift */,
075BBA39298ACF1D00710F44 /* EstateSaleCell.swift */,
0764F26A298642EF00F446CB /* SearchItemCell.swift */,
F51C6FF629991EA600048DEE /* RankViewCell.swift */,
0764F284298959C600F446CB /* TopViewCell.swift */,
F5DAEC1B298AD2F70098A11A /* LoginView.swift */,
078401D0298A49E200CDE061 /* ChartMarker.swift */,
Expand Down Expand Up @@ -337,6 +347,7 @@
078401B3298A484800CDE061 /* HomeViewController.swift */,
078401AE298A484800CDE061 /* MainTabController.swift */,
078401B0298A484800CDE061 /* StockChartViewController.swift */,
F51C6FF429991E8800048DEE /* RankViewController.swift */,
);
path = Controller;
sourceTree = "<group>";
Expand Down Expand Up @@ -486,6 +497,7 @@
packageProductDependencies = (
07120DF2296EDF6E00ABF98F /* Alamofire */,
07120DF5296EDF7A00ABF98F /* SnapKit */,
F51C6FFB299A55A300048DEE /* MarqueeLabel */,
);
productName = LGHTSG;
productReference = 071E053D296BB7B50020282F /* LGHTSG.app */;
Expand Down Expand Up @@ -518,6 +530,7 @@
packageReferences = (
07120DF1296EDF6E00ABF98F /* XCRemoteSwiftPackageReference "Alamofire" */,
07120DF4296EDF7A00ABF98F /* XCRemoteSwiftPackageReference "SnapKit" */,
F51C6FFA299A55A300048DEE /* XCRemoteSwiftPackageReference "MarqueeLabel" */,
);
productRefGroup = 071E053E296BB7B50020282F /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -620,6 +633,7 @@
F5DAEC04298AD20E0098A11A /* join.swift in Sources */,
078401DD298A49E300CDE061 /* StockDateSegmentControl.swift in Sources */,
F5DAEC00298AD1FA0098A11A /* login.swift in Sources */,
F51C6FF529991E8800048DEE /* RankViewController.swift in Sources */,
F5DAEC06298AD2180098A11A /* changePw.swift in Sources */,
078401BD298A484800CDE061 /* ExploreViewController.swift in Sources */,
F5DAEC3B298AD46B0098A11A /* CheckPageServiceController.swift in Sources */,
Expand All @@ -636,10 +650,12 @@
F5DAEC14298AD2A30098A11A /* CheckAgreeView.swift in Sources */,
F5DAEC20298AD31E0098A11A /* FindPwView.swift in Sources */,
F5DAEC1C298AD2F70098A11A /* LoginView.swift in Sources */,
F51C6FF729991EA600048DEE /* RankViewCell.swift in Sources */,
075BBA3A298ACF1D00710F44 /* EstateSaleCell.swift in Sources */,
075BBA30298A78FC00710F44 /* EstateController.swift in Sources */,
07F0D88C2995F3AA00D3C186 /* PasswordApiModel.swift in Sources */,
F5DAEC0A298AD23D0098A11A /* LoginResultModel.swift in Sources */,
F51C6FF92999207000048DEE /* RankingModel.swift in Sources */,
F5DAEC1E298AD3080098A11A /* StartView.swift in Sources */,
078401E7298A4B2D00CDE061 /* TableCellModel.swift in Sources */,
078401E9298A4C2600CDE061 /* TopViewController.swift in Sources */,
Expand Down Expand Up @@ -797,12 +813,12 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 9KQS6UJ9YX;
DEVELOPMENT_TEAM = KSR8K3JPUM;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = LGHTSG/Info.plist;
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "위치 정보 제공을 허용합니까?";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
Expand All @@ -827,12 +843,12 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 9KQS6UJ9YX;
DEVELOPMENT_TEAM = KSR8K3JPUM;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = LGHTSG/Info.plist;
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "위치 정보 제공을 허용합니까?";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
Expand Down Expand Up @@ -889,6 +905,14 @@
kind = branch;
};
};
F51C6FFA299A55A300048DEE /* XCRemoteSwiftPackageReference "MarqueeLabel" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/cbpowell/MarqueeLabel";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 4.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand All @@ -902,6 +926,11 @@
package = 07120DF4296EDF7A00ABF98F /* XCRemoteSwiftPackageReference "SnapKit" */;
productName = SnapKit;
};
F51C6FFB299A55A300048DEE /* MarqueeLabel */ = {
isa = XCSwiftPackageProductDependency;
package = F51C6FFA299A55A300048DEE /* XCRemoteSwiftPackageReference "MarqueeLabel" */;
productName = MarqueeLabel;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 071E0535296BB7B50020282F /* Project object */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions LGHTSG/LGHTSG/App/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {

sleep(1)

NMFAuthManager.shared().clientId = "t1d90xy372"
if #available(iOS 15, *) {
let appearance = UINavigationBarAppearance()
Expand All @@ -37,6 +39,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Use this method to select a configuration to create the new scene with.
return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
}

func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {

// 세로방향 고정
return UIInterfaceOrientationMask.portrait
}

func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
// Called when the user discards a scene session.
Expand Down
49 changes: 38 additions & 11 deletions LGHTSG/LGHTSG/App/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import UIKit
import Alamofire

class SceneDelegate: UIResponder, UIWindowSceneDelegate {

Expand All @@ -16,17 +17,43 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
guard let windowscene = (scene as? UIWindowScene) else { return }
window = UIWindow(windowScene: windowscene)
window?.backgroundColor = .systemBackground

// var jwt : String = UserDefaults.standard.string(forKey: "savedToken") ?? ""
// if jwt != "" {
// print(jwt)
// window?.rootViewController = MainTabController()
// }
// else{
window?.rootViewController = ViewController()
// }
//window?.rootViewController = UINavigationController(rootViewController: MainTabController())

//window?.rootViewController = ViewController()

// MARK: 회원가입 체크 초기화
UserDefaults.standard.set(false, forKey: "allcheck")
UserDefaults.standard.set(false, forKey: "check1")
UserDefaults.standard.set(false, forKey: "check2")
UserDefaults.standard.set(false, forKey: "check3")



// MARK: 자동로그인을 위한 코드
var loginSuccess : Bool = UserDefaults.standard.bool(forKey: "loginSuccess") ?? false

print("자동로그인 \(loginSuccess)")

if loginSuccess == true {
// MARK: 마지막 로그인 기록
let email = UserDefaults.standard.string(forKey: "email")
let password = UserDefaults.standard.string(forKey: "password")

let bodyData : Parameters = [
"email" : email,
"password" : password
]

LoginApiModel().requestLoginDataModel(bodyData: bodyData){
data in
print(data.accessToken)
print("자동로그인 성공")
UserDefaults.standard.set(data.accessToken, forKey: "savedToken")
self.window?.rootViewController = MainTabController()
}
}
else if loginSuccess == false {
window?.rootViewController = ViewController()
}

window?.tintColor = .label
window?.makeKeyAndVisible()
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading