Skip to content

Commit 6612e24

Browse files
committed
$$$ update $$$
1 parent 67d1e8c commit 6612e24

File tree

5 files changed

+119
-117
lines changed

5 files changed

+119
-117
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ yarn-error.log
1212
testem.log
1313
/typings
1414
app.hosts.ts
15+
/**/*._auto-generated_.ts
16+
/**/BUILD-INFO.md
1517
/linked-repos
1618

1719
/tests-environments

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
"trailingComma": "all",
99
"bracketSameLine": true,
1010
"printWidth": 80,
11-
"singleAttributePerLine": true
11+
"singleAttributePerLine": true,
12+
"endOfLine": "auto"
1213
}

.vscode/launch.json

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,12 @@
77
"name": "Debug/Start Server",
88
"program": "${workspaceFolder}/run.js",
99
"args": [
10-
"port=4404",
10+
"port=4506",
1111
"--ENVoverride=%7B%0A%20%20%20%20%22clientProjectName%22%3A%20%22static-columns%22%0A%7D "
1212
],
1313
"outFiles": [
1414
"${workspaceFolder}/dist/**/*.js",
15-
"!**/node_modules/**",
16-
"c:/Users/darek/projects/npm/firedev-io/any-project-cli/tmp-dist-release/dist/project/any-project-cli/src/../dist/**/*.js",
17-
"c:/Users/darek/projects/npm/firedev-io/firedev/tmp-dist-release/dist/project/firedev/src/../dist/**/*.js",
18-
"c:/Users/darek/projects/npm/firedev-io/firedev-crud/tmp-dist-release/dist/project/firedev-crud/src/../dist/**/*.js",
19-
"c:/Users/darek/projects/npm/firedev-io/firedev-crud-deamon/tmp-dist-release/dist/project/firedev-crud-deamon/src/../dist/**/*.js",
20-
"c:/Users/darek/projects/npm/firedev-io/firedev-ports/tmp-dist-release/dist/project/firedev-ports/src/../dist/**/*.js",
21-
"c:/Users/darek/projects/npm/firedev-io/firedev-storage/tmp-dist-release/dist/project/firedev-storage/src/../dist/**/*.js",
22-
"c:/Users/darek/projects/npm/firedev-io/firedev-type-sql/tmp-dist-release/dist/project/firedev-type-sql/src/../dist/**/*.js",
23-
"c:/Users/darek/projects/npm/firedev-io/firedev-typeorm/tmp-dist-release/dist/project/firedev-typeorm/src/../dist/**/*.js",
24-
"c:/Users/darek/projects/npm/firedev-io/incremental-compiler/tmp-dist-release/dist/project/incremental-compiler/src/../dist/**/*.js",
25-
"c:/Users/darek/projects/npm/firedev-io/isomorphic-region-loader/tmp-dist-release/dist/project/isomorphic-region-loader/src/../dist/**/*.js",
26-
"c:/Users/darek/projects/npm/firedev-io/json10/tmp-dist-release/dist/project/json10/src/../dist/**/*.js",
27-
"c:/Users/darek/projects/npm/firedev-io/json10-writer/tmp-dist-release/dist/project/json10-writer/src/../dist/**/*.js",
28-
"c:/Users/darek/projects/npm/firedev-io/lodash-walk-object/tmp-dist-release/dist/project/lodash-walk-object/src/../dist/**/*.js",
29-
"c:/Users/darek/projects/npm/firedev-io/magic-renamer/tmp-dist-release/dist/project/magic-renamer/src/../dist/**/*.js",
30-
"c:/Users/darek/projects/npm/firedev-io/ng2-logger/tmp-dist-release/dist/project/ng2-logger/src/../dist/**/*.js",
31-
"c:/Users/darek/projects/npm/firedev-io/ng2-rest/tmp-dist-release/dist/project/ng2-rest/src/../dist/**/*.js",
32-
"c:/Users/darek/projects/npm/firedev-io/static-columns/tmp-dist-release/dist/project/static-columns/src/../dist/**/*.js",
33-
"c:/Users/darek/projects/npm/firedev-io/tnp/tmp-dist-release/dist/project/tnp/src/../dist/**/*.js",
34-
"c:/Users/darek/projects/npm/firedev-io/tnp-config/tmp-dist-release/dist/project/tnp-config/src/../dist/**/*.js",
35-
"c:/Users/darek/projects/npm/firedev-io/tnp-core/tmp-dist-release/dist/project/tnp-core/src/../dist/**/*.js",
36-
"c:/Users/darek/projects/npm/firedev-io/tnp-db/tmp-dist-release/dist/project/tnp-db/src/../dist/**/*.js",
37-
"c:/Users/darek/projects/npm/firedev-io/tnp-helpers/tmp-dist-release/dist/project/tnp-helpers/src/../dist/**/*.js",
38-
"c:/Users/darek/projects/npm/firedev-io/tnp-models/tmp-dist-release/dist/project/tnp-models/src/../dist/**/*.js",
39-
"c:/Users/darek/projects/npm/firedev-io/typescript-class-helpers/tmp-dist-release/dist/project/typescript-class-helpers/src/../dist/**/*.js",
40-
"c:/Users/darek/projects/npm/cli-tools/navi-cli/src/../dist/**/*.js",
41-
"c:/Users/darek/projects/npm/cli-tools/p1-cli/src/../dist/**/*.js",
42-
"c:/Users/darek/projects/npm/firedev-projects/application-quiz/src/../dist/**/*.js",
43-
"c:/Users/darek/projects/npm/firedev-io/firedev/projects/examples/circural-deps-ctx/src/../dist/**/*.js",
44-
"c:/Users/darek/projects/npm/firedev-io/firedev/projects/examples/crud/src/../dist/**/*.js",
45-
"c:/Users/darek/projects/npm/firedev-io/firedev/projects/examples/inject-tests/src/../dist/**/*.js",
46-
"c:/Users/darek/projects/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/main/src/lib/../dist/**/*.js",
47-
"c:/Users/darek/projects/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/second/src/lib/../dist/**/*.js",
48-
"c:/Users/darek/projects/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/third/src/lib/../dist/**/*.js"
15+
"!**/node_modules/**"
4916
],
5017
"runtimeArgs": [
5118
"--nolazy",

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,8 @@
331331
"simple-git": "1.96.0",
332332
"sinon": "15.2.0",
333333
"sloc": "0.2.0",
334-
"socket.io": "2.4.1",
334+
"socket.io": "4.7.5",
335+
"socket.io-client": "4.7.5",
335336
"sort-package-json": "1.11.0",
336337
"sql.js": "1.8.0",
337338
"static-columns": "16.444.3",

src/app.ts

Lines changed: 111 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,120 @@
1-
// //#region @notForNpm
2-
// //#region imports
3-
// import { Firedev } from 'firedev';
4-
// import { HOST_BACKEND_PORT } from './app.hosts';
5-
// //#region @browser
6-
// import { NgModule, NgZone, ViewEncapsulation } from '@angular/core';
7-
// import { Component, OnInit } from '@angular/core';
8-
// import { PreloadAllModules, RouterModule, Routes } from "@angular/router";
1+
//#region imports
2+
import { Firedev, BaseContext } from 'firedev/src';
3+
import { Observable, map } from 'rxjs';
4+
import { HOST_BACKEND_PORT } from './app.hosts';
5+
//#region @browser
6+
import { NgModule, inject, Injectable } from '@angular/core';
7+
import { Component, OnInit } from '@angular/core';
8+
import { CommonModule } from '@angular/common';
9+
//#endregion
10+
//#endregion
911

10-
// //#endregion
11-
// //#endregion
12+
console.log('hello world');
13+
console.log('Your server will start on port '+ HOST_BACKEND_PORT);
14+
const host = 'http://localhost:' + HOST_BACKEND_PORT;
1215

13-
// //#region @browser
16+
//#region static-columns component
17+
//#region @browser
18+
@Component({
19+
selector: 'app-static-columns',
20+
template: `hello from static-columns<br>
21+
<br>
22+
users from backend
23+
<ul>
24+
<li *ngFor="let user of (users$ | async)"> {{ user | json }} </li>
25+
</ul>
26+
`,
27+
styles: [` body { margin: 0px !important; } `],
28+
})
29+
export class StaticColumnsComponent {
30+
userApiService = inject(UserApiService);
31+
readonly users$: Observable<User[]> = this.userApiService.getAll();
32+
}
33+
//#endregion
34+
//#endregion
1435

15-
// //#region routes
16-
// const routes: Routes = [
17-
// {
18-
// path: '',
19-
// loadChildren: () => import('./app/preview/preview.module')
20-
// .then(m => m.PreviewModule),
21-
// },
22-
// ];
23-
// //#endregion
36+
//#region static-columns api service
37+
//#region @browser
38+
@Injectable({
39+
providedIn:'root'
40+
})
41+
export class UserApiService {
42+
userControlller = Firedev.inject(()=> MainContext.get(UserController))
43+
getAll() {
44+
return this.userControlller.getAll()
45+
.received
46+
.observable
47+
.pipe(map(r => r.body.json));
48+
}
49+
}
50+
//#endregion
51+
//#endregion
2452

25-
// //#region main component
26-
// @Component({
27-
// selector: 'app-static-columns',
28-
// encapsulation: ViewEncapsulation.None,
29-
// styleUrls: ['./app.scss'],
30-
// templateUrl: './app.html',
31-
// })
32-
// export class StaticColumnsComponent {
33-
// constructor(
34-
// private ngZone: NgZone
35-
// ) { }
53+
//#region static-columns module
54+
//#region @browser
55+
@NgModule({
56+
exports: [StaticColumnsComponent],
57+
imports: [CommonModule],
58+
declarations: [StaticColumnsComponent],
59+
})
60+
export class StaticColumnsModule { }
61+
//#endregion
62+
//#endregion
3663

37-
// }
38-
// //#endregion
64+
//#region static-columns entity
65+
@Firedev.Entity({ className: 'User' })
66+
class User extends Firedev.Base.AbstractEntity {
67+
public static ctrl?: UserController;
68+
//#region @websql
69+
@Firedev.Orm.Column.String()
70+
//#endregion
71+
name?: string;
72+
}
73+
//#endregion
3974

40-
// //#region main module
41-
// @NgModule({
42-
// imports: [
43-
// RouterModule.forRoot(routes, {
44-
// useHash: true,
45-
// preloadingStrategy: PreloadAllModules,
46-
// enableTracing: false,
47-
// }),
48-
// ],
49-
// exports: [StaticColumnsComponent],
50-
// declarations: [StaticColumnsComponent],
51-
// providers: [],
52-
// })
53-
// export class StaticColumnsModule { }
54-
// //#endregion
55-
// //#endregion
75+
//#region static-columns controller
76+
@Firedev.Controller({ className: 'UserController' })
77+
class UserController extends Firedev.Base.CrudController<User> {
78+
entityClassResolveFn = ()=> User;
79+
//#region @websql
80+
async initExampleDbData(): Promise<void> {
81+
const superAdmin = new User();
82+
superAdmin.name = 'super-admin';
83+
await this.db.save(superAdmin);
84+
}
85+
//#endregion
86+
}
87+
//#endregion
5688

57-
// //#region firedev start function
58-
// async function start() {
59-
// const host = `http://localhost:${HOST_BACKEND_PORT}`;
60-
// // Firedev.enableProductionMode();
89+
//#region static-columns context
90+
const MainContext = Firedev.createContext(()=>({
91+
host,
92+
contextName: 'MainContext',
93+
contexts:{ BaseContext },
94+
controllers: {
95+
UserController,
96+
// PUT FIREDEV CONTORLLERS HERE
97+
},
98+
entities: {
99+
User,
100+
// PUT FIREDEV ENTITIES HERE
101+
},
102+
database: true,
103+
disabledRealtime: true,
104+
}));
105+
//#endregion
61106

62-
// const context = await Firedev.init({
63-
// host,
64-
// controllers: [
65-
// // PUT FIREDEV CONTORLLERS HERE
66-
// ],
67-
// entities: [
68-
// // PUT FIREDEV ENTITIES HERE
69-
// ],
70-
// //#region @websql
71-
// config: {
72-
// type: 'better-sqlite3',
73-
// database: 'tmp-db.sqlite',
74-
// logging: false,
75-
// }
76-
// //#endregion
77-
// });
78-
// //#region @backend
79-
// // if (Firedev.isNode) {
80-
// // context.node.app.get('/hello', (req, res) => {
81-
// // res.send('Hello static-columns')
82-
// // })
83-
// // }
84-
// //#endregion
85-
// }
86-
// //#endregion
107+
async function start() {
87108

88-
// export default start;
89-
// //#endregion
109+
await MainContext.initialize();
110+
111+
if (Firedev.isBrowser) {
112+
const users = (await MainContext.getClassInstance(UserController).getAll().received)
113+
.body?.json;
114+
console.log({
115+
'users from backend': users,
116+
});
117+
}
118+
}
119+
120+
export default start;

0 commit comments

Comments
 (0)