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.

Sign up for GitHub

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

Nicole/main schedule page #609

Open
wants to merge 15 commits into
base: dev
Choose a base branch
from
+683 −207
Open

Nicole/main schedule page #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2ea81d8
added exclamation mark
nicolehu26 Oct 20, 2024
772c948
Merge branch 'nicole/random' into dev
nicolehu26 Oct 20, 2024
e45993a
Merge remote-tracking branch 'refs/remotes/origin/dev'
nicolehu26 Dec 14, 2024
47128a1
background and block for dates
nicolehu26 Jan 18, 2025
31d7fe1
Delete MyPlayground.playground directory
anushkasankaran Jan 18, 2025
1609468
Delete HackIllinois/ViewControllers/ .swift
anushkasankaran Jan 18, 2025
abd60c5
changed grey blocks to vases and added shifts background
nicolehu26 Jan 23, 2025
2a04f58
Update schedule page background
anushkasankaran Jan 17, 2025
a30d9df
Changed weekend start/end dates to match 2025
anushkasankaran Jan 18, 2025
48ab975
event popup icons
nicolehu26 Jan 26, 2025
2b01c3a
removed api key
nicolehu26 Jan 26, 2025
4e3a301
Merge branch 'dev' into nicole/main-schedule-page
nicolehu26 Jan 26, 2025
90aa955
fixed spacing between bases on time and color of timestamp
nicolehu26 Jan 26, 2025
bc58eb3
home pages
nicolehu26 Jan 30, 2025
6ebed63
remove api key
nicolehu26 Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions HackIllinois.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
95C18DC52009618C004784B5 /* HIHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C18DC42009618C004784B5 /* HIHomeViewController.swift */; };
95C18DCA20096539004784B5 /* HIEventDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C18DC720096539004784B5 /* HIEventDetailViewController.swift */; };
95C18DCB20096539004784B5 /* HIScheduleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C18DC820096539004784B5 /* HIScheduleViewController.swift */; };
95C18DCC20096539004784B5 /* HIEventListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C18DC920096539004784B5 /* HIEventListViewController.swift */; };
95C3BE302008B99C0008ED79 /* HIBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C3BE2F2008B99C0008ED79 /* HIBaseViewController.swift */; };
95CA9230201E60D300C46037 /* UIImage+QRCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CA922F201E60D300C46037 /* UIImage+QRCode.swift */; };
95CCEA1F203D6B3600E3E28C /* HINavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CCEA1E203D6B3600E3E28C /* HINavigationController.swift */; };
Expand Down Expand Up @@ -157,6 +156,7 @@
D1F1463A2B605C57004E7FC9 /* Hack_Mushroom_Loading.json in Resources */ = {isa = PBXBuildFile; fileRef = D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */; };
D3A309BC2211175200CBA351 /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A309BB2211175200CBA351 /* PassKit.framework */; };
D704DB322C73A8E200355019 /* URLImage in Frameworks */ = {isa = PBXBuildFile; productRef = D704DB312C73A8E200355019 /* URLImage */; };
DAACDC322D3B8F5E00D15118 /* HIEventListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */; };
DF3706382925DDAA000B4278 /* GoogleMapsBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */; };
DF37063B2925DDB8000B4278 /* GoogleMaps.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF3706392925DDB7000B4278 /* GoogleMaps.framework */; };
DF37063C2925DDB8000B4278 /* GoogleMapsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF37063A2925DDB8000B4278 /* GoogleMapsCore.framework */; };
Expand Down Expand Up @@ -306,7 +306,6 @@
95C18DC42009618C004784B5 /* HIHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIHomeViewController.swift; sourceTree = "<group>"; };
95C18DC720096539004784B5 /* HIEventDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HIEventDetailViewController.swift; sourceTree = "<group>"; };
95C18DC820096539004784B5 /* HIScheduleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HIScheduleViewController.swift; sourceTree = "<group>"; };
95C18DC920096539004784B5 /* HIEventListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HIEventListViewController.swift; sourceTree = "<group>"; };
95C3BE2F2008B99C0008ED79 /* HIBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HIBaseViewController.swift; sourceTree = "<group>"; };
95CA922F201E60D300C46037 /* UIImage+QRCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+QRCode.swift"; sourceTree = "<group>"; };
95CCEA1E203D6B3600E3E28C /* HINavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HINavigationController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -376,6 +375,7 @@
D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Hack_Mushroom_Loading.json; sourceTree = "<group>"; };
D3A309BA221116A600CBA351 /* HackIllinois.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HackIllinois.entitlements; sourceTree = "<group>"; };
D3A309BB2211175200CBA351 /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; };
DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIEventListViewController.swift; sourceTree = "<group>"; };
DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsBase.framework; sourceTree = "<group>"; };
DF3706392925DDB7000B4278 /* GoogleMaps.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMaps.framework; sourceTree = "<group>"; };
DF37063A2925DDB8000B4278 /* GoogleMapsCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsCore.framework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -606,7 +606,7 @@
D14D3AE2295FBDA100EB7995 /* HIBannerViewController.swift */,
D158EC302B5A2D440003D799 /* HIQRAttendeeScannerSelection.swift */,
95C18DC720096539004784B5 /* HIEventDetailViewController.swift */,
95C18DC920096539004784B5 /* HIEventListViewController.swift */,
DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */,
9515E43622093E1300BCAF92 /* HIEventScannerViewController.swift */,
95C18DC42009618C004784B5 /* HIHomeViewController.swift */,
954EE1D21FD0F1680078F39E /* HILoginSelectionViewController.swift */,
Expand Down Expand Up @@ -997,6 +997,7 @@
951E67F723C1C88200477703 /* XCRemoteSwiftPackageReference "lottie-ios" */,
D1D335152B81DEBA00BBB596 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
D704DB302C73A8E200355019 /* XCRemoteSwiftPackageReference "url-image" */,
DADFD71E2D3311C200F1CE5D /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
);
productRefGroup = 951827801EA35AF100049F79 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -1092,6 +1093,7 @@
9521A6AA20191737009059C6 /* HIAnnouncementDataSource.swift in Sources */,
D19D4C932B794F9100376E1B /* HIScanMentorViewController.swift in Sources */,
95C18DCB20096539004784B5 /* HIScheduleViewController.swift in Sources */,
DAACDC322D3B8F5E00D15118 /* HIEventListViewController.swift in Sources */,
ACCB199D25F56DF100F88379 /* HIInterestCell.swift in Sources */,
95CCEA1F203D6B3600E3E28C /* HINavigationController.swift in Sources */,
957D7CAC1FC2940800C4332A /* HackIllinois.xcdatamodeld in Sources */,
Expand All @@ -1115,7 +1117,6 @@
1C9045D2274F048A00DDA74E /* HICarouselView.swift in Sources */,
AC3B621625E8611C002386A2 /* HIProfileDataSource.swift in Sources */,
BF0FDA3925F4DCCD003B5DB1 /* HIScheduleSegmentedControl.swift in Sources */,
95C18DCC20096539004784B5 /* HIEventListViewController.swift in Sources */,
95A7D28A203D4F54005EAEAF /* HIButton.swift in Sources */,
95A7D28E203D4F54005EAEAF /* HIView.swift in Sources */,
3CF8DB1323B419980035ECAE /* HIProjectCell.swift in Sources */,
Expand Down Expand Up @@ -1375,7 +1376,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2024.2.3;
MARKETING_VERSION = 2024.11.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -warn-long-expression-type-checking=150";
PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios;
Expand Down Expand Up @@ -1407,7 +1408,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2024.2.3;
MARKETING_VERSION = 2024.11.1;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1631,6 +1632,14 @@
minimumVersion = 3.1.1;
};
};
DADFD71E2D3311C200F1CE5D /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.57.1;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down
67 changes: 67 additions & 0 deletions HackIllinois.xcodeproj/xcshareddata/xcschemes/HIAPI.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "95E3142921FAD5B30092C22E"
BuildableName = "HIAPI.framework"
BlueprintName = "HIAPI"
ReferencedContainer = "container:HackIllinois.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "95E3142921FAD5B30092C22E"
BuildableName = "HIAPI.framework"
BlueprintName = "HIAPI"
ReferencedContainer = "container:HackIllinois.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
32 changes: 0 additions & 32 deletions HackIllinois.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions HackIllinois/Assets.xcassets/BackButton.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "BackButton.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}
0 ...ts/Background.imageset/Background (1).png → .../Background 1.imageset/Background (1).png
View file
Open in desktop
File renamed without changes
0 ...ts/Background.imageset/Background (2).png → .../Background 1.imageset/Background (2).png
View file
Open in desktop
File renamed without changes
0 ...assets/Background.imageset/Background.png → ...sets/Background 1.imageset/Background.png
View file
Open in desktop
File renamed without changes
23 changes: 23 additions & 0 deletions HackIllinois/Assets.xcassets/Background 1.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Background.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Background (1).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Background (2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 3 additions & 3 deletions HackIllinois/Assets.xcassets/Background.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "Background.png",
"filename" : "Group 954.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Background (1).png",
"filename" : "Group 954@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Background (2).png",
"filename" : "Group 954@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Binary file added HackIllinois/Assets.xcassets/Background.imageset/Group 954.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added HackIllinois/Assets.xcassets/Background.imageset/Group [email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added HackIllinois/Assets.xcassets/Background.imageset/Group [email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Group 954.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group [email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group [email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group [email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group [email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions HackIllinois/Assets.xcassets/DisclosureIndicator.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}
12 changes: 6 additions & 6 deletions HackIllinois/Assets.xcassets/Favorited.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Favorited.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}
23 changes: 23 additions & 0 deletions HackIllinois/Assets.xcassets/GreyBlock.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Group 903.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group [email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group [email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added HackIllinois/Assets.xcassets/GreyBlock.imageset/Group [email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added HackIllinois/Assets.xcassets/GreyBlock.imageset/Group [email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading