Skip to content

Commit 63ef7bc

Browse files
Merge branch 'master' of https://github.com/primefaces/primeng
2 parents 350fc27 + 806cc28 commit 63ef7bc

File tree

23 files changed

+213
-172
lines changed

23 files changed

+213
-172
lines changed

apps/showcase/components/doc/app.docsection-nav.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export class AppDocSectionNav implements OnInit {
111111
lightImage: 'https://fqjltiegiezfetthbags.supabase.co/storage/v1/object/public/common.images/ads/themedesigner-menu-light.jpg',
112112
darkImage: 'https://fqjltiegiezfetthbags.supabase.co/storage/v1/object/public/common.images/ads/themedesigner-menu-dark.jpg',
113113
title: 'Theme Designer',
114-
details: 'Theme Designer is the ultimate tool to customize and design your own themes featuring a visual editor, figma to theme code, cloud storage, and migration assistant.',
114+
details: 'Theme Designer is the ultimate tool to customize and design your own themes featuring a visual editor, Figma to theme code, cloud storage, and migration assistant.',
115115
routerLink: '/designer'
116116
}
117117
];

apps/showcase/components/layout/designer/dashboard/designdashboard.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import { ToastModule } from 'primeng/toast';
1515
imports: [RouterModule, CommonModule, FormsModule, ToastModule, MenuModule, ConfirmPopupModule],
1616
template: `<div style="border-radius: 50px" class="overflow-hidden mb-8">
1717
<a routerLink="/designer">
18-
<img src="https://primefaces.org/cdn/designer/{{ isDarkTheme() ? 'editor-intro-dark.png' : 'editor-intro.png' }}" />
18+
<img src="https://fqjltiegiezfetthbags.supabase.co/storage/v1/object/public/common.images/designer/{{ isDarkTheme() ? 'editor-intro-dark.png' : 'editor-intro.png' }}" />
1919
</a>
2020
</div>
2121
2222
<div class="text-lg font-semibold mb-2">Authenticate</div>
2323
<div *ngIf="!verified()">
2424
<span class="block leading-6 mb-4"
25-
>Theme Designer is the ultimate tool to customize and design your own themes featuring a visual editor, figma to theme code, cloud storage, and migration assistant. <a routerLink="/designer" class="doc-link">Discover</a> more about
25+
>Theme Designer is the ultimate tool to customize and design your own themes featuring a visual editor, Figma to theme code, cloud storage, and migration assistant. <a routerLink="/designer" class="doc-link">Discover</a> more about
2626
the Theme Designer by visiting the detailed <a routerLink="/designer/guide" class="doc-link">documentation</a>.</span
2727
>
2828
<span class="block leading-6 mb-4"

apps/showcase/doc/designer/ci/figma-doc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { RouterModule } from '@angular/router';
99
imports: [CommonModule, AppDocSectionText, RouterModule],
1010
template: `<app-docsectiontext>
1111
<p>
12-
Token Studio in Figma is the starting point of a continuous integration pipeline. You can connect a remote repository to sync your tokens data so that changes are saved remotely instead of locally. Token Studio offers various remote
12+
Tokens Studio in Figma is the starting point of a continuous integration pipeline. You can connect a remote repository to sync your tokens data so that changes are saved remotely instead of locally. Tokens Studio offers various remote
1313
storage options such as <a href="https://docs.tokens.studio/token-storage/remote/sync-git-github" target="_blank" rel="noopener noreferrer">GitHub</a>,
1414
<a href="https://docs.tokens.studio/token-storage/remote/sync-git-gitlab" target="_blank" rel="noopener noreferrer">GitLab</a> and
1515
<a href="https://docs.tokens.studio/token-storage/remote/sync-git-bitbucket" target="_blank" rel="noopener noreferrer">Bitbucket</a>. Refer to these documentations based on your environment before proceeding to the integrations in the

apps/showcase/doc/designer/ci/integration/bitbucket-doc.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import { AppCode } from '@/components/doc/app.code';
2929
3030
<h4>3. Test Integration</h4>
3131
<p>
32-
Edit a token in Token Studio in Figma and click <b>Push to BitBucket</b> button to update the tokens file in your Git repository, triggering the configured BitBucket Pipe. The pipe then sends the updated file content to the Theme Designer
33-
API, receives the generated theme code, and commits the resulting changes back to your repository. An <a href="https://bitbucket.org/cagataycivici/theme-designer-ci-test" target="_blank" rel="noopener noreferrer">example repository</a> is
34-
available at BitBucket that you may use as a starter.
32+
Edit a token in Tokens Studio in Figma and click <b>Push to BitBucket</b> button to update the tokens file in your Git repository, triggering the configured BitBucket Pipe. The pipe then sends the updated file content to the Theme
33+
Designer API, receives the generated theme code, and commits the resulting changes back to your repository. An
34+
<a href="https://bitbucket.org/cagataycivici/theme-designer-ci-test" target="_blank" rel="noopener noreferrer">example repository</a> is available at BitBucket that you may use as a starter.
3535
</p>
3636
</app-docsectiontext>`
3737
})

apps/showcase/doc/designer/ci/integration/github-doc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { RouterModule } from '@angular/router';
2929
3030
<h4>3. Test Integration</h4>
3131
<p>
32-
Edit a token in Token Studio in Figma and click <b>Push to GitHub</b> button to update the tokens file in your Git repository, triggering the configured GitHub Action. The GitHub Action then sends the updated file content to the Theme
32+
Edit a token in Tokens Studio in Figma and click <b>Push to GitHub</b> button to update the tokens file in your Git repository, triggering the configured GitHub Action. The GitHub Action then sends the updated file content to the Theme
3333
Designer API, receives the generated theme code, and commits the resulting changes back to your repository. An
3434
<a href="https://github.com/primefaces/theme-designer-ci-test" target="_blank" rel="noopener noreferrer">example repository</a> is available at GitHub that you may use as a starter.
3535
</p>

apps/showcase/doc/designer/ci/integration/gitlab-doc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { RouterModule } from '@angular/router';
3232
3333
<h4>4. Test Integration</h4>
3434
<p>
35-
Edit a token in Token Studio in Figma and click <b>Push to GitLab</b> button to update the tokens file in your Git repository, triggering the configured GitLab Action. The GitLab Action then sends the updated file content to the Theme
35+
Edit a token in Tokens Studio in Figma and click <b>Push to GitLab</b> button to update the tokens file in your Git repository, triggering the configured GitLab Action. The GitLab Action then sends the updated file content to the Theme
3636
Designer API, receives the generated theme code, and commits the resulting changes back to your repository. An
3737
<a href="https://gitlab.com/cagataycivici/theme-designer-ci-test" target="_blank" rel="noopener noreferrer">example repository</a> is available at GitLab that you may use as a starter.
3838
</p>

apps/showcase/doc/designer/ci/overview-doc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { RouterModule } from '@angular/router';
1010
template: `<app-docsectiontext>
1111
<p>
1212
The Figma UI Kit and the theming api is fully synchorized, meaning the design tokens in Figma map to the corresponding properties in a theme preset. The Theme Designer offers a feature to create a theme by uploading a tokens.json file
13-
that is exported from the Token Studio plugin in Figma. Once the theme is converted, it can either be edited further in the visual editor or downloaded as a zip file to access the full code. Visit the
13+
that is exported from the Tokens Studio plugin in Figma. Once the theme is converted, it can either be edited further in the visual editor or downloaded as a zip file to access the full code. Visit the
1414
<a routerLink="/designer/guide#figma">Figma</a>
1515
section at the designer documentation for more information.
1616
</p>

apps/showcase/doc/designer/createtheme/figma-doc.ts

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,51 @@ import { RouterModule } from '@angular/router';
99
imports: [CommonModule, AppDocSectionText, RouterModule],
1010
template: `<app-docsectiontext>
1111
<p>
12-
The <a routerLink="/uikit">Figma UI Kit</a> and the theming api is fully synchorized, meaning the design tokens in Figma map to the CSS variables in the code. The mapping is created via the
13-
<a href="https://tokens.studio/" target="_blank" rel="noopener noreferrer">Token Studio</a> at Figma which allows exporting a single json file. The Designer is able to interpret this file and transform it to an actual theme. In case your
14-
UI Kit version is older, the transformation process marks the missing tokens and recommends an auto migration via the migration assistant.
12+
For teams with UI designers, we recommend using PrimeOne Figma UI Kit for the design phase and utilizing the Theme Designer service to automate code generation during handoff. This workflow eliminates manual design-to-code translation,
13+
reducing implementation time and ensuring consistency between design and production.
1514
</p>
15+
<h4>UI Kit v4</h4>
16+
<b class="mb-4 block">Automated Flow</b>
1617
<p>
17-
This is an automated workflow and eliminates the manual design to code during the handoff process. If you have UI designers in your team, the recommended approach is using Figma for the actual design process and utilizing the designer for
18-
transformation, preview and download purposes.
19-
</p>
20-
<b class="mb-4 block">CI Pipeline</b>
21-
<p>
22-
Recommended approach is setting up the CI Pipeline flow as manually exporting the tokens file from Figma and uploading it to the online designer tool may quickly become tedious in active development cycles. As a solution, theme designer
23-
provides a remote API that can be integrated into your flow. Visit the <a routerLink="/designer/ci">CI Pipeline</a> documentation for comprehensive information and examples for GitHub, GitLab and BitBucket.
18+
Recommended approach is using the PrimeUI Theme Generator Figma plugin which provides built-in synchronization capabilities that automate the theme generation process. Visit
19+
<a href="https://www.figma.com/community/plugin/1592914021886732603" target="_blank" rel="noopener noreferrer">the plugin website</a> to learn more about this workflow.
2420
</p>
2521
<b class="mb-4 block">Manual Flow</b>
2622
<p>
27-
Instead of setting a CI pipeline, for quick prototyping purposes, you may also choose to use to manually export a tokens json file and then upload it to the designer. Note that, this flow would get tedious and repetitive in active
28-
development cycles when compared to an automated CI pipeline.
23+
Instead of generating themes directly from Figma using the plugin, for quick prototyping purposes, you may also choose to use to manually export a tokens json file and then upload it to the Theme Designer. Note that, this flow would get
24+
tedious and repetitive in active development cycles when compared to an automated flow.
2925
</p>
3026
<p>
3127
Open the <a routerLink="/uikit">PrimeOne UI Kit</a> in which you've modified tokens. In the Tokens Studio plugin, navigate to the <i>Tools</i> menu and select <i>Export to file/folder.</i> When the Export tokens modal appears, make sure
3228
the <i>Single file</i> tab is selected. Check the <i>All tokens sets</i> option, then click <i>Export</i>.
3329
</p>
3430
<p>In case you utilize custom tokens, create a new token set named <i>custom</i> and define your tokens under this set to make sure they are also exported to the theme code.</p>
3531
<div class="pl-8 pr-4 pt-4 bg-surface-0 dark:bg-surface-900 rounded-2xl border border-surface mb-4" style="max-width: 48rem">
36-
<img alt="Designer Dashboard" src="https://primefaces.org/cdn/designer/tokens-studio.png" class="w-full" />
32+
<img alt="Designer Dashboard" src="https://fqjltiegiezfetthbags.supabase.co/storage/v1/object/public/common.images/designer/figma-plugin.png" class="w-full" />
3733
</div>
3834
<p>When creating a new theme at Theme Designer, choose the <i>Import Figma Tokens</i> option and import the json file.</p>
3935
<div class="pl-8 pr-4 pt-4 bg-surface-0 dark:bg-surface-900 rounded-2xl border border-surface mb-4" style="max-width: 48rem">
40-
<img alt="Designer Dashboard" src="https://primefaces.org/cdn/designer/guide-create.png" class="w-full" />
36+
<img alt="Designer Dashboard" src="https://fqjltiegiezfetthbags.supabase.co/storage/v1/object/public/common.images/designer/guide-create.png" class="w-full" />
4137
</div>
42-
<!-- <b class="mb-4 block">Video Tutorial</b>
38+
<h4>UI Kit v3 (Deprecated)</h4>
39+
<b class="mb-4 block">CI Pipeline</b>
4340
<p>
44-
A tutorial is available demonstrating how the handoff process can be automated between the design team and the development team. The video demonstrates the feature from the PrimeVue version, which is exactly same as the PrimeNG
45-
implementation.
41+
Recommended approach is setting up the CI Pipeline flow as manually exporting the tokens file from Figma and uploading it to the online designer tool may quickly become tedious in active development cycles. As a solution, theme designer
42+
provides a remote API that can be integrated into your flow. Visit the CI Pipeline documentation for comprehensive information and examples for GitHub, GitLab and BitBucket.
4643
</p>
47-
<div class="video-container">
48-
<iframe width="560" height="315" src="https://www.youtube.com/embed/Ktocmi2dLLM?si=lG7JwkUfLTQFlfeX" frameborder="0" allowfullscreen></iframe>
49-
</div> -->
44+
45+
<b class="mb-4 block">Manual Flow</b>
46+
<p>
47+
Instead of setting a CI pipeline, for quick prototyping purposes, you may also choose to use to manually export a tokens json file and then upload it to the designer. Note that, this flow would get tedious and repetitive in active
48+
development cycles when compared to an automated CI pipeline.
49+
</p>
50+
<p>
51+
Open the PrimeOne UI Kit in which you've modified tokens. In the Tokens Studio plugin, navigate to the <i>Tools</i> menu and select <i>Export to file/folder.</i> When the Export tokens modal appears, make sure the <i>Single file</i> tab
52+
is selected. Check the <i>All tokens sets</i> option, then click <i>Export</i>.
53+
</p>
54+
<p>In case you utilize custom tokens, create a new token set named <i>custom</i> and define your tokens under this set to make sure they are also exported to the theme code.</p>
55+
<img alt="Tokens Studio export" src="https://primefaces.org/cdn/designer/tokens-studio.png" class="mb-4" />
56+
<p>When creating a new theme at Theme Designer, choose the <i>Import Figma Variables</i> option and import the json file.</p>
5057
</app-docsectiontext>`
5158
})
5259
export class FigmaDoc {}

apps/showcase/doc/designer/dashboard-doc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { AppDocSectionText } from '@/components/doc/app.docsectiontext';
1313
</p>
1414
</app-docsectiontext>
1515
<div class="px-8 pt-8 bg-surface-0 dark:bg-surface-900 rounded-2xl border border-surface" style="max-width: 48rem">
16-
<img alt="Designer Dashboard" src="https://primefaces.org/cdn/designer/guide-dashboard.png" class="w-full" />
16+
<img alt="Designer Dashboard" src="https://fqjltiegiezfetthbags.supabase.co/storage/v1/object/public/common.images/designer/guide-dashboard.png" class="w-full" />
1717
</div>`
1818
})
1919
export class DashboardDoc {}

apps/showcase/doc/designer/editor/intelligentcompletion-doc.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ import { AppDocSectionText } from '@/components/doc/app.docsectiontext';
1212
feature to list the available tokens to choose from. The <i>pi-sort-alt</i> symbol over the input, transfers the token between the common tokens and color scheme specific tokens so that you are able to define tokens based on light and
1313
dark mode as well.
1414
</p>
15+
<div class="px-8 pt-8 bg-surface-0 dark:bg-surface-900 rounded-2xl border border-surface" style="max-width: 48rem">
16+
<img alt="Designer Dashboard" src="https://fqjltiegiezfetthbags.supabase.co/storage/v1/object/public/common.images/designer/guide-editor.png" class="w-full" />
17+
</div>
1518
</app-docsectiontext>`
1619
})
1720
export class IntelligentCompletionDoc {}

0 commit comments

Comments
 (0)