Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Login&SignUp 퍼블리싱 #7

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Login&SignUp 퍼블리싱 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f25f56a
Login&SignUp 퍼블리싱
pji-min Aug 15, 2024
c7508ae
Auto stash before rebase of "1-Login_SignUp_UI" onto "main"
pji-min Aug 19, 2024
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added 10_CMD_iOS/.DS_Store
View file
Open in desktop
Binary file not shown.
32 changes: 31 additions & 1 deletion 10_CMD_iOS/10_CMD_iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
35A553402C6A1F93006F251F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35A5533F2C6A1F93006F251F /* AppDelegate.swift */; };
35A553422C6A1F93006F251F /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35A553412C6A1F93006F251F /* SceneDelegate.swift */; };
35A553442C6A1F93006F251F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35A553432C6A1F93006F251F /* ViewController.swift */; };
35A553472C6A1F93006F251F /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 35A553462C6A1F93006F251F /* Base */; };
35A553492C6A1F95006F251F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 35A553482C6A1F95006F251F /* Assets.xcassets */; };
35A5534C2C6A1F95006F251F /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 35A5534B2C6A1F95006F251F /* Base */; };
35A553572C6A1F95006F251F /* _0_CMD_iOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35A553562C6A1F95006F251F /* _0_CMD_iOSTests.swift */; };
35A553612C6A1F95006F251F /* _0_CMD_iOSUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35A553602C6A1F95006F251F /* _0_CMD_iOSUITests.swift */; };
35A553632C6A1F95006F251F /* _0_CMD_iOSUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35A553622C6A1F95006F251F /* _0_CMD_iOSUITestsLaunchTests.swift */; };
4FD69C04253412A6742AD524 /* Pods_10_CMD_iOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE0D08912E9A271364CE653A /* Pods_10_CMD_iOSTests.framework */; };
559B143F2C6B6A010043F98E /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 559B143E2C6B6A010043F98E /* SignUpViewController.swift */; };
82191AD8FF30AA328B5AA0CE /* Pods_10_CMD_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45632459C4739234C5EDFBFD /* Pods_10_CMD_iOS.framework */; };
BE32438EE662ABD6B98CA470 /* Pods_10_CMD_iOS_10_CMD_iOSUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC2FBAECE1DA9F6ABB4E8E3 /* Pods_10_CMD_iOS_10_CMD_iOSUITests.framework */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -43,6 +45,7 @@
35A5533F2C6A1F93006F251F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
35A553412C6A1F93006F251F /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
35A553432C6A1F93006F251F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
35A553462C6A1F93006F251F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
35A553482C6A1F95006F251F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
35A5534B2C6A1F95006F251F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
35A5534D2C6A1F95006F251F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -52,6 +55,7 @@
35A553602C6A1F95006F251F /* _0_CMD_iOSUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _0_CMD_iOSUITests.swift; sourceTree = "<group>"; };
35A553622C6A1F95006F251F /* _0_CMD_iOSUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _0_CMD_iOSUITestsLaunchTests.swift; sourceTree = "<group>"; };
45632459C4739234C5EDFBFD /* Pods_10_CMD_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_10_CMD_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
559B143E2C6B6A010043F98E /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SignUpViewController.swift; path = /Users/jiminzzang/Desktop/10_CMD_iOS/10_CMD_iOS/10_CMD_iOS/VC/SignUpViewController.swift; sourceTree = "<absolute>"; };
803FD702411BB3C5FB0DA9FD /* Pods-10_CMD_iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-10_CMD_iOSTests.debug.xcconfig"; path = "Target Support Files/Pods-10_CMD_iOSTests/Pods-10_CMD_iOSTests.debug.xcconfig"; sourceTree = "<group>"; };
8E112FFA00B1E31575B11711 /* Pods-10_CMD_iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-10_CMD_iOS.debug.xcconfig"; path = "Target Support Files/Pods-10_CMD_iOS/Pods-10_CMD_iOS.debug.xcconfig"; sourceTree = "<group>"; };
99F7BA657FD1E4B7F190727D /* Pods-10_CMD_iOS-10_CMD_iOSUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-10_CMD_iOS-10_CMD_iOSUITests.release.xcconfig"; path = "Target Support Files/Pods-10_CMD_iOS-10_CMD_iOSUITests/Pods-10_CMD_iOS-10_CMD_iOSUITests.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -130,6 +134,7 @@
35A5533F2C6A1F93006F251F /* AppDelegate.swift */,
35A553412C6A1F93006F251F /* SceneDelegate.swift */,
35A553432C6A1F93006F251F /* ViewController.swift */,
35A553452C6A1F93006F251F /* Main.storyboard */,
35A553482C6A1F95006F251F /* Assets.xcassets */,
35A5534A2C6A1F95006F251F /* LaunchScreen.storyboard */,
35A5534D2C6A1F95006F251F /* Info.plist */,
Expand All @@ -154,6 +159,24 @@
path = 10_CMD_iOSUITests;
sourceTree = "<group>";
};
55EC67CA2C6A2204006006FC /* VC */ = {
isa = PBXGroup;
children = (
35A553432C6A1F93006F251F /* LoginViewController.swift */,
559B143E2C6B6A010043F98E /* SignUpViewController.swift */,
);
path = VC;
sourceTree = "<group>";
};
55EC67CB2C6A220F006006FC /* Delegate */ = {
isa = PBXGroup;
children = (
35A5533F2C6A1F93006F251F /* AppDelegate.swift */,
35A553412C6A1F93006F251F /* SceneDelegate.swift */,
);
path = Delegate;
sourceTree = "<group>";
};
874B3D1EDCE591EBE6B43A5A /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -182,6 +205,8 @@
dependencies = (
);
name = 10_CMD_iOS;
packageProductDependencies = (
);
productName = 10_CMD_iOS;
productReference = 35A5533C2C6A1F93006F251F /* 10_CMD_iOS.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -257,6 +282,8 @@
Base,
);
mainGroup = 35A553332C6A1F93006F251F;
packageReferences = (
);
productRefGroup = 35A5533D2C6A1F93006F251F /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -402,7 +429,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
35A553442C6A1F93006F251F /* ViewController.swift in Sources */,
559B143F2C6B6A010043F98E /* SignUpViewController.swift in Sources */,
35A553442C6A1F93006F251F /* LoginViewController.swift in Sources */,
35A553402C6A1F93006F251F /* AppDelegate.swift in Sources */,
35A553422C6A1F93006F251F /* SceneDelegate.swift in Sources */,
);
Expand Down Expand Up @@ -581,6 +609,7 @@
CURRENT_PROJECT_VERSION = 1;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
IBSC_FLATTEN_NIBS = NO;
INFOPLIST_FILE = 10_CMD_iOS/Info.plist;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
Expand Down Expand Up @@ -609,6 +638,7 @@
CURRENT_PROJECT_VERSION = 1;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
IBSC_FLATTEN_NIBS = NO;
INFOPLIST_FILE = 10_CMD_iOS/Info.plist;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
Expand Down
15 changes: 15 additions & 0 deletions 10_CMD_iOS/10_CMD_iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"originHash" : "4cdad746817ac9ed37e44dbe90a2ff25fc018954899b7d513e41a4bfc70f065a",
"pins" : [
{
"identity" : "snapkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SnapKit/SnapKit",
"state" : {
"revision" : "2842e6e84e82eb9a8dac0100ca90d9444b0307f4",
"version" : "5.7.1"
}
}
],
"version" : 3
}
Binary file added ...proj/project.xcworkspace/xcuserdata/jiminzzang.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
124 changes: 124 additions & 0 deletions ...10_CMD_iOS.xcodeproj/xcuserdata/jiminzzang.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>10_CMD_iOS.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<<<<<<< Updated upstream
<integer>1</integer>
</dict>
<key>SnapKitPlayground (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>SnapKitPlayground (Playground) 10.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>SnapKitPlayground (Playground) 11.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>SnapKitPlayground (Playground) 12.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>SnapKitPlayground (Playground) 13.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>14</integer>
</dict>
<key>SnapKitPlayground (Playground) 14.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>SnapKitPlayground (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>SnapKitPlayground (Playground) 3.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>SnapKitPlayground (Playground) 4.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>SnapKitPlayground (Playground) 5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>SnapKitPlayground (Playground) 6.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>SnapKitPlayground (Playground) 7.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>SnapKitPlayground (Playground) 8.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>SnapKitPlayground (Playground) 9.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>SnapKitPlayground (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
=======
<integer>6</integer>
</dict>
>>>>>>> Stashed changes
</dict>
</dict>
</plist>
Binary file added ...S/10_CMD_iOS.xcworkspace/xcuserdata/jiminzzang.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
21 changes: 21 additions & 0 deletions 10_CMD_iOS/10_CMD_iOS/Assets.xcassets/eyeOff.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "eyeoff.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
3 changes: 3 additions & 0 deletions 10_CMD_iOS/10_CMD_iOS/Assets.xcassets/eyeOff.imageset/eyeoff.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions 10_CMD_iOS/10_CMD_iOS/Assets.xcassets/eyeOn.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "eyeon.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
3 changes: 3 additions & 0 deletions 10_CMD_iOS/10_CMD_iOS/Assets.xcassets/eyeOn.imageset/eyeon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions 10_CMD_iOS/10_CMD_iOS/Assets.xcassets/textField.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x8D",
"green" : "0x8D",
"red" : "0x8D"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
7 changes: 0 additions & 7 deletions 10_CMD_iOS/10_CMD_iOS/AppDelegate.swift → ...iOS/10_CMD_iOS/Delegate/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
//
// AppDelegate.swift
// 10_CMD_iOS
//
// Created by 손희찬 on 8/12/24.
//

import UIKit

@main
Expand Down
22 changes: 9 additions & 13 deletions 10_CMD_iOS/10_CMD_iOS/SceneDelegate.swift → ...S/10_CMD_iOS/Delegate/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
//
// SceneDelegate.swift
// 10_CMD_iOS
//
// Created by 손희찬 on 8/12/24.
//

import UIKit

class SceneDelegate: UIResponder, UIWindowSceneDelegate {
Expand All @@ -13,11 +6,15 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {


func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
guard let scene = (scene as? UIWindowScene) else { return }
window = UIWindow(windowScene: scene)
let viewController = ViewController()
window?.rootViewController = viewController
window?.makeKeyAndVisible()
// Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
// If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
guard let windowScene = (scene as? UIWindowScene) else { return }
window = UIWindow(frame: windowScene.coordinateSpace.bounds)
window?.windowScene = windowScene
let rootViewController = LoginViewController()
window?.rootViewController = UINavigationController(rootViewController: LoginViewController()) // RootViewController
window?.makeKeyAndVisible()
}

func sceneDidDisconnect(_ scene: UIScene) {
Expand Down Expand Up @@ -50,4 +47,3 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {


}

Loading