From fc8ddfc006d9a5bcc8ad6840162e2a5c057f0710 Mon Sep 17 00:00:00 2001 From: Abhi-git-dev1 Date: Wed, 26 Mar 2025 15:44:54 +0530 Subject: [PATCH 1/5] Added contribution.txt with an improvement idea --- contribution.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 contribution.txt diff --git a/contribution.txt b/contribution.txt new file mode 100644 index 0000000..5182a90 --- /dev/null +++ b/contribution.txt @@ -0,0 +1 @@ +Your Name - Your Improvement Idea From 943f6a170b3d391a36c5ee3cfb33bd54f9b56654 Mon Sep 17 00:00:00 2001 From: Abhi-git-dev1 Date: Wed, 26 Mar 2025 15:51:01 +0530 Subject: [PATCH 2/5] Added .gitignore and updated README.md --- .gitignore | 27 ++------------------------ README.md | 57 +++++++----------------------------------------------- 2 files changed, 9 insertions(+), 75 deletions(-) diff --git a/.gitignore b/.gitignore index e6d7c85..328214b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,2 @@ -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# production -/build -dist - -# cache -.electron-vendors.cache.json - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* -yarn-error.log* +*.log +temp/ diff --git a/README.md b/README.md index 2da92df..a0c40f7 100644 --- a/README.md +++ b/README.md @@ -1,55 +1,12 @@ -# todometer - -A simple, meter-based to-do list built with Electron and React. - -![todometer](assets/screenshot.png) - -## Download - -Nab the latest version from the [Releases](https://github.com/cassidoo/todometer/releases) page! - -## Development - -- Clone the repo: +# Todometer +A simple task management app. +## How to Run the Project +1. Clone the repository: ```bash -$ git clone https://github.com/cassidoo/todometer.git +git clone https://github.com/your-username/todometer.git ``` - -- Go to the project directory and install dependencies: - +2. Navigate into the project directory: ```bash -$ cd todometer && npm install +cd todometer ``` - -To show the Electron application window with your current build: - -```bash -$ npm run dev -``` - -To build a production version: - -```bash -$ npm install -$ npm run postinstall -$ npm run pre-electron-pack -$ npm run electron-pack -``` - -## Contributing - -So you want to contribute? Yay! Great! Fun! -I love seeing new PRs for todometer. That being said, not every pull request will be merged. The general guidelines I'll follow are: - -- Does it make developing todometer easier? -- Does it help other platforms (Windows, Mac, Linux) work better? -- Does it fix a bug? -- Does it break anything? -- Does it stick to the original goal of todometer (a _simple_, meter-based to-do list) -- Does it reduce the build size? -- Is it necessary? - -Regarding that last point, I don't expect all pull requests to be absolutely necessary. New features are good. That being said, if the new features make the app unnecessarily complex in some way without bringing value to the users, it won't be merged. - -Please don't be hurt if your PR isn't merged. You're lovely for working on it. If you are thinking about working on something, feel free to make an issue beforehand so that you can make sure it'll be worth your time! From dcb491aa2170802b1edef88b3a075dbce6b01c47 Mon Sep 17 00:00:00 2001 From: Abhi-git-dev1 Date: Wed, 26 Mar 2025 15:55:37 +0530 Subject: [PATCH 3/5] Updated description in conflict-demo branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a0c40f7..8cf1f84 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,4 @@ git clone https://github.com/your-username/todometer.git ```bash cd todometer ``` +A simple and efficient task management app. From 7b34b00fecc9434357c7285f1ab3dd510efa3a9d Mon Sep 17 00:00:00 2001 From: Abhi-git-dev1 Date: Wed, 26 Mar 2025 17:13:19 +0530 Subject: [PATCH 4/5] Updated README.md in conflict-demo branch --- README.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index 8cf1f84..1c989a1 100644 --- a/README.md +++ b/README.md @@ -1,13 +1 @@ -# Todometer -A simple task management app. - -## How to Run the Project -1. Clone the repository: -```bash -git clone https://github.com/your-username/todometer.git -``` -2. Navigate into the project directory: -```bash -cd todometer -``` -A simple and efficient task management app. +This is an update from conflict-demo branch From 930590076a4f5301d52da9a27ea6f7cc6857c4e3 Mon Sep 17 00:00:00 2001 From: Abhi-git-dev1 Date: Wed, 26 Mar 2025 17:14:01 +0530 Subject: [PATCH 5/5] Updated README.md in main branch --- README.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index 8cf1f84..78d9450 100644 --- a/README.md +++ b/README.md @@ -1,13 +1 @@ -# Todometer -A simple task management app. - -## How to Run the Project -1. Clone the repository: -```bash -git clone https://github.com/your-username/todometer.git -``` -2. Navigate into the project directory: -```bash -cd todometer -``` -A simple and efficient task management app. +This is an update from main branch