remove @amplify/api and fix admin links

package.json

@@ -35,7 +35,6 @@
   "author": "George Bell",
   "license": "ISC",
   "dependencies": {
-    "@aws-amplify/api": "^4.0.6",
     "@aws-amplify/ui-react": "^1.2.6",
     "@sentry/browser": "^6.9.0",
     "aws-amplify": "^4.2.0",

src/__mocks__/aws-amplify.ts

@@ -1,4 +1,4 @@
-import { GraphQLResult } from '@aws-amplify/api/lib/types';
+import { GraphQLResult } from '@aws-amplify/api';
 
 const Amplify = {
   configure: jest.fn(),

src/components/ImportYoutube/ImportYoutube.ts

@@ -3,7 +3,6 @@ import * as customqueries from '../../graphql-custom/customQueries';
 import * as mutations from '../../graphql/mutations';
 import Amplify, { API, graphqlOperation } from 'aws-amplify';
 import awsmobile from '../../aws-exports';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api/lib/types';
 import {
   CreateVideoMutation,
   GetVideoByYoutubeIdentQuery,
@@ -16,6 +15,7 @@ import {
 import { DeepPartial } from '../../utils';
 import ignorePlaylist from './ignore-playlists';
 import moment from 'moment';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 
 Amplify.configure(awsmobile);
 

src/components/Link/Link.scss

@@ -45,7 +45,7 @@ a.button-link {
 }
 
 a {
-  color: theme.$onyxblacktext !important;
+  color: theme.$onyxblacktext;
   text-decoration: underline;
   text-underline-offset: 0.25em;
 

src/components/Loaders/Blog.tsx

@@ -1,5 +1,6 @@
-import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api/lib/types';
 import { GetBlogQuery } from 'API';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+
 import { API, Analytics, AmazonPersonalizeProvider, Auth } from 'aws-amplify';
 import { ReactElement, useEffect, useState } from 'react';
 import { useHistory, useRouteMatch } from 'react-router-dom';

src/components/Loaders/Notes.tsx

@@ -1,10 +1,10 @@
-import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api/lib/types';
 import { Analytics, API } from 'aws-amplify';
 import RenderRouter from 'components/RenderRouter/RenderRouter';
 import moment from 'moment-timezone';
 import { useEffect, useState } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
 import { getNotesCustom } from '../../graphql-custom/customQueries';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 
 type GetCustomNotes = {
   getNotes: {

src/components/Loaders/Videos.tsx

@@ -1,10 +1,10 @@
-import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api/lib/types';
 import { GetSeriesQuery, GetVideoQuery } from 'API';
 import { API, Analytics } from 'aws-amplify';
 import { ReactElement, useEffect, useState } from 'react';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 import * as customQueries from '../../graphql-custom/customQueries';
 import VideoOverlay from '../VideoOverlay/VideoOverlay';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 
 interface Params {
   isPlaylist?: boolean;

src/components/Menu/HomeFooter.scss

@@ -26,6 +26,10 @@
 }
 
 .FooterNavLink {
+  color: #1a1a1a;
+  &:hover {
+    color: #1a1a1a !important;
+  }
   line-height: 32px;
   font-weight: bold;
   font-size: 22px;

src/components/Menu/HomeMenu.tsx

@@ -8,16 +8,16 @@ import {
   Button,
   NavItem,
 } from 'reactstrap';
+import { API } from 'aws-amplify';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import HamburgerMenu from 'react-hamburger-menu';
 import './menu.scss';
 import moment from 'moment-timezone';
 import * as queries from '../../graphql/queries';
-import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
-import API from '@aws-amplify/api';
 import { ListLivestreamsQuery } from '../../API';
 import { Link, NavLink } from 'components/Link/Link';
 import { LiveEvents } from '../types';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 const VideoOverlay = React.lazy(() => import('../VideoOverlay/VideoOverlay'));
 const Dropdown = React.lazy(
   () => import('../../components/LiveEvents/Dropdown')

src/components/RenderRouter/BlogItem.spec.tsx

@@ -1,8 +1,7 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import BlogItem from './BlogItem';
-import { API } from '@aws-amplify/api';
-
+import { API } from 'aws-amplify';
 type BuildPropsArgs = {
   style: 'multiImage' | 'hero' | 'featured';
   blogSeries?: string;

src/components/RenderRouter/BlogItem.tsx

@@ -1,9 +1,12 @@
 import React from 'react';
-import { API, GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api';
 import {
   getBlogSeries,
   getBlogByBlogStatus,
 } from 'graphql-custom/customQueries';
+import { API } from 'aws-amplify';
+
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+
 import moment from 'moment';
 import { Link, LinkButton } from 'components/Link/Link';
 import {

src/components/RenderRouter/DataLoader.ts

@@ -1,9 +1,10 @@
 import * as queries from '../../graphql/queries';
 import * as customQueries from '../../graphql-custom/customQueries';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api/lib/types';
 import Amplify, { API, graphqlOperation } from 'aws-amplify';
 import awsmobile from '../../aws-exports';
 import moment from 'moment';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+
 import {
   GetSeriesQuery,
   GetSeriesQueryVariables,

src/components/RenderRouter/SearchItem.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import './SearchItem.scss';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
+import { GraphQLResult } from '@aws-amplify/api';
 
 import Amplify, { API, graphqlOperation } from 'aws-amplify';
 import awsmobile from '../../aws-exports';
@@ -16,7 +17,6 @@ import {
   SearchNotessQuery,
   SearchSeriessQuery,
 } from 'API';
-import { GraphQLResult } from '@aws-amplify/api';
 import RenderRouter from './RenderRouter';
 import { Button } from 'reactstrap';
 Amplify.configure(awsmobile);

src/components/RenderRouter/TeachingItem.tsx

@@ -5,9 +5,9 @@ import './TeachingItem.scss';
 import * as customQueries from '../../graphql-custom/customQueries';
 import { API } from 'aws-amplify';
 import VideoOverlay from '../VideoOverlay/VideoOverlay';
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api/lib/types';
 import { LinkButton } from 'components/Link/Link';
 import { Button } from 'reactstrap';
+import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 
 interface Props extends RouteComponentProps {
   content: any;

src/components/RenderRouter/TeachingSearch.tsx

@@ -9,7 +9,8 @@ import {
   SearchBlogsQuery,
   SearchBlogsQueryVariables,
 } from 'API';
-import { GraphQLResult } from '@aws-amplify/api/lib/types';
+import { GraphQLResult } from '@aws-amplify/api';
+
 import { SearchBarContentProp } from '../types';
 import { Link } from 'components/Link/Link';
 

src/components/RenderRouter/VideoPlayerLive.tsx

@@ -2,12 +2,13 @@ import React, { Fragment } from 'react';
 import './VideoPlayerLive.scss';
 import * as queries from '../../graphql/queries';
 import * as customQueries from '../../graphql-custom/customQueries';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api/lib/types';
 import { API } from 'aws-amplify';
 import moment from 'moment-timezone';
 import { ListLivestreamsQuery } from '../../API';
 import { Link, LinkButton } from 'components/Link/Link';
 import { isMobile, isMobileOnly } from 'react-device-detect';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+
 import {
   Dropdown,
   DropdownItem,

src/pages/HomePage.tsx

@@ -1,4 +1,4 @@
-import Amplify from '@aws-amplify/core';
+import Amplify from 'aws-amplify';
 import React, { ReactNode } from 'react';
 import ReactGA from 'react-ga';
 import {

src/pages/admin/Announcements.tsx

@@ -4,9 +4,10 @@ import AdminMenu from '../../components/Menu/AdminMenu';
 import './Announcements.scss';
 import Amplify from 'aws-amplify';
 import awsmobile from '../../aws-exports';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api/lib/types';
 import { API } from 'aws-amplify';
 import { v4 as uuidv4 } from 'uuid';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+
 import {
   CreateAnnouncementMutationVariables,
   ListAnnouncementsQuery,

src/pages/admin/create-blog.tsx

@@ -8,7 +8,6 @@ import awsmobile from 'aws-exports';
 import * as customQueries from 'graphql-custom/customQueries';
 import * as queries from 'graphql/queries';
 import * as mutations from 'graphql/mutations';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api/lib/types';
 import Amplify, { API, Storage } from 'aws-amplify';
 import { Modal } from 'reactstrap';
 import { v4 as uuidv4 } from 'uuid';
@@ -19,6 +18,8 @@ import { EmptyProps } from 'utils';
 import 'react-datepicker/dist/react-datepicker.css';
 import format from 'date-fns/format';
 import parse from 'date-fns/parse';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+
 import './create-blog.scss';
 import {
   BlogBridgeByPostQuery,

src/pages/admin/create-notes.tsx

@@ -6,6 +6,8 @@ import {
   RawDraftContentState,
   convertFromRaw,
 } from 'draft-js';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+
 import { Editor } from 'react-draft-wysiwyg';
 import Amplify, { Auth } from 'aws-amplify';
 import AdminMenu from '../../components/Menu/AdminMenu';
@@ -15,7 +17,6 @@ import awsmobile from '../../aws-exports';
 import * as queries from '../../graphql/queries';
 import * as mutations from '../../graphql/mutations';
 import * as adminQueries from './queries';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api/lib/types';
 import { API, graphqlOperation } from 'aws-amplify';
 import { Storage } from 'aws-amplify';
 import { Modal } from 'reactstrap';

src/pages/admin/import-video.tsx

@@ -4,7 +4,6 @@ import * as adminQueries from './queries';
 import * as customQueries from '../../graphql-custom/customQueries';
 import * as mutations from '../../graphql/mutations';
 import * as customMutations from '../../graphql-custom/customMutations';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api/lib/types';
 import Amplify from 'aws-amplify';
 import { API } from 'aws-amplify';
 import { AmplifyAuthenticator } from '@aws-amplify/ui-react';
@@ -15,6 +14,7 @@ import ImportYoutube from '../../components/ImportYoutube/ImportYoutube';
 import { EmptyProps } from '../../utils';
 import { Modal } from 'reactstrap';
 import { DeleteCustomPlaylistMutation } from 'API';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 
 Amplify.configure(awsmobile);
 const federated = {

src/pages/admin/instagram.tsx

@@ -4,9 +4,9 @@ import Amplify from 'aws-amplify';
 import awsmobile from '../../aws-exports';
 import * as mutations from '../../graphql/mutations';
 import * as adminQueries from './queries';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api/lib/types';
 import { API } from 'aws-amplify';
 import { CreateInstagramInput, GetInstagramQuery } from 'API';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 
 Amplify.configure(awsmobile);
 const federated = {

src/pages/admin/livestream.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import AdminMenu from '../../components/Menu/AdminMenu';
 import * as queries from '../../graphql/queries';
 import * as mutations from '../../graphql/mutations';
-import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api';
 import { EmptyProps } from '../../utils';
 import Amplify, { API } from 'aws-amplify';
 import { Modal } from 'reactstrap';
@@ -20,6 +19,7 @@ import {
   UpdateLivestreamMutation,
 } from 'API';
 import './livestream.scss';
+import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 
 Amplify.configure(awsmobile);
 const federated = {