From c97f025679820eb9d9d3135630b1b33ba25f36e1 Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Mon, 9 Dec 2024 14:59:29 +0300 Subject: [PATCH 1/9] update version at topbar --- src/app/showcase/data/versions.json | 60 +++-------------------------- 1 file changed, 5 insertions(+), 55 deletions(-) diff --git a/src/app/showcase/data/versions.json b/src/app/showcase/data/versions.json index 63b5ff82f5a..55faff5342e 100644 --- a/src/app/showcase/data/versions.json +++ b/src/app/showcase/data/versions.json @@ -1,62 +1,12 @@ [ { - "version": "v17.18.12", - "name": "v17", - "url": "https://primeng.org" - }, - { - "version": "v18.0.0", + "version": "v18", "name": "v18", - "url": "https://v18.primeng.org" - }, - { - "version": "v16.9.15-lts", - "name": "v16", - "url": "https://www.primefaces.org/primeng-v16-lts/" - }, - { - "version": "v15.4.26-lts", - "name": "v15", - "url": "https://www.primefaces.org/primeng-v15-lts/" - }, - { - "version": "v14.2.17-lts", - "name": "v14", - "url": "https://www.primefaces.org/primeng-v14-lts" - }, - { - "version": "13.4.5-lts", - "name": "v13", - "url": "https://www.primefaces.org/primeng-v13-lts" - }, - { - "version": "12.2.5-lts", - "name": "v12", - "url": "https://www.primefaces.org/primeng-v12-lts" - }, - { - "version": "11.4.10-lts", - "name": "v11", - "url": "https://www.primefaces.org/primeng-v11-lts" - }, - { - "version": "10.1.5-lts", - "name": "v10", - "url": "https://www.primefaces.org/primeng-v10-lts" - }, - { - "version": "9.2.8-lts", - "name": "v9", - "url": "https://www.primefaces.org/primeng-v9-lts" - }, - { - "version": "8.2.9-lts", - "name": "v8", - "url": "https://www.primefaces.org/primeng-v8-lts" + "url": "https://primeng.org" }, { - "version": "7.2.6-lts", - "name": "v7", - "url": "https://www.primefaces.org/primeng-v7-lts" + "version": "v17", + "name": "v17", + "url": "https://v17.primeng.org" } ] From 18b059025c4c005c5e64c8be023252759fcbf931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87etin?= <69278826+cetincakiroglu@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:53:57 +0300 Subject: [PATCH 2/9] Set new version --- package-lock.json | 6 +++--- src/app/components/package.json | 2 +- src/app/showcase/layout/doc/codeeditor/templates.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b8dfdff2115..a452dee85a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,9 +43,9 @@ "esbuild": "^0.19.8", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-import": "*", - "eslint-plugin-jsdoc": "*", - "eslint-plugin-prefer-arrow": "*", + "eslint-plugin-import": "latest", + "eslint-plugin-jsdoc": "latest", + "eslint-plugin-prefer-arrow": "latest", "express": "^4.21.1", "file-saver": "^2.0.5", "gulp": "^5.0.0", diff --git a/src/app/components/package.json b/src/app/components/package.json index 53abed82b7d..0db75fec0f3 100644 --- a/src/app/components/package.json +++ b/src/app/components/package.json @@ -1,6 +1,6 @@ { "name": "primeng", - "version": "17.18.12", + "version": "17.18.13", "repository": { "type": "git", "url": "https://github.com/primefaces/primeng" diff --git a/src/app/showcase/layout/doc/codeeditor/templates.ts b/src/app/showcase/layout/doc/codeeditor/templates.ts index ee991858c90..81c9e28aabb 100644 --- a/src/app/showcase/layout/doc/codeeditor/templates.ts +++ b/src/app/showcase/layout/doc/codeeditor/templates.ts @@ -15,7 +15,7 @@ export interface Props { const app_dependencies = pkg ? pkg.devDependencies : {}; const PrimeNG = { - version: '17.18.12', + version: '17.18.13', description: 'PrimeNG is an open source UI library for Angular featuring a rich set of 80+ components, a theme designer, various theme alternatives such as Material, Bootstrap, Tailwind, premium templates and professional support. In addition, it integrates with PrimeBlock, which has 370+ ready to use UI blocks to build spectacular applications in no time.' }; From f7b26ade9d826d8937c1135254f793fa1f4dde6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87etin?= <69278826+cetincakiroglu@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:54:23 +0300 Subject: [PATCH 3/9] Set new version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a4551620e61..c63d71f1937 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "primeng", - "version": "17.18.12", + "version": "17.18.13", "license": "SEE LICENSE IN LICENSE.md", "scripts": { "ng": "ng", From b9d50f1e04dc5a8ea87d82a13b32e75766d901a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87etin?= <69278826+cetincakiroglu@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:02:50 +0300 Subject: [PATCH 4/9] Update versions.json --- src/app/showcase/data/versions.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/showcase/data/versions.json b/src/app/showcase/data/versions.json index 55faff5342e..0930b453928 100644 --- a/src/app/showcase/data/versions.json +++ b/src/app/showcase/data/versions.json @@ -1,12 +1,12 @@ [ + { + "version": "v17", + "name": "v17", + "url": "https://v17.primeng.org" + }, { "version": "v18", "name": "v18", "url": "https://primeng.org" - }, - { - "version": "v17", - "name": "v17", - "url": "https://v17.primeng.org" } ] From 3a936e835b90bb27ea5f3ab30a901492eb432b33 Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Mon, 9 Dec 2024 19:36:13 +0300 Subject: [PATCH 5/9] Update links --- package-lock.json | 4 ++-- .../showcase/layout/news/app.news.component.html | 2 +- src/app/showcase/layout/news/app.news.component.ts | 2 +- src/assets/showcase/data/menu.json | 14 +++++--------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index a452dee85a1..6249a2bb914 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "primeng", - "version": "17.18.12", + "version": "17.18.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "primeng", - "version": "17.18.12", + "version": "17.18.13", "license": "SEE LICENSE IN LICENSE.md", "devDependencies": { "@angular-devkit/build-angular": "^18.0.2", diff --git a/src/app/showcase/layout/news/app.news.component.html b/src/app/showcase/layout/news/app.news.component.html index 9cfcf46f8d0..6be6d496736 100644 --- a/src/app/showcase/layout/news/app.news.component.html +++ b/src/app/showcase/layout/news/app.news.component.html @@ -1,4 +1,4 @@ -
+
{{ announcement?.content }} diff --git a/src/app/showcase/layout/news/app.news.component.ts b/src/app/showcase/layout/news/app.news.component.ts index ad716d8af05..5c153f22fd0 100644 --- a/src/app/showcase/layout/news/app.news.component.ts +++ b/src/app/showcase/layout/news/app.news.component.ts @@ -13,7 +13,7 @@ import { AppConfigService } from '@service/appconfigservice'; imports: [CommonModule, FormsModule, StyleClassModule] }) export class AppNewsComponent { - storageKey: string = 'primeng'; + storageKey: string = 'primeng-v17'; announcement: any; diff --git a/src/assets/showcase/data/menu.json b/src/assets/showcase/data/menu.json index 6d6ab403a1f..3475f8bcb87 100644 --- a/src/assets/showcase/data/menu.json +++ b/src/assets/showcase/data/menu.json @@ -494,17 +494,13 @@ { "name": "Colors", "routerLink": "/colors" - }, - { - "name": "SASS API", - "href": "https://www.primefaces.org/designer/api/primeng/15.0.0" } ] }, { "name": "Figma UI Kit", "icon": "pi pi-pencil", - "routerLink": "/uikit" + "href": "https://primeng.org/uikit" }, { "name": "Icons", @@ -523,7 +519,7 @@ { "name": "Templates", "icon": "pi pi-star", - "routerLink": "/templates" + "href": "https://primeng.org/templates" }, { "name": "PrimeBlocks", @@ -562,11 +558,11 @@ }, { "name": "Long Term Support", - "routerLink": "/lts" + "href": "https://primeng.org/lts" }, { "name": "PRO Support", - "routerLink": "/support" + "href": "https://primeng.org/support" } ] }, @@ -582,7 +578,7 @@ "children": [ { "name": "About Us", - "routerLink": "/team" + "href": "https://primeng.org/team" }, { "name": "Source Code", From 86ed20bdbb0efe7ea618d3aa809a1959bc07f4d1 Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Mon, 9 Dec 2024 19:42:24 +0300 Subject: [PATCH 6/9] Reorder versions --- src/app/showcase/data/versions.json | 10 +- .../layout/news/app.news.component.ts | 4 +- .../layout/topbar/app.topbar.component.html | 92 ++++++------------- .../layout/topbar/app.topbar.component.ts | 2 + 4 files changed, 37 insertions(+), 71 deletions(-) diff --git a/src/app/showcase/data/versions.json b/src/app/showcase/data/versions.json index 0930b453928..55faff5342e 100644 --- a/src/app/showcase/data/versions.json +++ b/src/app/showcase/data/versions.json @@ -1,12 +1,12 @@ [ - { - "version": "v17", - "name": "v17", - "url": "https://v17.primeng.org" - }, { "version": "v18", "name": "v18", "url": "https://primeng.org" + }, + { + "version": "v17", + "name": "v17", + "url": "https://v17.primeng.org" } ] diff --git a/src/app/showcase/layout/news/app.news.component.ts b/src/app/showcase/layout/news/app.news.component.ts index 5c153f22fd0..bad6b884973 100644 --- a/src/app/showcase/layout/news/app.news.component.ts +++ b/src/app/showcase/layout/news/app.news.component.ts @@ -21,7 +21,7 @@ export class AppNewsComponent { private configService: AppConfigService, private cd: ChangeDetectorRef ) { - afterNextRender(() => { + /*afterNextRender(() => { const itemString = localStorage.getItem(this.storageKey); if (itemString) { @@ -38,7 +38,7 @@ export class AppNewsComponent { this.announcement = News; } this.cd.markForCheck(); - }); + });*/ } get isNewsActive(): boolean { diff --git a/src/app/showcase/layout/topbar/app.topbar.component.html b/src/app/showcase/layout/topbar/app.topbar.component.html index a464bcb8991..d0223825994 100644 --- a/src/app/showcase/layout/topbar/app.topbar.component.html +++ b/src/app/showcase/layout/topbar/app.topbar.component.html @@ -9,86 +9,54 @@ - - - + + + - - - + + - - + + - - - - + + + + - - - + + + - - - + + - - + + - - - - + + + +
@@ -123,21 +91,17 @@
  • -
  • - -