Skip to content

Commit

Permalink
Merge pull request #224 from devvsakib/revert-217-prettier
Browse files Browse the repository at this point in the history
Revert "Prettier Integration"
  • Loading branch information
devvsakib authored Jul 29, 2024
2 parents 4d1e48f + deb2577 commit 0a887b6
Show file tree
Hide file tree
Showing 54 changed files with 624 additions and 753 deletions.
24 changes: 11 additions & 13 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
title: ""
labels: ""
assignees: ""
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,17 +24,15 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
title: ""
labels: ""
assignees: ""
title: ''
labels: ''
assignees: ''

---


7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
name: Feature request
about: Suggest an idea for this project
title: ""
labels: ""
assignees: ""
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
interval: "daily"
2 changes: 1 addition & 1 deletion .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: "Congratulations, ${{ github.actor }}! 🎉 Thank you for creating your first issue in GES. Your contribution is greatly appreciated and we look forward to working with you to resolve the issue. Keep up the great work!"
pr-message: "Great job, ${{ github.actor }}! 🎉 Thank you for submitting your first pull request to GES. Your contribution is valuable and we appreciate your efforts to improve our project. We'll review your changes and provide feedback as soon as possible. Keep up the great work!"
pr-message: "Great job, ${{ github.actor }}! 🎉 Thank you for submitting your first pull request to GES. Your contribution is valuable and we appreciate your efforts to improve our project. We'll review your changes and provide feedback as soon as possible. Keep up the great work!"
2 changes: 1 addition & 1 deletion .github/workflows/jsoncheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
- name: json-syntax-check
uses: limitusus/json-syntax-check@v2
with:
pattern: "\\.json$"
pattern: "\\.json$"
4 changes: 0 additions & 4 deletions .prettierrc

This file was deleted.

22 changes: 11 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community include:

- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
- Focusing on what is best not just for us as individuals, but for the
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

- The use of sexualized language or imagery, and sexual attention or
* The use of sexualized language or imagery, and sexual attention or
advances of any kind
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or email
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
- Other conduct which could reasonably be considered inappropriate in a
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities
Expand Down Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand Down
71 changes: 32 additions & 39 deletions contributing.md
Original file line number Diff line number Diff line change
@@ -1,71 +1,66 @@
### How to contribute.
### How to contribute.

> There two ways you can contribute here
- Direct from GitHub
- Direct from GitHub
- Using a code editor(e.g vs code)



First Fork the repository
![First Fork the repository](https://user-images.githubusercontent.com/88102392/226692241-59d8adad-78ac-437a-99bb-c1396b9e61cf.png)

# 1. Step Direct from GitHub
- After forking the repository click on `go to file`

- After forking the repository click on `go to file`
![Go to file](https://user-images.githubusercontent.com/88102392/226693809-e96e3bfd-c5c2-4463-871e-5bcc1f8ef9e3.png)

![Go to file](https://user-images.githubusercontent.com/88102392/226693809-e96e3bfd-c5c2-4463-871e-5bcc1f8ef9e3.png)
- Navigate to the `src/data/error.json`

- Navigate to the `src/data/error.json`
![image](https://user-images.githubusercontent.com/88102392/226694741-92c67935-db29-4340-ae15-8beaa2651b09.png)

- Add your code in the `error.json` file usng this format

![image](https://user-images.githubusercontent.com/88102392/226694741-92c67935-db29-4340-ae15-8beaa2651b09.png)
```code
{
"type": "<Problem-type (e.g push, merge etc.)>",
"title": "<Exact title of the error>",
"description": "<Description of the error>",
"solutions": "<Soliution of the error>"
}
- Add your code in the `error.json` file usng this format
```
- Now add a suitable commit message like this & create a new branch by clicking the second option. Click on Propose changes

```code
{
"type": "<Problem-type (e.g push, merge etc.)>",
"title": "<Exact title of the error>",
"description": "<Description of the error>",
"solutions": "<Soliution of the error>"
}
```
![image](https://user-images.githubusercontent.com/88102392/226696447-ca59da05-47e9-48d4-9b11-0821356d7dab.png)

- Now add a suitable commit message like this & create a new branch by clicking the second option. Click on Propose changes

![image](https://user-images.githubusercontent.com/88102392/226696447-ca59da05-47e9-48d4-9b11-0821356d7dab.png)
- Click on `Compare & across forks `, Select `devvsakib/github-error-solve` in the base repository & also click on `Create Pull Request ` button.

- Click on `Compare & across forks `, Select `devvsakib/github-error-solve` in the base repository & also click on `Create Pull Request ` button.
![image](https://user-images.githubusercontent.com/88102392/226697482-95f5b392-bfae-4301-bd9d-eead9734045f.png)

![image](https://user-images.githubusercontent.com/88102392/226697482-95f5b392-bfae-4301-bd9d-eead9734045f.png)
- Fill the description & add a best commit title & create Pull request

- Fill the description & add a best commit title & create Pull request
![image](https://user-images.githubusercontent.com/88102392/226698872-e2254cf0-a794-4e76-8926-cd1aa3bbb804.png)



![image](https://user-images.githubusercontent.com/88102392/226698872-e2254cf0-a794-4e76-8926-cd1aa3bbb804.png)

That's it.

# 2. Using a Code editor(e.g Vs code)
That's it.

# 2. Using a Code editor(e.g Vs code)

Clone the repository.

```console
git clone https://github.com/<Your-GitHub-Username>/github-error-solve.git
```

- Navigate to folder

```console
cd github-error-solve
```

- Install node dependencies

```console
yarn
```

- Start the project

```console
yarn run dev
```
Expand All @@ -75,9 +70,7 @@ yarn run dev
```console
git checkout -b <name-of-your-branch>
```

- Add upstream command

- Add upstream command
```console
git remote add upstream https://github.com/devvsakib/github-error-solve.git
```
Expand Down Expand Up @@ -108,11 +101,11 @@ or

- The response should be like this


```console
On branch <name-of-your-branch>
nothing to commit, working tree clean
```

- Pushing your repository to GitHub.

```console
Expand All @@ -124,4 +117,4 @@ nothing to commit, working tree clean
- Click on that button, this will load a new page, comparing the local branch in your forked repository against the main branch. Click the green `Create Pull Request` button.

**Troubleshoot**
Facing problem starting the server or any other problem? Please let us know by raising an <a href="https://github.com/devvsakib/github-error-solve/issues/new">Issue</a>
Facing problem starting the server or any other problem? Please let us know by raising an <a href="https://github.com/devvsakib/github-error-solve/issues/new">Issue</a>
11 changes: 4 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>GitHub Error Solve - Opensource Projects</title>
<link rel="shortcut icon" href="githubfavicon.png" type="image/x-icon" />
<link rel="shortcut icon" href="githubfavicon.png" type="image/x-icon">
<link rel="stylesheet" href="./dist/output.css" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Fira+Mono:wght@400;500;700&display=swap"
rel="stylesheet"
/>
<meta
name="google-site-verification"
content="%VITE_GOOGLE_SITE_VERIFICATION%"
/>
<meta name="google-site-verification" content="%VITE_GOOGLE_SITE_VERIFICATION%" />
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
</html>
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"scripts": {
"dev": "vite --open",
"build": "vite build",
"preview": "vite preview",
"format": "prettier src/. --write"
"preview": "vite preview"
},
"dependencies": {
"@ant-design/icons": "^5.3.7",
Expand All @@ -16,7 +15,7 @@
"antd": "^5.19.1",
"axios": "^1.2.2",
"framer-motion": "^10.8.3",
"prettier": "3.3.3",
"prettier": "^3.3.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hot-toast": "^2.4.0",
Expand Down
2 changes: 1 addition & 1 deletion postcss.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ module.exports = {
tailwindcss: {},
autoprefixer: {},
},
};
}
2 changes: 1 addition & 1 deletion public/assets/posts/git_hooks_automating_your_workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@ Remember, while hooks are powerful, they should be used judiciously. Overly rest

Happy coding, and may your Git hooks serve you well!

> Written by **Sakib Ahmed** | [GitHub](https://github.com/devvsakib)
> Written by **Sakib Ahmed** | [GitHub](https://github.com/devvsakib)
2 changes: 1 addition & 1 deletion public/assets/posts/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
{
"title": "git_hooks_automating_your_workflow"
}
]
]
8 changes: 1 addition & 7 deletions public/assets/posts/mastering_git_branching_strategies.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ Additional supporting branches include:
- Hotfix branches

#### Pros:

- Clear separation of concerns
- Suitable for projects with scheduled releases

#### Cons:

- Can be complex for smaller projects
- May lead to long-lived feature branches

Expand All @@ -46,12 +44,10 @@ GitHub Flow is a simpler alternative to GitFlow. It uses a single main branch an
6. Merge to `main`

#### Pros:

- Simple and easy to understand
- Encourages continuous delivery

#### Cons:

- Less suitable for projects with multiple versions in production

### 3. Trunk-Based Development
Expand All @@ -63,12 +59,10 @@ This strategy involves keeping branches short-lived and merging frequently to a
- `main` is always in a releasable state

#### Pros:

- Supports continuous integration effectively
- Reduces merge conflicts

#### Cons:

- Requires a robust testing and CI/CD pipeline
- May be challenging for less experienced teams

Expand Down Expand Up @@ -100,4 +94,4 @@ Remember, the best strategy is one that your team can follow effectively. Start

Happy branching!

> Written by **Sakib Ahmed** | [GitHub](https://github.com/devvsakib)
> Written by **Sakib Ahmed** | [GitHub](https://github.com/devvsakib)
Loading

0 comments on commit 0a887b6

Please sign in to comment.