Skip to content

Commit

Permalink
changed namespace and projects to zajsf
Browse files Browse the repository at this point in the history
  • Loading branch information
zahmo committed Sep 4, 2023
1 parent ff7dfd1 commit c7af65b
Show file tree
Hide file tree
Showing 149 changed files with 27,067 additions and 27,065 deletions.
24 changes: 12 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Contributing to ajsf
# Contributing to zajsf

ajsf is an open project and welcomes contributions. These guidelines are provided to help you understand how the project works and to make contributing smooth and fun for everybody involved.
zajsf is an open project and welcomes contributions. These guidelines are provided to help you understand how the project works and to make contributing smooth and fun for everybody involved.

There are two main forms of contribution: reporting issues and performing code changes.

## Reporting Issues

If you find a problem with ajsf, report it using [GitHub issues](https://github.com/hamzahamidi/ajsf/issues/new).
If you find a problem with zajsf, report it using [GitHub issues](https://github.com/zahmo/zajsf/issues/new).

Before reporting a new issue, please take a moment to check whether it has already been reported
[here](https://github.com/hamzahamidi/ajsf/issues). If this is the case, please:
[here](https://github.com/zahmo/zajsf/issues). If this is the case, please:

- Read all the comments to confirm that it's the same issue you're having.
- Refrain from adding "same thing here" or "+1" comments. Just hit the
Expand Down Expand Up @@ -43,7 +43,7 @@ To send your code change, use GitHub pull requests. The workflow is as follows:

1. Publish the branch and create a pull request.

1. ajsf developers will review your change and possibly point out issues.
1. zajsf developers will review your change and possibly point out issues.
Adapt the code under their guidance until all issues are resolved.

1. Finally, the pull request will get merged or rejected.
Expand All @@ -58,15 +58,15 @@ requests.
Let's first generate all the bundles we need to start the demo:

```bash
$ cd ajsf
$ cd zajsf
$ yarn install or npm install
$ yarn start
```

You can stop the demo application.
The tricky part now is to run concurrently both the demo application & the library in watch mode.
So, first choose which library you want to change then run `$ ng build @ajsf/core --watch` for example
to build in watch mode the `@ajsf/core`.
So, first choose which library you want to change then run `$ ng build @zajsf/core --watch` for example
to build in watch mode the `@zajsf/core`.
Now let's start the demo application in watch mode too. So, open a new terminal and run `$ ng serve` and there you go.
This method is tricky but it works perfectly in all environments (I tried other methods like npm-run-all
or concurrently packages but angular-cli build doesn't restart after a failed build).
Expand Down Expand Up @@ -128,10 +128,10 @@ The scope should be the name of the npm package affected (as perceived by the pe

The following is the list of supported scopes:

* **ajsf/core**
* **ajsf/bs3**
* **ajsf/bs4**
* **ajsf/material**
* **zajsf/core**
* **zajsf/bs3**
* **zajsf/bs4**
* **zajsf/material**
* **locales**
* **demo**
* ...
Expand Down
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# AJSF (Angular JSON Schema Form)
This fork was created for anyone needing to use angular 15+ in there project until
[hamzahamidi/ajsf](https://github.com/hamzahamidi/ajsf) is updated for angular 15+.
[zahmo/zajsf](https://github.com/zahmo/zajsf) is updated for angular 15+.

**N.B:** For Angular6-json-schema-form please check [this documentation](https://github.com/zahmo/ajsf/tree/angular6-json-schema-form).

<p align="center">
<a href="https://github.com/zahmo/ajsf/actions?query=workflow%3ACI+branch%3Amain"><img src="https://github.com/zahmo/ajsf/workflows/CI/badge.svg" alt="CI Status"></a>
<a href="https://www.npmjs.com/package/@ajsf/core"><img src="https://img.shields.io/npm/dm/@ajsf/core.svg?style=plastic" alt="npm number of downloads"></a>
<a href="https://www.npmjs.com/package/@zajsf/core"><img src="https://img.shields.io/npm/dm/@zajsf/core.svg?style=plastic" alt="npm number of downloads"></a>
<a href="https://github.com/zahmo/ajsf/blob/master/LICENSE"><img src="https://img.shields.io/github/license/zahmo/ajsf.svg?style=social" alt="LICENSE IMT"></a>
<a href="https://app.netlify.com/sites/ajsf/deploys"><img src="https://api.netlify.com/api/v1/badges/6c5b5a1d-db7c-4d0e-8ac1-a4840d8812f0/deploy-status" alt="Netlify Status"></a>
</p>
Expand All @@ -21,10 +21,10 @@ A [JSON Schema](http://json-schema.org) Form builder for Angular, similar to, an

## Packages

* [`@ajsf/core`](./README.md) [![npm version](https://badge.fury.io/js/%40ajsf%2Fcore.svg)](https://badge.fury.io/js/%40ajsf%2Fcore)
* [`@ajsf/bootstrap3`](./projects/ajsf-bootstrap3/README.md) [![npm version](https://badge.fury.io/js/%40ajsf%2Fbootstrap3.svg)](https://badge.fury.io/js/%40ajsf%2Fbootstrap3)
* [`@ajsf/bootstrap4`](./projects/ajsf-bootstrap4/README.md) [![npm version](https://badge.fury.io/js/%40ajsf%2Fbootstrap4.svg)](https://badge.fury.io/js/%40ajsf%2Fbootstrap4)
* [`@ajsf/material`](./projects/ajsf-material/README.md) [![npm version](https://badge.fury.io/js/%40ajsf%2Fmaterial.svg)](https://badge.fury.io/js/%40ajsf%2Fmaterial)
* [`@zajsf/core`](./README.md) [![npm version](https://badge.fury.io/js/%40ajsf%2Fcore.svg)](https://badge.fury.io/js/%40ajsf%2Fcore)
* [`@zajsf/bootstrap3`](./projects/ajsf-bootstrap3/README.md) [![npm version](https://badge.fury.io/js/%40ajsf%2Fbootstrap3.svg)](https://badge.fury.io/js/%40ajsf%2Fbootstrap3)
* [`@zajsf/bootstrap4`](./projects/ajsf-bootstrap4/README.md) [![npm version](https://badge.fury.io/js/%40ajsf%2Fbootstrap4.svg)](https://badge.fury.io/js/%40ajsf%2Fbootstrap4)
* [`@zajsf/material`](./projects/ajsf-material/README.md) [![npm version](https://badge.fury.io/js/%40ajsf%2Fmaterial.svg)](https://badge.fury.io/js/%40ajsf%2Fmaterial)

## Check out the live demo and play with the examples

Expand All @@ -36,16 +36,16 @@ This example playground features over 70 different JSON Schemas for you to try (

### To install from NPM/YARN and use in your own project

If you want to try out the libraries, you can for example [install @ajsf/material package from NPM](https://www.npmjs.com/package/@ajsf/material) which uses `material-angular` UI. You can use either [NPM](https://www.npmjs.com) or [Yarn](https://yarnpkg.com). To install with NPM, run the following from your terminal:
If you want to try out the libraries, you can for example [install @zajsf/material package from NPM](https://www.npmjs.com/package/@zajsf/material) which uses `material-angular` UI. You can use either [NPM](https://www.npmjs.com) or [Yarn](https://yarnpkg.com). To install with NPM, run the following from your terminal:

```shell
npm install @ajsf/material@latest
npm install @zajsf/material@latest
```

With YARN, run the following:

```shell
yarn add @ajsf/material@latest
yarn add @zajsf/material@latest
```

Then import `MaterialDesignFrameworkModule` in your main application module like this:
Expand All @@ -54,7 +54,7 @@ Then import `MaterialDesignFrameworkModule` in your main application module like
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';

import { MaterialDesignFrameworkModule } from '@ajsf/material';
import { MaterialDesignFrameworkModule } from '@zajsf/material';

import { AppComponent } from './app.component';

Expand All @@ -71,10 +71,10 @@ export class AppModule { }

Four framework modules are currently included, the import is the same as above :

* MaterialDesignFrameworkModule from @ajsf/material — Material Design
* Bootstrap3FrameworkModule from @ajsf/bootstrap3 — Bootstrap 3
* Bootstrap4FrameworkModule from @ajsf/bootstrap4 — Bootstrap 4
* JsonSchemaFormModule from @ajsf/core — plain HTML (for testing)
* MaterialDesignFrameworkModule from @zajsf/material — Material Design
* Bootstrap3FrameworkModule from @zajsf/bootstrap3 — Bootstrap 3
* Bootstrap4FrameworkModule from @zajsf/bootstrap4 — Bootstrap 4
* JsonSchemaFormModule from @zajsf/core — plain HTML (for testing)

It is also possible to load multiple frameworks and switch between them at runtime, like the example playground on GitHub. But most typical sites will just load one framework.

Expand Down Expand Up @@ -436,7 +436,7 @@ const yourNewWidgets = {
...or...

```javascript
import { WidgetLibraryService } from '@ajsf/core';
import { WidgetLibraryService } from '@zajsf/core';
...
constructor(private widgetLibrary: WidgetLibraryService) { }
...
Expand Down Expand Up @@ -476,7 +476,7 @@ const yourCustomFramework = {
...or...

```javascript
import { FrameworkLibraryService } from '@ajsf/core';
import { FrameworkLibraryService } from '@zajsf/core';
...
constructor(private frameworkLibrary: FrameworkLibraryService) { }
...
Expand Down
72 changes: 36 additions & 36 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,115 +108,115 @@
}
}
},
"@ajsf/core": {
"root": "projects/ajsf-core",
"sourceRoot": "projects/ajsf-core/src",
"@zajsf/core": {
"root": "projects/zajsf-core",
"sourceRoot": "projects/zajsf-core/src",
"projectType": "library",
"prefix": "",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/ajsf-core/tsconfig.lib.json",
"project": "projects/ajsf-core/ng-package.json"
"tsConfig": "projects/zajsf-core/tsconfig.lib.json",
"project": "projects/zajsf-core/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/ajsf-core/tsconfig.lib.prod.json"
"tsConfig": "projects/zajsf-core/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ajsf-core/src/test.ts",
"tsConfig": "projects/ajsf-core/tsconfig.spec.json",
"karmaConfig": "projects/ajsf-core/karma.conf.js"
"main": "projects/zajsf-core/src/test.ts",
"tsConfig": "projects/zajsf-core/tsconfig.spec.json",
"karmaConfig": "projects/zajsf-core/karma.conf.js"
}
}
}
},
"@ajsf/bootstrap4": {
"@zajsf/bootstrap4": {
"projectType": "library",
"root": "projects/ajsf-bootstrap4",
"sourceRoot": "projects/ajsf-bootstrap4/src",
"root": "projects/zajsf-bootstrap4",
"sourceRoot": "projects/zajsf-bootstrap4/src",
"prefix": "",
"architect": {

"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/ajsf-bootstrap4/tsconfig.lib.json",
"project": "projects/ajsf-bootstrap4/ng-package.json"
"tsConfig": "projects/zajsf-bootstrap4/tsconfig.lib.json",
"project": "projects/zajsf-bootstrap4/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/ajsf-bootstrap4/tsconfig.lib.prod.json"
"tsConfig": "projects/zajsf-bootstrap4/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ajsf-bootstrap4/src/test.ts",
"tsConfig": "projects/ajsf-bootstrap4/tsconfig.spec.json",
"karmaConfig": "projects/ajsf-bootstrap4/karma.conf.js"
"main": "projects/zajsf-bootstrap4/src/test.ts",
"tsConfig": "projects/zajsf-bootstrap4/tsconfig.spec.json",
"karmaConfig": "projects/zajsf-bootstrap4/karma.conf.js"
}
}
}
},
"@ajsf/bootstrap3": {
"@zajsf/bootstrap3": {
"projectType": "library",
"root": "projects/ajsf-bootstrap3",
"sourceRoot": "projects/ajsf-bootstrap3/src",
"root": "projects/zajsf-bootstrap3",
"sourceRoot": "projects/zajsf-bootstrap3/src",
"prefix": "",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/ajsf-bootstrap3/tsconfig.lib.json",
"project": "projects/ajsf-bootstrap3/ng-package.json"
"tsConfig": "projects/zajsf-bootstrap3/tsconfig.lib.json",
"project": "projects/zajsf-bootstrap3/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/ajsf-bootstrap3/tsconfig.lib.prod.json"
"tsConfig": "projects/zajsf-bootstrap3/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ajsf-bootstrap3/src/test.ts",
"tsConfig": "projects/ajsf-bootstrap3/tsconfig.spec.json",
"karmaConfig": "projects/ajsf-bootstrap3/karma.conf.js"
"main": "projects/zajsf-bootstrap3/src/test.ts",
"tsConfig": "projects/zajsf-bootstrap3/tsconfig.spec.json",
"karmaConfig": "projects/zajsf-bootstrap3/karma.conf.js"
}
}
}
},
"@ajsf/material": {
"@zajsf/material": {
"projectType": "library",
"root": "projects/ajsf-material",
"sourceRoot": "projects/ajsf-material/src",
"root": "projects/zajsf-material",
"sourceRoot": "projects/zajsf-material/src",
"prefix": "",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/ajsf-material/tsconfig.lib.json",
"project": "projects/ajsf-material/ng-package.json"
"tsConfig": "projects/zajsf-material/tsconfig.lib.json",
"project": "projects/zajsf-material/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/ajsf-material/tsconfig.lib.prod.json"
"tsConfig": "projects/zajsf-material/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ajsf-material/src/test.ts",
"tsConfig": "projects/ajsf-material/tsconfig.spec.json",
"karmaConfig": "projects/ajsf-material/karma.conf.js"
"main": "projects/zajsf-material/src/test.ts",
"tsConfig": "projects/zajsf-material/tsconfig.spec.json",
"karmaConfig": "projects/zajsf-material/karma.conf.js"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions demo/app/demo.component.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { animate, state, style, transition, trigger } from '@angular/animations';
import { HttpClient } from '@angular/common/http';
import { Component, OnInit, ViewChild } from '@angular/core';
import { MatMenuTrigger } from '@angular/material/menu';
import { trigger, state, style, animate, transition } from '@angular/animations';
import { ActivatedRoute, Router } from '@angular/router';
import { HttpClient } from '@angular/common/http';

import { JsonPointer } from '@zajsf/core';
import { Examples } from './example-schemas.model';
import { JsonPointer } from '@ajsf/core';

@Component({
// tslint:disable-next-line:component-selector
Expand Down
8 changes: 4 additions & 4 deletions demo/app/demo.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
import { Bootstrap3FrameworkModule } from '@ajsf/bootstrap3';
import { Bootstrap4FrameworkModule } from '@ajsf/bootstrap4';
import { JsonSchemaFormModule } from '@ajsf/core';
import { MaterialDesignFrameworkModule } from '@ajsf/material';
import { HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
Expand All @@ -15,6 +11,10 @@ import { MatToolbarModule } from '@angular/material/toolbar';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router';
import { Bootstrap3FrameworkModule } from '@zajsf/bootstrap3';
import { Bootstrap4FrameworkModule } from '@zajsf/bootstrap4';
import { JsonSchemaFormModule } from '@zajsf/core';
import { MaterialDesignFrameworkModule } from '@zajsf/material';
import { AceEditorDirective } from './ace-editor.directive';
import { DemoRootComponent } from './demo-root.component';
import { DemoComponent } from './demo.component';
Expand Down
2 changes: 1 addition & 1 deletion demo/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ body {
width: 100%;
}

@import '../projects/ajsf-material/src/lib/flexlayout-replacement-styles.scss'
@import '../projects/zajsf-material/src/lib/flexlayout-replacement-styles.scss'
Loading

0 comments on commit c7af65b

Please sign in to comment.