Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@saumilthecode
saumilthecode authored Oct 31, 2024
1 parent 31ab5cc commit 0b97842
Show file tree
Hide file tree
Showing 22 changed files with 648 additions and 191 deletions.
4 changes: 2 additions & 2 deletions About BBSS/About BBSS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "club.bbsshack.About-BBSS";
PRODUCT_BUNDLE_IDENTIFIER = "club.bbsshack.About-bbss";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = auto;
Expand Down Expand Up @@ -324,7 +324,7 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "club.bbsshack.About-BBSS";
PRODUCT_BUNDLE_IDENTIFIER = "club.bbsshack.About-bbss";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = auto;
Expand Down
Binary file modified ...odeproj/project.xcworkspace/xcuserdata/tkrobot.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
9 changes: 7 additions & 2 deletions About BBSS/About BBSS/About BBSS Section/AboutBBSSView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,18 @@ struct AboutBBSSView: View {
.resizable()
.scaledToFit()
.frame(width: 400, height: 200)
.padding(.top, 30)

Image("Sideshow_1")
.resizable()
.scaledToFit()
.frame(width: 400, height: 200)


Text("Our Vision")
.font(.title)
.fontWeight(.bold)
.padding(.top, 20)


Text("Bukit Batok Secondary School is a premier school that provides quality holistic education to every BBSSian.")
.font(.body)
.padding(.horizontal, 20)
Expand Down
2 changes: 1 addition & 1 deletion About BBSS/About BBSS/About BBSS Section/AcademicView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct AcademicView: View {
.fontWeight(.bold)
.foregroundColor(Color(UIColor(red: 100/255, green: 80/255, blue: 20/255, alpha: 1.0)))

Text("In BBSS, the following subjects are offered as 'O' / 'N(A)' / 'N(T)' level examinable subjects, grouped by department.")
Text("In BBSS, the following subjects are offered as 'O' / 'N(A)' / 'N(T)' level examinable subjects.")
.font(.headline)
.foregroundColor(.gray)
}
Expand Down
27 changes: 25 additions & 2 deletions About BBSS/About BBSS/About BBSS Section/CCA'S/ClubAndSocietyView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,14 @@ struct ClubAndSocietyView: View {
NavigationLink(destination: OneEarthClubView()) {
ClubButton(title: "One Earth Club")
}
NavigationLink(destination: DramaAndDebateView()) {
ClubButton(title: "English Language Drama & Debating")
NavigationLink(destination: GymView()){
ClubButton(title: "Gym Club")

}

}


}
}
}
Expand Down Expand Up @@ -131,3 +135,22 @@ struct DramaAndDebateView: View {
}
}


struct GymView: View {
var body: some View {
NavigationStack {
ZStack {
Color(UIColor(red: 250/255, green: 240/255, blue: 180/255, alpha: 1.0))
.ignoresSafeArea()

WebView(url: URL(string: "https://www.bukitbatoksec.moe.edu.sg/clubs/gym-club/")!)
}
.navigationTitle("Robotics Club Website")
.foregroundColor(Color.black)
.navigationBarTitleDisplayMode(.inline)
}
}
}



24 changes: 22 additions & 2 deletions About BBSS/About BBSS/About BBSS Section/CCA'S/Uniformed Groups.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,30 @@ struct UniformedGroupsView: View {
.padding(.top, 40)
HStack(spacing: 20) {
NavigationLink(destination: NCCLandView()) {
ClubButton(title: "NCC (Land)")
// ClubButton(title: " ***NCC (Land) *** + NCC (Sea)")
Text("`NCC (Land)` + NCC (Sea)")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
.padding(.horizontal)

}
NavigationLink(destination: NCCSeaView()) {
ClubButton(title: "NCC (Sea)")
// ClubButton(title: "NCC (Land) + ***NCC (Sea)*** ")
Text("NCC (Land) + `NCC (Sea)`")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
.padding(.horizontal)

}
}
HStack(spacing: 20) {
Expand Down
7 changes: 6 additions & 1 deletion About BBSS/About BBSS/About BBSS Section/CCA'S/Visual and Performing Arts.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ struct VisualArts: View {
Color(UIColor(red: 250/255, green: 240/255, blue: 180/255, alpha: 1.0))
.ignoresSafeArea()
VStack(spacing: 30) {
Text("Visual and Performing Arts")
Text("Performing Arts")
.font(.largeTitle)
.bold()
.foregroundColor(Color.black)
Expand All @@ -32,6 +32,11 @@ struct VisualArts: View {
NavigationLink(destination:MalayDanceView()){
ClubButton(title: "Malay Dance")
}

NavigationLink(destination: DramaAndDebateView()) {
ClubButton(title: "English Language Drama & Debating")
}

}
}
}
Expand Down
107 changes: 49 additions & 58 deletions About BBSS/About BBSS/About BBSS Section/CCAView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,73 +7,64 @@ struct CCAView: View {
.ignoresSafeArea()

VStack {
Spacer()

Text("CCA'S")
.font(.title)
.fontWeight(.bold)
.padding()

Spacer()

NavigationLink(destination: SportsView()){
Text("Sports & Games")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
}
.padding(.horizontal, 40)


NavigationLink(destination: UniformedGroupsView()){
Text("Uniformed Groups")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
}
.padding(.horizontal, 40)



NavigationLink(destination: VisualArts()) {
Text("Visual and Performing Arts")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
}
.padding(.horizontal, 40)



NavigationLink(destination: ClubAndSocietyView()) {
Text("Clubs and Societies")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)

VStack(spacing: 20) {
// First row
HStack(spacing: 20) {
NavigationLink(destination: SportsView()){
Text("Sports & Games")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
}

NavigationLink(destination: UniformedGroupsView()){
Text("Uniformed Groups")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
}
}

// Second row
HStack(spacing: 20) {
NavigationLink(destination: VisualArts()) {
Text("Performing Arts")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
}

NavigationLink(destination: ClubAndSocietyView()) {
Text("Clubs and Societies")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.white)
.padding(25)
.frame(maxWidth: .infinity)
.background(Color(UIColor(red: 152/255, green: 29/255, blue: 32/255, alpha: 1.0)))
.cornerRadius(30)
}
}
}
.padding(.horizontal, 40)

Spacer()
}
}
}
}

52 changes: 29 additions & 23 deletions About BBSS/About BBSS/About BBSS Section/HolisticView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,34 +42,40 @@ struct HolisticView: View {
var body: some View {
NavigationStack {
ScrollView {
VStack(spacing: 30) { // Increased spacing
VStack(spacing: 10) { // Keep main stack spacing
Text("Holistic Programmes")
.font(.system(size: 40, weight: .bold)) // Increased size
.font(.system(size: 40, weight: .bold))
.frame(maxWidth: .infinity, alignment: .leading)
.padding()

ProgramCard(
title: "Applied Learning Programme",
description: "Developing Proactive Problem-Solvers through Robot Building, Coding & Programming! The Applied Learning Programme in BBSS focuses on developing each student to be a empathetic and active problem solver by utilising the mBot platform as a way to get students familiar with logical problem solving skills. This programme is compulsory for all secondary 1 and 2 students as part of their time in BBSS!",
imageName: "Image 1",
websiteURL: "https://www.bukitbatoksec.moe.edu.sg/our-bbss-experience/Key-Programmes/applied-learning-programme/"
)

ProgramCard(
title: "Learning for Life Programme",
description: "The BBSS Learning for Life Programme (LLP) focuses on Community Youth Leadership, offering students opportunities to develop leadership and values through community service. Supported by the Habits of Mind Programme, the LLP includes two tiers: broad-based opportunities for all students (Tier 1) and specialized experiences for those with higher interest and ability (Tier 2). These tiers involve three stages where students discover their strengths, develop leadership skills, and lead their peers.",
imageName: "Image",
websiteURL: "https://www.bukitbatoksec.moe.edu.sg/our-bbss-experience/Key-Programmes/learning-for-life-programme-llp/"
)

ProgramCard(
title: "Habits of Mind",
description: "Habits of Mind is a framework that helps students develop intelligent behaviors and critical thinking skills for solving problems. The program teaches 16 essential habits including persisting, managing impulsivity, listening with understanding and empathy, thinking flexibly, and striving for accuracy. Through this program, students learn to approach challenges thoughtfully and develop lifelong learning skills that will benefit them in academic and real-world situations.",
imageName: "HOM BANNER 2",
websiteURL: "https://www.bukitbatoksec.moe.edu.sg/our-bbss-experience/Key-Programmes/habits-of-mind/"
)
// Add horizontal padding to the cards container
VStack(spacing: 50) { // Increased spacing between cards to 40
ProgramCard(
title: "Applied Learning Programme",
description: "Developing Proactive Problem-Solvers through Robot Building, Coding & Programming! The Applied Learning Programme in BBSS focuses on developing each student to be a empathetic and active problem solver by utilising the mBot platform as a way to get students familiar with logical problem solving skills. This programme is compulsory for all secondary 1 and 2 students as part of their time in BBSS!",
imageName: "Image 1",
websiteURL: "https://www.bukitbatoksec.moe.edu.sg/our-bbss-experience/Key-Programmes/applied-learning-programme/"
)
.padding(.horizontal, 50) // Add horizontal padding to each card

ProgramCard(
title: "Learning for Life Programme",
description: "The BBSS Learning for Life Programme (LLP) focuses on Community Youth Leadership, offering students opportunities to develop leadership and values through community service. Supported by the Habits of Mind Programme, the LLP includes two tiers: broad-based opportunities for all students (Tier 1) and specialized experiences for those with higher interest and ability (Tier 2). These tiers involve three stages where students discover their strengths, develop leadership skills, and lead their peers.",
imageName: "Image",
websiteURL: "https://www.bukitbatoksec.moe.edu.sg/our-bbss-experience/Key-Programmes/learning-for-life-programme-llp/"
)
.padding(.horizontal, 50)

ProgramCard(
title: "Habits of Mind",
description: "Habits of Mind is a framework that helps students develop intelligent behaviors and critical thinking skills for solving problems. The program teaches 16 essential habits including persisting, managing impulsivity, listening with understanding and empathy, thinking flexibly, and striving for accuracy. Through this program, students learn to approach challenges thoughtfully and develop lifelong learning skills that will benefit them in academic and real-world situations.",
imageName: "HOM BANNER 2",
websiteURL: "https://www.bukitbatoksec.moe.edu.sg/our-bbss-experience/Key-Programmes/habits-of-mind/"
)
.padding(.horizontal, 50)
}
.padding(.bottom, 40) // Add bottom padding for last card
}
.padding()
}
.background(
Color(red: 250/255, green: 240/255, blue: 180/255)
Expand Down
Loading

0 comments on commit 0b97842

Please sign in to comment.