diff --git a/UML/4.Sequence/4.1.SignIn.puml b/UML/4.Sequence/4.1.SignIn.puml index 1ea9c86..4c8d703 100644 --- a/UML/4.Sequence/4.1.SignIn.puml +++ b/UML/4.Sequence/4.1.SignIn.puml @@ -5,9 +5,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nAuthService" as system participant Server -participant Firebase +participant "Provider" as Firebase activate User User -> InterfaceUI: Open sign in @@ -27,23 +27,23 @@ loop Form User -> InterfaceUI: User data alt #LightGreen User data successful - InterfaceUI -> System: Create account request - activate System - System -> Firebase: Create account request + InterfaceUI -> system: Create account request + activate system + system -> Firebase: Create account request activate Firebase alt #LightGreen successful case - System <-- Firebase: Create account successful - InterfaceUI <- System: Create account accepted + system <-- Firebase: Create account successful + InterfaceUI <- system: Create account accepted User <- InterfaceUI: Create account accepted else #Pink Account error - System <-- Firebase: Create account error + system <-- Firebase: Create account error deactivate Firebase - InterfaceUI <- System: Create account error - deactivate System + InterfaceUI <- system: Create account error + deactivate system User x<- InterfaceUI: Notification error end else #Pink Error in user data - InterfaceUI <- System: Error in user data + InterfaceUI <- system: Error in user data User <- InterfaceUI: Notification error in user data deactivate InterfaceUI end diff --git a/UML/4.Sequence/4.10.AutocompleteCode.puml b/UML/4.Sequence/4.10.AutocompleteCode.puml index 0cb7dda..f857897 100644 --- a/UML/4.Sequence/4.10.AutocompleteCode.puml +++ b/UML/4.Sequence/4.10.AutocompleteCode.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nEditor" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.11.ShowDocumentationCode.puml b/UML/4.Sequence/4.11.ShowDocumentationCode.puml index fee8b9a..b24878a 100644 --- a/UML/4.Sequence/4.11.ShowDocumentationCode.puml +++ b/UML/4.Sequence/4.11.ShowDocumentationCode.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nEditor" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.12.ShowErrorsInCode.puml b/UML/4.Sequence/4.12.ShowErrorsInCode.puml index 574eb3f..acd3820 100644 --- a/UML/4.Sequence/4.12.ShowErrorsInCode.puml +++ b/UML/4.Sequence/4.12.ShowErrorsInCode.puml @@ -6,9 +6,10 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nEditor" as System +participant "System\nMachineService" as MachineService participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login @@ -20,17 +21,22 @@ User <- InterfaceUI: Show Editor InterfaceUI -> System: Analyze code activate System - System -> Server: Analyze code + System -> MachineService: Analyze code + MachineService -> Server: Analyze code activate Server - System <-- Server: Analyze code response + MachineService <-- Server: Analyze code response deactivate Server - InterfaceUI <- System: Analyze code response + System <-- MachineService: Analyze code response + System -> System: Process code response + InterfaceUI <- System: Data deactivate System alt #LightGreen Have error User <- InterfaceUI: Show error in code else #LightBlue No error in code User <- InterfaceUI: Show code + else #Pink Error in response + User <- InterfaceUI: Show notification end deactivate InterfaceUI diff --git a/UML/4.Sequence/4.13.ShowLogs.puml b/UML/4.Sequence/4.13.ShowLogs.puml index cba43ab..b93efeb 100644 --- a/UML/4.Sequence/4.13.ShowLogs.puml +++ b/UML/4.Sequence/4.13.ShowLogs.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nLoggerService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.14.ModifyMemory.puml b/UML/4.Sequence/4.14.ModifyMemory.puml index d77ce4a..b171b81 100644 --- a/UML/4.Sequence/4.14.ModifyMemory.puml +++ b/UML/4.Sequence/4.14.ModifyMemory.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nMachineService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.15.ModifyRegisters.puml b/UML/4.Sequence/4.15.ModifyRegisters.puml index 2d75cae..a7e7915 100644 --- a/UML/4.Sequence/4.15.ModifyRegisters.puml +++ b/UML/4.Sequence/4.15.ModifyRegisters.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nMachineService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.16.ShowPipeline.puml b/UML/4.Sequence/4.16.ShowPipeline.puml index 8a451f2..778b7d4 100644 --- a/UML/4.Sequence/4.16.ShowPipeline.puml +++ b/UML/4.Sequence/4.16.ShowPipeline.puml @@ -8,7 +8,7 @@ actor User boundary InterfaceUI participant System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.17.ShowDiagram.puml b/UML/4.Sequence/4.17.ShowDiagram.puml index e4fc989..a05049e 100644 --- a/UML/4.Sequence/4.17.ShowDiagram.puml +++ b/UML/4.Sequence/4.17.ShowDiagram.puml @@ -8,7 +8,7 @@ actor User boundary InterfaceUI participant System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.18.ShowMemoryCode.puml b/UML/4.Sequence/4.18.ShowMemoryCode.puml index f0055d9..25cf097 100644 --- a/UML/4.Sequence/4.18.ShowMemoryCode.puml +++ b/UML/4.Sequence/4.18.ShowMemoryCode.puml @@ -8,7 +8,7 @@ actor User boundary InterfaceUI participant System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.19.ShowMemory.puml b/UML/4.Sequence/4.19.ShowMemory.puml index 813f673..1f04f0a 100644 --- a/UML/4.Sequence/4.19.ShowMemory.puml +++ b/UML/4.Sequence/4.19.ShowMemory.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nMachineService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.2.LogIn.puml b/UML/4.Sequence/4.2.LogIn.puml index cdcef72..e2a4a04 100644 --- a/UML/4.Sequence/4.2.LogIn.puml +++ b/UML/4.Sequence/4.2.LogIn.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nAuthService" as system participant Server -participant Firebase +participant "Provider" as Firebase activate User User -> InterfaceUI: Open login @@ -28,25 +28,25 @@ loop Form User -> InterfaceUI: User data alt #LightGreen User data successful - InterfaceUI -> System: Authentication request - activate System + InterfaceUI -> system: Authentication request + activate system - System -> Firebase: Authentication request + system -> Firebase: Authentication request activate Firebase alt #LightGreen successful case - System <- Firebase: Authentication successful - InterfaceUI <- System: Authentication accepted + system <- Firebase: Authentication successful + InterfaceUI <- system: Authentication accepted User <- InterfaceUI: Authentication accepted else #Pink Account error - System <- Firebase: Authentication error + system <- Firebase: Authentication error deactivate Firebase - InterfaceUI <- System: Authentication error - deactivate System + InterfaceUI <- system: Authentication error + deactivate system User x<- InterfaceUI: Notification error end else #Pink Error in User data - InterfaceUI <- System: Error in user data + InterfaceUI <- system: Error in user data User x<- InterfaceUI: Notification error in user data deactivate InterfaceUI end diff --git a/UML/4.Sequence/4.20.ShowRegisters.puml b/UML/4.Sequence/4.20.ShowRegisters.puml index dc0bb34..7f06bc1 100644 --- a/UML/4.Sequence/4.20.ShowRegisters.puml +++ b/UML/4.Sequence/4.20.ShowRegisters.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nMachineService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.21.Config.puml b/UML/4.Sequence/4.21.Config.puml index 34f7d7c..f46af09 100644 --- a/UML/4.Sequence/4.21.Config.puml +++ b/UML/4.Sequence/4.21.Config.puml @@ -6,9 +6,10 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nMachineService" as System +participant "System\nTHUMDER-App-Service" as THUMDER participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login @@ -48,34 +49,34 @@ end deactivate System User -> InterfaceUI: Set auto save -InterfaceUI -> System: Set auto save -activate System +InterfaceUI -> THUMDER: Set auto save +activate THUMDER alt #LightGreen Ok - InterfaceUI <- System: Set auto save + InterfaceUI <- THUMDER: Set auto save else #Pink Error - InterfaceUI <- System: Set auto save to default + InterfaceUI <- THUMDER: Set auto save to default end -deactivate System +deactivate THUMDER User -> InterfaceUI: Set time simulation step -InterfaceUI -> System: Set time simulation step -activate System +InterfaceUI -> THUMDER: Set time simulation step +activate THUMDER alt #LightGreen Ok - InterfaceUI <- System: Set time simulation step + InterfaceUI <- THUMDER: Set time simulation step else #Pink Error - InterfaceUI <- System: Set time simulation step to default + InterfaceUI <- THUMDER: Set time simulation step to default end -deactivate System +deactivate THUMDER User -> InterfaceUI: Set config multiview -InterfaceUI -> System: Set config multiview -activate System +InterfaceUI -> THUMDER: Set config multiview +activate THUMDER alt #LightGreen Ok - InterfaceUI <- System: Set config multiview + InterfaceUI <- THUMDER: Set config multiview else #Pink Error - InterfaceUI <- System: Set config multiview to default + InterfaceUI <- THUMDER: Set config multiview to default end -deactivate System +deactivate THUMDER User -> InterfaceUI: Select save or reset group #SkyBlue Select save diff --git a/UML/4.Sequence/4.22.Calculator.puml b/UML/4.Sequence/4.22.Calculator.puml index cffc75d..03e54a9 100644 --- a/UML/4.Sequence/4.22.Calculator.puml +++ b/UML/4.Sequence/4.22.Calculator.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nCalculator" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.23.LoadSimulation.puml b/UML/4.Sequence/4.23.LoadSimulation.puml index 8231b8a..0e906f1 100644 --- a/UML/4.Sequence/4.23.LoadSimulation.puml +++ b/UML/4.Sequence/4.23.LoadSimulation.puml @@ -7,9 +7,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nMachineService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.24.NextStepInSimulation.puml b/UML/4.Sequence/4.24.NextStepInSimulation.puml index 5f5a2b6..94c3840 100644 --- a/UML/4.Sequence/4.24.NextStepInSimulation.puml +++ b/UML/4.Sequence/4.24.NextStepInSimulation.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nMachineService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.25.Simulation.puml b/UML/4.Sequence/4.25.Simulation.puml index 7d8e74d..bd25932 100644 --- a/UML/4.Sequence/4.25.Simulation.puml +++ b/UML/4.Sequence/4.25.Simulation.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nMachineService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.3.CreateFile.puml b/UML/4.Sequence/4.3.CreateFile.puml index dbce9a4..7ba1ac4 100644 --- a/UML/4.Sequence/4.3.CreateFile.puml +++ b/UML/4.Sequence/4.3.CreateFile.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nFileSystemService" as system participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login @@ -21,16 +21,16 @@ User <- InterfaceUI: Show file manager deactivate InterfaceUI User -> InterfaceUI: Create file -InterfaceUI -> System: Create file -System -> Firebase: Create file +InterfaceUI -> system: Create file +system -> Firebase: Create file alt #LightGreen Ok - System <-- Firebase: Create file successful - InterfaceUI <- System: Create file successful + system <-- Firebase: Create file successful + InterfaceUI <- system: Create file successful User <- InterfaceUI: Create file successful else #Pink Error - System <-- Firebase: Create file error - InterfaceUI <- System: Create file error + system <-- Firebase: Create file error + InterfaceUI <- system: Create file error User x<- InterfaceUI: Create file error end diff --git a/UML/4.Sequence/4.4.ModifyAccount.puml b/UML/4.Sequence/4.4.ModifyAccount.puml index b2aeb10..0a3f374 100644 --- a/UML/4.Sequence/4.4.ModifyAccount.puml +++ b/UML/4.Sequence/4.4.ModifyAccount.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nAuthService" as system participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.5.ShowInfoApp.puml b/UML/4.Sequence/4.5.ShowInfoApp.puml index 30dd119..46e7c12 100644 --- a/UML/4.Sequence/4.5.ShowInfoApp.puml +++ b/UML/4.Sequence/4.5.ShowInfoApp.puml @@ -8,7 +8,7 @@ actor User boundary InterfaceUI participant System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.7.DeleteFile.puml b/UML/4.Sequence/4.7.DeleteFile.puml index 93d4eb4..cf2bc02 100644 --- a/UML/4.Sequence/4.7.DeleteFile.puml +++ b/UML/4.Sequence/4.7.DeleteFile.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System \n FileSystemService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.8.RenameFile.puml b/UML/4.Sequence/4.8.RenameFile.puml index 41f6081..28d088c 100644 --- a/UML/4.Sequence/4.8.RenameFile.puml +++ b/UML/4.Sequence/4.8.RenameFile.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System\nFileSystemService" as System participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login diff --git a/UML/4.Sequence/4.9.EditFile.puml b/UML/4.Sequence/4.9.EditFile.puml index 3504776..114147a 100644 --- a/UML/4.Sequence/4.9.EditFile.puml +++ b/UML/4.Sequence/4.9.EditFile.puml @@ -6,9 +6,9 @@ autonumber actor User boundary InterfaceUI -participant System +participant "System \n FileSystemService" as system participant Server -participant Firebase +participant "Provider" as Firebase activate User group#Gold User login @@ -21,16 +21,16 @@ User <- InterfaceUI: Show Editor deactivate InterfaceUI User -> InterfaceUI: Save file -InterfaceUI -> System: Edit file -System -> Firebase: Edit file +InterfaceUI -> system: Edit file +system -> Firebase: Edit file alt #LightGreen Ok - System <-- Firebase: Edit file successful - InterfaceUI <- System: Edit file successful + system <-- Firebase: Edit file successful + InterfaceUI <- system: Edit file successful User <- InterfaceUI: Edit file successful else #Pink Error - System <-- Firebase: Edit file error - InterfaceUI <- System: Edit file error + system <-- Firebase: Edit file error + InterfaceUI <- system: Edit file error User x<- InterfaceUI: Edit file error end diff --git a/_2_generate_png.sh b/_2_generate_png.sh index 62a66fd..5fa5326 100644 --- a/_2_generate_png.sh +++ b/_2_generate_png.sh @@ -1,19 +1,34 @@ #!/bin/bash echo 'Running Script' -PATH_UML_INPUT="/Users/nonodev96/WebstormProjects/THUMDER/UML/0.Project/" +PATH_UML_INPUT="/Users/nonodev96/WebstormProjects/THUMDER/UML/4.Sequence/" PATH_UML_OUTPUT="/Users/nonodev96/PNG/" FILES=" -0.0.Gantt-2021-08 -0.0.Gantt-2021-09 -0.0.Gantt-2021-10 -0.0.Gantt-2021-11 -0.0.Gantt-2021-12 -0.0.Gantt-2022-01 -0.0.Gantt-2022-02 -0.0.Gantt-2022-03 -0.0.Gantt-2022-04 +4.1.SignIn +4.2.LogIn +4.3.CreateFile +4.4.ModifyAccount +4.5.ShowInfoApp +4.7.DeleteFile +4.8.RenameFile +4.9.EditFile +4.10.AutocompleteCode +4.11.ShowDocumentationCode +4.12.ShowErrorsInCode +4.13.ShowLogs +4.14.ModifyMemory +4.15.ModifyRegisters +4.16.ShowPipeline +4.17.ShowDiagram +4.18.ShowMemoryCode +4.19.ShowMemory +4.20.ShowRegisters +4.21.Config +4.22.Calculator +4.23.LoadSimulation +4.24.NextStepInSimulation +4.25.Simulation " for filename in $FILES ; do echo $filename diff --git a/angular.json b/angular.json index 3430b59..b91923d 100644 --- a/angular.json +++ b/angular.json @@ -46,6 +46,11 @@ "input": "./wiki/wiki-assets", "output": "./wiki-assets/" }, + { + "glob": "*.png", + "input": "./assets/", + "output": "./assets/" + }, { "glob": "LICENSE.md", "input": "./", diff --git a/package.json b/package.json index 6d79c39..2d54479 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "thumder", - "version": "1.5.0", + "version": "1.6.0", "private": true, "description": "TFG - THUMDER (THe UltiMate Dlx EmulatoR): emulador multiplataforma DLX con fines didácticos", "keywords": [ "angular", - "angular 10", + "angular 12", "electron", "nodejs", "typescript", @@ -17,7 +17,7 @@ "linux", "dlx", "windlx", - "DLX-simulator", + "DLX-emulator", "simulator" ], "homepage": "https://github.com/nonodev96/THUMDER", @@ -133,7 +133,7 @@ "core-js": "3.6.5", "cross-env": "7.0.2", "cypress": "9.1.0", - "electron": "16.2.0", + "electron": ">=16.2.6", "electron-builder": "23.0.3", "electron-chromedriver": "14.0.0", "electron-reload": "1.5.0", diff --git a/src/app/CONSTANTS.ts b/src/app/CONSTANTS.ts index c86fc70..2e6de27 100644 --- a/src/app/CONSTANTS.ts +++ b/src/app/CONSTANTS.ts @@ -427,7 +427,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/pipeline", displayName: "Pipeline", data: { breadcrumb: "Pipeline" }, - icon: "fas fa-desktop" + icon: "fas fa-desktop", + show: true }, CYCLE_CLOCK_DIAGRAM: { lang: "CYCLE_CLOCK_DIAGRAM", @@ -435,7 +436,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/cycle-clock-diagram", displayName: "Cycle clock diagram", data: { breadcrumb: "Cycle-clock-diagram" }, - icon: "fas fa-desktop" + icon: "fas fa-desktop", + show: true }, REGISTERS: { lang: "REGISTERS", @@ -443,7 +445,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/registers", displayName: "Registers", data: { breadcrumb: "Registers" }, - icon: "fas fa-microchip" + icon: "fas fa-microchip", + show: true }, MEMORY: { lang: "MEMORY", @@ -451,7 +454,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/memory", displayName: "Memory", data: { breadcrumb: "Memory" }, - icon: "fas fa-memory" + icon: "fas fa-memory", + show: true }, CODE: { lang: "CODE", @@ -459,7 +463,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/code", displayName: "Code", data: { breadcrumb: "Code" }, - icon: "fas fa-calculator" + icon: "fas fa-calculator", + show: true }, STATISTICS: { lang: "STATISTICS", @@ -467,7 +472,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/statistics", displayName: "Statistics", data: { breadcrumb: "Statistics" }, - icon: "fas fa-chart-bar" + icon: "fas fa-chart-bar", + show: true }, FILE_MANAGER: { lang: "FILE_MANAGER", @@ -475,7 +481,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/file-manager", displayName: "File Manager", data: { breadcrumb: "File Manager" }, - icon: "far fa-folder-open" + icon: "far fa-folder-open", + show: true }, EDITOR: { lang: "EDITOR", @@ -483,7 +490,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/editor", displayName: "Editor", data: { breadcrumb: "Editor" }, - icon: "far fa-file" + icon: "far fa-file", + show: true }, MULTIVIEW: { lang: "MULTIVIEW", @@ -491,7 +499,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/multiview", displayName: "Multiview", data: { breadcrumb: "Multiview" }, - icon: "fas fa-table" + icon: "fas fa-table", + show: true }, CALCULATOR: { lang: "CALCULATOR", @@ -499,7 +508,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/calculator", displayName: "Calculator", data: { breadcrumb: "calculator" }, - icon: "fas fa-calculator" + icon: "fas fa-calculator", + show: true }, DOCUMENTATION: { lang: "DOCUMENTATION", @@ -507,7 +517,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/documentation", displayName: "Documentation", data: { breadcrumb: "Documentation" }, - icon: "fas fa-book" + icon: "fas fa-book", + show: true }, CONFIG: { lang: "CONFIG", @@ -515,7 +526,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/config", displayName: "Config", data: { breadcrumb: "config" }, - icon: "fas fa-wrench" + icon: "fas fa-wrench", + show: true }, DEBUG: { lang: "DEBUG", @@ -523,7 +535,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/debug", displayName: "Debug", data: { breadcrumb: "Debug" }, - icon: "fas fa-bug" + icon: "fas fa-bug", + show: AppConfig.environment === "DEV" }, LOGGER: { lang: "LOGGER", @@ -531,7 +544,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/logger", displayName: "Logger", data: { breadcrumb: "Logger" }, - icon: "fas fa-file-code" + icon: "fas fa-file-code", + show: AppConfig.environment === "DEV" }, PROFILE: { lang: "PROFILE", @@ -539,7 +553,8 @@ export const AUTH_ROUTES: PublicRoutesList = { routerLink: "/auth/profile", displayName: "Profile", data: { breadcrumb: "Profile" }, - icon: "fas fa-user" + icon: "fas fa-user", + show: AppConfig.environment === "DEV" } }; diff --git a/src/app/Types.ts b/src/app/Types.ts index 72479b4..07e3357 100644 --- a/src/app/Types.ts +++ b/src/app/Types.ts @@ -113,6 +113,7 @@ export type PublicRoutes_SET = { path: string; routerLink: string; displayName: string; + show: boolean; data?: any; icon?: string; children?: PublicRoutes[]; diff --git a/src/app/__core/TypesData.ts b/src/app/__core/TypesData.ts index f9adb15..13b93e9 100644 --- a/src/app/__core/TypesData.ts +++ b/src/app/__core/TypesData.ts @@ -1,7 +1,7 @@ import { Utils } from "../Utils"; export class Int32 { - // Se almacena en cadena de texto binaria, siempra + // Se almacena en cadena de texto binaria private _value: number = 0; get binary(): string { diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 349453d..dbb2942 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -30,6 +30,8 @@ import { CovalentCodeEditorModule } from "@covalent/code-editor"; import { ModalComponent } from './modals/modal/modal.component'; import { DebugComponent } from './windows/debug/debug.component'; import { DragDropModule } from "@angular/cdk/drag-drop"; +import { DocsItemComponent } from "./docs-item/docs-item.component"; +import { MarkdownModule } from "ngx-markdown"; @NgModule({ @@ -49,7 +51,8 @@ import { DragDropModule } from "@angular/cdk/drag-drop"; SharedModule, CovalentCodeEditorModule, - DragDropModule + DragDropModule, + MarkdownModule ], declarations: [ // Aside @@ -72,6 +75,7 @@ import { DragDropModule } from "@angular/cdk/drag-drop"; // xTerm XtermComponent, BreadcrumbComponent, + DocsItemComponent, // MemoryComponent, EditMemoryBinary32Component, @@ -99,6 +103,7 @@ import { DragDropModule } from "@angular/cdk/drag-drop"; // xTerm XtermComponent, BreadcrumbComponent, + DocsItemComponent, PixiPipelineComponent, EditMemoryBinary32Component, diff --git a/src/app/components/docs-item/docs-item.component.html b/src/app/components/docs-item/docs-item.component.html new file mode 100644 index 0000000..6f8cebf --- /dev/null +++ b/src/app/components/docs-item/docs-item.component.html @@ -0,0 +1,19 @@ +
+
+

+ + {{ item.title }} + +

+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/src/app/components/docs-item/docs-item.component.ts b/src/app/components/docs-item/docs-item.component.ts new file mode 100644 index 0000000..50ba451 --- /dev/null +++ b/src/app/components/docs-item/docs-item.component.ts @@ -0,0 +1,51 @@ +import { Component, Input, OnInit, Renderer2, ViewChild } from "@angular/core"; +import { Router } from "@angular/router"; +import { MarkdownComponent, MarkdownService } from "ngx-markdown"; +import { ViewportScroller } from "@angular/common"; +import { REGEX_IS_ABSOLUTE_HREF } from "../../CONSTANTS"; +import { TypeIdTitleFile } from "../../Types"; + +@Component({ + selector: "THUMDER-docs-item", + templateUrl: "./docs-item.component.html", + styleUrls: [] +}) +export class DocsItemComponent implements OnInit { + + @Input() + public item: TypeIdTitleFile; + + @ViewChild("markdownComponentID", { static: false }) + private markdownComponentID: MarkdownComponent; + private listenObj: any; + + constructor(private markdownService: MarkdownService, + private scroller: ViewportScroller, + private router: Router, + private renderer: Renderer2,) { + } + + ngOnInit(): void { + } + + public onMarkdownLoad(): void { + if (this.markdownComponentID) { + this.listenObj = this.renderer.listen(this.markdownComponentID.element.nativeElement, "click", (e: Event) => { + if (e.target && (e.target as any).tagName === "A") { + const el = (e.target as HTMLElement); + const linkURL = el.getAttribute && el.getAttribute("href"); + if (linkURL && !REGEX_IS_ABSOLUTE_HREF.test(linkURL)) { + e.preventDefault(); + const id = linkURL.replace("#", ""); + this.scrollToAnchor(id); + } + } + }); + } + } + + private scrollToAnchor(scrollToAnchor: string): void { + this.scroller.scrollToAnchor(scrollToAnchor); + } + +} diff --git a/src/app/components/navbars/auth-navbar/auth-navbar.component.html b/src/app/components/navbars/auth-navbar/auth-navbar.component.html index 489c5a3..f96d520 100644 --- a/src/app/components/navbars/auth-navbar/auth-navbar.component.html +++ b/src/app/components/navbars/auth-navbar/auth-navbar.component.html @@ -11,7 +11,7 @@
  • - Home + {{ 'HOME' | translate }}
    • @@ -21,9 +21,11 @@ class="nav-link dropdown-toggle">{{ 'NAVIGATION.PAGES' | translate }} @@ -138,41 +140,41 @@ - + - +
  • + + + +
    • + --> - {{'MACHINE.Uint8Array' | translate}} + {{'MACHINE.UINT8ARRAY' | translate}}

    {{ (machine.registers.F[address].binary | binary32_to_decimal_IEEE754 | uint_IEEE754_32) }}

    @@ -286,7 +286,7 @@

    {{'MACHINE.REGISTERS_DO - {{'MACHINE.Uint8Array' | translate}} + {{'MACHINE.UINT8ARRAY' | translate}}

    {{ (machine.registers.F[address].binary + machine.registers.F[address + 1].binary) | binary64_to_decimal_IEEE754 | uint_IEEE754_64 }}

    diff --git a/src/app/views/_index/index.view.html b/src/app/views/_index/index.view.html index 1ebf9d3..fbef570 100644 --- a/src/app/views/_index/index.view.html +++ b/src/app/views/_index/index.view.html @@ -33,7 +33,7 @@

    {{ ("NAVIGATION." + item.lang) | translate }}

    -

    {{ 'Machine' | translate }}

    +

    {{ 'PAGES.INDEX.MACHINE' | translate }}

    @@ -50,7 +50,7 @@

    {{ 'Machine' | translate }}

    -

    {{ 'IDE' | translate }}

    +

    {{ 'PAGES.INDEX.IDE' | translate }}

    @@ -61,7 +61,7 @@

    {{ 'IDE' | translate }}

    -

    {{ 'Utils' | translate }}

    +

    {{ 'PAGES.INDEX.UTILS' | translate }}

    @@ -70,14 +70,14 @@

    {{ 'Utils' | translate }}

    -

    {{ 'Config' | translate }}

    +

    {{ 'PAGES.INDEX.CONFIG' | translate }}

    -

    {{ 'Debug' | translate }}

    +

    {{ 'PAGES.INDEX.DEBUG' | translate }}

    diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index b9b497a..f081b5f 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1,4 +1,5 @@ { + "HOME": "Home", "ERROR": { "TITLE": "Error: {{title}}", "MESSAGE": "Message: {{message}}" @@ -118,6 +119,7 @@ "SET_MEMORY_VALUE": "Set memory value", "INTEGER": "Integer", "REGISTER": "Register", + "UINT8ARRAY": "Uint8", "MEMORY": "Memory", "DECIMAL": "Decimal", "HEXADECIMAL": "Hexadecimal", @@ -214,6 +216,11 @@ }, "PAGES": { "INDEX": { + "MACHINE": "Machine", + "IDE": "IDE", + "UTILS": "Utils", + "CONFIG": "Config", + "DEBUG": "Debug", "PAGES": "Pages", "MORE_INFO": "More info" }, diff --git a/src/assets/i18n/sp.json b/src/assets/i18n/sp.json index fa7c052..6399b34 100644 --- a/src/assets/i18n/sp.json +++ b/src/assets/i18n/sp.json @@ -1,4 +1,5 @@ { + "HOME": "Inicio", "ERROR": { "TITLE": "Error: {{title}}", "MESSAGE": "Mensaje: {{message}}" @@ -214,6 +215,11 @@ }, "PAGES": { "INDEX": { + "MACHINE": "Máquina", + "IDE": "IDE", + "UTILS": "Utilidades", + "CONFIG": "Configuración", + "DEBUG": "Desarrollo", "PAGES": "Páginas", "MORE_INFO": "Más información" }, diff --git a/wiki b/wiki index 0af287d..2ee4c9c 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 0af287df6a2a4eb5687fe2f7e177798f3b634d02 +Subproject commit 2ee4c9caafcd71980f6c66a41f13f3c6c5dc8695