pull from staging

Revitalized-Playground · Oct 23, 2019 · 2868f95 · 2868f95
2 parents d626717 + 636d758
commit 2868f95
Show file tree

Hide file tree

Showing 38 changed files with 573 additions and 285 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/revclient/package-lock.json b/revclient/package-lock.json
diff --git a/revclient/package.json b/revclient/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@lottiefiles/lottie-player": "^0.2.1",
     "apollo-boost": "^0.4.4",
     "apollo-cache-inmemory": "^1.6.3",
     "apollo-client": "^2.6.4",

diff --git a/revclient/src/graphql/fragments/index.js b/revclient/src/graphql/fragments/index.js
@@ -26,11 +26,22 @@ export const COMMENTS_FRAG = gql`
         likes {
             id
             profile {
-                ...UserSummary
+                id
+                verified
+                email
+                firstName
+                lastName
+                profileImage
+                country
+                state
+                city
+                zip
+                phone
+                address
+                aptNumber
             }
         }
     }
-    ${USER_SUMMARY_FRAG}
 `;
 
 
@@ -63,23 +74,6 @@ export const PROJECT_SUMMARY_FRAG = gql`
         difficulty
         startDate
         featuredImage
-        applicants {
-            id
-            licensed
-            coverLetter
-            jobExperience
-            education
-            availability
-            status
-            trade {
-                id
-                name
-                description
-            }
-            profile {
-                ...UserSummary
-            }
-        }
         images {
             id
             imageUrl
@@ -92,38 +86,68 @@ export const PROJECT_SUMMARY_FRAG = gql`
             id
             profile {
                 id
+                verified
+                email
+                firstName
+                lastName
+                profileImage
+                country
+                state
+                city
+                zip
+                phone
+                address
+                aptNumber
             }
         }
-        tradeMasters {
-            id
-            profile {
-                ...UserSummary
-            }
-        }
+
         students {
             id
             profile {
-                ...UserSummary
+                id
+                verified
+                email
+                firstName
+                lastName
+                profileImage
+                country
+                state
+                city
+                zip
+                phone
+                address
+                aptNumber
             }
         }
         trades {
             id
             name
             description
         }
+        tradeMasters {
+            id
+            profile {
+                id
+                profileImage
+                firstName
+                lastName
+                email
+                address
+                city
+                state
+                zip                
+            }
+        }
         tasks {
-            ...Tasks
+            id
+            title
+            description
+            priority
+            dueDate
+            budgetHours
+            completed
         }
-        # comments {
-        #     id
-        #     ...Comments
-        #     profile {
-        #         ...UserSummary
-        #     }
-        # }
     }
-    ${USER_SUMMARY_FRAG}
-    ${TASKS_FRAG}
 `
 
 

diff --git a/revclient/src/graphql/mutations/Project.js b/revclient/src/graphql/mutations/Project.js
@@ -35,6 +35,7 @@ export const ADD_PROJECT = gql`
 		createProject(data: $data) {
 			id
 			slug
+			featuredImage
 			images {
 				id
 				imageUrl
@@ -72,22 +73,11 @@ export const DONATE_TO_PROJECT = gql`
 `;
 
 export const REMOVE_COMMENT = gql`
-	mutation($id: ID!) {
-		deleteProjectComment(id: $id) {
-			id
-			project {
-				name
-				# comments {
-				# 	id
-				# 	comment
-				# 	likes {
-				# 		id
-				# 	}
-				# }
-			}
-			comment
-		}
-	}
+    mutation($id: ID!) {
+        deleteProjectComment(id: $id) {
+            id
+        }
+    }
 `;
 
 export const EDIT_COMMENT = gql`
@@ -194,6 +184,7 @@ export const UPDATE_PROJECT_TASK = gql`
 			data: $data
 		) {
 			id
+			completed
 		}
 	}
 `
diff --git a/revclient/src/graphql/queries/Projects.js b/revclient/src/graphql/queries/Projects.js
@@ -12,7 +12,6 @@ export const GET_PROJECTS = gql`
 			...ProjectSummary
 		}
 	}
-	${USER_SUMMARY_FRAG}
 	${PROJECT_SUMMARY_FRAG}
 `;
 
@@ -23,19 +22,26 @@ export const GET_RECOMMENDED_PROJECTS = gql`
 			...ProjectSummary
 		}
 	}
-	${USER_SUMMARY_FRAG}
 	${PROJECT_SUMMARY_FRAG}
 `;
 
 
 export const GET_PROJECTS_NEAR_ME = gql`
 	query projectsNearMe {
 		projectsNearMe {
-			...ProjectSummary
+			id
+			slug
+			name
+			description
+			address
+			city
+			state
+			zip
+			goalAmount
+			duration
+			featuredImage
 		}
 	}
-	${USER_SUMMARY_FRAG}
-	${PROJECT_SUMMARY_FRAG}
 `;
 
 
@@ -60,6 +66,12 @@ export const GET_PROJECT_BY_ID = gql`
 					}
 				}
 			}
+			tradeMasters {
+            	id
+				profile {
+					...UserSummary
+				}
+        	}
 			comments {
 				...Comments
 				profile {
@@ -93,12 +105,14 @@ export const GET_PROJECT_BY_SLUG = gql`
 	${USER_SUMMARY_FRAG}
 	${COMMENTS_FRAG}
 	${PROJECT_SUMMARY_FRAG}
-	${TASKS_FRAG}
 `;
 
 
-// export const GET_TRADES_BY_PROJECT_ID = gql`
-// 	query projectById($id: ID!) {
-
-// 	}
-// `;
+export const QUERY_PROJECTS = gql`
+	query projects($query: String!) {
+		projects(query: $query) {
+			...ProjectSummary
+		}
+	}
+	${PROJECT_SUMMARY_FRAG}
+`