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
12 changes: 6 additions & 6 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@ jobs:

steps:
- name: 🚚 Get latest code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install Node.js 20
uses: actions/setup-node@v1
- name: Install Node.js 22
uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: '22'

- name: 🔨 Build Project
run: |
yarn
yarn build-prod

- name: 📂 Deploy to Server
uses: easingthemes/ssh-deploy@v2.1.5
uses: easingthemes/ssh-deploy@v4
env:
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
# ARGS: "-rltgoDzvO --delete"
SOURCE: 'dist/'
REMOTE_HOST: 91.108.116.107
REMOTE_HOST: 82.29.156.38
REMOTE_USER: u106957989
REMOTE_PORT: '65002'
TARGET: domains/codedthemes.com/public_html/demos/admin-templates/datta-able/angular/free
Expand Down
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"tabWidth": 2,
"useTabs": false,
"htmlWhitespaceSensitivity": "ignore",
"bracketSameLine": false
"bracketSameLine": false,
"endOfLine": "lf"
}
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@
},
"cli": {
"analytics": "0eaad924-6e2a-434b-aad5-51d9f46776fc",
"schematicCollections": ["angular-eslint"]
"schematicCollections": ["@angular-eslint/schematics"]
}
}
89 changes: 51 additions & 38 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,46 +1,59 @@
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import js from '@eslint/js';
import { FlatCompat } from '@eslint/eslintrc';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [{
ignores: ["projects/**/*"],
}, ...compat.extends(
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
).map(config => ({
...config,
files: ["**/*.ts"],
})), {
files: ["**/*.ts"],

export default [
{
ignores: ['projects/**/*']
},
...compat
.extends(
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@angular-eslint/recommended',
'plugin:@angular-eslint/template/process-inline-templates'
)
.map((config) => ({
...config,
files: ['**/*.ts']
})),
{
files: ['**/*.ts'],
rules: {
"@angular-eslint/directive-selector": ["error", {
type: "attribute",
prefix: "app",
style: "camelCase",
}],

"@angular-eslint/component-selector": ["error", {
type: "element",
prefix: "app",
style: "kebab-case",
}],
},
}, ...compat.extends("plugin:@angular-eslint/template/recommended").map(config => ({
'@angular-eslint/directive-selector': [
'error',
{
type: 'attribute',
prefix: 'app',
style: 'camelCase'
}
],
'@angular-eslint/component-class-suffix': 'off',
'@angular-eslint/component-selector': [
'error',
{
type: 'element',
prefix: 'app',
style: 'kebab-case'
}
]
}
},
...compat.extends('plugin:@angular-eslint/template/recommended').map((config) => ({
...config,
files: ["**/*.html"],
})), {
files: ["**/*.html"],
rules: {},
}];
files: ['**/*.html']
})),
{
files: ['**/*.html'],
rules: {}
}
];
Loading