Skip to content

Commit

Permalink
chore: taon
Browse files Browse the repository at this point in the history
  • Loading branch information
@darekf77
darekf77 committed Aug 28, 2024
1 parent 76fbc0c commit a9304d0
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 81 deletions.
3 changes: 1 addition & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ Thumbs.db
/run.js
/run-org.js
# =====================
!firedev.json
!firedev.jsonc
!taon.jsonc
*.filetemplate


Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# This file is generated by firedev
# This file is generated by taon.dev
/build
/coverage
/e2e
Expand Down
50 changes: 19 additions & 31 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,31 @@
"name": "Debug/Start Server",
"program": "${workspaceFolder}/run.js",
"args": [
"port=4506",
"port=4504",
"--ENVoverride=%7B%0A%20%20%20%20%22clientProjectName%22%3A%20%22static-columns%22%0A%7D "
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js",
"!**/node_modules/**",
"/Users/dfilipiak/npm/firedev-io/any-project-cli/tmp-dist-release/dist/project/any-project-cli/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev/tmp-dist-release/dist/project/firedev/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-crud/tmp-dist-release/dist/project/firedev-crud/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-crud-deamon/tmp-dist-release/dist/project/firedev-crud-deamon/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-ports/tmp-dist-release/dist/project/firedev-ports/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-storage/tmp-dist-release/dist/project/firedev-storage/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-type-sql/tmp-dist-release/dist/project/firedev-type-sql/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-typeorm/tmp-dist-release/dist/project/firedev-typeorm/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-ui/tmp-dist-release/dist/project/firedev-ui/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/incremental-compiler/tmp-dist-release/dist/project/incremental-compiler/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/isomorphic-region-loader/tmp-dist-release/dist/project/isomorphic-region-loader/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/json10/tmp-dist-release/dist/project/json10/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/json10-writer/tmp-dist-release/dist/project/json10-writer/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/lodash-walk-object/tmp-dist-release/dist/project/lodash-walk-object/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/magic-renamer/tmp-dist-release/dist/project/magic-renamer/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/ng2-logger/tmp-dist-release/dist/project/ng2-logger/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/ng2-rest/tmp-dist-release/dist/project/ng2-rest/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/static-columns/tmp-dist-release/dist/project/static-columns/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp/tmp-dist-release/dist/project/tnp/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-config/tmp-dist-release/dist/project/tnp-config/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-core/tmp-dist-release/dist/project/tnp-core/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-db/tmp-dist-release/dist/project/tnp-db/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-helpers/tmp-dist-release/dist/project/tnp-helpers/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-models/tmp-dist-release/dist/project/tnp-models/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/typescript-class-helpers/tmp-dist-release/dist/project/typescript-class-helpers/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/main/src/lib/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/second/src/lib/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/third/src/lib/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-projects/application-quiz/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/incremental-compiler/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/isomorphic-region-loader/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/json10/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/json10-writer/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/lodash-walk-object/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/magic-renamer/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/ng2-logger/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/ng2-rest/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/node-cli-tester/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/record-replay-req-res-scenario/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/static-columns/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-config/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-core/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-helpers/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/tnp-models/src/../dist/**/*.js",
"/Users/dfilipiak/npm/cli-tools/navi-cli/src/../dist/**/*.js",
"/Users/dfilipiak/npm/cli-tools/p1-cli/src/../dist/**/*.js"
"/Users/dfilipiak/npm/cli-tools/p1-cli/src/../dist/**/*.js",
"/Users/dfilipiak/npm/firedev-io/ng2-rest-swagger-generator/src/../dist/**/*.js"
],
"runtimeArgs": [
"--nolazy",
Expand Down
4 changes: 2 additions & 2 deletions docs-app-build-config.json5
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is generated by command: firedev release
// With this configuration you can use: firedev automatic:release:docs
// This file is generated by command: taon release
// With this configuration you can use: taon automatic:release:docs
{
build: true,
prod: true,
Expand Down
30 changes: 12 additions & 18 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"workerPlugins": {}
},
"name": "static-columns",
"version": "18.0.7",
"version": "18.0.8",
"description": "Static columns with flexbox for Agnular2",
"repository": {
"type": "git",
Expand Down Expand Up @@ -142,7 +142,7 @@
"@types/lockfile": "1.0.4",
"@types/lodash": "4.14.92",
"@types/mocha": "10.0.7",
"@types/node": "18.19.45",
"@types/node": "16.18.21",
"@types/node-notifier": "8.0.5",
"@types/oauth2orize": "1.11.5",
"@types/password-hash": "1.2.24",
Expand All @@ -161,7 +161,6 @@
"angular-material-css-vars": "7.0.0",
"angular-resize-event": "3.2.0",
"animate.css": "4.1.1",
"any-project-cli": "~18.0.6",
"app-root-path": "3.1.0",
"axios": "1.7.3",
"background-worker-process": "~16.100.10",
Expand Down Expand Up @@ -216,14 +215,6 @@
"file-loader": "1.1.11",
"file-saver": "2.0.5",
"file-type": "19.1.1",
"firedev": "^18",
"firedev-crud": "~18.0.5",
"firedev-crud-deamon": "~18.0.6",
"firedev-ports": "~18.0.5",
"firedev-storage": "~18.0.5",
"firedev-type-sql": "~18.0.6",
"firedev-typeorm": "~18.0.5",
"firedev-ui": "~18.0.4",
"fkill": "6.1.0",
"font-awesome": "4.7.0",
"form-data": "4.0.0",
Expand Down Expand Up @@ -281,7 +272,7 @@
"ng-in-viewport": "16.1.0",
"ng-lock": "18.0.1",
"ng-packagr": "18.1.0",
"ng-talkback": "~18.0.3",
"ng-talkback": "~18.0.5",
"ng2-logger": "~18.0.8",
"ng2-pdfjs-viewer": "18.0.0",
"ng2-rest": "~18.0.6",
Expand All @@ -297,7 +288,7 @@
"ngx-scrolltop": "18.0.0",
"ngx-store": "3.1.1",
"ngx-typed-js": "2.1.1",
"node-cli-tester": "~18.0.3",
"node-cli-tester": "~18.0.5",
"node-localstorage": "2.1.6",
"node-notifier": "10.0.1",
"node-polyfill-webpack-plugin": "2.0.1",
Expand Down Expand Up @@ -327,7 +318,7 @@
"q": "1.5.1",
"rallax.js": "2.0.4",
"randomcolor": "0.5.3",
"record-replay-req-res-scenario": "~18.0.3",
"record-replay-req-res-scenario": "~18.0.5",
"reflect-metadata": "0.2.2",
"rimraf": "2.6.2",
"rxjs": "~7.8.1",
Expand All @@ -345,13 +336,15 @@
"supertest": "7.0.0",
"sweetalert2": "11.7.32",
"systeminformation": "3.45.7",
"taon": "^18",
"taon-storage": "18.0.5",
"taon-type-sql": "18.0.6",
"taon-typeorm": "18.0.5",
"task.js": "0.1.5",
"threads": "1.7.0",
"tnp": "~18.0.6",
"tnp-cli": "~18.0.3",
"tnp-config": "~18.0.8",
"tnp-core": "~18.0.30",
"tnp-db": "~18.0.6",
"tnp-helpers": "~18.0.6",
"tnp-models": "~18.0.7",
"ts-debug": "1.3.0",
Expand All @@ -361,6 +354,7 @@
"tslib": "~2.6.3",
"tslint": "6.1.3",
"turndown": "7.2.0",
"type-fest": "4.25.0",
"typedoc": "0.26.5",
"typedoc-plugin-markdown": "4.2.3",
"typescript": "~5.5.4",
Expand All @@ -370,7 +364,7 @@
"uuid": "10.0.0",
"validator": "13.5.2",
"video.js": "8.3.0",
"vpn-split": "~18.0.3",
"vpn-split": "~18.0.5",
"vscode": "1.1.37",
"wait-on": "7.0.1",
"watch": "1.0.2",
Expand All @@ -381,4 +375,4 @@
"zone.js": "~0.13.0"
},
"main": "dist/app.electron.js"
}
}
18 changes: 9 additions & 9 deletions src/app.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#region imports
import { Firedev, BaseContext } from 'firedev/src';
import { Taon, BaseContext } from 'taon/lib';
import { Observable, map } from 'rxjs';
import { HOST_BACKEND_PORT } from './app.hosts';
//#region @browser
Expand Down Expand Up @@ -44,7 +44,7 @@ export class StaticColumnsComponent {
providedIn: 'root',
})
export class UserApiService {
userControlller = Firedev.inject(() => MainContext.getClass(UserController));
userControlller = Taon.inject(() => MainContext.getClass(UserController));
getAll() {
return this.userControlller
.getAll()
Expand All @@ -66,19 +66,19 @@ export class StaticColumnsModule {}
//#endregion

//#region static-columns entity
@Firedev.Entity({ className: 'User' })
class User extends Firedev.Base.AbstractEntity {
@Taon.Entity({ className: 'User' })
class User extends Taon.Base.AbstractEntity {
public static ctrl?: UserController;
//#region @websql
@Firedev.Orm.Column.String()
@Taon.Orm.Column.String()
//#endregion
name?: string;
}
//#endregion

//#region static-columns controller
@Firedev.Controller({ className: 'UserController' })
class UserController extends Firedev.Base.CrudController<User> {
@Taon.Controller({ className: 'UserController' })
class UserController extends Taon.Base.CrudController<User> {
entityClassResolveFn = () => User;
//#region @websql
async initExampleDbData(): Promise<void> {
Expand All @@ -91,7 +91,7 @@ class UserController extends Firedev.Base.CrudController<User> {
//#endregion

//#region static-columns context
const MainContext = Firedev.createContext(() => ({
const MainContext = Taon.createContext(() => ({
host,
contextName: 'MainContext',
contexts: { BaseContext },
Expand All @@ -111,7 +111,7 @@ const MainContext = Firedev.createContext(() => ({
async function start() {
await MainContext.initialize();

if (Firedev.isBrowser) {
if (Taon.isBrowser) {
const users = (
await MainContext.getClassInstance(UserController).getAll().received
).body?.json;
Expand Down
6 changes: 3 additions & 3 deletions src/app/preview/preview.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@ <h2>Fluid content</h2>
lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum
</column>
</columns-container>
<!-- <firedev-github-fork-me-corner url="https://github.com/darekf77/static-columns"></firedev-github-fork-me-corner> -->
<firedev-github-fork-me-ribbon
url="https://github.com/darekf77/static-columns"></firedev-github-fork-me-ribbon>
<!-- <taon-github-fork-me-corner url="https://github.com/darekf77/static-columns"></taon-github-fork-me-corner> -->
<taon-github-fork-me-ribbon
url="https://github.com/darekf77/static-columns"></taon-github-fork-me-ribbon>
14 changes: 7 additions & 7 deletions src/app/preview/preview.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { RouterModule, Routes } from '@angular/router';
import { PreviewComponent } from './preview.component';
import { StaticColumnsModule } from '../../lib/columns.module';
import {
FiredevGithubForkMeCornerModule,
FiredevFullMaterialModule,
FiredevGithubForkMeRibbonModule,
} from 'firedev-ui/src';
TaonGithubForkMeCornerModule,
TaonFullMaterialModule,
TaonGithubForkMeRibbonModule,
} from 'taon-ui/src';

const routes: Routes = [
{
Expand All @@ -24,9 +24,9 @@ const routes: Routes = [

@NgModule({
imports: [
FiredevGithubForkMeRibbonModule,
FiredevGithubForkMeCornerModule,
FiredevFullMaterialModule,
TaonGithubForkMeRibbonModule,
TaonGithubForkMeCornerModule,
TaonFullMaterialModule,
StaticColumnsModule,
CommonModule,
RouterModule.forChild(routes),
Expand Down
16 changes: 8 additions & 8 deletions src/tests/mocha-tests-info.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ folder inside project.

1. By using console select menu:
```
firedev test # single run
firedev test:watch # watch mode
firedev test:debug # and start "attach" VSCode debugger
firedev test:watch:debug # and start "attach" VSCode debugger
taon test # single run
taon test:watch # watch mode
taon test:debug # and start "attach" VSCode debugger
taon test:watch:debug # and start "attach" VSCode debugger
```

2. Directly:
```
firedev mocha # single run
firedev mocha:watch # watch mode
firedev mocha:debug # and start "attach" VSCode debugger
firedev mocha:watch:debug # and start "attach" VSCode debugger
taon mocha # single run
taon mocha:watch # watch mode
taon mocha:debug # and start "attach" VSCode debugger
taon mocha:watch:debug # and start "attach" VSCode debugger
```

# Example
Expand Down
0 firedev.jsonc → taon.jsonc
View file
File renamed without changes.

0 comments on commit a9304d0

Please sign in to comment.