From 2744daeb1ea0604c7ebc8c57a99102f8bc8a9329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20=C3=87etin?= <92744169+mehmetcetin01140@users.noreply.github.com> Date: Mon, 6 Jan 2025 14:58:04 +0300 Subject: [PATCH 1/5] update tabledoc --- src/views/uikit/tabledoc.ts | 292 +++++++++++++++++++----------------- 1 file changed, 155 insertions(+), 137 deletions(-) diff --git a/src/views/uikit/tabledoc.ts b/src/views/uikit/tabledoc.ts index 7bf74e7..50732ab 100644 --- a/src/views/uikit/tabledoc.ts +++ b/src/views/uikit/tabledoc.ts @@ -15,6 +15,9 @@ import { RatingModule } from 'primeng/rating'; import { Customer, CustomerService, Representative } from '@/src/service/customer.service'; import { Product, ProductService } from '@/src/service/product.service'; import { RippleModule } from 'primeng/ripple'; +import { IconFieldModule } from 'primeng/iconfield'; +import { InputIconModule } from 'primeng/inputicon'; +import { TagModule } from 'primeng/tag'; interface expandedRows { [key: string]: boolean; @@ -22,60 +25,79 @@ interface expandedRows { @Component({ standalone: true, - imports:[TableModule, MultiSelectModule, SelectModule, InputTextModule, SliderModule,ProgressBarModule,ToggleButtonModule,ToastModule, CommonModule, FormsModule,ButtonModule,RatingModule, RippleModule], - template: ` -
+ imports: [ + TableModule, + MultiSelectModule, + SelectModule, + InputTextModule, + SliderModule, + ProgressBarModule, + ToggleButtonModule, + ToastModule, + CommonModule, + FormsModule, + ButtonModule, + RatingModule, + RippleModule, + IconFieldModule, + InputIconModule, + SelectModule, + TagModule + ], + template: `
Filtering
- - -
- - - - - + + +
+ + + + + + +
- -
+ +
Name - +
- -
+ +
Country - +
- -
+ +
Agent - + -
+
Agent Picker
- + -
- - {{ option.name }} +
+ + {{ option.name }}
@@ -83,47 +105,39 @@ interface expandedRows {
- -
+ +
Date - +
- -
+ +
Balance - +
- -
+ +
Status - + - {{ option.label }} +
- -
+ +
Activity - + - -
+ +
{{ activityValues[0] }} {{ activityValues[1] }}
@@ -131,10 +145,10 @@ interface expandedRows {
- -
+ +
Verified - +
@@ -145,32 +159,27 @@ interface expandedRows { {{ customer.name }} - + {{ customer.country.name }} - + {{ customer.representative.name }} {{ customer.date | date: 'MM/dd/yyyy' }} - {{ customer.balance | currency:'USD':'symbol' }} + {{ customer.balance | currency: 'USD' : 'symbol' }} {{ customer.status }} - + - + @@ -189,12 +198,9 @@ interface expandedRows {
Frozen Columns
- + - + Name @@ -211,12 +217,9 @@ interface expandedRows { {{ customer.name }} - {{ customer.id }} - + {{ customer.id }} - + {{ customer.country.name }} {{ customer.date }} @@ -226,14 +229,10 @@ interface expandedRows { {{ customer.activity }} - + {{ customer.representative.name }} - {{ formatCurrency(customer.balance) }} - + {{ formatCurrency(customer.balance) }} @@ -243,28 +242,31 @@ interface expandedRows {
Row Expansion
- -
-
+ +
- Name + + Name Image - Price + + Price - Category + + Category - Reviews + + Reviews - Status + + Status @@ -272,20 +274,17 @@ interface expandedRows { - + {{ product.name }} - - {{ product.price | currency:'USD' }} + + {{ product.price | currency: 'USD' }} {{ product.category }} - {{ product.inventoryStatus }} + + {{ product.inventoryStatus }} @@ -296,19 +295,24 @@ interface expandedRows { - Id + + Id - Customer + + Customer - Date + + Date - Amount + + Amount - Status + + Status @@ -319,9 +323,9 @@ interface expandedRows { {{ order.id }} {{ order.customer }} {{ order.date }} - {{ order.amount | currency:'USD' }} - {{ order.status }} + {{ order.amount | currency: 'USD' }} + + {{ order.status }} @@ -343,9 +347,7 @@ interface expandedRows {
Grouping
- + Name @@ -358,9 +360,7 @@ interface expandedRows { - + {{ customer.representative.name }} @@ -369,8 +369,7 @@ interface expandedRows { {{ customer.name }} - + {{ customer.country.name }} @@ -386,10 +385,9 @@ interface expandedRows {
`, - providers: [ConfirmationService, MessageService, CustomerService, ProductService], + providers: [ConfirmationService, MessageService, CustomerService, ProductService] }) export class TableDoc implements OnInit { - customers1: Customer[] = []; customers2: Customer[] = []; @@ -420,19 +418,22 @@ export class TableDoc implements OnInit { @ViewChild('filter') filter!: ElementRef; - constructor(private customerService: CustomerService, private productService: ProductService) { } + constructor( + private customerService: CustomerService, + private productService: ProductService + ) {} ngOnInit() { - this.customerService.getCustomersLarge().then(customers => { + this.customerService.getCustomersLarge().then((customers) => { this.customers1 = customers; this.loading = false; // @ts-ignore - this.customers1.forEach(customer => customer.date = new Date(customer.date)); + this.customers1.forEach((customer) => (customer.date = new Date(customer.date))); }); - this.customerService.getCustomersMedium().then(customers => this.customers2 = customers); - this.customerService.getCustomersLarge().then(customers => this.customers3 = customers); - this.productService.getProductsWithOrdersSmall().then(data => this.products = data); + this.customerService.getCustomersMedium().then((customers) => (this.customers2 = customers)); + this.customerService.getCustomersLarge().then((customers) => (this.customers3 = customers)); + this.productService.getProductsWithOrdersSmall().then((data) => (this.products = data)); this.representatives = [ { name: 'Amy Elsner', image: 'amyelsner.png' }, @@ -457,6 +458,28 @@ export class TableDoc implements OnInit { ]; } + getSeverity(status: string) { + switch (status.toLowerCase()) { + case 'unqualified': + return 'danger'; + + case 'qualified': + return 'success'; + + case 'new': + return 'info'; + + case 'negotiation': + return 'warn'; + + case 'renewal': + return null; + + default: + return null; + } + } + onSort() { this.updateRowGroupMetaData(); } @@ -471,14 +494,12 @@ export class TableDoc implements OnInit { if (i === 0) { this.rowGroupMetadata[representativeName] = { index: 0, size: 1 }; - } - else { + } else { const previousRowData = this.customers3[i - 1]; const previousRowGroup = previousRowData?.representative?.name; if (representativeName === previousRowGroup) { this.rowGroupMetadata[representativeName].size++; - } - else { + } else { this.rowGroupMetadata[representativeName] = { index: i, size: 1 }; } } @@ -488,8 +509,7 @@ export class TableDoc implements OnInit { expandAll() { if (!this.isExpanded) { - this.products.forEach(product => product && product.name ? this.expandedRows[product.name] = true : ''); - + this.products.forEach((product) => (product && product.name ? (this.expandedRows[product.name] = true) : '')); } else { this.expandedRows = {}; } @@ -508,6 +528,4 @@ export class TableDoc implements OnInit { table.clear(); this.filter.nativeElement.value = ''; } - - } From cedbba30ae9a2b839f1369f4756085d7062c4793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20=C3=87etin?= <92744169+mehmetcetin01140@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:38:18 +0300 Subject: [PATCH 2/5] update routes --- src/routes.ts | 15 ++++++++++----- src/views/pages/pages.routes.ts | 12 ++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/routes.ts b/src/routes.ts index 16aa4b9..4b74ff7 100644 --- a/src/routes.ts +++ b/src/routes.ts @@ -1,17 +1,22 @@ import { Routes } from '@angular/router'; -import { AppLayout} from '@/src/layout/applayout'; +import { AppLayout } from '@/src/layout/applayout'; import { Documentation } from '@/src/views/pages/documentation'; import { Dashboard } from '@/src/views/dashboard'; +import { Landing } from './views/pages/landing'; +import { Notfound } from './views/pages/notfound'; export const routes: Routes = [ - { path: '', component: AppLayout, + { + path: '', + component: AppLayout, children: [ { path: '', component: Dashboard }, { path: 'uikit', loadChildren: () => import('./views/uikit/uikit.routes') }, { path: 'documentation', component: Documentation }, - { path: 'pages', loadChildren: () => import('./views/pages/pages.routes') }, + { path: 'pages', loadChildren: () => import('./views/pages/pages.routes') } ] }, - {path: 'auth', loadChildren: () => import('./views/pages/auth/auth.routes') }, - + { path: 'landing', component: Landing }, + { path: 'notfound', component: Notfound }, + { path: 'auth', loadChildren: () => import('./views/pages/auth/auth.routes') } ]; diff --git a/src/views/pages/pages.routes.ts b/src/views/pages/pages.routes.ts index 4bec861..2b7c68f 100644 --- a/src/views/pages/pages.routes.ts +++ b/src/views/pages/pages.routes.ts @@ -1,15 +1,11 @@ import { Routes } from '@angular/router'; import { Documentation } from '@/src/views/pages/documentation'; import { Crud } from '@/src/views/pages/crud'; -import { Landing } from '@/src/views/pages/landing'; import { Empty } from '@/src/views/pages/empty'; -import { Notfound } from '@/src/views/pages/notfound'; export default [ - { path: 'documentation', component: Documentation}, - { path: 'crud', component: Crud}, - { path: 'landing', component: Landing}, - { path: 'empty', component: Empty}, - { path: 'notfound', component: Notfound}, - { path: '**', redirectTo: '/notfound' } + { path: 'documentation', component: Documentation }, + { path: 'crud', component: Crud }, + { path: 'empty', component: Empty }, + { path: '**', redirectTo: '/notfound' } ] as Routes; From e7ef3d4450ef722b30526a8cc7406d03f4340a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20=C3=87etin?= <92744169+mehmetcetin01140@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:39:56 +0300 Subject: [PATCH 3/5] update login.ts --- src/views/pages/auth/login.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/auth/login.ts b/src/views/pages/auth/login.ts index 5326496..a79f491 100644 --- a/src/views/pages/auth/login.ts +++ b/src/views/pages/auth/login.ts @@ -63,7 +63,7 @@ import { FloatingConfigurator } from '@/src/components/floatingconfigurator';
Forgot password?
- +
From 23c7746995ea8bee37e4472859a3968660b1e755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20=C3=87etin?= <92744169+mehmetcetin01140@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:56:06 +0300 Subject: [PATCH 4/5] update landing --- src/components/landing/herowidget.ts | 2 +- src/components/landing/pricingwidget.ts | 220 +++++++++--------- .../landing/topbarwidget.component.ts | 112 +++++---- src/views/pages/landing.ts | 42 ++-- 4 files changed, 184 insertions(+), 192 deletions(-) diff --git a/src/components/landing/herowidget.ts b/src/components/landing/herowidget.ts index bb047bf..1f51f67 100644 --- a/src/components/landing/herowidget.ts +++ b/src/components/landing/herowidget.ts @@ -14,7 +14,7 @@ import { ButtonModule } from 'primeng/button';

Eu sem integereget magna fermentum

Sed blandit libero volutpat sed cras. Fames ac turpis egestas integer. Placerat in egestas erat...

- +
Hero Image diff --git a/src/components/landing/pricingwidget.ts b/src/components/landing/pricingwidget.ts index 818cf32..8d652c2 100644 --- a/src/components/landing/pricingwidget.ts +++ b/src/components/landing/pricingwidget.ts @@ -4,118 +4,116 @@ import { ButtonModule } from 'primeng/button'; import { RippleModule } from 'primeng/ripple'; @Component({ - selector: 'pricing-widget', - imports: [DividerModule, ButtonModule, RippleModule], - template: ` -
-
-
Matchless Pricing
- Amet consectetur adipiscing elit... -
+ selector: 'pricing-widget', + imports: [DividerModule, ButtonModule, RippleModule], + template: ` +
+
+
Matchless Pricing
+ Amet consectetur adipiscing elit... +
-
-
-
-
Free
- free -
-
- $0 - per month -
- -
- -
    -
  • - - Responsive Layout -
    • -
  • - - Unlimited Push Messages -
    • -
  • - - 50 Support Ticket -
    • -
  • - - Free Shipping -
    • -
-
-
+
+
+
+
Free
+ free +
+
+ $0 + per month +
+ +
+ +
    +
  • + + Responsive Layout +
    • +
  • + + Unlimited Push Messages +
    • +
  • + + 50 Support Ticket +
    • +
  • + + Free Shipping +
    • +
+
+
-
-
-
Startup
- startup -
-
- $1 - per month -
- -
- -
    -
  • - - Responsive Layout -
    • -
  • - - Unlimited Push Messages -
    • -
  • - - 50 Support Ticket -
    • -
  • - - Free Shipping -
    • -
-
-
+
+
+
Startup
+ startup +
+
+ $1 + per month +
+ +
+ +
    +
  • + + Responsive Layout +
    • +
  • + + Unlimited Push Messages +
    • +
  • + + 50 Support Ticket +
    • +
  • + + Free Shipping +
    • +
+
+
-
-
-
Enterprise
- enterprise -
-
- $5 - per month -
- -
- -
    -
  • - - Responsive Layout -
    • -
  • - - Unlimited Push Messages -
    • -
  • - - 50 Support Ticket -
    • -
  • - - Free Shipping -
    • -
-
-
-
-
- `, +
+
+
Enterprise
+ enterprise +
+
+ $5 + per month +
+ +
+ +
    +
  • + + Responsive Layout +
    • +
  • + + Unlimited Push Messages +
    • +
  • + + 50 Support Ticket +
    • +
  • + + Free Shipping +
    • +
+
+
+
+
+ ` }) -export class PricingWidget { - -} +export class PricingWidget {} diff --git a/src/components/landing/topbarwidget.component.ts b/src/components/landing/topbarwidget.component.ts index bd9122d..67cd0c1 100644 --- a/src/components/landing/topbarwidget.component.ts +++ b/src/components/landing/topbarwidget.component.ts @@ -6,66 +6,62 @@ import { ButtonModule } from 'primeng/button'; import { LayoutService } from '@/src/service/layout.service'; @Component({ - selector: 'topbar-widget', - imports: [RouterModule, StyleClassModule, ButtonModule, RippleModule], - template: ` - - - - - - - - - - SAKAI - + selector: 'topbar-widget', + imports: [RouterModule, StyleClassModule, ButtonModule, RippleModule], + template: ` + + + + + + + + + + SAKAI + + + + - - - - - - `, + ` }) export class TopbarWidget { - - constructor(public router: Router) { } - + constructor(public router: Router) {} } diff --git a/src/views/pages/landing.ts b/src/views/pages/landing.ts index 63000f1..353485b 100644 --- a/src/views/pages/landing.ts +++ b/src/views/pages/landing.ts @@ -1,9 +1,9 @@ -import {Component} from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {RippleModule} from 'primeng/ripple'; -import {StyleClassModule} from 'primeng/styleclass'; -import {ButtonModule} from 'primeng/button'; -import {DividerModule} from 'primeng/divider'; +import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { RippleModule } from 'primeng/ripple'; +import { StyleClassModule } from 'primeng/styleclass'; +import { ButtonModule } from 'primeng/button'; +import { DividerModule } from 'primeng/divider'; import { HeroWidget } from '@/src/components/landing/herowidget'; import { FeaturesWidget } from '@/src/components/landing/featureswidget'; import { HighlightsWidget } from '@/src/components/landing/highlightswidget'; @@ -12,21 +12,19 @@ import { FooterWidget } from '@/src/components/landing/footerwidget'; import { TopbarWidget } from '@/src/components/landing/topbarwidget.component'; @Component({ - standalone: true, - imports: [RouterModule,TopbarWidget, HeroWidget, FeaturesWidget, HighlightsWidget, PricingWidget, FooterWidget, RippleModule, StyleClassModule, ButtonModule, DividerModule], - template:` -
-
-
- -
- - - - - -
-
- `, + standalone: true, + imports: [RouterModule, TopbarWidget, HeroWidget, FeaturesWidget, HighlightsWidget, PricingWidget, FooterWidget, RippleModule, StyleClassModule, ButtonModule, DividerModule], + template: ` +
+
+ + + + + + +
+
+ ` }) export class Landing {} From c751c9c93865474f4e31e83babcffc5cc4b43a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20=C3=87etin?= <92744169+mehmetcetin01140@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:59:34 +0300 Subject: [PATCH 5/5] update inputdoc --- src/views/uikit/inputdoc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/uikit/inputdoc.ts b/src/views/uikit/inputdoc.ts index 53ff1d5..417ff1c 100644 --- a/src/views/uikit/inputdoc.ts +++ b/src/views/uikit/inputdoc.ts @@ -202,7 +202,7 @@ import { ToggleButtonModule } from 'primeng/togglebutton';
- +
InputGroup