Dead

.gitignore

@@ -5,6 +5,27 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+## Build generated
+build/
+DerivedData/
+*.xcarchive
+archive.xcarchive.zip
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
 # User-specific stuff
 /.idea
 .idea/**/workspace.xml

api/bragbook/src/main/java/com/hackmidwest/bragbook/domain/entity/Entry.java

@@ -25,7 +25,7 @@ public class Entry {
     private List<Type> types;
     private List<Person> people;
     private boolean isPublic;
-    private List<Status> status;
+//    private List<Status> status;
     private ZonedDateTime completedDate;
 
 }

api/bragbook/src/main/java/com/hackmidwest/bragbook/domain/entity/Person.java

@@ -7,7 +7,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import java.time.ZonedDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Document("person")
@@ -28,8 +28,10 @@ public class Person {
     private String email;
     private String password;
     private String phoneNumber;
-    private ZonedDateTime dateCreated;
-    private ZonedDateTime lastLoggedIn;
+    private List<Entry> entries;
+    private List<Journey> journeys;
+    private Date dateCreated;
+    private Date lastLoggedIn;
     private String profile;
 
 }

api/bragbook/src/main/java/com/hackmidwest/bragbook/domain/service/EntryServiceImpl.java

@@ -39,7 +39,7 @@ public Entry updateEntry(String entryId, Entry entry) {
                 .types(entry.getTypes())
                 .people(entry.getPeople())
                 .isPublic(entry.isPublic())
-                .status(entry.getStatus())
+//                .status(entry.getStatus())
                 .completedDate(entry.getCompletedDate())
                 .build();
 

api/bragbook/src/main/java/com/hackmidwest/bragbook/domain/service/PersonServiceImpl.java

@@ -20,8 +20,8 @@ public String savePerson(Person person) {
     }
 
     @Override
-    public Person getPersonById(String journeyId) {
-        return personRepository.getPersonById(journeyId);
+    public Person getPersonById(String personId) {
+        return personRepository.getPersonById(personId);
     }
 
     @Override

api/bragbook/src/main/java/com/hackmidwest/bragbook/rest/PersonController.java

@@ -29,7 +29,7 @@ public String savePerson(@RequestBody Person person) {
     }
 
     @GetMapping(path = "/{personId}")
-    public Person getPersonByTitle(@PathVariable String personId) {
+    public Person getPersonById(@PathVariable String personId) {
         return personService.getPersonById(personId);
     }
 

ui/BragBook/BragBook.xcodeproj/xcuserdata/sgipson.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "13A83868-4127-41F0-9D46-ED1317E37D2D"
+   type = "1"
+   version = "2.0">
+</Bucket>

ui/BragBook/BragBook/BragBookApp.swift

@@ -12,8 +12,7 @@ struct BragBookApp: App {
     var body: some Scene {
         WindowGroup {
             NavigationView {
-                SplashView()
-                HomeScreenView(bragUser: BragUser.sampleUsers[0])
+                HomeScreenView()
             }
         }
     }

ui/BragBook/BragBook/Components/HomeProgressCardComponent.swift

@@ -0,0 +1,60 @@
+//
+//  HomeProgressCardComponent.swift
+//  BragBook
+//
+//  Created by Shanice Gipson on 7/23/22.
+//
+
+import SwiftUI
+
+struct HomeProgressCardComponent: View {
+    @State private var completedAmount = 45.0
+
+    var body: some View {
+        VStack {
+            Text("JUMP BACK INTO:").font(.subheadline)
+                .foregroundColor(Color("green"))
+
+                .padding(.bottom, 1)
+                .padding(.top)
+
+            Text("OVERCOMING IMPOSTER SYNDROME")
+                .foregroundColor(Color("Dark Green"))
+                .fontWeight(.semibold)
+                .multilineTextAlignment(.center)
+                .padding(3)
+
+            Text("Progress").font(.subheadline)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .multilineTextAlignment(.leading)
+                .padding(.bottom, -12)
+                .padding(.top, 12)
+                .padding(.leading)
+
+            ProgressView(value: completedAmount, total: 100)
+                .tint(Color("green"))
+                .scaleEffect(x: 1, y:4 , anchor: .center)
+                .padding()
+
+
+            Text("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Arcu ac tortor dignissim convallis aenean.")
+                .foregroundColor(Color("Dark Green"))
+                .multilineTextAlignment(.center)
+                .padding([.leading, .trailing], 14)
+                .padding([.top, .bottom], 8)
+
+            }
+        .background(Color.white)
+        .cornerRadius(6)
+        .padding(8)
+        .padding(.bottom, 3)
+        .shadow(color: Color("Dark Green"), radius: 7, x: 1, y: 4)
+
+    }
+}
+
+struct HomeProgressCardComponent_Previews: PreviewProvider {
+    static var previews: some View {
+        HomeProgressCardComponent()
+    }
+}

ui/BragBook/BragBook/Components/NavigationComponent.swift

@@ -0,0 +1,45 @@
+//
+//  NavigationComponent.swift
+//  BragBook
+//
+//  Created by Liz Wait on 7/23/22.
+//
+
+import SwiftUI
+
+struct NavigationComponent: View {
+    @State private var selectedTab = "One"
+
+    var body: some View {
+
+        VStack(spacing: 0) {
+            HStack {
+                TabView(selection: $selectedTab) {
+                    HomeScreenView(bragUser: BragUser.sampleUsers[0])
+                        .tabItem {
+                            Label("Home", systemImage: "house.circle.fill")
+                        }
+                    EntryMainView()
+                        .tabItem {
+                            Label("Entries", systemImage: "pencil.circle.fill")
+                            }
+                    ProfileView()
+                        .tabItem {
+                            Label("Profile", systemImage: "person.circle.fill")
+                            }
+                    JourneyView()
+                        .tabItem {
+                            Label("Journey", systemImage: "book.closed.circle.fill")
+                            }
+                }
+                .accentColor(Color("Dark Orange"))
+            }
+        }
+    }
+}
+
+struct NavigationComponent_Previews: PreviewProvider {
+    static var previews: some View {
+        NavigationComponent()
+    }
+}