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

Feat/3 #15

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

Feat/3 #15

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
c8067b7
Merge branch 'main' of https://github.com/SOPT28th-SOPKATHON-Kick/Kic…
heerucan May 22, 2021
10b5dd5
[fix] 오류 수정 및 마무리
heerucan May 22, 2021
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
6 changes: 3 additions & 3 deletions SOPKATHON_Kick.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
4040303F2659928100709B7F /* dateDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dateDataModel.swift; sourceTree = "<group>"; };
40403044265999DE00709B7F /* countDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = countDataModel.swift; sourceTree = "<group>"; };
4040304726599C9B00709B7F /* PopularWritingService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopularWritingService.swift; sourceTree = "<group>"; };
4051A1C22659A674000E4BB9 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Bold.ttf"; path = "../../../../Fonts/Roboto-Bold.ttf"; sourceTree = "<group>"; };
4051A1C32659A674000E4BB9 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Regular.ttf"; path = "../../../../Fonts/Roboto-Regular.ttf"; sourceTree = "<group>"; };
4051A1C42659A674000E4BB9 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Medium.ttf"; path = "../../../../Fonts/Roboto-Medium.ttf"; sourceTree = "<group>"; };
4051A1C22659A674000E4BB9 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Bold.ttf"; path = "../../../../../../Downloads/Roboto-Bold.ttf"; sourceTree = "<group>"; };
4051A1C32659A674000E4BB9 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Regular.ttf"; path = "../../../../../../Downloads/Roboto-Regular.ttf"; sourceTree = "<group>"; };
4051A1C42659A674000E4BB9 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Roboto-Medium.ttf"; path = "../../../../../../Downloads/Roboto-Medium.ttf"; sourceTree = "<group>"; };
4058242626593B5B00845A48 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
4058242A26593BAB00845A48 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
40F598E12659568F005DD065 /* HomeCollectionViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewModel.swift; sourceTree = "<group>"; };
Expand Down
34 changes: 29 additions & 5 deletions SOPKATHON_Kick/Application/Base.lproj/LaunchScreen.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<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>
Expand All @@ -11,15 +14,36 @@
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="group" translatesAutoresizingMaskIntoConstraints="NO" id="08S-Tj-q9R">
<rect key="frame" x="98" y="217" width="218.5" height="137"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="group1" translatesAutoresizingMaskIntoConstraints="NO" id="WL1-A1-7uB">
<rect key="frame" x="19.5" y="355.5" width="375" height="442"/>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="WL1-A1-7uB" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="Lep-F7-Qoe"/>
<constraint firstItem="WL1-A1-7uB" firstAttribute="top" secondItem="08S-Tj-q9R" secondAttribute="bottom" constant="1.7" id="iAL-IH-q3j"/>
<constraint firstItem="08S-Tj-q9R" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="jDJ-ms-KL7"/>
<constraint firstItem="08S-Tj-q9R" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="173" id="xMr-kS-7jJ"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
<resources>
<image name="group" width="218.5" height="137"/>
<image name="group1" width="375" height="442"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
1 change: 0 additions & 1 deletion SOPKATHON_Kick/Common/API/PopularWritingService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ struct PopularWriting{

dataRequest.responseData { dataResponse in

dump(dataResponse)

switch dataResponse.result {
case .success:
Expand Down
1 change: 0 additions & 1 deletion SOPKATHON_Kick/Common/API/RecentWritingService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ struct RecentWriting{

dataRequest.responseData { dataResponse in

dump(dataResponse)

switch dataResponse.result {
case .success:
Expand Down
2 changes: 2 additions & 0 deletions SOPKATHON_Kick/Common/Struct/dateDataModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ struct DateElement: Codable {
let id: String
let kickCount: Int
let timestamp, contents, title: String
let before: Int

enum CodingKeys: String, CodingKey {
case id = "_id"
case kickCount = "kick_count"
case timestamp, contents, title
case before
}
}
typealias Date = [DateElement]
12 changes: 6 additions & 6 deletions SOPKATHON_Kick/Resources/Assets.xcassets/btnBack.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "btnBack.png",
"scale" : "1x",
"idiom" : "universal"
"scale" : "1x"
},
{
"scale" : "2x",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
"idiom" : "universal"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
Expand Down
23 changes: 23 additions & 0 deletions SOPKATHON_Kick/Resources/Assets.xcassets/btnBookmark.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "btnBookmark.png"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/btnBookmark.imageset/btnBookmark.png
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/btnBookmark.imageset/[email protected]
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/btnBookmark.imageset/[email protected]
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.
23 changes: 23 additions & 0 deletions SOPKATHON_Kick/Resources/Assets.xcassets/btnKick.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "btnKick.png"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"scale" : "3x",
"filename" : "[email protected]",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/btnKick.imageset/btnKick.png
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/btnKick.imageset/[email protected]
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/btnKick.imageset/[email protected]
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.
23 changes: 23 additions & 0 deletions SOPKATHON_Kick/Resources/Assets.xcassets/group.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "group.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/group.imageset/group.png
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/group.imageset/[email protected]
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/group.imageset/[email protected]
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.
23 changes: 23 additions & 0 deletions SOPKATHON_Kick/Resources/Assets.xcassets/group1.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "group1.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/group1.imageset/group1.png
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/group1.imageset/[email protected]
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/group1.imageset/[email protected]
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.
23 changes: 23 additions & 0 deletions SOPKATHON_Kick/Resources/Assets.xcassets/icDot.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icDot.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "[email protected]"
},
{
"scale" : "3x",
"filename" : "[email protected]",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/icDot.imageset/icDot.png
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/icDot.imageset/[email protected]
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.
Binary file added SOPKATHON_Kick/Resources/Assets.xcassets/icDot.imageset/[email protected]
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.
10 changes: 5 additions & 5 deletions SOPKATHON_Kick/Resources/Assets.xcassets/iconHomePressed.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"images" : [
{
"scale" : "1x",
"idiom" : "universal",
"scale" : "1x",
"filename" : "iconHomePressed.png"
},
{
"scale" : "2x",
"filename" : "[email protected]",
"idiom" : "universal"
"idiom" : "universal",
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
Expand Down
4 changes: 2 additions & 2 deletions SOPKATHON_Kick/Resources/Assets.xcassets/iconHomeUnpressed.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"scale" : "2x"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "[email protected]"
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 6 additions & 6 deletions SOPKATHON_Kick/Resources/Assets.xcassets/iconPrizePressed.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "iconPrizePressed.png",
"scale" : "1x",
"idiom" : "universal"
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
"scale" : "2x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
"idiom" : "universal",
"filename" : "[email protected]"
}
],
"info" : {
Expand Down
10 changes: 5 additions & 5 deletions SOPKATHON_Kick/Resources/Assets.xcassets/iconPrizeUnpressed.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"images" : [
{
"scale" : "1x",
"filename" : "iconPrizeUnpressed.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal"
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
23 changes: 23 additions & 0 deletions SOPKATHON_Kick/Resources/Assets.xcassets/iconTagPressed.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "iconTagPressed.png",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added ...ATHON_Kick/Resources/Assets.xcassets/iconTagPressed.imageset/iconTagPressed.png
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.
Binary file added ...ON_Kick/Resources/Assets.xcassets/iconTagPressed.imageset/[email protected]
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.
Binary file added ...ON_Kick/Resources/Assets.xcassets/iconTagPressed.imageset/[email protected]
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.
10 changes: 5 additions & 5 deletions SOPKATHON_Kick/Resources/Assets.xcassets/iconTagUnpressed.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"idiom" : "universal",
"filename" : "iconTagUnpressed.png"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "[email protected]"
"filename" : "[email protected]",
"idiom" : "universal"
},
{
"scale" : "3x",
"filename" : "[email protected]",
"idiom" : "universal"
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
Binary file modified ...N_Kick/Resources/Assets.xcassets/iconTagUnpressed.imageset/iconTagUnpressed.png
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.
Binary file modified ...ick/Resources/Assets.xcassets/iconTagUnpressed.imageset/[email protected]
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.
Binary file modified ...ick/Resources/Assets.xcassets/iconTagUnpressed.imageset/[email protected]
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.
Loading