carloshra/nexus-spa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v19' into v19

Browse Source 
# Conflicts:
#	src/views/uikit/tabledoc.ts
This commit is contained in:
Çetin
2025-01-06 16:04:31 +03:00
parent 9a18016deb c751c9c938
commit d4aad54ff7
9 changed files with 213 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/pages/auth/login.ts
View File

@@ -63,7 +63,7 @@ import { FloatingConfigurator } from '@/src/components/floatingconfigurator';
</div>
<span class="font-medium no-underline ml-2 text-right cursor-pointer text-primary">Forgot password?</span>
</div>
<p-button label="Sign In" class="w-full" routerLink="/"></p-button>
<p-button label="Sign In" styleClass="w-full" routerLink="/"></p-button>
</div>
</div>
</div>

42
src/views/pages/landing.ts
View File

@@ -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:`
<div class="bg-surface-0 dark:bg-surface-900">
<div id="home" class="landing-wrapper overflow-hidden">
<div class="py-6 px-6 mx-0 md:mx-12 lg:mx-20 lg:px-20 flex items-center justify-between relative lg:static">
<topbar-widget />
</div>
<hero-widget />
<features-widget />
<highlights-widget />
<pricing-widget />
<footer-widget />
</div>
</div>
`,
standalone: true,
imports: [RouterModule, TopbarWidget, HeroWidget, FeaturesWidget, HighlightsWidget, PricingWidget, FooterWidget, RippleModule, StyleClassModule, ButtonModule, DividerModule],
template: `
<div class="bg-surface-0 dark:bg-surface-900">
<div id="home" class="landing-wrapper overflow-hidden">
<topbar-widget class="py-6 px-6 mx-0 md:mx-12 lg:mx-20 lg:px-20 flex items-center justify-between relative lg:static" />
<hero-widget />
<features-widget />
<highlights-widget />
<pricing-widget />
<footer-widget />
</div>
</div>
`
})
export class Landing {}

12
src/views/pages/pages.routes.ts
View File

@@ -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;

2
src/views/uikit/inputdoc.ts
View File

@@ -202,7 +202,7 @@ import { ToggleButtonModule } from 'primeng/togglebutton';
</div>
</p-fluid>
<p-fluid class="flex mt-20">
<p-fluid class="flex mt-8">
<div class="card flex flex-col gap-6 w-full">
<div class="font-semibold text-xl">InputGroup</div>
<div class="flex flex-col md:flex-row gap-6">

21
src/views/uikit/tabledoc.ts
View File

@@ -286,19 +286,24 @@ interface expandedRows {
<p-table [value]="product.orders" dataKey="id" responsiveLayout="scroll">
<ng-template pTemplate="header">
<tr>
<th pSortableColumn="id">Id
<th pSortableColumn="id">
Id
<p-sortIcon field="price"></p-sortIcon>
</th>
<th pSortableColumn="customer">Customer
<th pSortableColumn="customer">
Customer
<p-sortIcon field="customer"></p-sortIcon>
</th>
<th pSortableColumn="date">Date
<th pSortableColumn="date">
Date
<p-sortIcon field="date"></p-sortIcon>
</th>
<th pSortableColumn="amount">Amount
<th pSortableColumn="amount">
Amount
<p-sortIcon field="amount"></p-sortIcon>
</th>
<th pSortableColumn="stats">Status
<th pSortableColumn="stats">
Status
<p-sortIcon field="status"></p-sortIcon>
</th>
<th style="width: 4rem"></th>
@@ -309,9 +314,9 @@ interface expandedRows {
<td>{{ order.id }}</td>
<td>{{ order.customer }}</td>
<td>{{ order.date }}</td>
<td>{{ order.amount | currency:'USD' }}</td>
<td><span
[class]="'order-badge order-' + order.status.toLowerCase()">{{ order.status }}</span>
<td>{{ order.amount | currency: 'USD' }}</td>
<td>
<span [class]="'order-badge order-' + order.status.toLowerCase()">{{ order.status }}</span>
</td>
<td>
<p-button type="button" icon="pi pi-search"></p-button>