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

Group 6 Seanathan #7

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Group 6 Seanathan #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c91eaf
did stuff
waradsanath Jul 13, 2024
e9f15f9
did stuff
waradsanath Jul 13, 2024
1bd5617
i did stuff
James-Chew Jul 13, 2024
c81beec
did stuff
waradsanath Jul 13, 2024
e2e1722
Group6MmberYueyang yass
YueyangG Jul 13, 2024
fe06db9
added Jake member view
drsvds Jul 13, 2024
c57b8ad
added Jake member view
drsvds Jul 13, 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
28 changes: 28 additions & 0 deletions about-us-pm.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
1A4C4C4E2C426E2E00268F7B /* Group6MemberJames.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A4C4C4D2C426E2E00268F7B /* Group6MemberJames.swift */; };
3218FAD12C4225AD00A3C570 /* about_us_pmApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3218FAD02C4225AD00A3C570 /* about_us_pmApp.swift */; };
3218FAD32C4225AD00A3C570 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3218FAD22C4225AD00A3C570 /* ContentView.swift */; };
3218FAD52C4225AE00A3C570 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3218FAD42C4225AE00A3C570 /* Assets.xcassets */; };
Expand All @@ -18,9 +19,16 @@
3218FAE72C42264400A3C570 /* Group4View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3218FAE62C42264400A3C570 /* Group4View.swift */; };
3218FAE92C42264B00A3C570 /* Group5View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3218FAE82C42264B00A3C570 /* Group5View.swift */; };
3218FAEB2C42265200A3C570 /* Group6View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3218FAEA2C42265200A3C570 /* Group6View.swift */; };
819BDEB92C426C7200A94FF6 /* Group6MemberSanath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 819BDEB82C426C7200A94FF6 /* Group6MemberSanath.swift */; };
<<<<<<< HEAD
D9888AF42C426FFD002976D8 /* Group6MemberJake.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9888AF32C426FFD002976D8 /* Group6MemberJake.swift */; };
=======
D967496C2C427073008C4606 /* Group6MemberYueyang.swift in Sources */ = {isa = PBXBuildFile; fileRef = D967496B2C427073008C4606 /* Group6MemberYueyang.swift */; };
>>>>>>> main
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
1A4C4C4D2C426E2E00268F7B /* Group6MemberJames.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Group6MemberJames.swift; sourceTree = "<group>"; };
3218FACD2C4225AD00A3C570 /* about-us-pm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "about-us-pm.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3218FAD02C4225AD00A3C570 /* about_us_pmApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = about_us_pmApp.swift; sourceTree = "<group>"; };
3218FAD22C4225AD00A3C570 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
Expand All @@ -33,6 +41,12 @@
3218FAE62C42264400A3C570 /* Group4View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Group4View.swift; sourceTree = "<group>"; };
3218FAE82C42264B00A3C570 /* Group5View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Group5View.swift; sourceTree = "<group>"; };
3218FAEA2C42265200A3C570 /* Group6View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Group6View.swift; sourceTree = "<group>"; };
819BDEB82C426C7200A94FF6 /* Group6MemberSanath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Group6MemberSanath.swift; sourceTree = "<group>"; };
<<<<<<< HEAD
D9888AF32C426FFD002976D8 /* Group6MemberJake.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Group6MemberJake.swift; sourceTree = "<group>"; };
=======
D967496B2C427073008C4606 /* Group6MemberYueyang.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Group6MemberYueyang.swift; sourceTree = "<group>"; };
>>>>>>> main
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -74,6 +88,13 @@
3218FAE62C42264400A3C570 /* Group4View.swift */,
3218FAE82C42264B00A3C570 /* Group5View.swift */,
3218FAEA2C42265200A3C570 /* Group6View.swift */,
819BDEB82C426C7200A94FF6 /* Group6MemberSanath.swift */,
<<<<<<< HEAD
D9888AF32C426FFD002976D8 /* Group6MemberJake.swift */,
=======
D967496B2C427073008C4606 /* Group6MemberYueyang.swift */,
1A4C4C4D2C426E2E00268F7B /* Group6MemberJames.swift */,
>>>>>>> main
3218FAD42C4225AE00A3C570 /* Assets.xcassets */,
3218FAD62C4225AE00A3C570 /* Preview Content */,
);
Expand Down Expand Up @@ -160,11 +181,18 @@
files = (
3218FAE92C42264B00A3C570 /* Group5View.swift in Sources */,
3218FAE52C42263900A3C570 /* Group3View.swift in Sources */,
<<<<<<< HEAD
D9888AF42C426FFD002976D8 /* Group6MemberJake.swift in Sources */,
=======
1A4C4C4E2C426E2E00268F7B /* Group6MemberJames.swift in Sources */,
>>>>>>> main
3218FAEB2C42265200A3C570 /* Group6View.swift in Sources */,
3218FAE32C42263200A3C570 /* Group2View.swift in Sources */,
3218FAE72C42264400A3C570 /* Group4View.swift in Sources */,
819BDEB92C426C7200A94FF6 /* Group6MemberSanath.swift in Sources */,
3218FAE12C42262C00A3C570 /* Group1View.swift in Sources */,
3218FADF2C42262500A3C570 /* InstructorMentorView.swift in Sources */,
D967496C2C427073008C4606 /* Group6MemberYueyang.swift in Sources */,
3218FAD32C4225AD00A3C570 /* ContentView.swift in Sources */,
3218FAD12C4225AD00A3C570 /* about_us_pmApp.swift in Sources */,
);
Expand Down
30 changes: 30 additions & 0 deletions about-us-pm/Group6MemberJake.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//
// Group6MemberJake.swift
// about-us-pm
//
// Created by T Krobot on 13/7/24.
//

import SwiftUI

struct Group6MemberJake: View {
var body: some View {
VStack{
Image(systemName: "keyboard")
.resizable()
.scaledToFit()
.frame(width: 100)
.foregroundStyle(Color.gray)
Text("Jake")
.bold()
.font(.title)
Text("PCs are pretty sick man")


}
}
}

#Preview {
Group6MemberJake()
}
28 changes: 28 additions & 0 deletions about-us-pm/Group6MemberJames.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// Group6MemberSanath.swift
// about-us-pm
//
// Created by James on 13/7/24.
//

import SwiftUI

struct Group6MemberJames: View {
var body: some View {
VStack {
Image(systemName: "pencil")
.resizable()
.scaledToFit()
.frame(width: 100)
.foregroundStyle(Color.gray)
Text("james")
.bold()
.font(.title)
Text("im retarded")
}
}
}

#Preview {
Group6MemberJames()
}
28 changes: 28 additions & 0 deletions about-us-pm/Group6MemberSanath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// Group6MemberSanath.swift
// about-us-pm
//
// Created by Sanath Warad on 13/7/24.
//

import SwiftUI

struct Group6MemberSanath: View {
var body: some View {
VStack {
Image(systemName: "moon.fill")
.resizable()
.scaledToFit()
.frame(width: 100)
.foregroundStyle(Color.gray)
Text("Sanath")
.bold()
.font(.title)
Text("I like coding. (And I'm a moon trust)")
}
}
}

#Preview {
Group6MemberSanath()
}
30 changes: 30 additions & 0 deletions about-us-pm/Group6MemberYueyang.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//
// Group6MemberYueyang.swift
// about-us-pm
//
// Created by T Krobot on 13/7/24.
//

import SwiftUI

import SwiftUI

struct Group6MemberYueyang: View {
var body: some View {
VStack {
Image(systemName: "toilet.fill")
.resizable()
.scaledToFit()
.frame(width: 100)
.foregroundStyle(Color.blue)
Text("Yueyang")
.bold()
.font(.title)
Text("my first hamster pet commited suicide")
}
}
}

#Preview {
Group6MemberYueyang()
}
2 changes: 1 addition & 1 deletion about-us-pm/Group6View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import SwiftUI
struct Group6View: View {
var body: some View {
TabView {
/*@START_MENU_TOKEN@*/Text("This is person 1! Replace me with a view.")/*@END_MENU_TOKEN@*/
Group6MemberSanath()
.tabItem {
Label("Person 1", systemImage: "person.circle.fill")
}
Expand Down