diff --git a/assets/AxonGoodColor2.png b/assets/AxonTitleIcon.png similarity index 100% rename from assets/AxonGoodColor2.png rename to assets/AxonTitleIcon.png diff --git a/package.json b/package.json index e0949ab..f32dee2 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,10 @@ "build/icon.*" ], "win": { - "icon": "src/axonicon_UWT_icon.ico" + "icon": "src/axonDesktopIcon.ico" + }, + "mac":{ + "icon": "src/axonDesktopIcon.ico" } }, "scripts": { diff --git a/src/app/app.tsx b/src/app/app.tsx index 308e28b..bb33812 100644 --- a/src/app/app.tsx +++ b/src/app/app.tsx @@ -1,7 +1,7 @@ import React from 'react'; import RootComponent from '@/app/root'; import Particles from 'particlesjs'; -import logo from '../../assets/AxonFinalLogo.png'; +import logo from '../../assets/AxonTitleIcon.png'; diff --git a/src/axonDesktopIcon.ico b/src/axonDesktopIcon.ico new file mode 100644 index 0000000..7ac2cc9 Binary files /dev/null and b/src/axonDesktopIcon.ico differ diff --git a/src/axonicon_UWT_icon.ico b/src/axonicon_UWT_icon.ico deleted file mode 100644 index 997c584..0000000 Binary files a/src/axonicon_UWT_icon.ico and /dev/null differ diff --git a/src/utils/buildPathObject.ts b/src/utils/buildPathObject.ts index 07f4187..e4fa8a6 100644 --- a/src/utils/buildPathObject.ts +++ b/src/utils/buildPathObject.ts @@ -1,5 +1,5 @@ -import tempFindEndpointData from './utilityFunctions/tempFindEndpointData'; -import { tempIdentifyFileType } from './utilityFunctions/tempIdentifyFileType'; +import FindEndpointData from './utilityFunctions/FindEndpointData'; +import { IdentifyFileType } from './utilityFunctions/IdentifyFileType'; /** * When a server folder is uploaded, it is converted to a 'flat' array-like FileList object. @@ -28,7 +28,7 @@ export default function (fileList:any) { // When the file is read sucessfully .then((fileText) => { // Identify the type of file - const { fileType, portNumber } = tempIdentifyFileType(fileText); + const { fileType, portNumber } = IdentifyFileType(fileText); // When the type of file is a server, add the server path to the pathObject if (fileType === 'Server') { @@ -41,7 +41,7 @@ export default function (fileList:any) { // When the file is a server or router file if (fileType === 'Server' || fileType === 'Router') { // Extract necessary route and endpoint data from fileText - const { imports, endpoints, routers } = tempFindEndpointData(fileText, fileList[i].webkitRelativePath); + const { imports, endpoints, routers } = FindEndpointData(fileText, fileList[i].webkitRelativePath); // Add relevant data to the new file object newFileObject = { name: fileList[i].name, diff --git a/src/utils/utilityFunctions/tempFindEndpointData.ts b/src/utils/utilityFunctions/FindEndpointData.ts similarity index 94% rename from src/utils/utilityFunctions/tempFindEndpointData.ts rename to src/utils/utilityFunctions/FindEndpointData.ts index 0826a54..ffcd99c 100644 --- a/src/utils/utilityFunctions/tempFindEndpointData.ts +++ b/src/utils/utilityFunctions/FindEndpointData.ts @@ -1,5 +1,5 @@ -import tempResolvePath from './tempResolvePath'; -import tempFuncDefinitionParser from './tempFuncDefinitionParser'; +import ResolvePath from './ResolvePath'; +import FuncDefinitionParser from './FuncDefinitionParser'; const AbstractSyntaxTree = require('abstract-syntax-tree'); @@ -54,7 +54,7 @@ export default function (fileText: string, currentFilePath:string) { const importPath = statement.declarations[0].init.arguments[0].value; // Add the imported module to the imports object on the fileObject - fileObject.imports[importName] = tempResolvePath(importPath, currentFilePath); + fileObject.imports[importName] = ResolvePath(importPath, currentFilePath); } } } @@ -90,7 +90,7 @@ export default function (fileText: string, currentFilePath:string) { } // Convert the anonymous function, which is the last argument, into an object of the endpoint data - endpointArray[endpointArray.length - 1] = tempFuncDefinitionParser(endpointArray[endpointArray.length - 1]); + endpointArray[endpointArray.length - 1] = FuncDefinitionParser(endpointArray[endpointArray.length - 1]); // Add the Endpoint Array to the Endpoints object if (fileObject.endpoints[route]) { diff --git a/src/utils/utilityFunctions/tempFuncDefinitionParser.ts b/src/utils/utilityFunctions/FuncDefinitionParser.ts similarity index 100% rename from src/utils/utilityFunctions/tempFuncDefinitionParser.ts rename to src/utils/utilityFunctions/FuncDefinitionParser.ts diff --git a/src/utils/utilityFunctions/tempIdentifyFileType.ts b/src/utils/utilityFunctions/IdentifyFileType.ts similarity index 95% rename from src/utils/utilityFunctions/tempIdentifyFileType.ts rename to src/utils/utilityFunctions/IdentifyFileType.ts index 141d303..9a21018 100644 --- a/src/utils/utilityFunctions/tempIdentifyFileType.ts +++ b/src/utils/utilityFunctions/IdentifyFileType.ts @@ -6,7 +6,7 @@ * fileType: will be 'Server', 'Router' or 'Other' * portNumber: will be a string or null */ -export function tempIdentifyFileType(fileText:any) :any { +export function IdentifyFileType(fileText:any) :any { // Attempt to match a port number in the current file const dotListenRE = /\.listen\((?.*?)(?=,|\))/i; diff --git a/src/utils/utilityFunctions/tempResolvePath.ts b/src/utils/utilityFunctions/ResolvePath.ts similarity index 100% rename from src/utils/utilityFunctions/tempResolvePath.ts rename to src/utils/utilityFunctions/ResolvePath.ts