change to material

Author: SaraVieira

packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/EntryIcons/GetIconURL.js

@@ -52,23 +52,16 @@ const icons = {
   reason: reasonSvg,
 };
 
-const directoryMapping = {
-  'directory-open': 'default_folder_opened',
-  directory: 'default_folder',
-};
-
 async function getIconURL(type) {
   const base =
-    'https://cdn.rawgit.com/vscode-icons/vscode-icons/806a23ec/icons';
+    'https://cdn.rawgit.com/PKief/vscode-material-icon-theme/e04ab459/icons/';
 
   let url;
 
-  if (type === 'directory-open' || type === 'directory') {
-    url = `${base}/${directoryMapping[type]}.svg`;
-  } else if (type === 'codesandbox') {
+  if (type === 'codesandbox') {
     url = codesandboxSvg;
   } else {
-    url = `${base}/file_type_${type}.svg`;
+    url = `${base}/${type}.svg`;
   }
 
   try {

packages/app/src/app/utils/get-type.js

@@ -5,35 +5,46 @@ const mdRegex = /\.md$/;
 const yamlRegex = /\.yml$/;
 const svgRegex = /\.svg$/;
 const jsxRegex = /\.jsx$/;
+const tsRegex = /\.tsx?$/;
+const jsRegex = /\.js$/;
+const reasonRegex = /\.re$/;
+const sassRegex = /\.scss$/;
 
 export function getMode(title: string = '') {
-  const removeIgnoreTitle = title.split('ignore')[0];
-
-  if (removeIgnoreTitle === 'favicon.ico') {
-    return 'favicon';
-  }
-
-  if (removeIgnoreTitle === 'yarn.lock') {
-    return 'yarn';
-  }
-
-  if (removeIgnoreTitle === '.travis.yml') {
-    return 'travis';
-  }
+  const removeIgnoreTitle = title.split('ignore')[0].toLowerCase();
 
-  if (removeIgnoreTitle === 'package.json') {
-    return 'npm';
-  }
+  // EXCEPTIONS
 
-  if (removeIgnoreTitle === 'sandbox.config.json') {
-    return 'codesandbox';
-  }
+  if (removeIgnoreTitle === 'favicon.ico') return 'favicon';
+  if (removeIgnoreTitle === 'yarn.lock') return 'yarn';
+  if (removeIgnoreTitle === '.travis.yml') return 'travis';
+  if (removeIgnoreTitle === 'package.json') return 'npm';
+  if (removeIgnoreTitle === 'sandbox.config.json') return 'codesandbox';
+  if (removeIgnoreTitle === 'readme.md') return 'readme';
+  if (removeIgnoreTitle === 'contributing.md') return 'contributing';
 
+  // TEST BASED
   if (mdRegex.test(removeIgnoreTitle)) return 'markdown';
   if (yamlRegex.test(removeIgnoreTitle)) return 'yaml';
-  if (jsxRegex.test(removeIgnoreTitle)) return 'reactjs';
+  if (jsxRegex.test(removeIgnoreTitle)) return 'react';
+  if (reasonRegex.test(removeIgnoreTitle)) return 'reason';
+  if (sassRegex.test(removeIgnoreTitle)) return 'sass';
   if (!removeIgnoreTitle.includes('.')) return 'raw';
+  if (removeIgnoreTitle.startsWith('.flow')) return 'flow';
+  if (
+    removeIgnoreTitle.endsWith('.module.ts') ||
+    removeIgnoreTitle.endsWith('.component.ts')
+  )
+    return 'angular';
   if (removeIgnoreTitle.includes('webpack')) return 'webpack';
+  if (jsRegex.test(removeIgnoreTitle)) return 'javascript';
+  if (
+    tsRegex.test(title) ||
+    title === 'tsconfig.json' ||
+    title === 'tslint.json'
+  ) {
+    return 'typescript';
+  }
 
   if (isImage(removeIgnoreTitle) && !svgRegex.test(removeIgnoreTitle)) {
     return 'image';
@@ -48,22 +59,6 @@ export function getMode(title: string = '') {
   return titleArr[titleArr.length - 1];
 }
 
-const tsRegex = /\.tsx?$/;
-function isTS(title: string) {
-  if (
-    tsRegex.test(title) ||
-    title === 'tsconfig.json' ||
-    title === 'tslint.json'
-  )
-    return 'typescript';
-  return undefined;
-}
-
 export default function getType(title: string) {
-  const isTSType = isTS(title);
-  if (isTSType) {
-    return isTSType;
-  }
-
   return getMode(title);
 }