Skip to content

Commit

Permalink
Test deployment new 22
Browse files Browse the repository at this point in the history
  • Loading branch information
ndricimrr committed Jan 23, 2024
1 parent d878e1a commit 894a2f2
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# Compiled output
/docs
/dist
/tmp
/out-tsc
Expand Down
16 changes: 8 additions & 8 deletions src/app/modules/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; // CLI imports router
import { NameGeneratorComponent } from '../name-generator/name-generator.component';
import { UserGeneratorComponent } from '../user-generator/user-generator.component';
import { NgModule } from "@angular/core";
import { Routes, RouterModule } from "@angular/router"; // CLI imports router
import { NameGeneratorComponent } from "../name-generator/name-generator.component";
import { UserGeneratorComponent } from "../user-generator/user-generator.component";

const routes: Routes = [
{ path: '', redirectTo: 'generate-users', pathMatch: 'full' },
{ path: 'generate-names', component: NameGeneratorComponent },
{ path: 'generate-users', component: UserGeneratorComponent },
{ path: "", redirectTo: "generate-users", pathMatch: "full" },
{ path: "generate-names", component: NameGeneratorComponent },
{ path: "generate-users", component: UserGeneratorComponent },
];

// configures NgModule imports and exports
@NgModule({
imports: [RouterModule.forRoot(routes)],
imports: [RouterModule.forRoot(routes, { useHash: true })],
exports: [RouterModule],
})
export class AppRoutingModule {}
4 changes: 2 additions & 2 deletions src/app/navigation-bar/navigation-bar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<a
class="nav-link"
[class.active]="activeLink === 'generate-users'"
href="generate-users"
href="#generate-users"
>Generate Users</a
>
</li>
<li class="nav-item">
<a
class="nav-link"
[class.active]="activeLink === 'generate-names'"
href="generate-names"
href="#generate-names"
>Generate Names</a
>
</li>
Expand Down
32 changes: 21 additions & 11 deletions src/app/navigation-bar/navigation-bar.component.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
import { Component } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { Component } from "@angular/core";
import { TranslateService } from "@ngx-translate/core";
import { Router, NavigationEnd } from "@angular/router";

@Component({
selector: 'app-navigation-bar',
templateUrl: './navigation-bar.component.html',
styleUrls: ['./navigation-bar.component.css'],
selector: "app-navigation-bar",
templateUrl: "./navigation-bar.component.html",
styleUrls: ["./navigation-bar.component.css"],
})
export class NavigationBarComponent {
currentLanguage: string;
activeLink: string = 'generate-users';
activeLink: string = "generate-users";

constructor(private languageService: TranslateService) {
const currentPageLink = window.location.pathname.substring(1) || '';
this.activeLink = currentPageLink;
constructor(
private languageService: TranslateService,
private router: Router
) {
this.router.events.subscribe((event) => {
if (event instanceof NavigationEnd) {
// Get the current page link after each navigation
const currentPageLink = this.router.url.substring(1) || "";
console.log(currentPageLink);
this.activeLink = currentPageLink;
}
});

const storedLanguage = sessionStorage.getItem('language');
const storedLanguage = sessionStorage.getItem("language");
this.currentLanguage = storedLanguage || languageService.currentLang;
this.languageService.use(this.currentLanguage);
}

changeLanguage(language: string): void {
this.currentLanguage = language;
this.languageService.use(language);
sessionStorage.setItem('language', language);
sessionStorage.setItem("language", language);
}
}

0 comments on commit 894a2f2

Please sign in to comment.