Skip to content

Club Card View Layout #39

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

Open
amodhakal wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Club Card View Layout #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8f97fa
Implement a club card view layout
amodhakal Feb 22, 2024
b095f16
Fixed file structure for ClubCardView
amodhakal Feb 22, 2024
4da0104
Changed file structure based on the feedback
amodhakal Feb 29, 2024
8631e14
Removed the auto-generated comments
amodhakal Feb 29, 2024
37d8b0d
Merge branch 'develop' into feature/club-card-view
amodhakal Apr 2, 2024
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
5 changes: 5 additions & 0 deletions Marigold.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
DEBF7C982B847FD700A82249 /* TextButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBF7C972B847FD700A82249 /* TextButtonView.swift */; };
7E3FB8412B8578DF004B7FE2 /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E3FB8402B8578DF004B7FE2 /* HeaderView.swift */; };
DEBF7C942B84710B00A82249 /* EventCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBF7C932B84710B00A82249 /* EventCardView.swift */; };
FE1144862B87CF4800BECEA8 /* ClubCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE1144852B87CF4800BECEA8 /* ClubCardView.swift */; };
DEBF7C962B84737100A82249 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBF7C952B84737100A82249 /* HomeView.swift */; };
/* End PBXBuildFile section */

Expand All @@ -54,7 +55,9 @@
DEBF7C972B847FD700A82249 /* TextButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextButtonView.swift; sourceTree = "<group>"; };
7E3FB8402B8578DF004B7FE2 /* HeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderView.swift; sourceTree = "<group>"; };
DEBF7C932B84710B00A82249 /* EventCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventCardView.swift; sourceTree = "<group>"; };
FE1144852B87CF4800BECEA8 /* ClubCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClubCardView.swift; sourceTree = "<group>"; };
DEBF7C952B84737100A82249 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };

/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -133,6 +136,7 @@
454681EB2A8995400033B8D3 /* Profile */,
450C5BA52A7DC9D5005353EC /* Auth */,
453E439F2A6DF4BC00366A25 /* ContentView.swift */,
FE1144852B87CF4800BECEA8 /* ClubCardView.swift */,
453E43BA2A6DFBAD00366A25 /* CardView.swift */,
453E43BC2A6E1D5900366A25 /* EventsView.swift */,
450C5BA32A7DA742005353EC /* WelcomeView.swift */,
Expand Down Expand Up @@ -240,6 +244,7 @@
453E43BD2A6E1D5900366A25 /* EventsView.swift in Sources */,
450C5BA42A7DA742005353EC /* WelcomeView.swift in Sources */,
453E43B62A6DF6AB00366A25 /* Club.swift in Sources */,
FE1144862B87CF4800BECEA8 /* ClubCardView.swift in Sources */,
450C5BA72A7DC9E0005353EC /* SignUpView.swift in Sources */,
DEBF7C942B84710B00A82249 /* EventCardView.swift in Sources */,
453E43B22A6DF52000366A25 /* User.swift in Sources */,
Expand Down
Binary file added ...ld.xcodeproj/project.xcworkspace/xcuserdata/a1.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
Binary file added ...deproj/project.xcworkspace/xcuserdata/adhakal2.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
35 changes: 35 additions & 0 deletions Marigold.xcodeproj/xcuserdata/a1.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>GettingStarted (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>GettingStarted (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>GettingStarted (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>Marigold.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
35 changes: 35 additions & 0 deletions Marigold.xcodeproj/xcuserdata/adhakal2.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>GettingStarted (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>GettingStarted (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>GettingStarted (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>Marigold.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
6 changes: 6 additions & 0 deletions Marigold/Assets.xcassets/adc/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...Assets.xcassets/adc/adc-image-lg.imageset/5e7cfb29fd10257c7e079c855bfc989b.jpeg
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.
21 changes: 21 additions & 0 deletions Marigold/Assets.xcassets/adc/adc-image-lg.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "5e7cfb29fd10257c7e079c855bfc989b.jpeg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...Assets.xcassets/adc/adc-image-sm.imageset/276264b374573f439a5a1b0878151739.jpeg
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.
21 changes: 21 additions & 0 deletions Marigold/Assets.xcassets/adc/adc-image-sm.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "276264b374573f439a5a1b0878151739.jpeg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
24 changes: 21 additions & 3 deletions Marigold/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,29 @@
}
}
}
},
"• 1 capital letter" : {

},
"• 1 number" : {

},
"• 8 characters" : {

},
"Are you sure you want to delete your account? This action cannot be undone." : {

},
"Clubs" : {

},
"Confirm Password" : {
"Create Account" : {

},
"Create Event" : {

},
"Create Account" : {
"Create Post" : {

},
"Delete Account" : {
Expand Down Expand Up @@ -71,7 +83,7 @@
"NC State University" : {

},
"Password" : {
"Passwords must match" : {

},
"Please try again." : {
Expand All @@ -97,9 +109,15 @@
},
"Upcoming Events" : {

},
"Vice President" : {

},
"Welcome Back!" : {

},
"Your password must contain at least:" : {

}
},
"version" : "1.0"
Expand Down
94 changes: 94 additions & 0 deletions Marigold/View/ClubCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
//
// ClubCardView.swift
// Marigold
//
// Created by Amodh on 2/22/24.
//

import SwiftUI

struct ClubCardView: View {
private var club: Club

init(club: Club) {
self.club = club
}

var body: some View {
VStack(alignment: .leading) {
// Club Banner
Image(.adcImageLg)
.resizable()
.scaledToFill()
.frame(width: 357, height: 168)
.clipped()

HStack(alignment: .top) {
// Club Logo
Image(.adcImageSm)
.resizable()
.scaledToFill()
.frame(width: 26, height: 26)
.clipShape(Circle())
.padding([.leading], 6.0)
.padding([.top], 8.0)
.clipped()

VStack {
HStack {
// Club Name
Text(club.fullName)
.font(.system(size: 20.0))
.fontWeight(.bold)
.padding([.top], 8.0)

Spacer()
}

HStack {
// Club Role
Text("Vice President")
.font(.system(size: 12.0))

// Create Event Button
Button(action: {}, label: {
Text("Create Event")
.fontWeight(.bold)
.font(.system(size: 12.0))
.foregroundColor(.purple)
.frame(width: 104, height: 26)
})
.background(.opacity(0.1))
.clipShape(.capsule)

// Create Post Button
Button(action: {}, label: {
Text("Create Post")
.fontWeight(.bold)
.font(.system(size: 12.0))
.foregroundColor(.purple)
.frame(width: 104, height: 26)})
.background(.opacity(0.1))
.clipShape(.capsule)

Spacer()
}

Spacer()
}
}
}.cornerRadius(10.0)
.frame(width: 359, height: 264)
.background(
RoundedRectangle(cornerRadius: 20)
.fill(Color.white)
.shadow(color: .gray.opacity(0.5), radius: 3)
.mask(RoundedRectangle(cornerRadius: 50.0).padding(.bottom, -20))
)

}
}

#Preview {
ClubCardView(club: Club.adc)
}