Skip to content

Commit d71b0b6

Browse files
authored
Merge pull request #10 from LGHTSG/hound
feat: final
2 parents e334e7d + 3ae7d76 commit d71b0b6

File tree

58 files changed

+1370
-446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1370
-446
lines changed

Icon

Whitespace-only changes.

LGHTSG/LGHTSG.xcodeproj/project.pbxproj

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@
6767
F0F6B166299139D900F8835D /* AccountSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0F6B164299139D900F8835D /* AccountSettingViewController.swift */; };
6868
F0F6B167299139D900F8835D /* MyPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0F6B165299139D900F8835D /* MyPageViewController.swift */; };
6969
F0F6B16A29913ADB00F8835D /* UserApiModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0F6B16929913ADB00F8835D /* UserApiModel.swift */; };
70+
F51C6FF529991E8800048DEE /* RankViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51C6FF429991E8800048DEE /* RankViewController.swift */; };
71+
F51C6FF729991EA600048DEE /* RankViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51C6FF629991EA600048DEE /* RankViewCell.swift */; };
72+
F51C6FF92999207000048DEE /* RankingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51C6FF82999207000048DEE /* RankingModel.swift */; };
7073
F5DAEC00298AD1FA0098A11A /* login.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5DAEBFF298AD1FA0098A11A /* login.swift */; };
7174
F5DAEC02298AD2050098A11A /* email.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5DAEC01298AD2050098A11A /* email.swift */; };
7275
F5DAEC04298AD20E0098A11A /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5DAEC03298AD20E0098A11A /* join.swift */; };
@@ -159,6 +162,9 @@
159162
F0F6B164299139D900F8835D /* AccountSettingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountSettingViewController.swift; sourceTree = "<group>"; };
160163
F0F6B165299139D900F8835D /* MyPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageViewController.swift; sourceTree = "<group>"; };
161164
F0F6B16929913ADB00F8835D /* UserApiModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserApiModel.swift; sourceTree = "<group>"; };
165+
F51C6FF429991E8800048DEE /* RankViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankViewController.swift; sourceTree = "<group>"; };
166+
F51C6FF629991EA600048DEE /* RankViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankViewCell.swift; sourceTree = "<group>"; };
167+
F51C6FF82999207000048DEE /* RankingModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankingModel.swift; sourceTree = "<group>"; };
162168
F5DAEBFF298AD1FA0098A11A /* login.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = login.swift; sourceTree = "<group>"; };
163169
F5DAEC01298AD2050098A11A /* email.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = email.swift; sourceTree = "<group>"; };
164170
F5DAEC03298AD20E0098A11A /* join.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = join.swift; sourceTree = "<group>"; };
@@ -285,6 +291,7 @@
285291
F0F6B15D2991310000F8835D /* UserRoeModel.swift */,
286292
078401C1298A486300CDE061 /* EstatePriceModel.swift */,
287293
07F0D8872993D6D300D3C186 /* TopViewModel.swift */,
294+
F51C6FF82999207000048DEE /* RankingModel.swift */,
288295
);
289296
path = ViewModel;
290297
sourceTree = "<group>";
@@ -305,6 +312,7 @@
305312
078401CA298A49D500CDE061 /* EstateDetailCell.swift */,
306313
075BBA39298ACF1D00710F44 /* EstateSaleCell.swift */,
307314
0764F26A298642EF00F446CB /* SearchItemCell.swift */,
315+
F51C6FF629991EA600048DEE /* RankViewCell.swift */,
308316
0764F284298959C600F446CB /* TopViewCell.swift */,
309317
F5DAEC1B298AD2F70098A11A /* LoginView.swift */,
310318
078401D0298A49E200CDE061 /* ChartMarker.swift */,
@@ -337,6 +345,7 @@
337345
078401B3298A484800CDE061 /* HomeViewController.swift */,
338346
078401AE298A484800CDE061 /* MainTabController.swift */,
339347
078401B0298A484800CDE061 /* StockChartViewController.swift */,
348+
F51C6FF429991E8800048DEE /* RankViewController.swift */,
340349
);
341350
path = Controller;
342351
sourceTree = "<group>";
@@ -620,6 +629,7 @@
620629
F5DAEC04298AD20E0098A11A /* join.swift in Sources */,
621630
078401DD298A49E300CDE061 /* StockDateSegmentControl.swift in Sources */,
622631
F5DAEC00298AD1FA0098A11A /* login.swift in Sources */,
632+
F51C6FF529991E8800048DEE /* RankViewController.swift in Sources */,
623633
F5DAEC06298AD2180098A11A /* changePw.swift in Sources */,
624634
078401BD298A484800CDE061 /* ExploreViewController.swift in Sources */,
625635
F5DAEC3B298AD46B0098A11A /* CheckPageServiceController.swift in Sources */,
@@ -636,10 +646,12 @@
636646
F5DAEC14298AD2A30098A11A /* CheckAgreeView.swift in Sources */,
637647
F5DAEC20298AD31E0098A11A /* FindPwView.swift in Sources */,
638648
F5DAEC1C298AD2F70098A11A /* LoginView.swift in Sources */,
649+
F51C6FF729991EA600048DEE /* RankViewCell.swift in Sources */,
639650
075BBA3A298ACF1D00710F44 /* EstateSaleCell.swift in Sources */,
640651
075BBA30298A78FC00710F44 /* EstateController.swift in Sources */,
641652
07F0D88C2995F3AA00D3C186 /* PasswordApiModel.swift in Sources */,
642653
F5DAEC0A298AD23D0098A11A /* LoginResultModel.swift in Sources */,
654+
F51C6FF92999207000048DEE /* RankingModel.swift in Sources */,
643655
F5DAEC1E298AD3080098A11A /* StartView.swift in Sources */,
644656
078401E7298A4B2D00CDE061 /* TableCellModel.swift in Sources */,
645657
078401E9298A4C2600CDE061 /* TopViewController.swift in Sources */,
@@ -797,7 +809,7 @@
797809
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
798810
CODE_SIGN_STYLE = Automatic;
799811
CURRENT_PROJECT_VERSION = 1;
800-
DEVELOPMENT_TEAM = 9KQS6UJ9YX;
812+
DEVELOPMENT_TEAM = KSR8K3JPUM;
801813
GENERATE_INFOPLIST_FILE = YES;
802814
INFOPLIST_FILE = LGHTSG/Info.plist;
803815
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "위치 정보 제공을 허용합니까?";
@@ -827,7 +839,7 @@
827839
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
828840
CODE_SIGN_STYLE = Automatic;
829841
CURRENT_PROJECT_VERSION = 1;
830-
DEVELOPMENT_TEAM = 9KQS6UJ9YX;
842+
DEVELOPMENT_TEAM = KSR8K3JPUM;
831843
GENERATE_INFOPLIST_FILE = YES;
832844
INFOPLIST_FILE = LGHTSG/Info.plist;
833845
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "위치 정보 제공을 허용합니까?";

LGHTSG/LGHTSG/App/AppDelegate.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3737
// Use this method to select a configuration to create the new scene with.
3838
return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
3939
}
40+
41+
func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
42+
43+
// 세로방향 고정
44+
return UIInterfaceOrientationMask.portrait
45+
}
4046

4147
func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
4248
// Called when the user discards a scene session.

LGHTSG/LGHTSG/App/SceneDelegate.swift

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77

88
import UIKit
9+
import Alamofire
910

1011
class SceneDelegate: UIResponder, UIWindowSceneDelegate {
1112

@@ -16,17 +17,35 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
1617
guard let windowscene = (scene as? UIWindowScene) else { return }
1718
window = UIWindow(windowScene: windowscene)
1819
window?.backgroundColor = .systemBackground
19-
20-
// var jwt : String = UserDefaults.standard.string(forKey: "savedToken") ?? ""
21-
// if jwt != "" {
22-
// print(jwt)
23-
// window?.rootViewController = MainTabController()
24-
// }
25-
// else{
26-
window?.rootViewController = ViewController()
27-
// }
28-
//window?.rootViewController = UINavigationController(rootViewController: MainTabController())
29-
20+
//window?.rootViewController = ViewController()
21+
22+
// MARK: 자동로그인을 위한 코드
23+
var loginSuccess : Bool = UserDefaults.standard.bool(forKey: "loginSuccess") ?? false
24+
25+
print("자동로그인 \(loginSuccess)")
26+
27+
if loginSuccess == true {
28+
// MARK: 마지막 로그인 기록
29+
let email = UserDefaults.standard.string(forKey: "email")
30+
let password = UserDefaults.standard.string(forKey: "password")
31+
32+
let bodyData : Parameters = [
33+
"email" : email,
34+
"password" : password
35+
]
36+
37+
LoginApiModel().requestLoginDataModel(bodyData: bodyData){
38+
data in
39+
print(data.accessToken)
40+
print("자동로그인 성공")
41+
UserDefaults.standard.set(data.accessToken, forKey: "savedToken")
42+
self.window?.rootViewController = MainTabController()
43+
}
44+
}
45+
else if loginSuccess == false {
46+
window?.rootViewController = ViewController()
47+
}
48+
3049
window?.tintColor = .label
3150
window?.makeKeyAndVisible()
3251
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Rectangle 172 (14).png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "Rectangle 172 (13).png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "Rectangle 172 (12).png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
947 Bytes
Loading
545 Bytes
Loading
269 Bytes
Loading
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "free-icon-money-bag-189715 2.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "free-icon-money-bag-189715 2 (1).png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "free-icon-money-bag-189715 2 (2).png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
2.72 KB
Loading

0 commit comments

Comments
 (0)