andreacavalli/cavallium-website
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: andreacavalli:e75fe75a5fdd01dadb5daf0502e9f22c64ee541e
Branches Tags
andreacavalli:master
..
compare: andreacavalli:a7fd44e3a31b8b0de8de58eb3beea173d8bda5a8
Branches Tags
andreacavalli:master

No commits in common. "e75fe75a5fdd01dadb5daf0502e9f22c64ee541e" and "a7fd44e3a31b8b0de8de58eb3beea173d8bda5a8" have entirely different histories.
e75fe75a5f ... a7fd44e3a3

4 changed files with 5 additions and 16 deletions
Show Stats Expand all files Collapse all files

6
src/app/app-routing.module.ts
View File

@ -44,10 +44,6 @@ const routes: Routes = [
];
export const navigationLinks: NavigationLink[] = [
{
text: "Home",
address: "/"
},
{
text: "WarpPI",
address: "/page/WarpPI"
@ -87,7 +83,7 @@ export function fwlinkMatcher(url: UrlSegment[]): UrlMatchResult {
}
@NgModule({
imports: [RouterModule.forRoot(routes, {scrollPositionRestoration: "enabled"})],
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule]
})
export class AppRoutingModule { }

4
src/app/gui/navbar/navbar.component.html
View File

@ -7,14 +7,14 @@
[href]="link.address"
[target]="link.newtab === undefined || link.newtab === true ? '_blank' : '_self'"
rel="noopener"
[class.forcefocus] = "currentDocument?.id == link.address"
[class.forcefocus] = "(currentDocument.onDocumentChange() | async)?.id == link.address"
><span>{{link.text}}</span></a>
<a
*ngIf="link.external !== true"
[routerLink]="link.address"
[target]="link.newtab === true ? '_blank' : '_self'"
rel="noopener"
[class.force-focus] = "'/page/' + currentDocument?.id == link.address || (currentDocument?.id == 'index' && link.address == '/')"
[class.force-focus] = "'/page/' + (currentDocument.onDocumentChange() | async)?.id == link.address"
><span>{{link.text}}</span></a>
</li>
</ul>

9
src/app/gui/navbar/navbar.component.ts
View File

@ -4,8 +4,6 @@ import { ActivatedRoute, UrlSegment } from "@angular/router";
import { map } from "rxjs/operators";
import { CurrentDocumentService } from "src/app/services/current-document.service";
import { navigationLinks } from "src/app/app-routing.module";
import { DocumentData } from "src/app/symbols/DocumentData";
import { Observable } from "rxjs";
@Component({
selector: "app-navbar",
@ -20,13 +18,8 @@ export class NavbarComponent implements OnInit, AfterViewInit {
overflowMax = false;
@ViewChild("navlogo") navLogo: ElementRef<HTMLElement>;
@ViewChild("navbuttons") navButtons: ElementRef<HTMLElement>;
currentDocument: DocumentData;
constructor(private elRef: ElementRef<HTMLElement>, currentDocument: CurrentDocumentService) {
currentDocument.onDocumentChange().subscribe(docData => {
this.currentDocument = docData;
});
}
constructor(private elRef: ElementRef<HTMLElement>, public currentDocument: CurrentDocumentService) { }
ngOnInit() {
}

2
src/documents/software/midi23d.en.md
View File

@ -51,5 +51,5 @@ Enjoy
## Videos
<div style="margin: auto; text-align: center;">
<iframe width="560" height="315" src="https://www.youtube.com/embed/4rcnu8j1Xqk" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen style="max-width: 100%;"></iframe>
<iframe width="560" height="315" src="https://www.youtube.com/embed/4rcnu8j1Xqk" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</div>