Skip to content

New layout #227

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.

Sign up for GitHub

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

Open
A77AY wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New layout #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 0 additions & 58 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,64 +33,6 @@ jobs:
command: pages deploy ./dist/browser --project-name=dashboard
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
packageManager: npm
# - name: Set config
# run: |
# printf "$APP_ENV_FILE" > dist/browser/assets/appConfig.json
# printf "$AUTH_ENV_FILE" > dist/browser/assets/authConfig.json
# env:
# APP_ENV_FILE: ${{secrets.APP_CONFIG_CF}}
# AUTH_ENV_FILE: ${{secrets.AUTH_CONFIG_CF}}
# - name: Publish to CF Pages
# uses: cloudflare/pages-action@1
# with:
# apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
# accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
# projectName: 'dashboard'
# directory: 'dist/browser'
# gitHubToken: ${{ secrets.GITHUB_TOKEN }}
# branch: main
# - name: Set pcigate config
# run: |
# printf "$APP2_ENV_FILE" > dist/browser/assets/appConfig.json
# env:
# APP2_ENV_FILE: ${{secrets.APP2_ENV_FILE}}
# - name: Publish pcigate to CF Pages
# uses: cloudflare/pages-action@1
# with:
# apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
# accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
# projectName: 'dashboard-pgate'
# directory: 'dist/browser'
# gitHubToken: ${{ secrets.GITHUB_TOKEN }}
# branch: main
# - name: Set globalgatein config
# run: |
# printf "$APP3_ENV_FILE" > dist/browser/assets/appConfig.json
# env:
# APP3_ENV_FILE: ${{secrets.APP3_ENV_FILE}}
# - name: Publish globalgatein to CF Pages
# uses: cloudflare/pages-action@1
# with:
# apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
# accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
# projectName: 'dashboard-globalgatein'
# directory: 'dist/browser'
# gitHubToken: ${{ secrets.GITHUB_TOKEN }}
# branch: main
# - name: Set flow3dtunnel config
# run: |
# printf "$APP4_ENV_FILE" > dist/browser/assets/appConfig.json
# env:
# APP4_ENV_FILE: ${{secrets.APP4_ENV_FILE}}
# - name: Publish flow3dtunnel to CF Pages
# uses: cloudflare/pages-action@1
# with:
# apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
# accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
# projectName: 'dashboard-flow3dtunnel'
# directory: 'dist/browser'
# gitHubToken: ${{ secrets.GITHUB_TOKEN }}
# branch: main
notify:
name: Notify
runs-on: ubuntu-latest
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,3 @@ Thumbs.db
.env*
src/assets/*Config*.json
!src/assets/_*Config*.json

.nx/cache
.nx/workspace-data
162 changes: 162 additions & 0 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"dashboard": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular/build:application",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"browser": "src/main.ts",
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
"src/styles/core.scss",
{
"input": "src/styles/themes/eastern.scss",
"bundleName": "eastern-theme",
"inject": false
}
],
"scripts": []
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "2MB",
"maximumError": "5MB"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kB",
"maximumError": "4kB"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"outputHashing": "all"
},
"development": {
"optimization": false,
"extractLicenses": false,
"sourceMap": true
},
"stage": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.stage.ts"
}
]
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular/build:dev-server",
"configurations": {
"production": {
"buildTarget": "dashboard:build:production"
},
"development": {
"buildTarget": "dashboard:build:development"
},
"stage": {
"buildTarget": "dashboard:build:development,stage"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular/build:extract-i18n"
},
"test": {
"builder": "@angular/build:karma",
"options": {
"polyfills": ["zone.js", "zone.js/testing"],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
"src/styles/core.scss",
{
"input": "src/styles/themes/main.scss",
"bundleName": "main-theme",
"inject": false
},
{
"input": "src/styles/themes/persian-green.scss",
"bundleName": "persian-green-theme",
"inject": false
},
{
"input": "src/styles/themes/solitude.scss",
"bundleName": "solitude-theme",
"inject": false
},
{
"input": "src/styles/themes/eastern.scss",
"bundleName": "eastern-theme",
"inject": false
}
],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
},
"outputs": ["{options.outputFile}"]
}
}
}
},
"schematics": {
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
}
}
51 changes: 10 additions & 41 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,15 @@
const nx = require('@nx/eslint-plugin');
const tseslint = require('typescript-eslint');
const angular = require('angular-eslint');
const configs = require('@vality/ng-configs');

module.exports = [
...nx.configs['flat/base'],
...nx.configs['flat/typescript'],
...nx.configs['flat/javascript'],
{
ignores: ['**/dist'],
},
{
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
// Override or add rules here
rules: {},
},
// {
// files: ['**/*.json'],
// rules: {
// '@nx/dependency-checks': [
// 'error',
// {
// ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs}'],
// },
// ],
// },
// languageOptions: { parser: require('jsonc-eslint-parser') },
// },
...configs.baseEslintConfig,
module.exports = tseslint.config(
{ ignores: ['**/dist'] },
{
files: ['**/*.ts'],
extends: [...tseslint.configs.recommended, ...angular.configs.tsRecommended],
processor: angular.processInlineTemplates,
rules: {
'@angular-eslint/prefer-standalone': 'off',
},
},
...nx.configs['flat/angular'],
...nx.configs['flat/angular-template'],
{
files: ['**/*.ts'],
rules: {
'@angular-eslint/directive-selector': [
'error',
{
Expand All @@ -53,18 +26,14 @@ module.exports = [
style: 'kebab-case',
},
],
'@angular-eslint/prefer-inject': 'off',
},
},
{
files: ['**/*.html'],
// Override or add rules here
extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
rules: {},
},
...configs.baseEslintConfig,
...configs.appEslintConfig({ internalPatterns: ['@dsh/**'] }),
{
files: ['**/*.ts'],
rules: {
'@angular-eslint/prefer-standalone': 'off',
},
},
];
);
25 changes: 0 additions & 25 deletions nx.json
View file
Open in desktop

This file was deleted.

Loading
Loading