From aebf0514aec3a197ad1d7f90df53056aed5c4fcb Mon Sep 17 00:00:00 2001 From: Mishthi Jhamb Date: Wed, 26 Mar 2025 21:31:18 +0530 Subject: [PATCH 1/5] Added new.txt with my improvement idea --- new.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new.txt diff --git a/new.txt b/new.txt new file mode 100644 index 0000000..27688f6 --- /dev/null +++ b/new.txt @@ -0,0 +1 @@ +Mishthi Jhamb : Idea for improvement From 4ef84f144e16e8e2b6dbc674c9d3aa7e3c643651 Mon Sep 17 00:00:00 2001 From: Mishthi Jhamb Date: Wed, 26 Mar 2025 21:49:52 +0530 Subject: [PATCH 2/5] Added .gitignore and README.md --- .gitignore | 3 +++ README.md | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.gitignore b/.gitignore index 4d29575..5cb27a9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ npm-debug.log* yarn-debug.log* yarn-error.log* +*.log +*.log +temp/ diff --git a/README.md b/README.md index 0c83cde..2caf263 100644 --- a/README.md +++ b/README.md @@ -68,3 +68,28 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d ### `npm run build` fails to minify This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify) +## Features +- Add tasks with due dates +- Mark tasks as completed +- Delete tasks +- View pending tasks + +## Steps to Run the Project +1. **Clone the repository** + ```sh + git clone https://github.com/your-username/todo-list.git + cd todo-list + ``` + +2. **Install dependencies (if any)** + ```sh + pip install -r requirements.txt + ``` + +3. **Run the project** + ```sh + python main.py + ``` + +## Contribution +Feel free to fork the repository and submit pull requests with improvements! From 04c7649300e9afb44be806cc74ec32ad6184d07a Mon Sep 17 00:00:00 2001 From: Mishthi Jhamb Date: Wed, 26 Mar 2025 22:01:38 +0530 Subject: [PATCH 3/5] Modified BMI Calculator section in conflict-demo branch --- README.md | 124 +++++++++++++----------------------------------------- 1 file changed, 29 insertions(+), 95 deletions(-) diff --git a/README.md b/README.md index 2caf263..441a0aa 100644 --- a/README.md +++ b/README.md @@ -1,95 +1,29 @@ -# Getting Started with Create React App - -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). - -## Available Scripts - -In the project directory, you can run: - -### `npm start` - -Runs the app in the development mode.\ -Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.\ -You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.\ -See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `npm run build` - -Builds the app for production to the `build` folder.\ -It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.\ -Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `npm run eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). - -### Code Splitting - -This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting) - -### Analyzing the Bundle Size - -This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size) - -### Making a Progressive Web App - -This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app) - -### Advanced Configuration - -This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration) - -### Deployment - -This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment) - -### `npm run build` fails to minify - -This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify) -## Features -- Add tasks with due dates -- Mark tasks as completed -- Delete tasks -- View pending tasks - -## Steps to Run the Project -1. **Clone the repository** - ```sh - git clone https://github.com/your-username/todo-list.git - cd todo-list - ``` - -2. **Install dependencies (if any)** - ```sh - pip install -r requirements.txt - ``` - -3. **Run the project** - ```sh - python main.py - ``` - -## Contribution -Feel free to fork the repository and submit pull requests with improvements! +# To-Do List Application +A simple command-line to-do list application built using Python. + +## Features +- Add tasks with due dates +- Mark tasks as completed +- Delete tasks +- View pending tasks +- **BMI Calculator** – Enhanced version with additional health metrics + +## Steps to Run the Project +1. **Clone the repository** + ```sh + git clone https://github.com/your-username/todo-list.git + cd todo-list + ``` + +2. **Install dependencies (if any)** + ```sh + pip install -r requirements.txt + ``` + +3. **Run the project** + ```sh + python main.py + ``` + +## Contribution +Feel free to fork the repository and submit pull requests with improvements! From cff3d8f0b398d79efa81d29070c604008a5d8f3e Mon Sep 17 00:00:00 2001 From: Mishthi Jhamb Date: Wed, 26 Mar 2025 22:14:52 +0530 Subject: [PATCH 4/5] Modified Changes --- README.md | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 441a0aa..6251c3f 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,28 @@ -# To-Do List Application -A simple command-line to-do list application built using Python. +# To-Do List Application for Project +A simple command-line to-do list application built using Python. -## Features -- Add tasks with due dates -- Mark tasks as completed -- Delete tasks -- View pending tasks -- **BMI Calculator** – Enhanced version with additional health metrics +## Features +- Add tasks with due dates +- Mark tasks as completed +- Delete tasks +- View pending tasks -## Steps to Run the Project -1. **Clone the repository** - ```sh - git clone https://github.com/your-username/todo-list.git - cd todo-list - ``` +## Steps to Run the Project +1. **Clone the repository** + ```sh + git clone https://github.com/your-username/todo-list.git + cd todo-list + ``` -2. **Install dependencies (if any)** - ```sh - pip install -r requirements.txt - ``` +2. **Install dependencies (if any)** + ```sh + pip install -r requirements.txt + ``` -3. **Run the project** - ```sh - python main.py - ``` +3. **Run the project** + ```sh + python main.py + ``` -## Contribution -Feel free to fork the repository and submit pull requests with improvements! +## Contribution +Feel free to fork the repository and submit pull requests with improvements! From 8eadf3021378c138a96d9f734fe98868651b0b5f Mon Sep 17 00:00:00 2001 From: Mishthi Jhamb Date: Wed, 26 Mar 2025 22:19:56 +0530 Subject: [PATCH 5/5] Updated --- README.md | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 441a0aa..33b045c 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,28 @@ -# To-Do List Application -A simple command-line to-do list application built using Python. +# To-Do List Application for Project Work +A simple command-line to-do list application built using Python. -## Features -- Add tasks with due dates -- Mark tasks as completed -- Delete tasks -- View pending tasks -- **BMI Calculator** – Enhanced version with additional health metrics +## Features +- Add tasks with due dates +- Mark tasks as completed +- Delete tasks +- View pending tasks -## Steps to Run the Project -1. **Clone the repository** - ```sh - git clone https://github.com/your-username/todo-list.git - cd todo-list - ``` +## Steps to Run the Project +1. **Clone the repository** + ```sh + git clone https://github.com/your-username/todo-list.git + cd todo-list + ``` -2. **Install dependencies (if any)** - ```sh - pip install -r requirements.txt - ``` +2. **Install dependencies (if any)** + ```sh + pip install -r requirements.txt + ``` -3. **Run the project** - ```sh - python main.py - ``` +3. **Run the project** + ```sh + python main.py + ``` -## Contribution -Feel free to fork the repository and submit pull requests with improvements! +## Contribution +Feel free to fork the repository and submit pull requests with improvements!