Package cleanup & transition to latest apollo.

client/src/utils/DateFormatter.jsx

@@ -1,20 +1,15 @@
-import React from "react";
-import moment from "moment";
-import Moment from "react-moment";
 import { Tooltip } from "antd";
+import moment from "moment";
+import React from "react";
 
 export function DateFormatter(props) {
-  return props.children ? (
-    <Moment className={props && props.className} format="MM/DD/YYYY ">
-      {props.children}
-    </Moment>
-  ) : null;
+  return props.children ? moment(props.children).format("MM/DD/YYYY") : null;
 }
 
 export function DateTimeFormatter(props) {
-  return props.children ? (
-    <Moment format="MM/DD/YYYY hh:mm a">{props.children}</Moment>
-  ) : null;
+  return props.children
+    ? moment(props.children).format("MM/DD/YYYY hh:mm a")
+    : null;
 }
 
 export function TimeAgoFormatter(props) {

client/src/utils/GraphQLClient.js

@@ -1,11 +1,11 @@
-import { ApolloClient, ApolloLink, InMemoryCache } from "@apollo/client";
+import { ApolloClient, ApolloLink, InMemoryCache, split } from "@apollo/client";
 import { setContext } from "@apollo/client/link/context";
 import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http";
 import { RetryLink } from "@apollo/client/link/retry";
 import { WebSocketLink } from "@apollo/client/link/ws";
-import { split } from "apollo-link";
+//import { split } from "apollo-link";
 import apolloLogger from "apollo-link-logger";
-import { getMainDefinition } from "apollo-utilities";
+import { getMainDefinition } from "@apollo/client/utilities";
 import { auth } from "../firebase/firebase.utils";
 import errorLink from "../graphql/apollo-error-handling";
 

client/src/utils/RenderTemplate.js

@@ -1,6 +1,6 @@
 import { notification } from "antd";
 import axios from "axios";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import jsreport from "jsreport-browser-client-dist";
 import { auth } from "../firebase/firebase.utils";
 import { setEmailOptions } from "../redux/email/email.actions";