Skip to content

Commit c5aa249

Browse files
author
kevserozkan
committed
Merge branch 'refs/heads/main' into feature/AYS-227/create-pre-application
# Conflicts: # src/app/globals.css # src/components/ui/form.tsx # src/components/ui/toast.tsx
2 parents f85c47f + b77cbc4 commit c5aa249

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1248
-871
lines changed

.eslintrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"extends": [
3+
"next/core-web-vitals",
4+
"plugin:@typescript-eslint/recommended",
5+
"plugin:prettier/recommended"
6+
],
7+
"parser": "@typescript-eslint/parser",
8+
"plugins": ["@typescript-eslint", "prettier"],
9+
"rules": {
10+
"prettier/prettier": "warn",
11+
"@typescript-eslint/no-explicit-any": "warn",
12+
"@typescript-eslint/no-unused-vars": "warn",
13+
"@typescript-eslint/ban-ts-comment": "warn",
14+
"@typescript-eslint/ban-types": "warn",
15+
"@typescript-eslint/explicit-function-return-type": "warn",
16+
"@typescript-eslint/no-empty-function": "warn"
17+
}
18+
}

.eslintrc.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ yarn-error.log*
3131
# vercel
3232
.vercel
3333

34+
# vscode
35+
.vscode
36+
3437
# typescript
3538
*.tsbuildinfo
3639
next-env.d.ts

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
node_modules
2+
3+
build
4+
coverage

.prettierrc

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
2-
"semi": false,
2+
"printWidth": 80,
33
"tabWidth": 2,
44
"singleQuote": true,
5-
"endOfLine": "lf"
6-
}
5+
"bracketSpacing": true,
6+
"semi": false,
7+
"useTabs": false,
8+
"bracketSameLine": false,
9+
"jsxSingleQuote": false,
10+
"arrowParens": "always",
11+
"endOfLine": "lf",
12+
"trailingComma": "es5"
13+
}

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ Here are some additional standards to keep in mind:
9494
- Avoid including secret/credential information.
9595
- Code should comply with existing coding standards; no new standards should be introduced without justification.
9696

97-
9897
## Pull Request Guidelines
9998

10099
When submitting a pull request, please adhere to the following guidelines:

PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,37 @@ Before submitting your pull request, ensure the following:
1010
- [ ] Other (please specify)
1111

1212
- [ ] **Summary:**
13-
- Add a short description (e.g., added or modified features).
13+
14+
- Add a short description (e.g., added or modified features).
1415

1516
- [ ] **Title and Branch Naming Conventions:**
16-
- The pull request title follows the
17-
standard: [Pull Request Naming Conventions](CONTRIBUTING.md#pull-request-naming-conventions).
18-
- The branch name follows one of the conventions outlined in
19-
the [Branch Naming Conventions](CONTRIBUTING.md#branch-naming-conventions).
17+
18+
- The pull request title follows the
19+
standard: [Pull Request Naming Conventions](CONTRIBUTING.md#pull-request-naming-conventions).
20+
- The branch name follows one of the conventions outlined in
21+
the [Branch Naming Conventions](CONTRIBUTING.md#branch-naming-conventions).
2022

2123
- [ ] **Local Testing:**
22-
- I have tested my changes locally on my browser, and they are working as expected.
24+
25+
- I have tested my changes locally on my browser, and they are working as expected.
2326

2427
- [ ] **Code Quality:**
25-
- The code is formatted according to the project's coding guidelines and style.
26-
- The code has been reviewed to ensure its quality.
27-
- The code does not contain any issues flagged by ESLint.
28+
29+
- The code is formatted according to the project's coding guidelines and style.
30+
- The code has been reviewed to ensure its quality.
31+
- The code does not contain any issues flagged by ESLint.
2832

2933
- [ ] **Documentation:**
30-
- Necessary documentation has been added or existing documentation has been updated.
34+
35+
- Necessary documentation has been added or existing documentation has been updated.
3136

3237
- [ ] **Reviewers and Assignees:**
33-
- Default reviewers have been assigned to this pull request.
34-
- Assignees have been added if necessary.
3538

36-
- [ ] **Related Issue:**
37-
- Closes #AYS-345 (If there is a relevant issue)
39+
- Default reviewers have been assigned to this pull request.
40+
- Assignees have been added if necessary.
41+
42+
- [ ] **Related Issue:**
43+
- Closes #AYS-345 (If there is a relevant issue)
3844

3945
- [ ] **Labels and Associations:**
40-
- No specific actions are required in the Labels and Associations section for this pull request.
46+
- No specific actions are required in the Labels and Associations section for this pull request.

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ npm run dev
4242

4343
Note that you need to install [Node.js](https://nodejs.org/en/) and [npm](https://www.npmjs.com/) to run the project locally. We recommend using `version v18` of Node.js.
4444

45+
### Useful Commands
46+
47+
- **`npm run lint`**: Runs ESLint to check for code issues.
48+
- **`npm run lint:fix`**: Runs ESLint and fixes auto-fixable issues.
49+
- **`npm run format`**: Checks code formatting with Prettier.
50+
- **`npm run format:fix`**: Formats code according to Prettier rules.
51+
4552
##  Contributing
4653

4754
Thank you for your interest in contributing to Afet Yönetim Sistemi project. We appreciate your help in making our project better and more useful to everyone. To contribute to the project, please read the [contributing guidelines](CONTRIBUTING.md) first.

components.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
"components": "@/components",
1515
"utils": "@/lib/utils"
1616
}
17-
}
17+
}

0 commit comments

Comments
 (0)