chore(POC Shim): Remove unneeded iconfont shim for the webId POC

maidsafe · Apr 22, 2019 · 42947f3 · 42947f3
1 parent 3ce23cd
commit 42947f3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 1,679 deletions.
diff --git a/app/extensions/safe/iconfont/iconfont.css b/app/extensions/safe/iconfont/iconfont.css
diff --git a/app/extensions/safe/iconfont/iconfont.eot b/app/extensions/safe/iconfont/iconfont.eot
diff --git a/app/extensions/safe/iconfont/iconfont.svg b/app/extensions/safe/iconfont/iconfont.svg
diff --git a/app/extensions/safe/iconfont/iconfont.ts b/app/extensions/safe/iconfont/iconfont.ts
diff --git a/app/extensions/safe/iconfont/iconfont.ttf b/app/extensions/safe/iconfont/iconfont.ttf
diff --git a/app/extensions/safe/iconfont/iconfont.woff b/app/extensions/safe/iconfont/iconfont.woff
diff --git a/app/extensions/safe/index.ts b/app/extensions/safe/index.ts
@@ -35,10 +35,10 @@ import { handleSafeBrowserStoreChanges } from './safeBrowserApplication';
 import blockNonSAFERequests from './blockNonSafeReqs';
 import registerSafeAuthProtocol from './protocols/safe-auth';
 import registerSafeProtocol from './protocols/safe';
-import setupRoutes from './server-routes';
+import { setupRoutes } from './server-routes';
 import * as ffiLoader from './auth-api/ffiLoader';
 
-const onWebviewPreload = store => webviewPreload( store );
+const onWebviewPreload = ( store ) => webviewPreload( store );
 
 const preAppLoad = () => {
     // app.setPath( 'userData', path.resolve( app.getPath( 'temp' ), 'safe-browser' ) );
@@ -61,7 +61,7 @@ const addExtensionMenuItems = ( store, menusArray ) => {
 
     const newMenuArray = [];
 
-    menusArray.forEach( menu => {
+    menusArray.forEach( ( menu ) => {
         const { label } = menu;
         let newMenu = menu;
 
@@ -96,7 +96,7 @@ const actionsForBrowser = {
     ...SafeBrowserActions
 };
 
-const onInitBgProcess = async store => {
+const onInitBgProcess = async ( store ) => {
     logger.info( 'Registering SAFE Network Protocols' );
     try {
         setSafeBgProcessStore( store );
@@ -112,15 +112,15 @@ const onInitBgProcess = async store => {
     // load the auth/safe libs
     const theLibs = await ffiLoader.loadLibrary( startedRunningMock );
 
-    let prevAuthLibStatus;
+    let previousAuthLibraryStatus;
 
     store.subscribe( () => {
-        const authLibStatus = getLibStatus();
+        const authLibraryStatus = getLibStatus();
 
-        if ( authLibStatus && authLibStatus !== prevAuthLibStatus ) {
-            logger.info( 'Authenticator lib status: ', authLibStatus );
-            prevAuthLibStatus = authLibStatus;
-            store.dispatch( setAuthLibStatus( authLibStatus ) );
+        if ( authLibraryStatus && authLibraryStatus !== previousAuthLibraryStatus ) {
+            logger.info( 'Authenticator lib status: ', authLibraryStatus );
+            previousAuthLibraryStatus = authLibraryStatus;
+            store.dispatch( setAuthLibStatus( authLibraryStatus ) );
 
             initSafeBrowserApp( store );
         }
@@ -145,7 +145,7 @@ const onInitBgProcess = async store => {
  * on open of peruse application
  * @param  {Object} store redux store
  */
-const onOpen = store =>
+const onOpen = ( store ) =>
     new Promise( ( resolve, reject ) => {
         logger.info( 'OnOpen: Setting mock in store. ', startedRunningMock );
         store.dispatch( setIsMock( startedRunningMock ) );
@@ -157,7 +157,7 @@ const onOpen = store =>
  * on open of peruse application
  * @param  {Object} store redux store
  */
-const onAppReady = store => {
+const onAppReady = ( store ) => {
     logger.info( 'OnAppReady: Setting mock in store. ', startedRunningMock );
     store.dispatch( setIsMock( startedRunningMock ) );
 };
@@ -166,7 +166,7 @@ const onAppReady = store => {
  * Add middleware to Peruse redux store
  * @param  {Object} store redux store
  */
-const middleware = store => next => action => {
+const middleware = ( store ) => ( next ) => ( action ) => {
     if ( isRunningSpectronTestProcess ) {
         logger.info( 'ACTION:', action );
     }
@@ -180,7 +180,7 @@ const parseSafeUri = function( uri ) {
 };
 
 const waitForBasicConnection = ( theStore, timeout = 15000 ) =>
-    new Promise( resolve => {
+    new Promise( ( resolve ) => {
         let timeLeft = timeout;
         const check = () => {
             timeLeft -= 500;

diff --git a/app/extensions/safe/server-routes/index.ts b/app/extensions/safe/server-routes/index.ts
@@ -1,47 +1,16 @@
 import { logger } from '$Logger';
-import {
-    isRunningPackaged,
-    isRunningSpectronTestProcess,
-    isRunningSpectronTestProcessingPackagedApp
-} from '$Constants';
-import path from 'path';
-import url from 'url';
 
 import safeRoute from './safe';
 import authRoute from './auth';
 
-const setupRoutes = ( server, store ) => {
+export const setupRoutes = ( server, store ): void => {
     const routes = [safeRoute( store ), authRoute];
 
-    // TODO: Remove serving onf antd files when we can package
-    // webId manager properly.
-    server.get( /dummy/, ( request, res ) => {
-        const { link } = request.params;
-        const linkUrl = url.parse( link );
-
-        let safeFolder = isRunningPackaged
-            ? '../extensions/safe/'
-            : './extensions/safe/';
-        safeFolder =
-      isRunningSpectronTestProcess &&
-      !isRunningSpectronTestProcessingPackagedApp
-          ? 'extensions/safe/'
-          : safeFolder;
-
-        const antdIcons = path.resolve( __dirname, safeFolder, 'iconfont/' );
-        const finalPath = path.resolve( antdIcons, link );
-        res
-            .sendFile( finalPath, { confine: false } )
-            .header( 'Access-Control-Allow-Origin', '*' );
-    } );
-
-    routes.forEach( route => {
+    routes.forEach( ( route ) => {
         try {
             server.get( route.path, route.handler );
-        } catch ( e ) {
-            logger.error( 'Problem initing a route.', route, e );
+        } catch ( error ) {
+            logger.error( 'Problem initing a route.', route, error );
         }
     } );
 };
-
-export default setupRoutes;