Skip to content

Commit b6aff73

Browse files
authored
Merge pull request #222 from ConnorGaskill/development
Set all routes to lowercase.
2 parents 9f17f5d + 57f2570 commit b6aff73

6 files changed

Lines changed: 20 additions & 22 deletions

File tree

modelcabinet.client/src/app/About-ModelCabinet/About-ModelCabinet.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
22

3-
import { AboutModelCabinetComponent } from './About-ModelCabinet.component';
3+
import { AboutModelCabinetComponent } from './about-modelcabinet.component';
44
import { ContributorsComponent } from '../components/contributors/contributors.component';
55
import { provideHttpClient } from '@angular/common/http';
66
import { provideHttpClientTesting } from '@angular/common/http/testing';

modelcabinet.client/src/app/About-ModelCabinet/About-ModelCabinet.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { Component } from '@angular/core';
22

33
@Component({
44
selector: 'app-about-modelcabinet',
5-
templateUrl: './About-ModelCabinet.component.html',
6-
styleUrl: './About-ModelCabinet.component.css'
5+
templateUrl: './about-modelcabinet.component.html',
6+
styleUrl: './about-modelcabinet.component.css'
77
})
88
export class AboutModelCabinetComponent {
99
}

modelcabinet.client/src/app/Help-Page/Help-Page.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { Component } from '@angular/core';
22

33
@Component({
44
selector: 'app-about1-project',
5-
templateUrl: './Help-Page.component.html',
6-
styleUrl: './Help-Page.component.css'
5+
templateUrl: './help-page.component.html',
6+
styleUrl: './help-page.component.css'
77
})
88
export class HelpProjectComponent {
99

modelcabinet.client/src/app/app-routing.module.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,20 @@ import { nonAuthGuard } from './guards/non-auth.guard';
2020

2121
const routes: Routes = [
2222
{ path: '', pathMatch: "full", component: LandingPageComponent },
23-
{ path: 'LandingPage', redirectTo: '' },
24-
{ path: 'Projects', component: ProjectListPageComponent, canActivate: [authGuard] },
25-
{ path: 'Projects/:id', component: ProjectPageComponent, canActivate: [authGuard] },
26-
{ path: 'About-ModelCabinet', component: AboutModelCabinetComponent },
23+
{ path: 'landingPage', redirectTo: '' },
24+
{ path: 'projects', component: ProjectListPageComponent, canActivate: [authGuard] },
25+
{ path: 'projects/:id', component: ProjectPageComponent, canActivate: [authGuard] },
26+
{ path: 'about-modelcabinet', component: AboutModelCabinetComponent },
2727
{ path: 'changelog', component: ChangelogComponent },
2828
{ path: `assets`, component: AssetListComponent, canActivate: [authGuard] },
29-
{ path: 'Help', component: HelpProjectComponent },
30-
{ path: 'Assets', component: AssetListComponent, canActivate: [authGuard] },
31-
{ path: 'Assets/:id', component: AssetDetailComponent, canActivate: [authGuard] },
32-
{ path: 'User', component: ProfilePageComponent, canActivate: [authGuard] },
29+
{ path: 'help', component: HelpProjectComponent },
30+
{ path: 'assets', component: AssetListComponent, canActivate: [authGuard] },
31+
{ path: 'assets/:id', component: AssetDetailComponent, canActivate: [authGuard] },
32+
{ path: 'user', component: ProfilePageComponent, canActivate: [authGuard] },
3333
{ path: 'coming-soon', component: ComingSoonComponent },
34-
{ path: 'Edit-Tags', component: TagEditComponent, canActivate: [authGuard] },
34+
{ path: 'edit-Tags', component: TagEditComponent, canActivate: [authGuard] },
3535
{ path: 'login', component: LoginComponent, canActivate: [nonAuthGuard] },
36-
{ path: 'Login', component: LoginComponent, canActivate: [nonAuthGuard] }, // duplicated for case insensitivity
3736
{ path: 'register', component: RegisterComponent, canActivate: [nonAuthGuard] },
38-
{ path: 'Register', component: RegisterComponent, canActivate: [nonAuthGuard] }, // duplicated for case insensitivity
3937
{ path: '**', component: PageNotFoundComponent }
4038
];
4139

modelcabinet.client/src/app/landing-page/landing-page.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ <h1 class="display-4 fw-bold text-primary">ModelCabinet</h1>
55
Effortlessly manage your 3D models—upload, view, and download STL files anytime, anywhere.
66
</p>
77
<div class="d-flex justify-content-center mt-4">
8-
<button class="btn btn-danger btn-lg me-3" routerLink="Help">Get Help</button>
9-
<button class="btn btn-outline-secondary btn-lg" routerLink="/About-ModelCabinet">Learn More</button>
8+
<button class="btn btn-danger btn-lg me-3" routerLink="help">Get Help</button>
9+
<button class="btn btn-outline-secondary btn-lg" routerLink="/about-modelcabinet">Learn More</button>
1010
</div>
1111

1212
<!-- Call to Action Section -->

modelcabinet.client/src/app/nav-bar/nav-bar.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
<li class="nav-item"><a class="nav-link" routerLink="/" routerLinkActive="active">Home</a></li>
2323

24-
<li class="nav-item"><a class="nav-link" routerLink="/About-ModelCabinet" routerLinkActive="active">About ModelCabinet</a></li>
24+
<li class="nav-item"><a class="nav-link" routerLink="/about-modelcabinet" routerLinkActive="active">About ModelCabinet</a></li>
2525

26-
<li class="nav-item"><a class="nav-link" routerLink="Projects">Projects</a></li>
26+
<li class="nav-item"><a class="nav-link" routerLink="projects">Projects</a></li>
2727
<li class="nav-item"><a class="nav-link" routerLink="/changelog">Changelog</a></li>
2828

29-
<li class="nav-item"><a class="nav-link" routerLink="Help">Help</a></li>
29+
<li class="nav-item"><a class="nav-link" routerLink="help">Help</a></li>
3030

3131
<li class="nav-item d-flex align-items-center justify-content-center">
3232
<form class="d-flex" (submit)="onSearch($event)">
@@ -45,7 +45,7 @@
4545
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
4646
<!-- Conditionally render links based on user login state -->
4747
<li *ngIf="isAuthenticated()">
48-
<a class="dropdown-item" routerLink="/User">User</a>
48+
<a class="dropdown-item" routerLink="/user">User</a>
4949
</li>
5050
<li *ngIf="isAuthenticated()">
5151
<!-- Button to trigger the logout confirmation modal -->

0 commit comments

Comments
 (0)