From 2ea81d85990a773b39a37b5eb7f26cacb45e889d Mon Sep 17 00:00:00 2001 From: nicolehu26 Date: Sun, 20 Oct 2024 12:33:09 -0500 Subject: [PATCH 1/2] added exclamation mark --- .../xcshareddata/swiftpm/Package.resolved | 32 ------------------- .../SwiftUI/HIOnboardingViewModel.swift | 2 +- .../contents.xcworkspacedata | 7 ++++ 3 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 HackIllinois.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 HackIllinois/Tests.playground/playground.xcworkspace/contents.xcworkspacedata diff --git a/HackIllinois.xcworkspace/xcshareddata/swiftpm/Package.resolved b/HackIllinois.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 8cc703d6..00000000 --- a/HackIllinois.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pins" : [ - { - "identity" : "api-manager", - "kind" : "remoteSourceControl", - "location" : "https://github.com/rauhul/api-manager.git", - "state" : { - "revision" : "c8b6b426a4172cf1cd4568601cf36b6437d65ae8", - "version" : "0.4.0" - } - }, - { - "identity" : "keychain", - "kind" : "remoteSourceControl", - "location" : "https://github.com/rauhul/keychain.git", - "state" : { - "revision" : "5c8ad6af202395cdafaa7968af473da8bfe5c35f", - "version" : "0.2.0" - } - }, - { - "identity" : "lottie-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/airbnb/lottie-ios.git", - "state" : { - "revision" : "eb115967234671b725264422d82c9d1d6b226e5a", - "version" : "3.1.5" - } - } - ], - "version" : 2 -} diff --git a/HackIllinois/SwiftUI/HIOnboardingViewModel.swift b/HackIllinois/SwiftUI/HIOnboardingViewModel.swift index ab488075..0b9e39f3 100644 --- a/HackIllinois/SwiftUI/HIOnboardingViewModel.swift +++ b/HackIllinois/SwiftUI/HIOnboardingViewModel.swift @@ -14,7 +14,7 @@ import SwiftUI class HIOnboardingViewModel: ObservableObject { @Published var data: [CarouselData] = UIDevice.current.userInterfaceIdiom == .pad ? [ - CarouselData(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!"), + CarouselData(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome!", descriptionText: "Swipe to see what our app has to offer!"), CarouselData(image: UIImage(named: "iPadOnboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"), CarouselData(image: UIImage(named: "iPadOnboarding2"), titleText: "Schedule", descriptionText: "See the times and details of all of our events."), CarouselData(image: UIImage(named: "iPadOnboarding3"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop."), diff --git a/HackIllinois/Tests.playground/playground.xcworkspace/contents.xcworkspacedata b/HackIllinois/Tests.playground/playground.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/HackIllinois/Tests.playground/playground.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + From de9a1274b47418ffeaf9e662e72165033a59d07d Mon Sep 17 00:00:00 2001 From: nicolehu26 Date: Sun, 2 Feb 2025 13:03:52 -0600 Subject: [PATCH 2/2] updated timestamps for schedule --- .../DataSources/HITimeDataSource.swift | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/HackIllinois/DataSources/HITimeDataSource.swift b/HackIllinois/DataSources/HITimeDataSource.swift index 4cd4d5d1..9f7a1542 100644 --- a/HackIllinois/DataSources/HITimeDataSource.swift +++ b/HackIllinois/DataSources/HITimeDataSource.swift @@ -18,21 +18,21 @@ final class HITimeDataSource { static var shared = HITimeDataSource() public static let defaultTimes = EventTimes( - checkInStart: Date(timeIntervalSince1970: 1708723800), // Friday, February 23, 2024 3:30:00 PM CST - checkInEnd: Date(timeIntervalSince1970: 1708725600), // Friday, February 23, 2024 4:00:00 PM CST - scavengerHuntStart: Date(timeIntervalSince1970: 1708725600), // Friday, February 23, 2024 4:00:00 PM CST - scavengerHuntEnd: Date(timeIntervalSince1970: 1708732800), // Friday, February 23, 2024 6:00:00 PM CST - openingCeremonyStart: Date(timeIntervalSince1970: 1708732800), // Friday, February 23, 2024 6:00:00 PM CST - openingCeremonyEnd: Date(timeIntervalSince1970: 1708736400), // Friday, February 23, 2024 7:00:00 PM CST - projectShowcaseStart: Date(timeIntervalSince1970: 1708880400), // Sunday, February 25, 2024 11:00:00 AM CST - projectShowcaseEnd: Date(timeIntervalSince1970: 1708894800), // Sunday, February 25, 2024 3:00:00 PM CST - closingCeremonyStart: Date(timeIntervalSince1970: 1708894800), // Sunday, February 25, 2024 3:00:00 PM CST - closingCeremonyEnd: Date(timeIntervalSince1970: 1708898400), // Sunday, February 25, 2024 4:00:00 PM CST - - eventStart: Date(timeIntervalSince1970: 1708732800), // Friday, February 23, 2024 6:00:00 PM CST - eventEnd: Date(timeIntervalSince1970: 1708898400), // Sunday, February 25, 2024 4:00:00 PM CST - hackStart: Date(timeIntervalSince1970: 1708736400), // Friday, February 23, 2024 7:00:00 PM CST - hackEnd: Date(timeIntervalSince1970: 1708876800), // Sunday, February 25, 2024 10:00:00 AM CST + checkInStart: Date(timeIntervalSince1970: 1740774600), // Friday, February 28, 2025 2:30:00 PM CST + checkInEnd: Date(timeIntervalSince1970: 1740783600), // Friday, February 28, 2025 5:00:00 PM CST + scavengerHuntStart: Date(timeIntervalSince1970: 1740776400), // Friday, February 28, 2024 3:00:00 PM CST + scavengerHuntEnd: Date(timeIntervalSince1970: 1740783600), // Friday, February 28, 2025 5:00:00 PM CST + openingCeremonyStart: Date(timeIntervalSince1970: 1740783600), // Friday, February 28, 2025 5:00:00 PM CST + openingCeremonyEnd: Date(timeIntervalSince1970: 1740787200), // Friday, February 28, 2025 6:00:00 PM CST + projectShowcaseStart: Date(timeIntervalSince1970: 1740927600), // Sunday, March 2, 2025 9:00:00 AM CST + projectShowcaseEnd: Date(timeIntervalSince1970: 1740942000), // Sunday, March 2, 2025 1:00:00 PM CST + closingCeremonyStart: Date(timeIntervalSince1970: 1740949200), // Sunday, March 2, 2025 3:00:00 PM CST + closingCeremonyEnd: Date(timeIntervalSince1970: 1740952800), // Sunday, March 2, 2025 4:00:00 PM CST + + eventStart: Date(timeIntervalSince1970: 1740774600), // Friday, February 28, 2025 2:30:00 PM CST + eventEnd: Date(timeIntervalSince1970: 1740952800), // Sunday, March 2, 2025 4:00:00 PM CST + hackStart: Date(timeIntervalSince1970: 1740787200), // Friday, February 28, 2025 6:00:00 PM CST + hackEnd: Date(timeIntervalSince1970: 1740920400), // Sunday, March 2, 2025 7:00:00 AM CST // TODO: Need to get events + times for everything above fridayStart: Date(timeIntervalSince1970: 1740722400), // Friday, February 28, 2025 12:00:00 AM CST fridayEnd: Date(timeIntervalSince1970: 1740808799), // Friday, February 28, 2025 11:59:59 PM CST