Merge pull request #8 from siddharthgarg-waterloo/branch

Branch
siddharthgarg4 · Mar 10, 2019 · 2d15584 · 2d15584
2 parents f636df0 + c1e25a5
commit 2d15584
Show file tree

Hide file tree

Showing 8 changed files with 7,599 additions and 15 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Grow.xcodeproj/project.pbxproj b/Grow.xcodeproj/project.pbxproj
@@ -31,6 +31,9 @@
 		1DB004A7223568BE00E247B6 /* ArScannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DB0049E223568BE00E247B6 /* ArScannerViewController.xib */; };
 		1DB004A92235691A00E247B6 /* ArScannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB004A82235691A00E247B6 /* ArScannerViewController.swift */; };
 		1DB004AB22356A3700E247B6 /* LogoClassifierV2.mlmodel in Sources */ = {isa = PBXBuildFile; fileRef = 1DB004AA22356A3700E247B6 /* LogoClassifierV2.mlmodel */; };
+		1DB004B122356F2C00E247B6 /* signUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB004B022356F2B00E247B6 /* signUpViewController.swift */; };
+		1DB004B322356F5100E247B6 /* profilePAge.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DB004B222356F5100E247B6 /* profilePAge.xib */; };
+		1DB004B522356F5500E247B6 /* signUpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DB004B422356F5500E247B6 /* signUpViewController.xib */; };
 		234A57780CCB77D52E1E53A6 /* Pods_Grow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B88E6DC4066406C58A9424A /* Pods_Grow.framework */; };
 		578D32A02235701F0050A84E /* RealProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 578D329E2235701F0050A84E /* RealProfile.swift */; };
 		578D32A12235701F0050A84E /* RealProfile.xib in Resources */ = {isa = PBXBuildFile; fileRef = 578D329F2235701F0050A84E /* RealProfile.xib */; };
@@ -65,6 +68,9 @@
 		1DB0049E223568BE00E247B6 /* ArScannerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ArScannerViewController.xib; sourceTree = "<group>"; };
 		1DB004A82235691A00E247B6 /* ArScannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArScannerViewController.swift; sourceTree = "<group>"; };
 		1DB004AA22356A3700E247B6 /* LogoClassifierV2.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; path = LogoClassifierV2.mlmodel; sourceTree = "<group>"; };
+		1DB004B022356F2B00E247B6 /* signUpViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = signUpViewController.swift; sourceTree = "<group>"; };
+		1DB004B222356F5100E247B6 /* profilePAge.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = profilePAge.xib; sourceTree = "<group>"; };
+		1DB004B422356F5500E247B6 /* signUpViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = signUpViewController.xib; sourceTree = "<group>"; };
 		56333178CEC5AFD5FE63A7EC /* Pods-Grow.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Grow.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Grow/Pods-Grow.debug.xcconfig"; sourceTree = "<group>"; };
 		578D329E2235701F0050A84E /* RealProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealProfile.swift; sourceTree = "<group>"; };
 		578D329F2235701F0050A84E /* RealProfile.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RealProfile.xib; sourceTree = "<group>"; };
@@ -121,6 +127,7 @@
 				1DB004A82235691A00E247B6 /* ArScannerViewController.swift */,
 				1DB004AA22356A3700E247B6 /* LogoClassifierV2.mlmodel */,
 				1DB004902235681E00E247B6 /* CGImagePropertyOrientation+UIImageOrientation.swift */,
+				1DB004B022356F2B00E247B6 /* signUpViewController.swift */,
 				1DB0048F2235681E00E247B6 /* CompanyExploreViewController.swift */,
 				1DB004912235681E00E247B6 /* CompanyInformationViewController.swift */,
 				1DB004832235680D00E247B6 /* Profile.swift */,
@@ -136,12 +143,14 @@
 		1DB004952235682400E247B6 /* Xibs */ = {
 			isa = PBXGroup;
 			children = (
+				1DB004B222356F5100E247B6 /* profilePAge.xib */,
 				1DB0049E223568BE00E247B6 /* ArScannerViewController.xib */,
 				1DB0049D223568BD00E247B6 /* challengePopUp.xib */,
 				1DB0049C223568BD00E247B6 /* CollectionViewCell.xib */,
 				1DB0049B223568BD00E247B6 /* Company.xib */,
 				1DB00498223568BD00E247B6 /* CompanyExploreViewController.xib */,
 				1DB0049A223568BD00E247B6 /* CompanyInformationViewController.xib */,
+				1DB004B422356F5500E247B6 /* signUpViewController.xib */,
 				1DB00496223568BD00E247B6 /* ExploreHeaderView.xib */,
 				1DB00497223568BD00E247B6 /* Onboarding.xib */,
 				1DB00499223568BD00E247B6 /* Profile.xib */,
@@ -221,12 +230,14 @@
 			files = (
 				1DB0047C223566EB00E247B6 /* LaunchScreen.storyboard in Resources */,
 				1DB004A2223568BE00E247B6 /* Profile.xib in Resources */,
+				1DB004B322356F5100E247B6 /* profilePAge.xib in Resources */,
 				1DB004A7223568BE00E247B6 /* ArScannerViewController.xib in Resources */,
 				1DB004A1223568BE00E247B6 /* CompanyExploreViewController.xib in Resources */,
 				1DB004A4223568BE00E247B6 /* Company.xib in Resources */,
 				578D32A12235701F0050A84E /* RealProfile.xib in Resources */,
 				1DB004A3223568BE00E247B6 /* CompanyInformationViewController.xib in Resources */,
 				1DB0049F223568BE00E247B6 /* ExploreHeaderView.xib in Resources */,
+				1DB004B522356F5500E247B6 /* signUpViewController.xib in Resources */,
 				1DB004A6223568BE00E247B6 /* challengePopUp.xib in Resources */,
 				1DB004A0223568BE00E247B6 /* Onboarding.xib in Resources */,
 				1DB00479223566EB00E247B6 /* Assets.xcassets in Resources */,
@@ -290,6 +301,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1DB004B122356F2C00E247B6 /* signUpViewController.swift in Sources */,
 				1DB0046F223566EA00E247B6 /* AppDelegate.swift in Sources */,
 				1DB004942235681E00E247B6 /* CompanyInformationViewController.swift in Sources */,
 				1DB004922235681E00E247B6 /* CompanyExploreViewController.swift in Sources */,

diff --git a/Grow/.DS_Store b/Grow/.DS_Store
diff --git a/Grow/ArScannerViewController.swift b/Grow/ArScannerViewController.swift
@@ -20,6 +20,20 @@ class ArScannerViewController: UIViewController, ARSCNViewDelegate {
     lazy var config = ARWorldTrackingConfiguration()
     private var companyInfo = CompanyInformationViewController()
 
+
+
+    @IBAction func challengeButton(_ sender: Any) {
+        self.navigationController?.pushViewController(Profile(), animated: true)
+    }
+
+    @IBAction func profileButton(_ sender: Any) {
+
+    }
+
+    @IBAction func exploreButton(_ sender: Any) {
+        self.navigationController?.pushViewController(CompanyExploreViewController(), animated: true)
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 

diff --git a/Grow/Profile.swift b/Grow/Profile.swift
@@ -12,7 +12,6 @@ class Profile: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
     }
 
 

diff --git a/Grow/Xibs/.DS_Store b/Grow/Xibs/.DS_Store
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,6 @@ class Profile: UIViewController {

		override func viewDidLoad() {
		super.viewDidLoad()

		}


Expand Down