cleanup migration

.gitignore

@@ -19,4 +19,5 @@ nodemon.json
 /myscripts
 .DS_Store
 /server_build
-google_vision_api_key.json
+google_vision_api_key.json
+/client/dist

client/src/components/modal/Front/SwipableImage.tsx

@@ -76,7 +76,6 @@ function SwipableImage({ zoomInfo, onSlidePin, onSetImageMetaData }: SwipableIma
           marginLeft: 'auto',
           marginRight: 'auto',
           objectFit: 'contain',
-          borderColor: 'black',
           border: parentDivStyle.border,
         }}
         onLoad={onPinLoad}

client/src/components/signin/logout.tsx

@@ -1,18 +1,7 @@
 import { useEffect } from 'react';
-import { useHistory } from 'react-router-dom';
-import { useDispatch } from 'react-redux';
-import { getUser } from '../../actions/authentication';
-import RESTcall from '../../crud';
 
 function LogOut() {
-  const history = useHistory();
-  const dispatch = useDispatch();
-
   const logout = async () => {
-    // TODO: vite erroring out on axios rest call to auth/logout
-    // await RESTcall({ address: '/auth/logout' });
-    // dispatch(getUser('/auth/profile'));
-    // history.replace('/logout');
     window.location.assign('/auth/logout');
   };
 

tests/client/src/components/modal/Front/__snapshots__/SwipableImage.test.tsx.snap

@@ -15,7 +15,6 @@ exports[`will render with the list item bar 1`] = `
     sx={
       {
         "border": 0,
-        "borderColor": "black",
         "height": 500,
         "marginLeft": "auto",
         "marginRight": "auto",
@@ -98,7 +97,6 @@ exports[`will render without the list item bar 1`] = `
     sx={
       {
         "border": 0,
-        "borderColor": "black",
         "height": 500,
         "marginLeft": "auto",
         "marginRight": "auto",

tests/client/src/components/signin/logout.test.tsx

@@ -1,33 +1,18 @@
+/**
+ * @jest-environment jsdom
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
-import * as router from 'react-router-dom';
 import LogOut from '../../../../../client/src/components/signin/logout';
-import RESTcall from '../../../../../client/src/crud';
 
-const mockdispatch = jest.fn();
-// Mock RESTcall
-jest.mock('../../../../../client/src/crud');
-// Mock redux hooks
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'), // use actual for all non-hook parts
-  useDispatch: jest.fn(() => mockdispatch),
-}));
-
-// Mock router hooks
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'), // use actual for all non-hook parts
-  useHistory: jest.fn(),
-}));
+const windowSpy = jest.spyOn(window, 'location', 'get');
+const mockedAssign: jest.Mock = jest.fn();
+windowSpy.mockReturnValue({
+  ...window.location,
+  assign: mockedAssign,
+});
 
-xtest('will logout a user', async () => {
-  const replace = jest.fn();
-  const hist = router.useHistory();
-  jest
-    .spyOn(router, 'useHistory')
-    .mockImplementation(() => ({ ...hist, replace }));
+test('will logout a user', () => {
   shallow(<LogOut />);
-  await Promise.resolve();
-  expect(RESTcall).toHaveBeenCalledWith({ address: '/auth/logout' });
-  expect(mockdispatch).toHaveBeenCalled();
-  expect(replace).toHaveBeenCalledWith('/');
+  expect(mockedAssign).toHaveBeenCalledWith('/auth/logout');
 });