Skip to content

Commit c958fef

Browse files
committed
Format code in project shopapp-frontend
1 parent 2f6b6fe commit c958fef

File tree

70 files changed

+2176
-1972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2176
-1972
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
2-
import { provideServerRendering } from '@angular/platform-server';
3-
import { appConfig } from './app.config';
1+
import { mergeApplicationConfig, ApplicationConfig } from '@angular/core'
2+
import { provideServerRendering } from '@angular/platform-server'
3+
import { appConfig } from './app.config'
44

55
const serverConfig: ApplicationConfig = {
66
providers: [
77
provideServerRendering()
88
]
9-
};
9+
}
1010

11-
export const config = mergeApplicationConfig(appConfig, serverConfig);
11+
export const config = mergeApplicationConfig(appConfig, serverConfig)

shopapp-angular/src/app/app.config.ts

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
import { ApplicationConfig } from '@angular/core';
2-
import { provideRouter } from '@angular/router';
3-
import { provideHttpClient } from '@angular/common/http';
4-
import { withFetch } from '@angular/common/http';
1+
import { ApplicationConfig } from '@angular/core'
2+
import { provideRouter } from '@angular/router'
3+
import { provideHttpClient } from '@angular/common/http'
4+
import { withFetch } from '@angular/common/http'
55

6-
import { routes } from './app.routes';
7-
import { provideClientHydration } from '@angular/platform-browser';
8-
import { Provider } from '@angular/core';
9-
import { HTTP_INTERCEPTORS } from '@angular/common/http';
10-
import { TokenInterceptor } from './interceptors/token.interceptor';
11-
import { importProvidersFrom } from '@angular/core';
12-
import { HttpClientModule } from '@angular/common/http';
13-
import { adminRoutes } from './components/admin/admin-routes';
14-
import { RouterModule } from '@angular/router';
6+
import { routes } from './app.routes'
7+
import { provideClientHydration } from '@angular/platform-browser'
8+
import { Provider } from '@angular/core'
9+
import { HTTP_INTERCEPTORS } from '@angular/common/http'
10+
import { TokenInterceptor } from './interceptors/token.interceptor'
11+
import { importProvidersFrom } from '@angular/core'
12+
import { HttpClientModule } from '@angular/common/http'
13+
import { adminRoutes } from './components/admin/admin-routes'
14+
import { RouterModule } from '@angular/router'
1515

1616
const tokenInterceptorProvider: Provider =
17-
{ provide: HTTP_INTERCEPTORS, useClass: TokenInterceptor, multi: true };
18-
17+
{provide: HTTP_INTERCEPTORS, useClass: TokenInterceptor, multi: true}
1918

2019
export const appConfig: ApplicationConfig = {
2120
providers: [
22-
provideRouter(routes),
21+
provideRouter(routes),
2322
//importProvidersFrom(RouterModule.forRoot(routes)),
24-
importProvidersFrom(RouterModule.forChild(adminRoutes)),
23+
importProvidersFrom(RouterModule.forChild(adminRoutes)),
2524
provideHttpClient(withFetch()),
2625
//provideHttpClient(),
2726
tokenInterceptorProvider,
2827
provideClientHydration(),
29-
importProvidersFrom(HttpClientModule),
28+
importProvidersFrom(HttpClientModule)
3029
]
31-
};
30+
}

shopapp-angular/src/app/app.routes.ts

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
import { NgModule, importProvidersFrom } from '@angular/core';
2-
import { RouterModule, Routes } from '@angular/router';
3-
import { CommonModule } from '@angular/common';
4-
import { HomeComponent } from './components/home/home.component';
5-
import { LoginComponent } from './components/login/login.component';
6-
import { RegisterComponent } from './components/register/register.component';
7-
import {
8-
DetailProductComponent
9-
} from './components/detail-product/detail-product.component';
10-
import { OrderComponent } from './components/order/order.component';
11-
import { OrderDetailComponent } from './components/detail-order/order.detail.component';
12-
import { UserProfileComponent } from './components/user-profile/user.profile.component';
13-
import { AdminComponent } from './components/admin/admin.component';
14-
import { AuthGuardFn } from './guards/auth.guard';
15-
import { AdminGuardFn } from './guards/admin.guard';
1+
import { NgModule, importProvidersFrom } from '@angular/core'
2+
import { RouterModule, Routes } from '@angular/router'
3+
import { CommonModule } from '@angular/common'
4+
import { HomeComponent } from './components/home/home.component'
5+
import { LoginComponent } from './components/login/login.component'
6+
import { RegisterComponent } from './components/register/register.component'
7+
import {
8+
DetailProductComponent
9+
} from './components/detail-product/detail-product.component'
10+
import { OrderComponent } from './components/order/order.component'
11+
import { OrderDetailComponent } from './components/detail-order/order.detail.component'
12+
import { UserProfileComponent } from './components/user-profile/user.profile.component'
13+
import { AdminComponent } from './components/admin/admin.component'
14+
import { AuthGuardFn } from './guards/auth.guard'
15+
import { AdminGuardFn } from './guards/admin.guard'
1616
//import { OrderAdminComponent } from './components/admin/order/order.admin.component';
1717

1818
export const routes: Routes = [
19-
{ path: '', component: HomeComponent },
20-
{ path: 'login', component: LoginComponent },
21-
{ path: 'register', component: RegisterComponent },
22-
{ path: 'products/:id', component: DetailProductComponent },
23-
{ path: 'orders', component: OrderComponent,canActivate:[AuthGuardFn] },
24-
{ path: 'user-profile', component: UserProfileComponent, canActivate:[AuthGuardFn] },
25-
{ path: 'orders/:id', component: OrderDetailComponent },
26-
//Admin
27-
{
28-
path: 'admin',
29-
component: AdminComponent,
30-
canActivate:[AdminGuardFn]
31-
},
32-
];
19+
{path: '', component: HomeComponent},
20+
{path: 'login', component: LoginComponent},
21+
{path: 'register', component: RegisterComponent},
22+
{path: 'products/:id', component: DetailProductComponent},
23+
{path: 'orders', component: OrderComponent, canActivate: [AuthGuardFn]},
24+
{path: 'user-profile', component: UserProfileComponent, canActivate: [AuthGuardFn]},
25+
{path: 'orders/:id', component: OrderDetailComponent},
26+
//Admin
27+
{
28+
path: 'admin',
29+
component: AdminComponent,
30+
canActivate: [AdminGuardFn]
31+
}
32+
]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { Component } from '@angular/core';
2-
import { RouterModule } from '@angular/router';
1+
import { Component } from '@angular/core'
2+
import { RouterModule } from '@angular/router'
3+
34
@Component({
45
selector: 'app-root',
56
templateUrl: './app.component.html',
67
styleUrls: ['./app.component.scss'],
78
standalone: true,
89
imports: [
9-
RouterModule,
10+
RouterModule
1011
]
1112
})
1213
export class AppComponent {
13-
1414
}

shopapp-angular/src/app/components/admin/admin-routes.ts

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
import { AdminComponent } from "./admin.component";
2-
import { OrderAdminComponent } from "./order/order.admin.component";
3-
import { DetailOrderAdminComponent } from "./detail-order/detail.order.admin.component";
4-
import { Route, Router,Routes } from "@angular/router";
5-
import { NgModule } from "@angular/core";
6-
import { RouterModule } from "@angular/router";
7-
import { ProductAdminComponent } from "./product/product.admin.component";
8-
import { CategoryAdminComponent } from "./category/category.admin.component";
9-
import { UpdateProductAdminComponent } from "./product/update/update.product.admin.component";
10-
import { InsertProductAdminComponent } from "./product/insert/insert.product.admin.component";
11-
import { InsertCategoryAdminComponent } from "./category/insert/insert.category.admin.component";
12-
import { UpdateCategoryAdminComponent } from "./category/update/update.category.admin.component";
13-
import { UserAdminComponent } from "./user/user.admin.component";
1+
import { AdminComponent } from './admin.component'
2+
import { OrderAdminComponent } from './order/order.admin.component'
3+
import { DetailOrderAdminComponent } from './detail-order/detail.order.admin.component'
4+
import { Route, Router, Routes } from '@angular/router'
5+
import { NgModule } from '@angular/core'
6+
import { RouterModule } from '@angular/router'
7+
import { ProductAdminComponent } from './product/product.admin.component'
8+
import { CategoryAdminComponent } from './category/category.admin.component'
9+
import { UpdateProductAdminComponent } from './product/update/update.product.admin.component'
10+
import { InsertProductAdminComponent } from './product/insert/insert.product.admin.component'
11+
import { InsertCategoryAdminComponent } from './category/insert/insert.category.admin.component'
12+
import { UpdateCategoryAdminComponent } from './category/update/update.category.admin.component'
13+
import { UserAdminComponent } from './user/user.admin.component'
1414

1515
export const adminRoutes: Routes = [
16-
{
17-
path: 'admin',
18-
component: AdminComponent,
19-
children: [
20-
{
21-
path: 'orders',
22-
component: OrderAdminComponent
23-
},
24-
{
25-
path: 'products',
26-
component: ProductAdminComponent
27-
},
28-
{
29-
path: 'categories',
30-
component: CategoryAdminComponent
31-
},
32-
//sub path
33-
{
34-
path: 'orders/:id',
35-
component: DetailOrderAdminComponent
36-
},
37-
{
38-
path: 'products/update/:id',
39-
component: UpdateProductAdminComponent
40-
},
41-
{
42-
path: 'products/insert',
43-
component: InsertProductAdminComponent
44-
},
45-
//categories
46-
{
47-
path: 'categories/update/:id',
48-
component: UpdateCategoryAdminComponent
49-
},
50-
{
51-
path: 'categories/insert',
52-
component: InsertCategoryAdminComponent
53-
},
54-
{
55-
path: 'users',
56-
component: UserAdminComponent
57-
},
58-
]
59-
}
60-
];
16+
{
17+
path: 'admin',
18+
component: AdminComponent,
19+
children: [
20+
{
21+
path: 'orders',
22+
component: OrderAdminComponent
23+
},
24+
{
25+
path: 'products',
26+
component: ProductAdminComponent
27+
},
28+
{
29+
path: 'categories',
30+
component: CategoryAdminComponent
31+
},
32+
//sub path
33+
{
34+
path: 'orders/:id',
35+
component: DetailOrderAdminComponent
36+
},
37+
{
38+
path: 'products/update/:id',
39+
component: UpdateProductAdminComponent
40+
},
41+
{
42+
path: 'products/insert',
43+
component: InsertProductAdminComponent
44+
},
45+
//categories
46+
{
47+
path: 'categories/update/:id',
48+
component: UpdateCategoryAdminComponent
49+
},
50+
{
51+
path: 'categories/insert',
52+
component: InsertCategoryAdminComponent
53+
},
54+
{
55+
path: 'users',
56+
component: UserAdminComponent
57+
}
58+
]
59+
}
60+
]
6161
/*
6262
@NgModule({
6363
imports: [
Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,55 @@
11
<div class="container-fluid">
2-
<header class="header bg-success text-white d-flex justify-content-between">
3-
<h1 class="header-title">Dashboard Header</h1>
4-
<!-- Logout Button -->
5-
<button class="btn btn-danger btn-sm" (click)="logout()">Logout</button>
6-
</header>
7-
<div class="row">
8-
<nav id="sidebar" class="col-md-2 col-lg-2 d-md-block bg-light sidebar">
9-
<div class="position-sticky">
10-
<ul class="nav flex-column">
11-
<li class="nav-item">
12-
<a class="nav-link"
13-
(click)="showAdminComponent('orders')"
14-
routerLink="/admin/orders"
15-
routerLinkActive="active">
16-
<i class="fab fa-first-order icon"></i>Orders
17-
</a>
18-
</li>
19-
<li class="nav-item">
20-
<a class="nav-link"
21-
(click)="showAdminComponent('categories')"
22-
routerLink="/admin/categories"
23-
routerLinkActive="active">
24-
<i class="fab fa-canadian-maple-leaf icon"></i>Categories
25-
</a>
26-
</li>
27-
<li class="nav-item">
28-
<a class="nav-link"
29-
(click)="showAdminComponent('products')"
30-
routerLink="/admin/products"
31-
routerLinkActive="active">
32-
<i class="fab fa-codepen icon"></i>Products
33-
</a>
34-
</li>
35-
</ul>
36-
</div>
37-
</nav>
38-
<div class="col-md-10 col-lg-10 overflow-auto">
39-
<!--
40-
<ng-container [ngSwitch]="adminComponent">
41-
<app-order-admin *ngSwitchCase="'orders'"></app-order-admin>
42-
<app-product-admin *ngSwitchCase="'products'"></app-product-admin>
43-
<app-category-admin *ngSwitchCase="'categories'"></app-category-admin>
44-
</ng-container>
45-
-->
46-
<router-outlet></router-outlet>
2+
<header class="header bg-success text-white d-flex justify-content-between">
3+
<h1 class="header-title">Dashboard Header</h1>
4+
<!-- Logout Button -->
5+
<button (click)="logout()" class="btn btn-danger btn-sm">Logout</button>
6+
</header>
7+
<div class="row">
8+
<nav class="col-md-2 col-lg-2 d-md-block bg-light sidebar" id="sidebar">
9+
<div class="position-sticky">
10+
<ul class="nav flex-column">
11+
<li class="nav-item">
12+
<a
13+
(click)="showAdminComponent('orders')"
14+
class="nav-link"
15+
routerLink="/admin/orders"
16+
routerLinkActive="active"
17+
>
18+
<i class="fab fa-first-order icon"></i>Orders
19+
</a>
20+
</li>
21+
<li class="nav-item">
22+
<a
23+
(click)="showAdminComponent('categories')"
24+
class="nav-link"
25+
routerLink="/admin/categories"
26+
routerLinkActive="active"
27+
>
28+
<i class="fab fa-canadian-maple-leaf icon"></i>Categories
29+
</a>
30+
</li>
31+
<li class="nav-item">
32+
<a
33+
(click)="showAdminComponent('products')"
34+
class="nav-link"
35+
routerLink="/admin/products"
36+
routerLinkActive="active"
37+
>
38+
<i class="fab fa-codepen icon"></i>Products
39+
</a>
40+
</li>
41+
</ul>
4742
</div>
43+
</nav>
44+
<div class="col-md-10 col-lg-10 overflow-auto">
45+
<!--
46+
<ng-container [ngSwitch]="adminComponent">
47+
<app-order-admin *ngSwitchCase="'orders'"></app-order-admin>
48+
<app-product-admin *ngSwitchCase="'products'"></app-product-admin>
49+
<app-category-admin *ngSwitchCase="'categories'"></app-category-admin>
50+
</ng-container>
51+
-->
52+
<router-outlet></router-outlet>
4853
</div>
49-
</div>
54+
</div>
55+
</div>

0 commit comments

Comments
 (0)