Merge pull request #15 from The-Sebastian/main

renamed algorithm file names and fixed icon issue for mac

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": {

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';
 
 
 

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,

src/utils/utilityFunctions/tempFindEndpointData.ts → 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]) {

src/utils/utilityFunctions/tempIdentifyFileType.ts → 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\((?<port>.*?)(?=,|\))/i;