Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Don't allow people to merge changes to these generated files, because the result
# may be invalid. You need to run "rush update" again.
pnpm-lock.yaml merge=binary
pnpm-lock.yaml merge=text
shrinkwrap.yaml merge=binary
npm-shrinkwrap.json merge=binary
yarn.lock merge=binary
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/auto-merge.action.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .github/workflows/ci.action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,10 @@ jobs:
with:
node-version: 14
- run: node common/scripts/install-run-rush.js prettier
automerge:
runs-on: ubuntu-latest
needs: [eslint_linter_job, prettier_linter_job]
steps:
- uses: fastify/github-action-merge-dependabot@v2.1.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,8 @@ common/temp/
common/autoinstallers/*/.npmrc
**/.rush/temp/

# Heft
.heft

certs/
keys/
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/nestjs-api/.prettierrc → apps/api/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"singleQuote": true,
"trailingComma": "all"
}
}
8 changes: 7 additions & 1 deletion apps/nestjs-api/CHANGELOG.json → apps/api/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"name": "nestjs-api",
"name": "api",
"entries": [
{
"version": "0.1.2",
"tag": "api_v0.1.2",
"date": "Fri, 07 Jan 2022 07:00:03 GMT",
"comments": {}
},
{
"version": "0.1.1",
"tag": "nestjs-api_v0.1.1",
Expand Down
14 changes: 14 additions & 0 deletions apps/api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Change Log - api

This log was last generated on Fri, 07 Jan 2022 07:00:03 GMT and should not be manually modified.

## 0.1.2
Fri, 07 Jan 2022 07:00:03 GMT

_Version update only_

## 0.1.1
Sun, 12 Sep 2021 04:22:23 GMT

_Initial release_

File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 5 additions & 4 deletions apps/nestjs-api/package.json → apps/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nestjs-api",
"version": "0.1.1",
"name": "api",
"version": "0.1.2",
"description": "",
"author": "",
"private": true,
Expand Down Expand Up @@ -33,7 +33,7 @@
"@nestjs/schematics": "^8.0.0",
"@nestjs/testing": "^8.0.0",
"@types/express": "^4.17.13",
"@types/jest": "^26.0.24",
"@types/jest": "^27.0.0",
"@types/node": "^16.0.0",
"@types/supertest": "^2.0.11",
"@typescript-eslint/eslint-plugin": "^4.28.2",
Expand All @@ -48,7 +48,8 @@
"ts-loader": "^9.2.3",
"ts-node": "^10.0.0",
"tsconfig-paths": "^3.10.1",
"typescript": "^4.3.5"
"typescript": "~4.3.2",
"webpack": "^5.0.0"
},
"jest": {
"moduleFileExtensions": [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions apps/frontend/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
3 changes: 3 additions & 0 deletions apps/site/.editorconfig → apps/frontend/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single

[*.md]
max_line_length = off
trim_trailing_whitespace = false
18 changes: 9 additions & 9 deletions apps/site/.eslintrc.json → apps/frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
{
"files": ["*.ts"],
"parserOptions": {
"project": ["tsconfig.json", "e2e/tsconfig.json"],
"project": ["tsconfig.json"],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/component-selector": [
"@angular-eslint/directive-selector": [
"error",
{
"prefix": "td",
"style": "kebab-case",
"type": "element"
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
"@angular-eslint/directive-selector": [
"@angular-eslint/component-selector": [
"error",
{
"prefix": "td",
"style": "camelCase",
"type": "attribute"
"type": "element",
"prefix": "app",
"style": "kebab-case"
}
]
}
Expand Down
3 changes: 1 addition & 2 deletions apps/site/.gitignore → apps/frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
/node_modules

# profiling files
chrome-profiler-events.json
speed-measure-plugin.json
chrome-profiler-events*.json

# IDEs and editors
/.idea
Expand Down
11 changes: 11 additions & 0 deletions apps/frontend/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "frontend",
"entries": [
{
"version": "0.1.2",
"tag": "frontend_v0.1.2",
"date": "Fri, 07 Jan 2022 07:00:03 GMT",
"comments": {}
}
]
}
9 changes: 9 additions & 0 deletions apps/frontend/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Change Log - frontend

This log was last generated on Fri, 07 Jan 2022 07:00:03 GMT and should not be manually modified.

## 0.1.2
Fri, 07 Jan 2022 07:00:03 GMT

_Initial release_

10 changes: 5 additions & 5 deletions apps/site/README.md → apps/frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Angular Nebular App
# Frontend

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.1.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.1.3.

## Development server

Expand All @@ -12,16 +12,16 @@ Run `ng generate component component-name` to generate a new component. You can

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.

## Running unit tests

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).

## Running end-to-end tests

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.

## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
Loading