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.

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

Harolddavis/ch107770/fix up hierarchy folder structure in the #9

Merged

Conversation

@HaroldFS
Copy link
Contributor

HaroldFS commented Mar 10, 2020

Fix up Hierarchy so everything is nice an organized …

HaroldFS added 14 commits Mar 4, 2020
- Create the singleton
- Add main endpoint as a property
- Setup header for method to get shop items
- fixed error guard statment
- Improved Try by adding a `catch` for errors
Made baseURL a computed property that retrives the URL from the config file.
# Conflicts:
#	swift/ios-shoppe-demo/ios-shoppe-demo.xcodeproj/project.pbxproj
#	swift/ios-shoppe-demo/ios-shoppe-demo/ShoppeItem.swift
# Conflicts:
#	swift/ios-shoppe-demo/ios-shoppe-demo.xcodeproj/project.pbxproj
#	swift/ios-shoppe-demo/ios-shoppe-demo/ShoppeItem.swift
…i-service

# Conflicts:
#	swift/ios-shoppe-demo/ios-shoppe-demo.xcodeproj/project.pbxproj
renamed file from shopeeItem to product
- Make folders to organize files
- set up project for programmatic UI
@patrick-fs

This comment has been minimized.

Copy link
Member

patrick-fs commented Mar 10, 2020

Hey @HaroldFS , I think you may have fixed up the hierarchy already on your latest PR: #5

Does the master branch looks right to you?

HaroldFS added 2 commits Mar 10, 2020
// TODO: use class Product
// TODO: Change this to be an array of class Product
…er-structure-in-the

# Conflicts:
#	ios-shoppe-demo/ios-shoppe-demo/ios-shoppe-demo/AppDelegate.swift
#	ios-shoppe-demo/ios-shoppe-demo/ios-shoppe-demo/Assets.xcassets/AppIcon.appiconset/Contents.json
#	ios-shoppe-demo/ios-shoppe-demo/ios-shoppe-demo/Assets.xcassets/Contents.json
#	ios-shoppe-demo/ios-shoppe-demo/ios-shoppe-demo/Base.lproj/LaunchScreen.storyboard
#	ios-shoppe-demo/ios-shoppe-demo/ios-shoppe-demo/Info.plist
#	ios-shoppe-demo/ios-shoppe-demo/ios-shoppe-demo/SceneDelegate.swift
#	ios-shoppe-demo/ios-shoppe-demo/ios-shoppe-demo/ShoppeItem.swift
#	ios-shoppe-demo/ios-shoppe-demo/ios-shoppe-demo/ViewController.swift
#	swift/ios-shoppe-demo.xcodeproj/project.pbxproj
#	swift/ios-shoppe-demo/AppDelegate.swift
#	swift/ios-shoppe-demo/Assets.xcassets/AppIcon.appiconset/Contents.json
#	swift/ios-shoppe-demo/Assets.xcassets/Contents.json
#	swift/ios-shoppe-demo/Base.lproj/LaunchScreen.storyboard
#	swift/ios-shoppe-demo/Base.lproj/Main.storyboard
#	swift/ios-shoppe-demo/Info.plist
#	swift/ios-shoppe-demo/Model/Product.swift
#	swift/ios-shoppe-demo/Product.swift
#	swift/ios-shoppe-demo/Resources/AppDelegate.swift
#	swift/ios-shoppe-demo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
#	swift/ios-shoppe-demo/Resources/Assets.xcassets/Contents.json
#	swift/ios-shoppe-demo/Resources/Base.lproj/LaunchScreen.storyboard
#	swift/ios-shoppe-demo/Resources/Info.plist
#	swift/ios-shoppe-demo/Resources/SceneDelegate.swift
#	swift/ios-shoppe-demo/SceneDelegate.swift
#	swift/ios-shoppe-demo/StoreViewController.swift
#	swift/ios-shoppe-demo/ViewController.swift
@HaroldFS

This comment has been minimized.

Copy link
Contributor Author

HaroldFS commented Mar 10, 2020

Hey @HaroldFS , I think you may have fixed up the hierarchy already on your latest PR: #5

Does the master branch looks right to you?

Actually I meant to say "improve" :), master is not the way I want it. I want the files to be organized into major folders

@patrick-fs

This comment has been minimized.

Copy link
Member

patrick-fs commented Mar 10, 2020

Actually I meant to say "improve" :), master is not the way I want it. I want the files to be organized into major folders

Got it. I got confused because it looks like some commits that are already on master are in this branch as well.

image

Would you mind rebasing from master onto this branch?

@HaroldFS

This comment has been minimized.

Copy link
Contributor Author

HaroldFS commented Mar 10, 2020

Actually I meant to say "improve" :), master is not the way I want it. I want the files to be organized into major folders

Got it. I got confused because it looks like some commits that are already on master are in this branch as well.

image

Would you mind rebasing from master onto this branch?

Done :)

@patrick-fs

This comment has been minimized.

Copy link
Member

patrick-fs commented Mar 10, 2020

@HaroldFS It looks like some more cruft may have been committed:
image

@HaroldFS

This comment has been minimized.

Copy link
Contributor Author

HaroldFS commented Mar 11, 2020

@HaroldFS It looks like some more cruft may have been committed:
image

That was weird but it should be resolved now.

@HaroldFS

This comment has been minimized.

Copy link
Contributor Author

HaroldFS commented Mar 11, 2020

@HaroldFS It looks like some more cruft may have been committed:
image

Looks like when moving items around they where copied instead of moved. I removed the duplicates and ran the project to make sure I'm not missing anything. Done.

@@ -0,0 +1,46 @@
//
// APIService.swift

This comment has been minimized.

Copy link
@patrick-fs

patrick-fs Mar 12, 2020

Member

@HaroldFS this looks like another duplicated file (also at swift/ios-shoppe-demo/APIService.swift). Would you please verify:

image

Copy link
Member

patrick-fs left a comment

LGTM

@HaroldFS HaroldFS merged commit 03a1f02 into master Mar 20, 2020
@HaroldFS HaroldFS deleted the harolddavis/ch107770/fix-up-hierarchy-folder-structure-in-the branch Mar 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.