Skip to content

Commit

Permalink
Made converters and formater stand alone
Browse files Browse the repository at this point in the history
  • Loading branch information
timothydodd committed Oct 1, 2023
1 parent ab88dc8 commit 2f9984e
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 28 deletions.
9 changes: 3 additions & 6 deletions src/app/_services/route.service.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { Type } from "@angular/core";
import { DefaultExport, Routes } from "@angular/router";
import { Observable } from "rxjs";
import { CJsonYamlComponent } from "../converters/c-json-yaml/c-json-yaml.component";
import { FJsonComponent } from "../formatters/f-json/f-json.component";
import { FSqlComponent } from "../formatters/f-sql/f-sql.component";


export class RouteService{
Expand All @@ -30,14 +27,14 @@ export class RouteService{
{
name: 'Formatters',
routes: [
{ name: 'SQL', url: '/format/sql', component: FSqlComponent },
{ name: 'JSON', url: '/format/json', component: FJsonComponent }
{ name: 'SQL', url: '/format/sql', loadComponent: () => import('../formatters/f-sql/f-sql.component').then(mod => mod.FSqlComponent) },
{ name: 'JSON', url: '/format/json', loadComponent: () => import('../formatters/f-json/f-json.component').then(mod => mod.FJsonComponent) }
]
},
{
name: 'Converters',
routes: [
{ name: 'Json To Yaml', url: '/convert/json-yaml', component: CJsonYamlComponent},
{ name: 'Json To Yaml', url: '/convert/json-yaml', loadComponent: () => import('../converters/c-json-yaml/c-json-yaml.component').then(mod => mod.CJsonYamlComponent) },
]
},
{
Expand Down
15 changes: 0 additions & 15 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,19 @@ import { FormsModule } from '@angular/forms';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { CJsonYamlComponent } from './converters/c-json-yaml/c-json-yaml.component';
import { ConvertViewComponent } from './converters/convert-view/convert-view.component';
import { FJsonComponent } from './formatters/f-json/f-json.component';
import { FSqlComponent } from './formatters/f-sql/f-sql.component';
import { FYamlComponent } from './formatters/f-yaml/f-yaml.component';
import { FormatViewComponent } from './formatters/format-view/format-view.component';
import { MonacoEditorConfig } from './monaco/monaco-global-config';
import { SideBarComponent } from './nav/side-bar/side-bar.component';

@NgModule({
declarations: [
AppComponent,
SideBarComponent,
FSqlComponent,
FormatViewComponent,
FJsonComponent,
FYamlComponent,
CJsonYamlComponent,
ConvertViewComponent,
],
imports: [
BrowserModule,
AppRoutingModule,
FormsModule,
MonacoEditorModule.forRoot(new MonacoEditorConfig()),
BrowserAnimationsModule
],
bootstrap: [AppComponent]
Expand Down
7 changes: 6 additions & 1 deletion src/app/converters/c-json-yaml/c-json-yaml.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { ConverterServiceBase } from '../_services/converter.service';
import { JsonToYamlConverter } from '../_services/json-to-yaml.service';
import { ConvertViewComponent } from '../convert-view/convert-view.component';

@Component({
selector: 'app-c-json-yaml',
templateUrl: './c-json-yaml.component.html',
styleUrls: ['./c-json-yaml.component.scss'],
providers: [{ provide: ConverterServiceBase, useClass: JsonToYamlConverter }]
providers: [{ provide: ConverterServiceBase, useClass: JsonToYamlConverter }],
standalone: true,
imports: [CommonModule, FormsModule, ConvertViewComponent],
})
export class CJsonYamlComponent {

Expand Down
9 changes: 8 additions & 1 deletion src/app/converters/convert-view/convert-view.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import { CommonModule } from '@angular/common';
import { Component, signal } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { MonacoEditorModule, NGX_MONACO_EDITOR_CONFIG } from 'ngx-monaco-editor-v2';
import { from } from 'rxjs';
import { MonacoEditorConfig } from 'src/app/monaco/monaco-global-config';
import { MonacoConfig } from 'src/app/monaco/ng-monaco-config';
import { ConverterServiceBase } from '../_services/converter.service';

@Component({
selector: 'app-convert-view',
templateUrl: './convert-view.component.html',
styleUrls: ['./convert-view.component.scss']
styleUrls: ['./convert-view.component.scss'],
standalone: true,
imports: [CommonModule, FormsModule, MonacoEditorModule],
providers: [{ provide: NGX_MONACO_EDITOR_CONFIG, useClass: MonacoEditorConfig }]
})
export class ConvertViewComponent {

Expand Down
7 changes: 6 additions & 1 deletion src/app/formatters/f-json/f-json.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { JsonFormatProvider } from '../_services/json-format.service';
import { FormatViewService } from '../_services/sql-format.service';
import { FormatViewComponent } from '../format-view/format-view.component';

@Component({
selector: 'app-f-json',
templateUrl: './f-json.component.html',
styleUrls: ['./f-json.component.scss'],
providers: [{ provide: FormatViewService, useClass: JsonFormatProvider }]
providers: [{ provide: FormatViewService, useClass: JsonFormatProvider }],
standalone: true,
imports: [CommonModule, FormsModule, FormatViewComponent],
})
export class FJsonComponent {

Expand Down
7 changes: 6 additions & 1 deletion src/app/formatters/f-sql/f-sql.component.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { FormatViewService, SqlFormatProvider } from '../_services/sql-format.service';
import { FormatViewComponent } from '../format-view/format-view.component';

@Component({
selector: 'app-f-sql',
templateUrl: './f-sql.component.html',
styleUrls: ['./f-sql.component.scss'],
providers: [{ provide: FormatViewService, useClass: SqlFormatProvider }]
providers: [{ provide: FormatViewService, useClass: SqlFormatProvider }],
standalone: true,
imports: [CommonModule, FormsModule, FormatViewComponent],
})
export class FSqlComponent {

Expand Down
7 changes: 6 additions & 1 deletion src/app/formatters/f-yaml/f-yaml.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { FormatViewComponent } from '../format-view/format-view.component';

@Component({
selector: 'app-f-yaml',
templateUrl: './f-yaml.component.html',
styleUrls: ['./f-yaml.component.scss']
styleUrls: ['./f-yaml.component.scss'],
standalone: true,
imports: [CommonModule, FormsModule, FormatViewComponent],
})
export class FYamlComponent {

Expand Down
10 changes: 8 additions & 2 deletions src/app/formatters/format-view/format-view.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { CommonModule } from '@angular/common';
import { Component, signal } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { MonacoEditorModule, NGX_MONACO_EDITOR_CONFIG } from 'ngx-monaco-editor-v2';
import { from } from 'rxjs';
import { MonacoEditorConfig } from 'src/app/monaco/monaco-global-config';
import { MonacoConfig } from '../../monaco/ng-monaco-config';
import { FormatViewService } from '../_services/sql-format.service';

@Component({
selector: 'app-format-view',
templateUrl: './format-view.component.html',
styleUrls: ['./format-view.component.scss']
styleUrls: ['./format-view.component.scss'],
standalone: true,
imports: [CommonModule, FormsModule, MonacoEditorModule],
providers: [{ provide: NGX_MONACO_EDITOR_CONFIG, useClass: MonacoEditorConfig }]
})
export class FormatViewComponent {
inputOptions: MonacoConfig;
Expand Down

0 comments on commit 2f9984e

Please sign in to comment.