Skip to content

Commit

Permalink
Merge pull request #114 from Sopt-Mongle/feature/#106
Browse files Browse the repository at this point in the history
Feature/#106
  • Loading branch information
qodhrkawk committed Nov 8, 2020
2 parents b8ace1f + 7f4d1eb commit 29027e1
Show file tree
Hide file tree
Showing 42 changed files with 1,016 additions and 6 deletions.
9 changes: 9 additions & 0 deletions Mongle/Mongle.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@
ECA23EE024B5F5F100C100F1 /* WritingSentenceSecondVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECA23EDF24B5F5F100C100F1 /* WritingSentenceSecondVC.swift */; };
ECEF22BA24B4A3B200933534 /* WritingSentence.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ECEF22B924B4A3B200933534 /* WritingSentence.storyboard */; };
ECEF22BC24B4A3DF00933534 /* WritingSentenceVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECEF22BB24B4A3DF00933534 /* WritingSentenceVC.swift */; };
ECF97E862556720C00BF85AA /* SignUpEmail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ECF97E852556720C00BF85AA /* SignUpEmail.storyboard */; };
ECF97E892556722000BF85AA /* SignUpEmailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECF97E882556722000BF85AA /* SignUpEmailVC.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -396,6 +398,8 @@
ECA23EDF24B5F5F100C100F1 /* WritingSentenceSecondVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WritingSentenceSecondVC.swift; sourceTree = "<group>"; };
ECEF22B924B4A3B200933534 /* WritingSentence.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = WritingSentence.storyboard; sourceTree = "<group>"; };
ECEF22BB24B4A3DF00933534 /* WritingSentenceVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WritingSentenceVC.swift; sourceTree = "<group>"; };
ECF97E852556720C00BF85AA /* SignUpEmail.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignUpEmail.storyboard; sourceTree = "<group>"; };
ECF97E882556722000BF85AA /* SignUpEmailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpEmailVC.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -520,6 +524,7 @@
EC76E10225109C29009DDEF1 /* SignUpMain.storyboard */,
EC771BB0254D4DD10041603E /* SignUpServiceAgree.storyboard */,
EC304628254ED08800DB6E4A /* ServiceAgreeForSignUp.storyboard */,
ECF97E852556720C00BF85AA /* SignUpEmail.storyboard */,
);
path = Storyboard;
sourceTree = "<group>";
Expand Down Expand Up @@ -695,6 +700,8 @@
EC76E10425109D56009DDEF1 /* SignUpMainVC.swift */,
EC771BB3254D4E210041603E /* SignUpServiceAgreeVC.swift */,
EC30462B254ED0AA00DB6E4A /* ServiceAgreeForSignUpVC.swift */,
B83800F42525FF78009286AE /* AccountEditVC.swift */,
ECF97E882556722000BF85AA /* SignUpEmailVC.swift */,
);
path = VCs;
sourceTree = "<group>";
Expand Down Expand Up @@ -816,6 +823,7 @@
7F6ABEBE24ADE7720040746E /* LaunchScreen.storyboard in Resources */,
EC7C78EE24B2F2A800B7FCFB /* UnderTab.storyboard in Resources */,
7FFEA27E24BE441F003D381A /* AppleSDGothicNeoR.ttf in Resources */,
ECF97E862556720C00BF85AA /* SignUpEmail.storyboard in Resources */,
7FFEA27C24BE441F003D381A /* AppleSDGothicNeoB.ttf in Resources */,
B8B48B2B24BC66B700551F5B /* CuratorTabMain.storyboard in Resources */,
EC7410B424BA03E800CBAF1C /* EndOfWritingSentence.storyboard in Resources */,
Expand Down Expand Up @@ -927,6 +935,7 @@
B8E2E16124C0D48800595752 /* CuratorFollowService.swift in Sources */,
7FB4203724BCAD2200294314 /* SettingTVC.swift in Sources */,
B8E2E14724BEE07000595752 /* MyTabVC.swift in Sources */,
ECF97E892556722000BF85AA /* SignUpEmailVC.swift in Sources */,
B8B48B2924BB3DEE00551F5B /* SearchResultCuratorHeaderView.swift in Sources */,
7F6ABEDD24ADF3B20040746E /* NetworkResult.swift in Sources */,
B8E2E17524C28BBC00595752 /* MyProfileData.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Mongle/Mongle/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>LogIn</string>
<string>SignUpEmail</string>
</dict>
</array>
</dict>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"scale" : "1x",
"idiom" : "universal",
"filename" : "joinStep32BtnBack.png"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "joinStep32BtnHelp.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "joinStep32IcNumber1.png",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"scale" : "2x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"scale" : "1x",
"idiom" : "universal",
"filename" : "joinStep32IcNumber2.png"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "joinStep32ImgMail.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"scale" : "2x",
"idiom" : "universal"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "joinStep3IcNumber1.png",
"scale" : "1x"
},
{
"scale" : "2x",
"filename" : "[email protected]",
"idiom" : "universal"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "joinStep3IcNumber2.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"scale" : "3x",
"filename" : "[email protected]",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "mongleMongleCom.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"scale" : "2x",
"filename" : "[email protected]",
"idiom" : "universal"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "sample.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 29027e1

Please sign in to comment.