Resolving merge conflicts

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG] Your bug title"
+title: '[BUG] Your bug title'
 labels: bug
 assignees: ''
 ---
@@ -11,6 +11,7 @@ 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 '...'

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[FEATURE] Your feature title"
+title: '[FEATURE] Your feature title'
 labels: enhancement
 assignees: ''
 ---

.github/workflows/format.yml

@@ -0,0 +1,26 @@
+name: Format
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16' # Use the Node.js version your project requires
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run Prettier to check formatting
+        run: npm run prettier -- --check
+        continue-on-error: false # Fail the workflow if formatting issues are found

.github/workflows/lint.yml

@@ -0,0 +1,28 @@
+name: Lint and Format
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  lint-and-format:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16' # or whichever version your project requires
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run Prettier to check formatting
+        run: npm run format -- --check
+
+      - name: Run ESLint to check for linting issues
+        run: npm run lint

.gitignore

@@ -0,0 +1,30 @@
+# Node modules
+node_modules/
+
+# Logs
+logs/
+*.log
+npm-debug.log*
+
+# Dependency directories
+jspm_packages/
+bower_components/
+
+# Optional npm cache directory
+.npm/
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Build output directories
+dist/
+build/
+
+# Mac OS specific files
+.DS_Store
+
+# Windows specific files
+Thumbs.db

.prettierignore

@@ -0,0 +1,3 @@
+node_modules
+build
+dist

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "tabWidth": 2
+}

CONTRIBUTING.md

@@ -5,22 +5,40 @@ Thank you for considering contributing to this To-Do List project! Whether it's
 ## Getting Started
 
 ### 1. Fork the Repository
+
 To contribute, start by forking the repository to your GitHub account. Click the "Fork" button at the top right of the repository page.
 
 ### 2. Clone the Repository
+
 Once you've forked the repository, clone it to your local machine.
 
 ```bash
 git clone https://github.com/YOUR-USERNAME/To-Do-List.git
 ```
 
+## Linting and Formatting
+
+This project uses **ESLint** and **Prettier** to ensure code quality and consistency.
+
+- **ESLint** helps identify and fix problems in your JavaScript code.
+- **Prettier** automatically formats your code to follow consistent styling rules.
+
+### Running the Linter
+
+To check your code for issues, run the following command:
+
+```bash
+npm run lint
+```
+
+This command will execute ESLint on your project files and report any errors or warnings.
+
 ## Maintainers
 
 This project is actively maintained by:
 
 | ![Maintainer 1](https://github.com/bryans-go.png?size=100) | ![Maintainer 2](https://github.com/Anshgrover23.png?size=100) |
-|:----------------------------------------------------------:|:----------------------------------------------------------:|
-| **[Maintainer 1](https://github.com/bryans-go)**            | **[Maintainer 2](https://github.com/Anshgrover23)**            |
+| :--------------------------------------------------------: | :-----------------------------------------------------------: |
+|      **[Maintainer 1](https://github.com/bryans-go)**      |      **[Maintainer 2](https://github.com/Anshgrover23)**      |
 
 Feel free to reach out to either of us for any issues or contributions.
-

README.md

@@ -17,6 +17,7 @@ Clone the repository:
 ```bash
 git clone https://github.com/Anshgrover23/To-Do-List.git
 ```
+
 Open `index.html` in your browser to use the application.
 
 ## Usage
@@ -25,10 +26,26 @@ Open `index.html` in your browser to use the application.
 - **Edit a Task:** Click the edit icon next to the task, make your changes, and save.
 - **Delete a Task:** Click the delete icon next to the task.
 
-## Contributing to Hacktoberfest 2024 🎉
-![hecktoberfest](https://github.com/user-attachments/assets/9352e904-6b2d-495e-8140-1437e385ffdb)
+## Linting and Formatting
+
+This project uses **ESLint** and **Prettier** to ensure code quality and consistency.
+
+- **ESLint** helps identify and fix problems in your JavaScript code.
+- **Prettier** automatically formats your code to follow consistent styling rules.
 
+### Running the Linter
+
+To check your code for issues, run the following command:
+
+```bash
+npm run lint
+```
 
+This command will execute ESLint on your project files and report any errors or warnings.
+
+## Contributing to Hacktoberfest 2024 🎉
+
+![hecktoberfest](https://github.com/user-attachments/assets/9352e904-6b2d-495e-8140-1437e385ffdb)
 
 We are excited to participate in **Hacktoberfest 2024**! If you'd like to contribute to this project during Hacktoberfest, here’s how you can get involved:
 
@@ -52,16 +69,12 @@ Let's make this project even better together! 🎉
   </a>
 </div>
 
-
 ## Maintainers
 
 This project is actively maintained by:
 
 | ![Maintainer 1](https://github.com/bryans-go.png?size=100) | ![Maintainer 2](https://github.com/Anshgrover23.png?size=100) |
-|:----------------------------------------------------------:|:----------------------------------------------------------:|
-| **[Bryans-go](https://github.com/bryans-go)**            | **[Anshgrover23](https://github.com/Anshgrover23)**            |
+| :--------------------------------------------------------: | :-----------------------------------------------------------: |
+|       **[Bryans-go](https://github.com/bryans-go)**        |      **[Anshgrover23](https://github.com/Anshgrover23)**      |
 
 Feel free to reach out to either of us for any issues or contributions.
-
-
-

eslint.config.mjs

@@ -0,0 +1,12 @@
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+
+export default [
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      globals: globals.browser,
+    },
+  },
+  pluginJs.configs.recommended,
+];

index.html

@@ -1,33 +1,33 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Todo-List</title>
-    <link rel="stylesheet" href="style.css">
-</head>
-<body>
+    <link rel="stylesheet" href="style.css" />
+  </head>
+  <body>
     <div class="container">
-        <h1>Todo-List</h1>
-
-        <div class="js-add-grid">
-            <input type="text" placeholder="Share Your Thoughts" class="js-name-input">
-            <input type="date" class="js-date-input">
-            <input type="time" class="js-time-input">
-            <button class="js-add-button" onclick="addTodo();">
-                <img src="assets/add-icon.png" alt="Add" width="16" height="16"> Add
-            </button>
-        </div>
-        <div class="js-add-html js-add-grid"></div>
+      <h1>Todo-List</h1>
 
+      <div class="js-add-grid">
+        <input
+          type="text"
+          placeholder="Share Your Thoughts"
+          class="js-name-input"
+        />
+        <input type="date" class="js-date-input" />
+        <input type="time" class="js-time-input" />
+        <button class="js-add-button" onclick="addTodo();">
+          <img src="assets/add-icon.png" alt="Add" width="16" height="16" /> Add
+        </button>
+      </div>
+      <div class="js-add-html js-add-grid"></div>
     </div>
     <footer>
-        <p>&copy; 2024 Made with &#10084;  by Ansh Grover. All rights reserved.</p>
-      </footer>
-
-
+      <p>&copy; 2024 Made with &#10084; by Ansh Grover. All rights reserved.</p>
+    </footer>
 
     <script src="script.js"></script>
-</body>
+  </body>
 </html>
-