From dd715ad9a989aa76245af0c127f1f942abe390a6 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Thu, 5 Jan 2023 14:18:15 +0300 Subject: [PATCH 1/8] Added new packages `@abp/ng.oauth` --- docs/en/Migration-Guides/Abp-7_0.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index da8d9c863a..b3ac21834a 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -115,4 +115,27 @@ See https://github.com/abpframework/abp/pull/13845 for more info. The `Devart.Data.Oracle.EFCore` package do not yet support EF Core 7.0, If you use `AbpEntityFrameworkCoreOracleDevartModule(Volo.Abp.EntityFrameworkCore.Oracle.Devart)` may not work as expected, We will release new packages as soon as they are updated. See https://github.com/abpframework/abp/issues/14412 for more info. +# Changes on Angular Apps +## Added new packages `@abp/ng.oauth` +OAuth Functionality moved to seperated packages that name is `@abp/ng.oauth` So The abp users should add `@abp/ng.oauth` packages on app.module.ts. +Add the new npm package on your app. +``` +yarn add @abp/ng.oauth +// or npm i ---save @abp/ng.oauth +``` +```typescript +// app.module.ts +import { AbpOAuthModule } from "@abp/ng.oauth"; +// ... +@NgModule({ + // ... + imports: [ + AbpOAuthModule.forRoot(), // <-- Add This + // ... + ], + // ... +}) +export class AppModule {} + +``` From b5b31902bef7311da23de6461a5e83187faaf175 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Thu, 5 Jan 2023 14:28:48 +0300 Subject: [PATCH 2/8] Add font-bundle changes on docs --- docs/en/Migration-Guides/Abp-7_0.md | 34 +++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index b3ac21834a..ee3902289e 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -116,8 +116,8 @@ The `Devart.Data.Oracle.EFCore` package do not yet support EF Core 7.0, If you u See https://github.com/abpframework/abp/issues/14412 for more info. # Changes on Angular Apps -## Added new packages `@abp/ng.oauth` -OAuth Functionality moved to seperated packages that name is `@abp/ng.oauth` So The abp users should add `@abp/ng.oauth` packages on app.module.ts. +## Added new package `@abp/ng.oauth` +OAuth Functionality moved to seperated package that name is `@abp/ng.oauth` So The abp users should add `@abp/ng.oauth` packages on app.module.ts. Add the new npm package on your app. ``` yarn add @abp/ng.oauth @@ -139,3 +139,33 @@ import { AbpOAuthModule } from "@abp/ng.oauth"; export class AppModule {} ``` +## Lepton X Google-Font +If you are using leptonx, that has google fonts. The fonts was added builtin lepton file. it moved seperated file. So the abp user should add font-bundle in the angular.json. ( Projects > 'your-app-name' > architect > build > options > styles ) + +// for the lepton x lite +```json + { + input: 'node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.rtl.css', + inject: false, + bundleName: 'font-bundle.rtl', + }, + { + input: 'node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.css', + inject: false, + bundleName: 'font-bundle', + }, +``` + +// for the lepton x +```json + { + input: 'node_modules/@volosoft/ngx-lepton-x/assets/css/font-bundle.css', + inject: false, + bundleName: 'font-bundle', + }, + { + input: 'node_modules/@volosoft/ngx-lepton-x/assets/css/font-bundle.rtl.css', + inject: false, + bundleName: 'font-bundle.rtl', + }, +``` From 5a38b16b12aa88eeda37f637236f7b79e7f2d152 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Thu, 5 Jan 2023 15:10:22 +0300 Subject: [PATCH 3/8] Update Abp-7_0.md --- docs/en/Migration-Guides/Abp-7_0.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index ee3902289e..908b2fc618 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -140,7 +140,7 @@ export class AppModule {} ``` ## Lepton X Google-Font -If you are using leptonx, that has google fonts. The fonts was added builtin lepton file. it moved seperated file. So the abp user should add font-bundle in the angular.json. ( Projects > 'your-app-name' > architect > build > options > styles ) +If you are using leptonx, that has google fonts. The fonts was added builtin lepton file. it moved seperated file. So the abp user should add font-bundle in the angular.json. ( under the 'yourProjectName' > 'architect' > 'build' > 'options' >'styles' ) // for the lepton x lite ```json @@ -169,3 +169,9 @@ If you are using leptonx, that has google fonts. The fonts was added builtin lep bundleName: 'font-bundle.rtl', }, ``` + +## ng-zorro-antd-tree.css + +ng-zorro-antd-tree.css file should be in angular.json if the user uses AbpTree component or Abp-commercial. The ABP User should add this style definition on angular.json. ( under the 'yourProjectName' > 'architect' > 'build' > 'options' >'styles' ) + +{ "input": "node_modules/ng-zorro-antd/tree/style/index.min.css", "inject": false, "bundleName": "ng-zorro-antd-tree" }, From 0713b515cac3535233e586094644ea5a56908a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Thu, 5 Jan 2023 15:21:10 +0300 Subject: [PATCH 4/8] added side menu layout changes to docs --- docs/en/Migration-Guides/Abp-7_0.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index ee3902289e..ab994d2f7a 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -169,3 +169,11 @@ If you are using leptonx, that has google fonts. The fonts was added builtin lep bundleName: 'font-bundle.rtl', }, ``` + +## Updated Side Menu Layout + +In side menu layout affected some keys in SideMenuApplicationLayoutComponent and added new replaceable component like Logo Component, Language Component etc. + +If you are using replaceable component system you can check [documentation](https://docs.abp.io/en/commercial/latest/themes/lepton-x/angular). + + From 346f5f5e609724bff7eff9064fe0acd1930d7b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Thu, 5 Jan 2023 15:24:23 +0300 Subject: [PATCH 5/8] resolve conflicit --- docs/en/Migration-Guides/Abp-7_0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index c624fdfd9e..63950a9adc 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -182,4 +182,4 @@ If you are using replaceable component system you can check [documentation](http ng-zorro-antd-tree.css file should be in angular.json if the user uses AbpTree component or Abp-commercial. The ABP User should add this style definition on angular.json. ( under the 'yourProjectName' > 'architect' > 'build' > 'options' >'styles' ) { "input": "node_modules/ng-zorro-antd/tree/style/index.min.css", "inject": false, "bundleName": "ng-zorro-antd-tree" }, ->>>>>>> 5a38b16b12aa88eeda37f637236f7b79e7f2d152 + From dc0697a2d37be1dc92ae9462a3b40bea5363a4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Thu, 5 Jan 2023 16:03:25 +0300 Subject: [PATCH 6/8] add changed keys --- docs/en/Migration-Guides/Abp-7_0.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index 63950a9adc..242ea68980 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -172,9 +172,24 @@ If you are using leptonx, that has google fonts. The fonts was added builtin lep ## Updated Side Menu Layout -In side menu layout affected some keys in SideMenuApplicationLayoutComponent and added new replaceable component like Logo Component, Language Component etc. +In side menu layout affected toolbarKey, navbarKey, toolbarItemsKey keys in SideMenuApplicationLayoutComponent like below. -If you are using replaceable component system you can check [documentation](https://docs.abp.io/en/commercial/latest/themes/lepton-x/angular). +#### Before +```ts +toolbarKey = eThemeLeptonXComponents.Navbar; +navbarKey = eThemeLeptonXComponents.Sidebar; +toolbarItemsKey = eThemeLeptonXComponents.NavItems; +``` + +#### After +```ts +toolbarKey = eThemeLeptonXComponents.Toolbar; +navbarKey = eThemeLeptonXComponents.Navbar; +navItemsKey = eThemeLeptonXComponents.NavItems; +``` +And also added new replaceable component like Logo Component, Language Component etc. + +If you are using replaceable component system you can check [documentation](https://docs.abp.io/en/commercial/latest/themes/lepton-x/angular#customization). ## ng-zorro-antd-tree.css From fd0fb4fbb058b104ecef8ff6d0a3ec66570b3e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Thu, 5 Jan 2023 16:41:18 +0300 Subject: [PATCH 7/8] change keys --- docs/en/Migration-Guides/Abp-7_0.md | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index 242ea68980..c92129c534 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -172,21 +172,9 @@ If you are using leptonx, that has google fonts. The fonts was added builtin lep ## Updated Side Menu Layout -In side menu layout affected toolbarKey, navbarKey, toolbarItemsKey keys in SideMenuApplicationLayoutComponent like below. +In side menu layout affected eThemeLeptonXComponents.Navbar to eThemeLeptonXComponents.Toolbar, +eThemeLeptonXComponents.Sidebar to eThemeLeptonXComponents.Navbar. -#### Before -```ts -toolbarKey = eThemeLeptonXComponents.Navbar; -navbarKey = eThemeLeptonXComponents.Sidebar; -toolbarItemsKey = eThemeLeptonXComponents.NavItems; -``` - -#### After -```ts -toolbarKey = eThemeLeptonXComponents.Toolbar; -navbarKey = eThemeLeptonXComponents.Navbar; -navItemsKey = eThemeLeptonXComponents.NavItems; -``` And also added new replaceable component like Logo Component, Language Component etc. If you are using replaceable component system you can check [documentation](https://docs.abp.io/en/commercial/latest/themes/lepton-x/angular#customization). From 2dfdfff2948ef204da26a014b2981cc6363f72d7 Mon Sep 17 00:00:00 2001 From: Hamza Albreem <94292623+braim23@users.noreply.github.com> Date: Fri, 6 Jan 2023 10:58:16 +0300 Subject: [PATCH 8/8] Quick fix for the Abp-7_0 doc --- docs/en/Migration-Guides/Abp-7_0.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index c92129c534..05dc276e3d 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -116,9 +116,9 @@ The `Devart.Data.Oracle.EFCore` package do not yet support EF Core 7.0, If you u See https://github.com/abpframework/abp/issues/14412 for more info. # Changes on Angular Apps -## Added new package `@abp/ng.oauth` -OAuth Functionality moved to seperated package that name is `@abp/ng.oauth` So The abp users should add `@abp/ng.oauth` packages on app.module.ts. -Add the new npm package on your app. +## Added a new package `@abp/ng.oauth` +OAuth Functionality moved to a seperate package named `@abp/ng.oauth`, so ABP users should add the `@abp/ng.oauth` packages on app.module.ts. +Add the new npm package to your app. ``` yarn add @abp/ng.oauth // or npm i ---save @abp/ng.oauth @@ -140,9 +140,9 @@ export class AppModule {} ``` ## Lepton X Google-Font -If you are using leptonx, that has google fonts. The fonts was added builtin lepton file. it moved seperated file. So the abp user should add font-bundle in the angular.json. ( under the 'yourProjectName' > 'architect' > 'build' > 'options' >'styles' ) +If you are using LeptonX that has google fonts, the fonts were built-in the Lepton file. It's been moved to a seperate file. So the ABP user should add font-bundle in angular.json. ( under the 'yourProjectName' > 'architect' > 'build' > 'options' >'styles' ) -// for the lepton x lite +// for LeptonX Lite ```json { input: 'node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.rtl.css', @@ -156,7 +156,7 @@ If you are using leptonx, that has google fonts. The fonts was added builtin lep }, ``` -// for the lepton x +// for LeptonX ```json { input: 'node_modules/@volosoft/ngx-lepton-x/assets/css/font-bundle.css', @@ -172,7 +172,7 @@ If you are using leptonx, that has google fonts. The fonts was added builtin lep ## Updated Side Menu Layout -In side menu layout affected eThemeLeptonXComponents.Navbar to eThemeLeptonXComponents.Toolbar, +In side menu layout, eThemeLeptonXComponents.Navbar has been changed to eThemeLeptonXComponents.Toolbar, and eThemeLeptonXComponents.Sidebar to eThemeLeptonXComponents.Navbar. And also added new replaceable component like Logo Component, Language Component etc.