Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Angular+ Separate Boot #763

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
"@fullcalendar/moment": "^5.11.3",
"@fullcalendar/moment-timezone": "^5.11.3",
"@fullcalendar/timegrid": "^5.11.3",
"@rollup/plugin-commonjs": "^23.0.4",
"@rollup/plugin-multi-entry": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-typescript": "^9.0.2",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-multi-entry": "^6.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.5",
"@stratusjs/angular": "file:packages/angular",
"@stratusjs/angularjs": "file:packages/angularjs",
"@stratusjs/angularjs-extras": "file:packages/angularjs-extras",
Expand Down Expand Up @@ -120,8 +120,8 @@
"bowser": "^2.11.0",
"codelyzer": "^6.0.2",
"codemirror": "^6.0.1",
"core-js": "^3.19.0",
"css-loader": "^6.7.1",
"core-js": "^3.34.0",
"css-loader": "^6.8.1",
"cssnano": "^5.1.14",
"del": "^5.0.0",
"dropzone": "^5.7.1",
Expand All @@ -131,7 +131,7 @@
"glob": "^8.0.3",
"gulp": "^4.0.2",
"gulp-babel": "^8.0.0",
"gulp-clean-css": "^4.2.0",
"gulp-clean-css": "^4.3.0",
"gulp-cli": "^2.3.0",
"gulp-coffee": "^3.0.3",
"gulp-concat": "^2.6.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@angular/platform-browser-dynamic": "^12.2.16",
"@angular/router": "^12.2.16",
"@codemirror/lang-html": "^6.4.0",
"@stratusjs/boot": "^0.4.0",
"@stratusjs/boot": "^1.2.0",
"@stratusjs/core": "^0.6.2",
"@stratusjs/runtime": "^0.12.1",
"angular-froala-wysiwyg": "^3.2.7",
Expand All @@ -65,6 +65,7 @@
"hammerjs": "^2.0.8",
"html2pdf.js": "^0.9.2",
"lodash": "^4.17.21",
"ngx-json-viewer": "^3.0.1",
"reflect-metadata": "^0.1.13",
"rxjs": "^6.6.7",
"rxjs-compat": "^6.6.7",
Expand Down
10 changes: 10 additions & 0 deletions packages/angular/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {BaseComponent} from './base/base.component'
// Stratus Custom Directives/Components
import {ConfirmDialogComponent} from './confirm-dialog/confirm-dialog.component'
import {EditorComponent} from './editor/editor.component'
import {JsonComponent} from './json/json.component'
import {MediaSelectorComponent} from './media-selector/media-selector.component'
import {SelectorComponent} from './selector/selector.component'
import {TreeComponent} from './tree/tree.component'
Expand All @@ -57,6 +58,11 @@ import {
FroalaViewModule
} from 'angular-froala-wysiwyg'

// ngx-json-viewer Module (Required by JSON)
import {
NgxJsonViewerModule
} from 'ngx-json-viewer'

// Editor Dialogs
import {CitationDialogComponent} from './editor/citation-dialog.component'
import {
Expand Down Expand Up @@ -111,6 +117,7 @@ const ngModuleImports: any[] = [
HttpClientModule,
MaterialModules,
MatNativeDateModule,
NgxJsonViewerModule,
ReactiveFormsModule,
// SelectorComponent.forRoot()
]
Expand All @@ -122,6 +129,7 @@ const ngDeclarations: any[] = [
CodeViewDialogComponent,
ConfirmDialogComponent,
EditorComponent,
JsonComponent,
LinkDialogComponent,
MediaDialogComponent,
MediaSelectorComponent,
Expand All @@ -138,6 +146,7 @@ const ngEntryComponents: any[] = [
CodeViewDialogComponent,
ConfirmDialogComponent,
EditorComponent,
JsonComponent,
LinkDialogComponent,
MediaDialogComponent,
MediaSelectorComponent,
Expand All @@ -150,6 +159,7 @@ const ngEntryComponents: any[] = [
const appModuleComponents = {
'sa-base': BaseComponent,
'sa-editor': EditorComponent,
'sa-json': JsonComponent,
'sa-media-selector': MediaSelectorComponent,
'sa-selector': SelectorComponent,
'sa-tree': TreeComponent
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/base/base.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class BaseComponent extends RootComponent implements OnInit, OnChanges {
}

ngOnInit() {
console.info('selector.ngOnInit')
console.info('base.ngOnInit')
}

ngOnChanges() {
Expand Down
1 change: 1 addition & 0 deletions packages/angular/src/boot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ function angularBoot() {
// 'sa-base',
'sa-boot', // Forcibly Boot Angular. Useful if element is not directly on a page onLoad
'sa-editor',
'sa-json',
'sa-map',
'sa-media-selector',
'sa-selector',
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/editor/editor.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,7 @@ export class EditorComponent extends RootComponent implements OnInit, TriggerInt
// Stratus Angular+ Tags
'sa-boot',
'sa-editor',
'sa-json',
'sa-map',
'sa-media-selector',
'sa-selector',
Expand Down Expand Up @@ -837,6 +838,7 @@ export class EditorComponent extends RootComponent implements OnInit, TriggerInt
// Stratus Angular+ Tags
'sa-boot',
'sa-editor',
'sa-json',
'sa-map',
'sa-media-selector',
'sa-selector',
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/json/json.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<span>Loaded!</span>
<ngx-json-viewer [json]="data"></ngx-json-viewer>
3 changes: 3 additions & 0 deletions packages/angular/src/json/json.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
sa-json {
// stub for now
}
Loading