Skip to content

Commit

Permalink
Merge branch 'latest' into upgrade-vaadin-24.7.0.alpha1
Browse files Browse the repository at this point in the history
  • Loading branch information
ZheSun88 authored Dec 19, 2024
2 parents 5c96641 + 0b23d71 commit 2f4823c
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion articles/building-apps/spring-boot.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Spring Boot
page-title: Building Vaadin apps with Spring Boot: A comprehensive guide
page-title: "Building Vaadin apps with Spring Boot: A comprehensive guide"
description: The role Spring Boot plays in Vaadin applications.
meta-description: Learn how to build Vaadin applications with Spring Boot. Explore setup, integration, and best practices for developing modern web applications.
order: 5
Expand Down
2 changes: 1 addition & 1 deletion articles/components/basic-layouts/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Basic Layouts
page-title: Basic Layouts | Vaadin components
description: How to render content with vertical and horizontal layout components.
meta-description: Vaadin features two basic layout components: Vertical Layout and Horizontal Layout which render their contents vertically and horizontally.
meta-description: "Vaadin features two basic layout components: Vertical Layout and Horizontal Layout which render their contents vertically and horizontally."
section-nav: hidden
page-links:
- 'API: https://cdn.vaadin.com/vaadin-web-components/{moduleNpmVersion:@vaadin/horizontal-layout}/#/elements/vaadin-vertical-layout[TypeScript] / https://vaadin.com/api/platform/{moduleMavenVersion:com.vaadin:vaadin}/com/vaadin/flow/component/orderedlayout/VerticalLayout.html[Java]'
Expand Down
2 changes: 1 addition & 1 deletion articles/components/icons/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ layout: tabbed-page
title: Icons
page-title: Icons | Vaadin components
description: Lumo and Vaadin icons and how to use them in your projects.
meta-description: Two icon collections are available through Vaadin dependencies: Vaadin Icons and Lumo Icons. Learn how to use them in your application.
meta-description: "Two icon collections are available through Vaadin dependencies: Vaadin Icons and Lumo Icons. Learn how to use them in your application."
page-links:
- 'API: https://cdn.vaadin.com/vaadin-web-components/{moduleNpmVersion:vaadin-lumo-styles}/#/elements/vaadin-icon[TypeScript] / https://vaadin.com/api/platform/{moduleMavenVersion:com.vaadin:vaadin}/com/vaadin/flow/component/icon/Icon.html[Java]'
- 'Source: https://github.com/vaadin/web-components/blob/v{moduleNpmVersion:vaadin-lumo-styles}/packages/vaadin-lumo-styles/vaadin-iconset.js[Lumo Icons] / https://github.com/vaadin/web-components/blob/v{moduleNpmVersion:vaadin-lumo-styles}/packages/icons/vaadin-iconset.js[Vaadin Icons]'
Expand Down
2 changes: 1 addition & 1 deletion articles/flow/integrations/hilla.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Hilla
page-title: How to integrate Vaadin Flow with Hilla: A complete guide
page-title: "How to integrate Vaadin Flow with Hilla: A complete guide"
description: Create hybrid applications by combining Hilla or React views with Flow views.
meta-description: Learn how to integrate Vaadin Flow with Hilla for seamless full-stack development. Explore configuration, best practices, and use cases in this guide.
order: 10
Expand Down
2 changes: 1 addition & 1 deletion articles/flow/integrations/spring/spring-boot.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Spring Boot
page-title: How to Integrate Vaadin with Spring Boot: A Complete Guide
page-title: "How to Integrate Vaadin with Spring Boot: A Complete Guide"
description: How to use Vaadin with Spring Boot.
meta-description: Learn how to seamlessly integrate Vaadin with Spring Boot for building modern web apps. This guide covers setup, configuration, and key integration steps.
order: 20
Expand Down
2 changes: 1 addition & 1 deletion articles/flow/production/cloud-providers/heroku/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Heroku
page-title: How to deploy Vaadin apps on Heroku
description: How to deploy your Vaadin application to Heroku.
meta-descriptionExplore the steps to deploy Vaadin applications on Heroku. Optimize your apps for cloud-based hosting.
meta-description: Explore the steps to deploy Vaadin applications on Heroku. Optimize your apps for cloud-based hosting.
order: 40
---

Expand Down
1 change: 0 additions & 1 deletion articles/hilla/guides/security/index.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
title: Security
page-title: How to secure your Hilla application | Vaadin
page-title: "Hilla framework security"
description: "The best practices for securing applications, configuring security, authentication and role-based access control for views."
meta-description: Explore comprehensive security practices and tools to safeguard your Hilla applications.
order: 100
Expand Down
2 changes: 1 addition & 1 deletion articles/hilla/index.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Hilla
page-title: Hilla: A full-stack framework for modern web apps
page-title: "Hilla: A full-stack framework for modern web apps"
description: Learn how to use Hilla, a full-stack web framework that seamlessly integrates a Spring Boot backend and a React frontend.
meta-description: Learn how to use the full-stack web framework Hilla, created by Vaadin, that seamlessly integrates a Spring Boot backend and a React frontend.
order: 20
Expand Down
2 changes: 1 addition & 1 deletion articles/tools/collaboration/components/index.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Binder pass:[&] Components
page-title: Vaadin Collaboration components: Real-time collaboration made easy
page-title: "Vaadin Collaboration components: Real-time collaboration made easy"
meta-description: Enable real-time collaboration in your apps with Vaadin Collaboration Components. Learn how to integrate and customize these tools for seamless teamwork.
order: 5
---
2 changes: 0 additions & 2 deletions articles/tools/start/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ page-title: Create a new Vaadin project using Vaadin Start
order: 20
description: Description of possibilities with Vaadin Start.
meta-description: Create a Vaadin project using Vaadin Start, a tool that allows you to visually create a custom Spring Boot based Vaadin Flow or Hilla app starter.

The recommended way to start a new Vaadin project is to use Vaadin Start (start.vaadin.com). This allows you to configure and download a customizable starting point for an application.
---


Expand Down

0 comments on commit 2f4823c

Please sign in to comment.