Merge branch 'main' of https://github.com/ProjectInTheClass/Noto

docs/assets/css/main.css

@@ -885,7 +885,7 @@ input, select, textarea {
 	}
 
 		.image.filtered:after {
-			background-image: url("../../images/overlay.png"), linear-gradient(45deg, rgba(114, 97, 147, 0.25) 25%, rgba(227, 123, 124, 0.25) 50%, rgba(255, 228, 180, 0.25));
+			background-image: url("../../images/overlay.png");
 			background-size: 128px 128px, auto;
 			pointer-events: none;
 			content: '';
@@ -2210,7 +2210,7 @@ input, select, textarea {
 		}
 
 			.panel > *.color0 {
-				background-image: url("../../images/overlay.png"), linear-gradient(45deg, #726193 20%, #e37b7c 60%, #ffe4b4);
+				background-image: url("../../images/overlay.png"), linear-gradient(45deg, #028DFF 20%, #028DFF 60%, #1BD5FF);
 				background-size: 128px 128px, auto;
 			}
 
@@ -2223,7 +2223,7 @@ input, select, textarea {
 			.panel > *.color2 {
 				background-image: url("../../images/overlay.png"), linear-gradient(45deg, rgba(114, 97, 147, 0.25) 25%, rgba(227, 123, 124, 0.25) 50%, rgba(255, 228, 180, 0.25));
 				background-size: 128px 128px, auto;
-				background-color: #e37b7c;
+				background-color: #028DFF;
 			}
 
 			.panel > *.color3 {
@@ -2731,7 +2731,7 @@ input, select, textarea {
 		}
 
 		.panel.color0 {
-			background-image: url("../../images/overlay.png"), linear-gradient(45deg, #726193 20%, #e37b7c 60%, #ffe4b4);
+			background-image: url("../../images/overlay.png"), linear-gradient(45deg, white 20%, white 60%, white);
 			background-size: 128px 128px, auto;
 		}
 

docs/index.html

@@ -31,7 +31,7 @@ <h1 class="major">NOTO</h1>
                            </a> -->
                         </div>
                         <div class="image filtered span-1-75" data-position="50% 50%">
-                           <img src="images/icon.webp" alt="" />
+                           <img src="images/NOTO icon.png" alt="" />
                         </div>
                      </section>
                </div>

noto-App/noto-App.xcodeproj/project.pbxproj

@@ -23,7 +23,9 @@
 		621B9BD72CF46B5800451367 /* Main_Page.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621B9BD62CF46B5300451367 /* Main_Page.swift */; };
 		621B9BD92CF46C5100451367 /* Project_Progress_Component.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621B9BD82CF46C4800451367 /* Project_Progress_Component.swift */; };
 		621B9BDB2CF4750400451367 /* Setting_Page.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621B9BDA2CF474FD00451367 /* Setting_Page.swift */; };
-		621B9BDD2CF47F2C00451367 /* Request_Page.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621B9BDC2CF47F2700451367 /* Request_Page.swift */; };
+		621B9BDD2CF47F2C00451367 /* RequestList_Page.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621B9BDC2CF47F2700451367 /* RequestList_Page.swift */; };
+		62251AA22D008827004E1453 /* RequestDetail_Page.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62251AA12D00881F004E1453 /* RequestDetail_Page.swift */; };
+		62251AA42D009101004E1453 /* User_DataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62251AA32D0090F5004E1453 /* User_DataModel.swift */; };
 		627078DE2CE30A660027FF09 /* ColorStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 627078DD2CE30A5D0027FF09 /* ColorStyle.swift */; };
 		627FFE9C2CEC295100DF70E8 /* FontStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 627FFE9B2CEC294E00DF70E8 /* FontStyle.swift */; };
 		627FFE9E2CEC299700DF70E8 /* Frame_Component.swift in Sources */ = {isa = PBXBuildFile; fileRef = 627FFE9D2CEC299300DF70E8 /* Frame_Component.swift */; };
@@ -74,7 +76,9 @@
 		621B9BD62CF46B5300451367 /* Main_Page.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main_Page.swift; sourceTree = "<group>"; };
 		621B9BD82CF46C4800451367 /* Project_Progress_Component.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Project_Progress_Component.swift; sourceTree = "<group>"; };
 		621B9BDA2CF474FD00451367 /* Setting_Page.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Setting_Page.swift; sourceTree = "<group>"; };
-		621B9BDC2CF47F2700451367 /* Request_Page.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Request_Page.swift; sourceTree = "<group>"; };
+		621B9BDC2CF47F2700451367 /* RequestList_Page.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestList_Page.swift; sourceTree = "<group>"; };
+		62251AA12D00881F004E1453 /* RequestDetail_Page.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestDetail_Page.swift; sourceTree = "<group>"; };
+		62251AA32D0090F5004E1453 /* User_DataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User_DataModel.swift; sourceTree = "<group>"; };
 		623334682CDDE79100DE9DA1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		627078DD2CE30A5D0027FF09 /* ColorStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorStyle.swift; sourceTree = "<group>"; };
 		627FFE9B2CEC294E00DF70E8 /* FontStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontStyle.swift; sourceTree = "<group>"; };
@@ -192,10 +196,11 @@
 		621B9BCD2CF4448F00451367 /* Page */ = {
 			isa = PBXGroup;
 			children = (
+				62251AA12D00881F004E1453 /* RequestDetail_Page.swift */,
 				62FB21492CFEAE0300B298F0 /* Project_Page.swift */,
 				62D1EA692CFDA95B005801F6 /* ProgressList_Page.swift */,
 				62D1EA622CFD8852005801F6 /* TodoDetail_Page.swift */,
-				621B9BDC2CF47F2700451367 /* Request_Page.swift */,
+				621B9BDC2CF47F2700451367 /* RequestList_Page.swift */,
 				621B9BDA2CF474FD00451367 /* Setting_Page.swift */,
 				621B9BD62CF46B5300451367 /* Main_Page.swift */,
 			);
@@ -221,6 +226,7 @@
 		62D1EA5D2CFD80D8005801F6 /* DataModel */ = {
 			isa = PBXGroup;
 			children = (
+				62251AA32D0090F5004E1453 /* User_DataModel.swift */,
 				62D1EA672CFDA6AC005801F6 /* Project_DataModel.swift */,
 				62D1EA652CFD9775005801F6 /* Person_DataModel.swift */,
 				62D1EA602CFD8130005801F6 /* Todo_DataModel.swift */,
@@ -365,6 +371,7 @@
 				1371F01E2CDDE0150034FC36 /* ContentView.swift in Sources */,
 				621B9BD72CF46B5800451367 /* Main_Page.swift in Sources */,
 				627FFE9C2CEC295100DF70E8 /* FontStyle.swift in Sources */,
+				62251AA22D008827004E1453 /* RequestDetail_Page.swift in Sources */,
 				62D1EA612CFD813D005801F6 /* Todo_DataModel.swift in Sources */,
 				621B9BD92CF46C5100451367 /* Project_Progress_Component.swift in Sources */,
 				62D1EA632CFD8865005801F6 /* TodoDetail_Page.swift in Sources */,
@@ -373,8 +380,9 @@
 				627FFE9E2CEC299700DF70E8 /* Frame_Component.swift in Sources */,
 				1371F0202CDDE0150034FC36 /* Item.swift in Sources */,
 				62FB214A2CFEAE1800B298F0 /* Project_Page.swift in Sources */,
-				621B9BDD2CF47F2C00451367 /* Request_Page.swift in Sources */,
+				621B9BDD2CF47F2C00451367 /* RequestList_Page.swift in Sources */,
 				62D1EA6A2CFDA962005801F6 /* ProgressList_Page.swift in Sources */,
+				62251AA42D009101004E1453 /* User_DataModel.swift in Sources */,
 				62D1EA5F2CFD80F6005801F6 /* Request_DataModel.swift in Sources */,
 				62D1EA682CFDA6B1005801F6 /* Project_DataModel.swift in Sources */,
 				1371F01C2CDDE0150034FC36 /* noto_AppApp.swift in Sources */,

noto-App/noto-App/Assets.xcassets/mail.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "mail.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

noto-App/noto-App/Assets.xcassets/paper-plane.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "paper-plane.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

noto-App/noto-App/Assets.xcassets/receive.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "receive.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

noto-App/noto-App/Component/Frame_Component.swift

@@ -55,6 +55,13 @@ struct viewAllComponent: View {
   }
 }
 
+struct dumyBottom: View {
+  var body: some View {
+    VStack {}
+      .frame(width: 120, height: 90)
+  }
+}
+
 // 컴포넌트 정의
 extension View {
   func scrollViewStyle() -> some View {

noto-App/noto-App/Component/Header_Component.swift

@@ -9,7 +9,7 @@ struct mainHeader: View {
         .scaledToFit()
         .frame(width: 120)
     }
-    .frame(width: .infinity, height: 96, alignment: .bottom)
+    .frame(width: 120, height: 96, alignment: .bottom)
   }
 }
 

noto-App/noto-App/Component/Styles/FontStyle.swift

@@ -61,7 +61,7 @@ struct ProjectContnentFont: ViewModifier {
 struct DescriptionFont: ViewModifier {
   func body(content: Content) -> some View {
     content
-      .font(.custom("Freesentation-5Medium", size: 12))
+      .font(.custom("Freesentation-5Medium", size: 13))
       .foregroundColor(.customDarkGray)
       .multilineTextAlignment(.leading)
       .lineSpacing(10)

noto-App/noto-App/Component/Sub_Component.swift

@@ -95,6 +95,68 @@ struct settingRow: View {
   }
 }
 
+// 행 컴포넌트
+struct titleRow_1: View {
+  var title: String
+
+  var body: some View {
+    HStack {
+      Text(title)
+        .titleFont()
+        .lineLimit(1)
+        .truncationMode(.tail)
+    }
+    .frame(maxWidth: .infinity, alignment: .leading)
+    .padding(.horizontal, 20)
+  }
+}
+
+struct titleRow_2: View {
+  var title: String
+  var imageName: String
+  var imageSize: CGFloat
+
+  var body: some View {
+    HStack {
+      Image(imageName)
+        .resizable()
+        .frame(width: imageSize, height: imageSize)
+        .padding(.trailing, 5)
+      Text(title)
+        .titleFont()
+        .lineLimit(1)
+        .truncationMode(.tail)
+    }
+    .frame(maxWidth: .infinity, alignment: .leading)
+    .padding(.horizontal, 20)
+  }
+}
+
+struct titleRow_3: View {
+  var title: String
+  var optionAction: () -> Void
+
+  var body: some View {
+    HStack {
+      Text(title)
+        .titleFont()
+        .lineLimit(1)
+        .truncationMode(.tail)
+      Spacer()
+      Button(action: {
+        optionAction()
+      }) {
+        Image(systemName: "ellipsis")
+          .font(.system(size: 24))
+          .foregroundColor(.customBlack)
+      }
+    }
+    .frame(maxWidth: .infinity, alignment: .leading)
+    .padding(.horizontal, 20)
+
+  }
+}
+
 enum ShapeType { case circle, rectangle }
 
 // 이미지 컴포넌트(크기는 정형 (n x n))
@@ -120,6 +182,7 @@ struct imageComponent: View {
   }
 }
 
+// 입력창 컴포넌트
 struct inputComponent: View {
   @Binding var userInput: String
   var placeholder: String