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

Committing 2023 Code to Master #530

Merged
merged 42 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c31c200
Added Lasya as codeowner
ashayp22 Jun 28, 2022
7824374
fixed deprecations `Using 'class' keyword to define a class-constrain…
louisunlimited Nov 16, 2022
0b72084
bumped deployment target to iOS14.0
louisunlimited Nov 16, 2022
3399414
fixed identifiable protocol conflict
louisunlimited Nov 16, 2022
a4f29c7
Merge pull request #461 from HackIllinois/louis/SwifUI_warinings
lasyaneti Dec 1, 2022
f970c76
remove patrick as codeowner (#464)
PatrickKan Dec 1, 2022
03cc275
Louis/swift UI migration test (#462)
louisunlimited Dec 7, 2022
e1133df
Louis/google maps manual (#463)
louisunlimited Dec 21, 2022
3babab6
Louis/ios14 warnings (#477)
louisunlimited Dec 25, 2022
38531d6
Added in Montserrat
s0phialiu Jan 8, 2023
ab27477
Merge pull request #481 from HackIllinois/sophia/Montserrat
s0phialiu Jan 9, 2023
eaeb5df
Sophia - Home, Schedule page (#487)
s0phialiu Feb 2, 2023
9709bd8
Vincent/profile page (#489)
vincentbanguyen Feb 2, 2023
1b21dbc
Updated dates to reflect 2023 schedule. (#494)
s0phialiu Feb 4, 2023
572da24
Finished Onboarding (#491)
louisunlimited Feb 4, 2023
cd21630
Updated iMessage stickers (#497)
s0phialiu Feb 6, 2023
e4dae4d
Updated refresh animation to ferris wheel. (#498)
s0phialiu Feb 6, 2023
c8f39e5
Updated leaderboard cells (#499)
s0phialiu Feb 6, 2023
c504a40
fix: Google Maps on EventDetail (#495)
louisunlimited Feb 6, 2023
d4c06b0
Updated iPad Texts for event cells and leaderboard (#500)
s0phialiu Feb 7, 2023
ff99b36
feat!: added keys (#501)
louisunlimited Feb 7, 2023
8e53f83
Staff QR Code WIP (#502)
vincentbanguyen Feb 8, 2023
63bc792
Louis/lottie with Text (#506)
louisunlimited Feb 8, 2023
d8572b9
Add Staff QR Scanner working POST + GET (#508)
vincentbanguyen Feb 10, 2023
5c04cbe
Update HIScheduleViewController.swift (#509)
s0phialiu Feb 10, 2023
e441f5e
Sophia/leaderboard truncate (#510)
s0phialiu Feb 10, 2023
73ea563
Updated profile error page (#511)
s0phialiu Feb 10, 2023
59bfee3
chore: flipped profile ticket (#512)
louisunlimited Feb 10, 2023
ef747f7
Add Dietary Restrictions + username to qr staff, add "custom" to prof…
vincentbanguyen Feb 15, 2023
b5b8f41
Sophia/update icons (#513)
s0phialiu Feb 15, 2023
b2e92b0
fix: re-flipped profile ticket (#514)
louisunlimited Feb 15, 2023
b7e23a0
chore(Onboarding): fixed 2022 text to 2023 (#517)
louisunlimited Feb 16, 2023
1140b77
Add everything in Final Doc (#519)
vincentbanguyen Feb 18, 2023
943a7ed
Merge branch 'master' into dev
lasyaneti Feb 23, 2023
cce6aaa
Fixed height constraint of leaderboard name (#522)
s0phialiu Feb 23, 2023
32db059
FixAlertWithNoData (#521)
vincentbanguyen Feb 23, 2023
70952d9
merging Vincent/fix alert (#523)
lasyaneti Feb 23, 2023
db17609
removed MEMORIES MADE text (#524)
louisunlimited Feb 24, 2023
1951cc8
Make location text default to "Online" (#525)
s0phialiu Feb 24, 2023
5ff1e0e
Louis/location fix (#526)
louisunlimited Feb 24, 2023
73deafb
Update README.md
lasyaneti Jul 17, 2023
3744be5
Update README.md
lasyaneti Jul 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# codeowners' reviews are required before merging

* @PatrickKan @jeffkim2001 @ashayp22
* @jeffkim2001 @ashayp22 @lasyaneti

1 change: 1 addition & 0 deletions HIAPI/Models/Attendee.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ public struct Attendee: Codable, APIReturnable {
public let school: String
public let major: String
public let gender: String
public let dietary: [String]?
}
41 changes: 41 additions & 0 deletions HIAPI/Models/Event.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,47 @@ public struct EventContainer: Decodable, APIReturnable {
}
}

public struct StaffEventContainer: Decodable, APIReturnable {
public let events: [StaffEvent]

public init(from data: Data) throws {
let decoder = JSONDecoder()
decoder.dateDecodingStrategy = .secondsSince1970
self = try decoder.decode(StaffEventContainer.self, from: data)
}
}

public struct StaffEvent: Codable {
internal enum CodingKeys: String, CodingKey {
case id
case endTime
case eventType
case info = "description"
case locations
case name
case sponsor
case startTime
case points
case isAsync
case isPrivate
case displayOnStaffCheckin
}

public var id: String
public let endTime: Date
public let eventType: String
public let info: String
public let locations: [Location]
public let name: String
public let sponsor: String
public let startTime: Date
public let points: Int
public let isAsync: Bool
public let isPrivate: Bool
public let displayOnStaffCheckin: Bool
}


public struct Event: Codable {
internal enum CodingKeys: String, CodingKey {
case id
Expand Down
4 changes: 2 additions & 2 deletions HIAPI/Models/Profile.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public struct Profile: Codable, APIReturnable {
case firstName
case lastName
case points
case timezone
case foodWave
case discord
case avatarUrl
}
Expand All @@ -38,7 +38,7 @@ public struct Profile: Codable, APIReturnable {
public let firstName: String
public let lastName: String
public let points: Int
public let timezone: String
public let foodWave: Int
public let discord: String
public let avatarUrl: String
}
Expand Down
7 changes: 6 additions & 1 deletion HIAPI/Models/User.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public struct RolesContainer: Codable, APIReturnable {
public struct Roles: OptionSet, Codable {
public let rawValue: Int

public static let null = Roles(rawValue: 0)
public static let null = Roles([])
public static let user = Roles(rawValue: 1 << 0)
public static let applicant = Roles(rawValue: 1 << 1)
public static let attendee = Roles(rawValue: 1 << 2)
Expand Down Expand Up @@ -93,6 +93,11 @@ fileprivate extension Optional where Wrapped == String {
}
}

public struct QRData: Codable, APIReturnable {
public let id: String
public let qrInfo: String
}

public struct DietaryRestrictions: OptionSet, Codable, APIReturnable {
public let rawValue: Int

Expand Down
13 changes: 13 additions & 0 deletions HIAPI/Services/EventService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@ public class EventService: BaseService {
return APIRequest<EventCheckInStatus>(service: self, endpoint: "checkin/", body: body, method: .POST)
}

public static func staffCheckIn(userToken: String, eventId: String) -> APIRequest<EventCheckInStatus> {
var body = HTTPBody()
body["userToken"] = userToken
body["eventId"] = eventId
return APIRequest<EventCheckInStatus>(service: self, endpoint: "staff/checkin/", body: body, method: .POST)
}

public static func getStaffCheckInEvents(authToken: String) -> APIRequest<StaffEventContainer> {
var header = HTTPHeaders()
header["Authorization"] = authToken
return APIRequest<StaffEventContainer>(service: self, endpoint: "filter/?displayOnStaffCheckin=true", headers: header, method: .GET)
}

public static func create(event: Event) -> APIRequest<EventContainer> {
let eventDict = [String: Any]()
assert(false)
Expand Down
5 changes: 5 additions & 0 deletions HIAPI/Services/RegistrationService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,9 @@ public final class RegistrationService: BaseService {
public static func getAttendee() -> APIRequest<AttendeeContainer> {
return APIRequest<AttendeeContainer>(service: self, endpoint: "", method: .GET)
}

public static func getAttendeeRegistrationUserID(userID: String) -> APIRequest<Attendee> {

return APIRequest<Attendee>(service: self, endpoint: "attendee/" + userID + "/", method: .GET)
}
}
4 changes: 4 additions & 0 deletions HIAPI/Services/UserService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ public final class UserService: BaseService {
public static func getUser() -> APIRequest<User> {
return APIRequest<User>(service: self, endpoint: "", headers: headers, method: .GET)
}

public static func getQR() -> APIRequest<QRData> {
return APIRequest<QRData>(service: self, endpoint: "qr/", method: .GET)
}
}
Loading
Loading