Merge pull request #340 from HackIllinois/yasha/dev-2020.2

2020.2-rc1

Author: redsn0w422

.gitattributes

@@ -1,4 +1,4 @@
 #	codeowners' reviews are required before merging
 
-*	@redsn0w422 @rauhul @sujaypat
+*	@redsn0w422 @sujaypat @PatrickKan
 

.github/CODEOWNERS

@@ -2,6 +2,9 @@
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
+## User Workspace
+HackIllinois.xcodeproj/project.xcworkspace
+
 ## Build generated
 build/
 DerivedData
@@ -27,38 +30,5 @@ xcuserdata
 *.hmap
 *.ipa
 
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-Pods/
-Podfile.lock
-*.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
-
-fastlane/report.xml
-fastlane/screenshots
-
 # OS X cache files
 *.DS_Store
-
-# Custom script to run database (NEVER commit)
-server_start.sh
-
-# api repository for this branch only
-api-2017

.gitignore

@@ -1,13 +1,7 @@
 language: swift
 os: osx
-osx_image: xcode10.1
-
-before_install:
-  - pod repo update
+osx_image: xcode11.3
 
 script:
   - swiftlint --strict
-  - xcodebuild clean build -workspace HackIllinois.xcworkspace -scheme HackIllinois -destination "platform=iOS Simulator,OS=12.1,name=iPhone X" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet
-
-cache:
-  - cocoapods
+  - xcodebuild clean build -project HackIllinois.xcodeproj -scheme HackIllinois -destination "platform=iOS Simulator,OS=13.3,name=iPhone 11" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet

.gitmodules

@@ -0,0 +1 @@
+Please contribute using [Github Flow](https://guides.github.com/introduction/flow/). Create a branch, add commits, and [open a pull request](https://github.com/Hackillinois/ios/compare/).

.travis.yml

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>

CONTRIBUTING.md

@@ -22,17 +22,8 @@ public struct Attendee: Codable, APIReturnable {
     public let firstName: String?
     public let lastName: String?
     public let email: String
-    public let shirtSize: String
-    public let diet: DietaryRestrictions
-    public let age: Int
     public let graduationYear: Int
-    public let transportation: String
     public let school: String
     public let major: String
     public let gender: String
-    public let professionalInterest: [String]?
-    public let github: String
-    public let linkedin: String?
-    public let interests: [String]?
-    public let phone: String
 }

HIAPI/Info.plist

@@ -25,6 +25,7 @@ public struct EventContainer: Decodable, APIReturnable {
 
 public struct Event: Codable {
     internal enum CodingKeys: String, CodingKey {
+        case id
         case endTime
         case eventType
         case info = "description"
@@ -34,6 +35,7 @@ public struct Event: Codable {
         case startTime
     }
 
+    public let id: String
     public let endTime: Date
     // Could be made into an enum with some coredata work
     public let eventType: String
@@ -56,7 +58,7 @@ public struct Location: Codable {
     public let name: String
 }
 
-public struct Favorite: Codable, APIReturnable {
+public struct EventFavorites: Codable, APIReturnable {
     public let events: Set<String>
     public let id: String
 }

HIAPI/Models/Attendee.swift

@@ -0,0 +1,43 @@
+//
+//  Project.swift
+//  HackIllinois
+//
+//  Created by HackIllinois Team on 12/20/19.
+//  Copyright © 2019 HackIllinois. All rights reserved.
+//  This file is part of the Hackillinois iOS App.
+//  The Hackillinois iOS App is open source software, released under the University of
+//  Illinois/NCSA Open Source License. You should have received a copy of
+//  this license in a file with the distribution.
+//
+
+import Foundation
+import APIManager
+
+public struct ProjectContainer: Decodable, APIReturnable {
+    public let projects: [Project]
+}
+
+public struct Project: Codable {
+    internal enum CodingKeys: String, CodingKey {
+        case id
+        case name
+        case info = "description"
+        case mentors
+        case room
+        case tags
+        case number
+    }
+
+    public let id: String
+    public let name: String
+    public let info: String
+    public let mentors: [String]
+    public let room: String
+    public let tags: [String]
+    public let number: Int32
+}
+
+public struct ProjectFavorites: Codable, APIReturnable {
+    public let projects: Set<String>
+    public let id: String
+}