diff --git a/.gitignore b/.gitignore index 8171d66..c6df91a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store - +Keys.plist +BlogSmart/BlogSmart/Keys.plist # Xcode # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore diff --git a/BlogSmart/.DS_Store b/BlogSmart/.DS_Store deleted file mode 100644 index 48b4144..0000000 Binary files a/BlogSmart/.DS_Store and /dev/null differ diff --git a/BlogSmart/BlogSmart.xcodeproj/project.pbxproj b/BlogSmart/BlogSmart.xcodeproj/project.pbxproj index 08beafa..54b5f5f 100644 --- a/BlogSmart/BlogSmart.xcodeproj/project.pbxproj +++ b/BlogSmart/BlogSmart.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - A22881DF29F5FEF3007F48B9 /* OpenAIKit in Frameworks */ = {isa = PBXBuildFile; productRef = A22881DE29F5FEF3007F48B9 /* OpenAIKit */; }; A22881E429FB5DD2007F48B9 /* WriteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A22881E329FB5DD2007F48B9 /* WriteViewController.swift */; }; + A22881EA29FCC824007F48B9 /* GPTResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A22881E929FCC824007F48B9 /* GPTResponse.swift */; }; A27AC8B829EC31450011E378 /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A27AC8B729EC31450011E378 /* SignUpViewController.swift */; }; AF202F0929E889E600D18F2C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF202F0829E889E600D18F2C /* AppDelegate.swift */; }; AF202F0B29E889E600D18F2C /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF202F0A29E889E600D18F2C /* SceneDelegate.swift */; }; @@ -21,6 +21,8 @@ AF202F2429E88A4A00D18F2C /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = AF202F2329E88A4A00D18F2C /* AlamofireImage */; }; AFA3139729FA22B4003719FE /* PostCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA3139629FA22B4003719FE /* PostCell.swift */; }; AFA3139929FA2A5B003719FE /* Post.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA3139829FA2A5B003719FE /* Post.swift */; }; + AFAD94482A007BF900510528 /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFAD94472A007BF900510528 /* DetailViewController.swift */; }; + AFF89DCF29FDB31300302838 /* Keys.plist in Resources */ = {isa = PBXBuildFile; fileRef = AFF89DCE29FDB31300302838 /* Keys.plist */; }; BA1BA4F129EA503A00E13CDC /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA1BA4F029EA503A00E13CDC /* LoginViewController.swift */; }; BA1BA4F429EA534100E13CDC /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA1BA4F329EA534100E13CDC /* User.swift */; }; BA1BA4F729EA571700E13CDC /* ViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA1BA4F629EA571700E13CDC /* ViewController+Extensions.swift */; }; @@ -29,6 +31,7 @@ /* Begin PBXFileReference section */ A22881E329FB5DD2007F48B9 /* WriteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WriteViewController.swift; sourceTree = ""; }; + A22881E929FCC824007F48B9 /* GPTResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GPTResponse.swift; sourceTree = ""; }; A27AC8B729EC31450011E378 /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewController.swift; sourceTree = ""; }; AF202F0529E889E600D18F2C /* BlogSmart.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BlogSmart.app; sourceTree = BUILT_PRODUCTS_DIR; }; AF202F0829E889E600D18F2C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -40,6 +43,8 @@ AF202F1629E889E800D18F2C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; AFA3139629FA22B4003719FE /* PostCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostCell.swift; sourceTree = ""; }; AFA3139829FA2A5B003719FE /* Post.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Post.swift; sourceTree = ""; }; + AFAD94472A007BF900510528 /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = ""; }; + AFF89DCE29FDB31300302838 /* Keys.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Keys.plist; sourceTree = ""; }; BA1BA4F029EA503A00E13CDC /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = ""; }; BA1BA4F329EA534100E13CDC /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = ""; }; BA1BA4F629EA571700E13CDC /* ViewController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ViewController+Extensions.swift"; sourceTree = ""; }; @@ -52,7 +57,6 @@ buildActionMask = 2147483647; files = ( AF202F2129E88A2E00D18F2C /* ParseSwift in Frameworks */, - A22881DF29F5FEF3007F48B9 /* OpenAIKit in Frameworks */, AF202F1E29E88A1700D18F2C /* Alamofire in Frameworks */, AF202F2429E88A4A00D18F2C /* AlamofireImage in Frameworks */, ); @@ -88,6 +92,7 @@ AF202F0729E889E600D18F2C /* BlogSmart */ = { isa = PBXGroup; children = ( + AFAD94462A007BD500510528 /* Detail */, A22881E229FB5DBF007F48B9 /* Write */, AFA3139529FA2231003719FE /* Feed */, AFA3139329FA1F42003719FE /* Login */, @@ -99,6 +104,7 @@ AF202F1129E889E800D18F2C /* Assets.xcassets */, AF202F1329E889E800D18F2C /* LaunchScreen.storyboard */, AF202F1629E889E800D18F2C /* Info.plist */, + AFF89DCE29FDB31300302838 /* Keys.plist */, ); path = BlogSmart; sourceTree = ""; @@ -121,11 +127,20 @@ path = Feed; sourceTree = ""; }; + AFAD94462A007BD500510528 /* Detail */ = { + isa = PBXGroup; + children = ( + AFAD94472A007BF900510528 /* DetailViewController.swift */, + ); + path = Detail; + sourceTree = ""; + }; BA1BA4F229EA532A00E13CDC /* Models */ = { isa = PBXGroup; children = ( BA1BA4F329EA534100E13CDC /* User.swift */, AFA3139829FA2A5B003719FE /* Post.swift */, + A22881E929FCC824007F48B9 /* GPTResponse.swift */, ); path = Models; sourceTree = ""; @@ -159,7 +174,6 @@ AF202F1D29E88A1700D18F2C /* Alamofire */, AF202F2029E88A2E00D18F2C /* ParseSwift */, AF202F2329E88A4A00D18F2C /* AlamofireImage */, - A22881DE29F5FEF3007F48B9 /* OpenAIKit */, ); productName = BlogSmart; productReference = AF202F0529E889E600D18F2C /* BlogSmart.app */; @@ -193,7 +207,6 @@ AF202F1C29E88A1700D18F2C /* XCRemoteSwiftPackageReference "Alamofire" */, AF202F1F29E88A2E00D18F2C /* XCRemoteSwiftPackageReference "Parse-Swift" */, AF202F2229E88A4A00D18F2C /* XCRemoteSwiftPackageReference "AlamofireImage" */, - A22881DD29F5FEF3007F48B9 /* XCRemoteSwiftPackageReference "openai-kit" */, ); productRefGroup = AF202F0629E889E600D18F2C /* Products */; projectDirPath = ""; @@ -209,6 +222,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + AFF89DCF29FDB31300302838 /* Keys.plist in Resources */, AF202F1529E889E800D18F2C /* LaunchScreen.storyboard in Resources */, AF202F1229E889E800D18F2C /* Assets.xcassets in Resources */, AF202F1029E889E600D18F2C /* Main.storyboard in Resources */, @@ -222,8 +236,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + AFAD94482A007BF900510528 /* DetailViewController.swift in Sources */, BA1BA4F129EA503A00E13CDC /* LoginViewController.swift in Sources */, A22881E429FB5DD2007F48B9 /* WriteViewController.swift in Sources */, + A22881EA29FCC824007F48B9 /* GPTResponse.swift in Sources */, AF202F0D29E889E600D18F2C /* ReadViewController.swift in Sources */, A27AC8B829EC31450011E378 /* SignUpViewController.swift in Sources */, BA1BA4F929EA57F200E13CDC /* DateFormatter+Extensions.swift in Sources */, @@ -456,14 +472,6 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - A22881DD29F5FEF3007F48B9 /* XCRemoteSwiftPackageReference "openai-kit" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/dylanshine/openai-kit"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; - }; - }; AF202F1C29E88A1700D18F2C /* XCRemoteSwiftPackageReference "Alamofire" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Alamofire/Alamofire"; @@ -491,11 +499,6 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - A22881DE29F5FEF3007F48B9 /* OpenAIKit */ = { - isa = XCSwiftPackageProductDependency; - package = A22881DD29F5FEF3007F48B9 /* XCRemoteSwiftPackageReference "openai-kit" */; - productName = OpenAIKit; - }; AF202F1D29E88A1700D18F2C /* Alamofire */ = { isa = XCSwiftPackageProductDependency; package = AF202F1C29E88A1700D18F2C /* XCRemoteSwiftPackageReference "Alamofire" */; diff --git a/BlogSmart/BlogSmart.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BlogSmart/BlogSmart.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0763a01..3eb587e 100644 --- a/BlogSmart/BlogSmart.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/BlogSmart/BlogSmart.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -18,24 +18,6 @@ "version" : "4.2.0" } }, - { - "identity" : "async-http-client", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swift-server/async-http-client.git", - "state" : { - "revision" : "333e60cc90f52973f7ee29cd8e3a7f6adfe79f4e", - "version" : "1.17.0" - } - }, - { - "identity" : "openai-kit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/dylanshine/openai-kit", - "state" : { - "revision" : "db5c74c5ad637376f6c778db188c5c2fd8d606ab", - "version" : "1.7.2" - } - }, { "identity" : "parse-swift", "kind" : "remoteSourceControl", @@ -44,78 +26,6 @@ "revision" : "dc7666f774755be333f48f25c4d8bead0a1a6877", "version" : "4.14.2" } - }, - { - "identity" : "swift-atomics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-atomics.git", - "state" : { - "revision" : "6c89474e62719ddcc1e9614989fff2f68208fe10", - "version" : "1.1.0" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections.git", - "state" : { - "revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2", - "version" : "1.0.4" - } - }, - { - "identity" : "swift-log", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-log.git", - "state" : { - "revision" : "32e8d724467f8fe623624570367e3d50c5638e46", - "version" : "1.5.2" - } - }, - { - "identity" : "swift-nio", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio.git", - "state" : { - "revision" : "e0cc6dd6ffa8e6a6f565938acd858b24e47902d0", - "version" : "2.50.0" - } - }, - { - "identity" : "swift-nio-extras", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-extras.git", - "state" : { - "revision" : "0e0d0aab665ff1a0659ce75ac003081f2b1c8997", - "version" : "1.19.0" - } - }, - { - "identity" : "swift-nio-http2", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-http2.git", - "state" : { - "revision" : "6d021a48483dbb273a9be43f65234bdc9185b364", - "version" : "1.26.0" - } - }, - { - "identity" : "swift-nio-ssl", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-ssl.git", - "state" : { - "revision" : "9d0d5d8798a576fbf674a823734e65e15ca5f2ec", - "version" : "2.23.1" - } - }, - { - "identity" : "swift-nio-transport-services", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-transport-services.git", - "state" : { - "revision" : "59b966415dd336db6f388bbfe3fb43cfa549b981", - "version" : "1.16.0" - } } ], "version" : 2 diff --git a/BlogSmart/BlogSmart.xcodeproj/project.xcworkspace/xcuserdata/raunaqmalhotra.xcuserdatad/UserInterfaceState.xcuserstate b/BlogSmart/BlogSmart.xcodeproj/project.xcworkspace/xcuserdata/raunaqmalhotra.xcuserdatad/UserInterfaceState.xcuserstate index 37fc174..af3a240 100644 Binary files a/BlogSmart/BlogSmart.xcodeproj/project.xcworkspace/xcuserdata/raunaqmalhotra.xcuserdatad/UserInterfaceState.xcuserstate and b/BlogSmart/BlogSmart.xcodeproj/project.xcworkspace/xcuserdata/raunaqmalhotra.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/BlogSmart/BlogSmart/Assets.xcassets/AccentColor.colorset/Contents.json b/BlogSmart/BlogSmart/Assets.xcassets/AccentColor.colorset/Contents.json index eb87897..8a427b3 100644 --- a/BlogSmart/BlogSmart/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/BlogSmart/BlogSmart/Assets.xcassets/AccentColor.colorset/Contents.json @@ -1,6 +1,15 @@ { "colors" : [ { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.239", + "green" : "0.635", + "red" : "0.949" + } + }, "idiom" : "universal" } ], diff --git a/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/BlogIT default image.png b/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/BlogIT default image.png deleted file mode 100644 index dc8f8a3..0000000 Binary files a/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/BlogIT default image.png and /dev/null differ diff --git a/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/Contents.json b/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/Contents.json index 50c3766..b1c1009 100644 --- a/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "BlogIT default image.png", + "filename" : "blogsmart.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/blogsmart.png b/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/blogsmart.png new file mode 100644 index 0000000..8119f64 Binary files /dev/null and b/BlogSmart/BlogSmart/Assets.xcassets/AppIcon.appiconset/blogsmart.png differ diff --git a/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image 1.png b/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image 1.png deleted file mode 100644 index dc8f8a3..0000000 Binary files a/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image 1.png and /dev/null differ diff --git a/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image 2.png b/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image 2.png deleted file mode 100644 index dc8f8a3..0000000 Binary files a/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image 2.png and /dev/null differ diff --git a/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image.png b/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image.png deleted file mode 100644 index dc8f8a3..0000000 Binary files a/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/BlogIT default image.png and /dev/null differ diff --git a/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/Contents.json b/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/Contents.json similarity index 65% rename from BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/Contents.json rename to BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/Contents.json index 5dd3923..28ed34c 100644 --- a/BlogSmart/BlogSmart/Assets.xcassets/BlogIT default image.imageset/Contents.json +++ b/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "BlogIT default image.png", + "filename" : "blogsmart.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "BlogIT default image 1.png", + "filename" : "blogsmart 1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "BlogIT default image 2.png", + "filename" : "blogsmart 2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart 1.png b/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart 1.png new file mode 100644 index 0000000..8119f64 Binary files /dev/null and b/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart 1.png differ diff --git a/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart 2.png b/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart 2.png new file mode 100644 index 0000000..8119f64 Binary files /dev/null and b/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart 2.png differ diff --git a/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart.png b/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart.png new file mode 100644 index 0000000..8119f64 Binary files /dev/null and b/BlogSmart/BlogSmart/Assets.xcassets/default_image.imageset/blogsmart.png differ diff --git a/BlogSmart/BlogSmart/Base.lproj/Main.storyboard b/BlogSmart/BlogSmart/Base.lproj/Main.storyboard index 160abf6..aef7a68 100644 --- a/BlogSmart/BlogSmart/Base.lproj/Main.storyboard +++ b/BlogSmart/BlogSmart/Base.lproj/Main.storyboard @@ -186,6 +186,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -194,18 +319,8 @@ - - - - - - - - - - - + @@ -221,7 +336,7 @@ - + @@ -275,6 +390,7 @@ + @@ -283,12 +399,9 @@ + - - - - @@ -325,8 +438,8 @@ - - + + @@ -336,21 +449,31 @@ - - + + + + + + + + - - + + - - + + - - + + + + + +