Skip to content

Commit

Permalink
new layout
Browse files Browse the repository at this point in the history
add about page
add new routes
angular performance.
  • Loading branch information
nonodev96 committed Nov 4, 2021
1 parent 1173b2f commit 14591e4
Show file tree
Hide file tree
Showing 30 changed files with 422 additions and 213 deletions.
17 changes: 17 additions & 0 deletions ABOUT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
THUMDER - DLX Processor Simulator
=================================

Copyright (©) 2021 The THUMDER project, University of Jaén

* Interface: Antonio Mudarra Machuca
* Core contributors: Antonio Mudarra Machuca

Project URL: [THUMDER Github](https://github.com/nonodev96/THUMDER)

Download: [Releases](https://github.com/nonodev96/THUMDER/releases)

This program is free software: you can redistribute it and/or modify it under the terms. of the MIT License.

This program is distributed in the hope that it will be useful.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7 changes: 7 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright 2021 - Antonio Mudarra Machuca - <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 5 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@
"debug"
],
"assets": [
"src/assets"
"src/assets",
{ "glob": "LICENSE.md", "input": "./", "output": "./assets/md/" },
{ "glob": "README.md", "input": "./", "output": "./assets/md/" },
{ "glob": "ABOUT.md", "input": "./", "output": "./assets/md/" },
{ "glob": "Datapath_Schematic.svg", "input": "./assets", "output": "./assets/" }
],
"styles": [
"src/styles.scss",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thumder",
"version": "1.2.2",
"version": "1.2.3",
"description": "TFG - THUMDER (THe UltiMate Dlx EmulatoR): emulador multiplataforma DLX con fines didácticos",
"homepage": "https://github.com/nonodev96/THUMDER",
"author": {
Expand Down
94 changes: 50 additions & 44 deletions src/app/CONSTAST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,34 @@ export const CONFIG_WEBSOCKET: SocketIoConfig = {
};

export const AUTH_ROUTES: PublicRoutesList = [
{
lang: "CALCULATOR",
path: "calculator",
routerLink: '/auth/calculator',
displayName: 'Calculator',
data: {breadcrumb: 'calculator'}
},
{
lang: "CODE",
path: "code",
routerLink: '/auth/code',
displayName: 'Code',
data: {breadcrumb: 'Code'}
},
{
lang: "CONFIG",
path: "config",
routerLink: '/auth/config',
displayName: 'Config',
data: {breadcrumb: 'config'}
},
{
lang: "DOCUMENTATION",
path: "documentation",
routerLink: '/auth/documentation',
displayName: 'Documentation',
data: {breadcrumb: 'Documentation'}
},
{
lang: 'FILE-MANAGER',
path: 'file-manager',
Expand All @@ -339,11 +367,11 @@ export const AUTH_ROUTES: PublicRoutesList = [
data: {breadcrumb: 'IDE'}
},
{
lang: "PIPELINE",
path: "pipeline",
routerLink: '/auth/pipeline',
displayName: 'Pipeline',
data: {breadcrumb: 'Pipeline'}
lang: "MEMORY",
path: "memory",
routerLink: '/auth/memory',
displayName: 'Memory',
data: {breadcrumb: 'Memory'}
},
{
lang: "CYCLE-CLOCK-DIAGRAM",
Expand All @@ -353,18 +381,18 @@ export const AUTH_ROUTES: PublicRoutesList = [
data: {breadcrumb: 'Cycle-clock-diagram'}
},
{
lang: "MEMORY",
path: "memory",
routerLink: '/auth/memory',
displayName: 'Memory',
data: {breadcrumb: 'Memory'}
lang: "PIPELINE",
path: "pipeline",
routerLink: '/auth/pipeline',
displayName: 'Pipeline',
data: {breadcrumb: 'Pipeline'}
},
{
lang: "CODE",
path: "code",
routerLink: '/auth/code',
displayName: 'Code',
data: {breadcrumb: 'Code'}
lang: "PROFILE",
path: "profile",
routerLink: '/auth/profile',
displayName: 'Profile',
data: {breadcrumb: 'Profile'}
},
{
lang: "REGISTERS",
Expand All @@ -380,34 +408,6 @@ export const AUTH_ROUTES: PublicRoutesList = [
displayName: 'Statistics',
data: {breadcrumb: 'Statistics'}
},
{
lang: "PROFILE",
path: "profile",
routerLink: '/auth/profile',
displayName: 'Profile',
data: {breadcrumb: 'Profile'}
},
{
lang: "DOCUMENTATION",
path: "documentation",
routerLink: '/auth/documentation',
displayName: 'Documentation',
data: {breadcrumb: 'Documentation'}
},
{
lang: "CONFIG",
path: "config",
routerLink: '/auth/config',
displayName: 'Config',
data: {breadcrumb: 'config'}
},
{
lang: "CALCULATOR",
path: "calculator",
routerLink: '/auth/calculator',
displayName: 'Calculator',
data: {breadcrumb: 'calculator'}
}
]

export const PUBLIC_ROUTES: PublicRoutes = {
Expand Down Expand Up @@ -445,9 +445,15 @@ export const PUBLIC_ROUTES: PublicRoutes = {
{
lang: "LANDING",
path: "landing",
routerLink: '/landing',
routerLink: '/landing/landing',
displayName: 'Landing',
},
{
lang: "ABOUT",
path: "about",
routerLink: '/landing/about',
displayName: 'About',
},
// _admin views
{
lang: 'ADMIN',
Expand Down
8 changes: 7 additions & 1 deletion src/app/_layouts/admin/layout-admin.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<!-- Main Sidebar Container -->
<app-aside-left></app-aside-left>
<!-- /.aside-left-sidebar -->

<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
Expand All @@ -16,10 +17,15 @@
<h1 class="m-0 text-dark">{{ 'PAGES.HOME.TITLE' | translate }}</h1>
</div><!-- /.col -->
<div class="col-sm-6">

<thumder-breadcrumb></thumder-breadcrumb>

<!--
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a (click)="log('TODO')">Home</a></li>
<li class="breadcrumb-item"><a (click)="log('TO-DO')">Home</a></li>
<li class="breadcrumb-item active">Dashboard v2</li>
</ol>
-->
</div><!-- /.col -->
</div><!-- /.row -->
</div><!-- /.container-fluid -->
Expand Down
15 changes: 8 additions & 7 deletions src/app/_layouts/admin/layout-admin.component.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import {Component, Inject, OnInit} from "@angular/core";
import {DOCUMENT} from "@angular/common";
import { AfterViewInit, Component, Inject, OnInit } from "@angular/core";
import { DOCUMENT } from "@angular/common";

@Component({
selector: "app-admin",
templateUrl: "./layout-admin.component.html",
})
export class LayoutAdminComponent implements OnInit {
constructor(@Inject(DOCUMENT) private document: Document) {
export class LayoutAdminComponent implements OnInit, AfterViewInit {

constructor(@Inject(DOCUMENT)
private document: Document) {
}

ngOnInit(): void {
this.document.body.className = "dx-viewport";
}

log(msg: string) {
console.log(msg)
ngAfterViewInit(): void {
this.document.body.classList.add('dx-viewport', 'sidebar-mini', 'layout-fixed', 'layout-footer-fixed');
}
}
1 change: 1 addition & 0 deletions src/app/_layouts/auth/layout-auth.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<!-- Main Sidebar Container -->
<app-aside-left></app-aside-left>
<!-- /.aside-left-sidebar -->

<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
Expand Down
13 changes: 7 additions & 6 deletions src/app/_layouts/auth/layout-auth.component.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
import { Component, Inject, OnInit } from "@angular/core";
import { AfterViewInit, Component, Inject, OnInit } from "@angular/core";
import { DOCUMENT } from "@angular/common";
import { ActivatedRoute } from "@angular/router";
import { ToastrService } from "ngx-toastr";
import { IndividualConfig } from "ngx-toastr/toastr/toastr-config";

@Component({
selector: "app-auth",
templateUrl: "./layout-auth.component.html",
})
export class LayoutAuthComponent implements OnInit {
export class LayoutAuthComponent implements OnInit, AfterViewInit {

constructor(@Inject(DOCUMENT)
private document: Document) {
}

ngOnInit(): void {
this.document.body.className = "dx-viewport";
}

ngAfterViewInit(): void {
this.document.body.classList.add('dx-viewport', 'sidebar-mini', 'layout-fixed', 'layout-footer-fixed');
}

}
47 changes: 47 additions & 0 deletions src/app/_layouts/landing/layout-landing.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<div class="wrapper">
<!-- Navbar -->
<app-auth-navbar></app-auth-navbar>
<!-- /.navbar -->

<!-- Main Sidebar Container -->
<app-aside-left></app-aside-left>
<!-- /.aside-left-sidebar -->

<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<div class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1 class="m-0 text-dark">{{ 'PAGES.HOME.TITLE' | translate }}</h1>
</div>
<div class="col-sm-6">

<thumder-breadcrumb></thumder-breadcrumb>

</div>
</div><!-- /.row -->
</div><!-- /.container-fluid -->
</div><!-- /.content-header -->


<!-- Main content -->
<section class="content">

<!-- THIS IS THE IMPORTANT -->
<router-outlet></router-outlet>


</section>
<!-- /.content -->
</div>
<!-- /.content-wrapper -->

<!-- Control Sidebar -->
<!-- <app-aside-right></app-aside-right>-->
<!-- /.control-sidebar -->

<!-- Main Footer -->
<app-footer></app-footer>
</div>
21 changes: 21 additions & 0 deletions src/app/_layouts/landing/layout-landing.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { AfterViewInit, Component, Inject, OnInit } from '@angular/core';
import { DOCUMENT } from "@angular/common";

@Component({
selector: 'app-landing',
templateUrl: './layout-landing.component.html'
})
export class LayoutLandingComponent implements OnInit, AfterViewInit {

constructor(@Inject(DOCUMENT)
private document: Document) {
}

ngOnInit(): void {
}

ngAfterViewInit(): void {
this.document.body.classList.add('dx-viewport', 'sidebar-mini', 'layout-fixed', 'layout-footer-fixed');
window.jQuery('[data-widget="pushmenu"]').PushMenu('collapse');
}
}
Loading

0 comments on commit 14591e4

Please sign in to comment.