Skip to content

Commit

Permalink
chore: updated to mRender
Browse files Browse the repository at this point in the history
  • Loading branch information
siarheihuzarevich committed Dec 31, 2024
1 parent 398f503 commit 3bce99c
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 36 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ All notable changes to this project will be documented in this file. See [standa
* Added Server Side Rendering (SSR) support ([ba73083](https://github.com/foblex/flow/commit/ba7308383ec498f2ce79718d502ec75bd220a1b8))
* Added snap connection to create functionality ([82b3872](https://github.com/foblex/flow/commit/82b38725db63093c2a126867345d2780049492c3))
* Added snap connection to reassign functionality ([37972df](https://github.com/foblex/flow/commit/37972df1ccf933d0590d8efa8cc253b17f462464))
* Added SSR support to f-docs ([a3d6595](https://github.com/foblex/flow/commit/a3d6595fb28df1e8bfd61ccc8e989ec26e43f58d))
* Added SSR support to m-render ([a3d6595](https://github.com/foblex/flow/commit/a3d6595fb28df1e8bfd61ccc8e989ec26e43f58d))
* Changed imports from @foblex/core to @foblex/mediator, @foblex/platform, @foblex/2d ([30a60da](https://github.com/foblex/flow/commit/30a60da2e64aa87be52e6fb90f06f780b2dc0777))
* Changed imports from @foblex/core to @foblex/utils, @foblex/drag-toolkit ([26d9631](https://github.com/foblex/flow/commit/26d96313b86d068d9912b3c6ff28ca0fa6c14039))
* Cleanup after delete @foblex/core ([9aa5717](https://github.com/foblex/flow/commit/9aa5717434849c1a9b612e503d67c1a893b6b6e3))
Expand Down Expand Up @@ -93,7 +93,7 @@ All notable changes to this project will be documented in this file. See [standa
* Modified layers sorting functionality after adding f-group ([3c60249](https://github.com/foblex/flow/commit/3c602498df9dfdcd4a5a74bc174dd23000015eca))
* Moved external item drag and drop functionality to component directory ([8b9dbb1](https://github.com/foblex/flow/commit/8b9dbb114eec8816a10e7de9494bcc6e82187911))
* Moved selection area drag and drop functionality to component directory ([121a63e](https://github.com/foblex/flow/commit/121a63e1fdc8d5bdb7be9127c0008ba9f2de14e0))
* Updated to f-docs v1.2.2 ([bdaa267](https://github.com/foblex/flow/commit/bdaa267a705b701cbd5bb0886940f925412a79bd))
* Updated to m-render v1.2.2 ([bdaa267](https://github.com/foblex/flow/commit/bdaa267a705b701cbd5bb0886940f925412a79bd))


### Bug Fixes
Expand Down Expand Up @@ -124,7 +124,7 @@ All notable changes to this project will be documented in this file. See [standa
* Add various site icons and upgrade library to Zoneless ([e561e69](https://github.com/foblex/flow/commit/e561e6972a723ea299005518057963ba260961af))
* Added minimap functionality ([f5eece6](https://github.com/foblex/flow/commit/f5eece6df6e556a0ec0bbfa26ec623ce368f60ef))
* Added Zoneless support ([a8c5812](https://github.com/foblex/flow/commit/a8c581285d8c9e6f246cbd2f2a07c346ce1ba131))
* Update to f-docs v1.2.1 ([8067764](https://github.com/foblex/flow/commit/80677640c5d917b564964987b575d9fb28e28ce5))
* Update to m-render v1.2.1 ([8067764](https://github.com/foblex/flow/commit/80677640c5d917b564964987b575d9fb28e28ce5))


### Documentation
Expand Down
15 changes: 7 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
}
],
"styles": [
// "projects/f-docs/src/assets/styles/styles.scss",
"src/styles/styles.scss"
],
"scripts": [],
Expand Down Expand Up @@ -133,31 +132,31 @@
}
}
},
"f-docs": {
"m-render": {
"projectType": "library",
"root": "projects/f-docs",
"sourceRoot": "projects/f-docs/src",
"root": "projects/m-render",
"sourceRoot": "projects/m-render/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "projects/f-docs/ng-package.json"
"project": "projects/m-render/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/f-docs/tsconfig.lib.prod.json"
"tsConfig": "projects/m-render/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/f-docs/tsconfig.lib.json"
"tsConfig": "projects/m-render/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "projects/f-docs/tsconfig.spec.json",
"tsConfig": "projects/m-render/tsconfig.spec.json",
"polyfills": [
"zone.js",
"zone.js/testing"
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"start": "ng serve",
"start-shared": "ng serve --host 0.0.0.0",
"build": "ng build",
"build-sequence": "ng build f-docs && ng build",
"watch": "ng build --watch --configuration development",
"test": "ng test f-flow",
"publish": "ng build f-flow && cd dist/f-flow && npm publish",
Expand Down Expand Up @@ -69,7 +68,7 @@
"@cypress/angular": "^2.1.0",
"@foblex/2d": "1.1.5",
"@foblex/drag-toolkit": "1.1.0",
"@foblex/f-docs": "1.5.0",
"@foblex/m-render": "2.5.1",
"@foblex/mediator": "1.1.0",
"@foblex/platform": "1.0.4",
"@foblex/utils": "1.1.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ViewChild } from '@angular/core';
import { FCanvasComponent, FCreateConnectionEvent, FFlowModule } from '@foblex/flow';
import { FCheckboxComponent } from '@foblex/f-docs';
import { FCheckboxComponent } from '@foblex/m-render';
import { MatIcon } from '@angular/material/icon';

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ViewChild } from '@angular/core';
import { FCanvasComponent, FCreateConnectionEvent, FFlowModule } from '@foblex/flow';
import { FCheckboxComponent } from '@foblex/f-docs';
import { FCheckboxComponent } from '@foblex/m-render';
import { MatIcon } from '@angular/material/icon';

@Component({
Expand Down
2 changes: 1 addition & 1 deletion projects/f-examples/extensions/zoom/zoom.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ViewChild } from '@angular/core';
import { FCanvasComponent, FFlowModule, FZoomDirective } from '@foblex/flow';
import { FCheckboxComponent } from '@foblex/f-docs';
import { FCheckboxComponent } from '@foblex/m-render';

@Component({
selector: 'zoom',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as dagre from "dagre";
import { IPoint, PointExtensions } from '@foblex/2d';
import { graphlib } from 'dagre';
import Graph = graphlib.Graph;
import { FCheckboxComponent } from '@foblex/f-docs';
import { FCheckboxComponent } from '@foblex/m-render';
import { generateGuid } from '@foblex/utils';

interface INodeViewModel {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
import { EFConnectableSide, FCanvasComponent, FFlowComponent, FFlowModule } from '@foblex/flow';
import { PointExtensions } from '@foblex/2d';
import { FCheckboxComponent } from '@foblex/f-docs';
import { FCheckboxComponent } from '@foblex/m-render';
import { generateGuid } from '@foblex/utils';

@Component({
Expand Down
2 changes: 1 addition & 1 deletion public/markdown/examples/environment.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IDocsEnvironment, INavigationGroup } from '@foblex/f-docs';
import { IDocsEnvironment, INavigationGroup } from '@foblex/m-render';

export const EXAMPLES_ENVIRONMENT: IDocsEnvironment = createEnvironment();

Expand Down
2 changes: 1 addition & 1 deletion public/markdown/guides/environment.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IDocsEnvironment, INavigationGroup } from '@foblex/f-docs';
import { IDocsEnvironment, INavigationGroup } from '@foblex/m-render';

export const GUIDES_ENVIRONMENT: IDocsEnvironment = createEnvironment();

Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { MatIconRegistry } from '@angular/material/icon';
import { Subscription } from 'rxjs';
import { BrowserService } from '@foblex/platform';
import { takeScreenshot } from './take-screenshot';
import { CookiePopup, FAnalyticsService, FMetaService, IMetaData } from '@foblex/f-docs';
import { CookiePopup, FAnalyticsService, FMetaService, IMetaData } from '@foblex/m-render';
import { GUIDES_ENVIRONMENT } from '../../public/markdown/guides/environment';
import { EXAMPLES_ENVIRONMENT } from '../../public/markdown/examples/environment';

Expand Down
6 changes: 3 additions & 3 deletions src/app/app.routes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Routes } from '@angular/router';
import { GUIDES_ENVIRONMENT } from '../../public/markdown/guides/environment';
import { EXAMPLES_ENVIRONMENT } from '../../public/markdown/examples/environment';
import { F_ENVIRONMENT } from '@foblex/f-docs';
import { F_ENVIRONMENT } from '@foblex/m-render';

export const routes: Routes = [
{
Expand All @@ -13,14 +13,14 @@ export const routes: Routes = [
providers: [
{ provide: F_ENVIRONMENT, useValue: GUIDES_ENVIRONMENT }
],
loadChildren: () => import('@foblex/f-docs').then(m => m.F_DOCUMENTATION_ROUTES)
loadChildren: () => import('@foblex/m-render').then(m => m.F_DOCUMENTATION_ROUTES)
},
{
path: 'examples',
providers: [
{ provide: F_ENVIRONMENT, useValue: EXAMPLES_ENVIRONMENT }
],
loadChildren: () => import('@foblex/f-docs').then(m => m.F_DOCUMENTATION_ROUTES)
loadChildren: () => import('@foblex/m-render').then(m => m.F_DOCUMENTATION_ROUTES)
},
{
path: '**',
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="content">
<div class="flex-space"></div>
<div>
<div class="item">Created with Foblex MarkEngine</div>
<div class="item">Created with Foblex <a href="https://github.com/Foblex/m-render" target="_blank">MRender</a></div>
<div class="item">MIT License | Copyright © 2022 - Present</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/header/header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import { NgOptimizedImage } from '@angular/common';
import {
FThemeButtonComponent
} from '@foblex/f-docs';
} from '@foblex/m-render';

@Component({
selector: 'header[header]',
Expand Down
2 changes: 1 addition & 1 deletion src/styles/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@include mat.core();

@import "@angular/material/prebuilt-themes/indigo-pink.css";
@import "@foblex/f-docs/assets/styles/styles.scss";
@import "@foblex/m-render/assets/styles/styles.scss";

.f-zoom-in-icon {
mask: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M781.69-136.92 530.46-388.16q-30 24.77-69 38.77-39 14-80.69 14-102.55 0-173.58-71.01-71.03-71.01-71.03-173.54 0-102.52 71.01-173.6 71.01-71.07 173.54-71.07 102.52 0 173.6 71.03 71.07 71.03 71.07 173.58 0 42.85-14.38 81.85-14.39 39-38.39 67.84l251.23 251.23-42.15 42.16ZM380.77-395.38q77.31 0 130.96-53.66 53.66-53.65 53.66-130.96t-53.66-130.96q-53.65-53.66-130.96-53.66t-130.96 53.66Q196.15-657.31 196.15-580t53.66 130.96q53.65 53.66 130.96 53.66Zm-30-76.93V-550h-77.69v-60h77.69v-77.69h60V-610h77.69v60h-77.69v77.69h-60Z"/></svg>');
Expand Down
4 changes: 0 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
"outDir": "./dist/out-tsc",
"strict": true,
"paths": {
// "@foblex/f-docs": [
// "./projects/f-docs/src/public-api.ts"
//// "./dist/f-docs"
// ],
"@foblex/flow": [
"./projects/f-flow/src/public-api.ts"
],
Expand Down

0 comments on commit 3bce99c

Please sign in to comment.