Skip to content

modified server address #9

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

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

modified server address #9

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
2dadea2
modified server address
Aug 23, 2023
f1de838
modified server user
Aug 23, 2023
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 added HelloThere_iOS/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion HelloThere_iOS/HelloThere_iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
4200395E2A81E02A00461FDA /* AddressVerification.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = AddressVerification.storyboard; sourceTree = "<group>"; };
420039602A81E03800461FDA /* AddressVerificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressVerificationViewController.swift; sourceTree = "<group>"; };
4248C7272A861006003234CA /* Manager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Manager.swift; sourceTree = "<group>"; };
4248C7292A8615E0003234CA /* SetAlarm.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SetAlarm.storyboard; path = ../../../../../../.Trash/SetAlarm.storyboard; sourceTree = "<group>"; };
4248C7292A8615E0003234CA /* SetAlarm.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SetAlarm.storyboard; sourceTree = "<group>"; };
42ADD80D2A80D9BB00925FE1 /* SignIn.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignIn.storyboard; sourceTree = "<group>"; };
42ADD80F2A80D9D900925FE1 /* SignInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewController.swift; sourceTree = "<group>"; };
42ADD8122A80DDE500925FE1 /* SignUp.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignUp.storyboard; sourceTree = "<group>"; };
Expand Down
2 changes: 1 addition & 1 deletion ...here_iOS.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>HelloThere_iOS.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
Expand Down
Binary file modified ...oThere_iOS.xcworkspace/xcuserdata/ujusuperstar.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
Binary file added HelloThere_iOS/HelloThere_iOS/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added HelloThere_iOS/HelloThere_iOS/MyDetailPages/.DS_Store
View file
Open in desktop
Binary file not shown.
47 changes: 47 additions & 0 deletions HelloThere_iOS/HelloThere_iOS/MyDetailPages/pushAlarm/SetAlarm.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Set Alarm View Controller-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController id="Y6W-OH-hqX" customClass="SetAlarmViewController" customModule="HelloThere_iOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="알림 설정" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kOa-MY-nWA">
<rect key="frame" x="157" y="59" width="100" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="3lz-KE-oNb"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="kOa-MY-nWA" firstAttribute="centerX" secondItem="5EZ-qb-Rvc" secondAttribute="centerX" id="Nih-hC-vNx"/>
<constraint firstItem="kOa-MY-nWA" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="15" id="PNI-fN-9ZM"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="139" y="90"/>
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
4 changes: 2 additions & 2 deletions HelloThere_iOS/HelloThere_iOS/SignInPages/SignInPage/SignInViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class SignInViewController: UIViewController {
"password" : password
]

let url = "http://3.37.126.149:8080/users/log-in"
let url = "https://hello-there.shop/users/log-in"

AF.request(url, method: .post, parameters: body, encoding: JSONEncoding.default).responseJSON {
response in
Expand All @@ -83,7 +83,7 @@ class SignInViewController: UIViewController {
print(">>")
print(json.result?.accessToken)
defaults.set(json.result?.accessToken, forKey: "accessToken")
self.signInErrorMessageLabel.text = "성공✅"
// self.signInErrorMessageLabel.text = "성공✅"

let nextStoryBoard = UIStoryboard(name: "Main", bundle: nil)
let nextViewController = nextStoryBoard.instantiateViewController(identifier: "Main")
Expand Down
10 changes: 5 additions & 5 deletions HelloThere_iOS/HelloThere_iOS/SignInPages/SignUpPage/SignUpViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class SignUpViewController: UIViewController {
let emailTest = NSPredicate(format: "SELF MATCHES %@", emailRegEx)
let emailCheck = emailTest.evaluate(with: email)

let urlEmail = "http://3.37.126.149:8080/users/check-email?email=\(email)"
let urlEmail = "https://hello-there.shop/users/check-email?email=\(email)"

if emailCheck {
AF.request(urlEmail, method: .get).validate().responseJSON { response in
Expand All @@ -72,8 +72,8 @@ class SignUpViewController: UIViewController {
self.emailErrorMessage.textColor = UIColor(red: 43/255, green: 203/255, blue: 165/255, alpha: 1)
}else {
// print("사용불가능한 이메일")
// self.emailErrorMessage.text = "사용불가능한 이메일입니다"
self.emailErrorMessage.text = json["message"] as! String
self.emailErrorMessage.text = "사용불가능한 이메일입니다"
// self.emailErrorMessage.text = json["message"] as! String
self.emailErrorMessage.textColor = UIColor.red
}
case .failure(let error):
Expand Down Expand Up @@ -139,7 +139,7 @@ class SignUpViewController: UIViewController {
}

func isNicknameValidate(nickname: String) {
let urlNickname = "http://3.37.126.149:8080/users/check-nickname?nickName=\(nickname)"
let urlNickname = "https://hello-there.shop/users/check-nickname?nickName=\(nickname)"
let encodedStr = urlNickname.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)! // 닉네임이 한국어로 들어가는 경우
let url = URL(string: encodedStr)!

Expand Down Expand Up @@ -172,7 +172,7 @@ class SignUpViewController: UIViewController {
}

func isSignUpValidate(nickName:String, email:String, password:String, passwordChk:String){
let url = "http://3.37.126.149:8080/users"
let url = "https://hello-there.shop/users"
struct SignUpResult: Codable {
let isSuccess: Bool
let code: Int
Expand Down
10 changes: 5 additions & 5 deletions ...ods/Pods.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop

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