From 6a882c7c80289c6ff9d89c1b57006b724d9fe9e0 Mon Sep 17 00:00:00 2001 From: Ziad H Date: Wed, 2 Aug 2023 14:08:59 -0700 Subject: [PATCH 01/12] initial attempt --- amato/docker-compose.yml | 14 ++++++++++++++ amato/umbrel-app.yml | 20 ++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 amato/docker-compose.yml create mode 100644 amato/umbrel-app.yml diff --git a/amato/docker-compose.yml b/amato/docker-compose.yml new file mode 100644 index 0000000000..5b8d92c267 --- /dev/null +++ b/amato/docker-compose.yml @@ -0,0 +1,14 @@ +version: "3.7" + +services: + app_proxy: + environment: + APP_HOST: amato_web_1 + APP_PORT: 80 + + web: + image: berkeleyengineer/mopomo:v0.0.1 + restart: on-failure + stop_grace_period: 1m + environment: + PORT: 80 \ No newline at end of file diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml new file mode 100644 index 0000000000..5ed0d6f082 --- /dev/null +++ b/amato/umbrel-app.yml @@ -0,0 +1,20 @@ +manifestVersion: 1 +id: amato +category: productivity +name: Amato Timer +version: "0.0.1" +tagline: Simple work timer. +description: >- + A simple timer with default 25 minute increments to track your work. +releaseNotes: >- + This is an initial alpha version +developer: Bitparasol +website: http://bitparasol.com +port: 3000 +gallery: + - 1.jpg + - 2.jpg + - 3.jpg +path: "" +defaultUsername: "" +defaultPassword: "" \ No newline at end of file From f39f448cd4775753a9d749476d59658c24f0dd0a Mon Sep 17 00:00:00 2001 From: Ziad H Date: Wed, 2 Aug 2023 14:26:08 -0700 Subject: [PATCH 02/12] Update docker-compose.yml --- amato/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amato/docker-compose.yml b/amato/docker-compose.yml index 5b8d92c267..894cce6bf2 100644 --- a/amato/docker-compose.yml +++ b/amato/docker-compose.yml @@ -4,11 +4,11 @@ services: app_proxy: environment: APP_HOST: amato_web_1 - APP_PORT: 80 + APP_PORT: 8080 web: image: berkeleyengineer/mopomo:v0.0.1 restart: on-failure stop_grace_period: 1m environment: - PORT: 80 \ No newline at end of file + PORT: 8080 \ No newline at end of file From 1bc181143fde56d36329decd0763642d32d97511 Mon Sep 17 00:00:00 2001 From: Ziad H Date: Wed, 2 Aug 2023 14:38:04 -0700 Subject: [PATCH 03/12] Update docker-compose.yml --- amato/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amato/docker-compose.yml b/amato/docker-compose.yml index 894cce6bf2..6e02627199 100644 --- a/amato/docker-compose.yml +++ b/amato/docker-compose.yml @@ -4,11 +4,11 @@ services: app_proxy: environment: APP_HOST: amato_web_1 - APP_PORT: 8080 + APP_PORT: 3000 web: image: berkeleyengineer/mopomo:v0.0.1 restart: on-failure stop_grace_period: 1m environment: - PORT: 8080 \ No newline at end of file + PORT: 3000 \ No newline at end of file From 025baa52db7784298fca50f5d5ef91d023f4bf14 Mon Sep 17 00:00:00 2001 From: Ziad H Date: Thu, 17 Aug 2023 12:37:19 -0700 Subject: [PATCH 04/12] update port and image --- amato/docker-compose.yml | 6 +++--- amato/umbrel-app.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/amato/docker-compose.yml b/amato/docker-compose.yml index 6e02627199..f133007891 100644 --- a/amato/docker-compose.yml +++ b/amato/docker-compose.yml @@ -4,11 +4,11 @@ services: app_proxy: environment: APP_HOST: amato_web_1 - APP_PORT: 3000 + APP_PORT: 3838 web: - image: berkeleyengineer/mopomo:v0.0.1 + image: berkeleyengineer/mopomo:v0.0.1.1 restart: on-failure stop_grace_period: 1m environment: - PORT: 3000 \ No newline at end of file + PORT: 3838 \ No newline at end of file diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index 5ed0d6f082..2abd187c01 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -2,7 +2,7 @@ manifestVersion: 1 id: amato category: productivity name: Amato Timer -version: "0.0.1" +version: "0.0.1.1" tagline: Simple work timer. description: >- A simple timer with default 25 minute increments to track your work. @@ -10,7 +10,7 @@ releaseNotes: >- This is an initial alpha version developer: Bitparasol website: http://bitparasol.com -port: 3000 +port: 3838 gallery: - 1.jpg - 2.jpg From e723312a7a19fb44ef89018e6479c16de778bfdf Mon Sep 17 00:00:00 2001 From: Ziad H Date: Mon, 25 Sep 2023 05:28:51 -0700 Subject: [PATCH 05/12] Update amato/umbrel-app.yml edit release notes to null Co-authored-by: Parth Jadhav --- amato/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index 2abd187c01..3ad826b358 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -7,7 +7,7 @@ tagline: Simple work timer. description: >- A simple timer with default 25 minute increments to track your work. releaseNotes: >- - This is an initial alpha version + releaseNotes: "" developer: Bitparasol website: http://bitparasol.com port: 3838 From f972eaf21867384e56c147bec9d9207bcf1e26df Mon Sep 17 00:00:00 2001 From: Ziad H Date: Mon, 25 Sep 2023 05:35:51 -0700 Subject: [PATCH 06/12] Update umbrel-app.yml add submitter and submission data --- amato/umbrel-app.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index 3ad826b358..7783c38d42 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -17,4 +17,6 @@ gallery: - 3.jpg path: "" defaultUsername: "" -defaultPassword: "" \ No newline at end of file +defaultPassword: "" +submitter: ziadgit +submission: https://github.com/getumbrel/umbrel-apps/pull/729 From ac580af5c38c50de21617af1e068589a0685d297 Mon Sep 17 00:00:00 2001 From: Ziad H Date: Mon, 25 Sep 2023 05:39:22 -0700 Subject: [PATCH 07/12] Update umbrel-app.yml remove duplicate/erroneous releaseNotes field --- amato/umbrel-app.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index 7783c38d42..340ff07dd3 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -6,8 +6,7 @@ version: "0.0.1.1" tagline: Simple work timer. description: >- A simple timer with default 25 minute increments to track your work. -releaseNotes: >- - releaseNotes: "" +releaseNotes: "" developer: Bitparasol website: http://bitparasol.com port: 3838 From 73697dff9e811a24b367873e30b0387973a45c9f Mon Sep 17 00:00:00 2001 From: Ziad H Date: Wed, 11 Oct 2023 15:14:55 -0700 Subject: [PATCH 08/12] initial housekeeping changes --- amato/umbrel-app.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index 2abd187c01..d85863cc36 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -1,11 +1,11 @@ manifestVersion: 1 id: amato -category: productivity +category: files name: Amato Timer -version: "0.0.1.1" +version: "0.0.1.2" tagline: Simple work timer. description: >- - A simple timer with default 25 minute increments to track your work. + A simple timer to help track your time spent on tasks and boost your productivity. Choose between 5, 10, and 25 minute timers. releaseNotes: >- This is an initial alpha version developer: Bitparasol @@ -17,4 +17,7 @@ gallery: - 3.jpg path: "" defaultUsername: "" -defaultPassword: "" \ No newline at end of file +defaultPassword: "" +repo: https://github.com/ziadgit/amato +support: https://github.com/ziadgit/amato/issues +submitter: ziadgit, founder of bitparasol \ No newline at end of file From 01390ab675371c81f62f512fd40f2de3e01802d3 Mon Sep 17 00:00:00 2001 From: Ziad H Date: Wed, 11 Oct 2023 18:38:42 -0700 Subject: [PATCH 09/12] update umbrel app description schema file --- amato/docker-compose.yml | 2 +- amato/umbrel-app.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amato/docker-compose.yml b/amato/docker-compose.yml index f133007891..7367c65842 100644 --- a/amato/docker-compose.yml +++ b/amato/docker-compose.yml @@ -7,7 +7,7 @@ services: APP_PORT: 3838 web: - image: berkeleyengineer/mopomo:v0.0.1.1 + image: berkeleyengineer/amato:v0.0.1.2@sha256:399142b4322573725ec0c6e922e56e66331d1f3e4d769459c1d585d68aca989b restart: on-failure stop_grace_period: 1m environment: diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index fa836e7956..ea673b519a 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -7,8 +7,8 @@ tagline: Simple work timer. description: A simple timer to help track your time spent on tasks and boost your productivity. Choose between 5, 10, and 25 minute timers. releaseNotes: "" -developer: Bitparasol -website: http://bitparasol.com +developer: bitparasol +website: http://bitparasol.com/amato/ port: 3838 gallery: - 1.jpg @@ -19,5 +19,5 @@ defaultUsername: "" defaultPassword: "" repo: https://github.com/ziadgit/amato support: https://github.com/ziadgit/amato/issues -submitter: ziadgit, founder of bitparasol +submitter: ziadgit (github) - Ziad Hussain founder of bitparasol submission: https://github.com/getumbrel/umbrel-apps/pull/729 From f970ac2e5b68f3fa8920f25d4decfb906a2ebc15 Mon Sep 17 00:00:00 2001 From: Ziad H Date: Wed, 11 Oct 2023 18:46:29 -0700 Subject: [PATCH 10/12] add dependencies line --- amato/umbrel-app.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index ea673b519a..27161d7357 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -21,3 +21,4 @@ repo: https://github.com/ziadgit/amato support: https://github.com/ziadgit/amato/issues submitter: ziadgit (github) - Ziad Hussain founder of bitparasol submission: https://github.com/getumbrel/umbrel-apps/pull/729 +dependencies: [] \ No newline at end of file From 70227aa92e3d2a8d913cdac2d8419477b1ac138d Mon Sep 17 00:00:00 2001 From: Ziad H Date: Wed, 11 Oct 2023 18:49:55 -0700 Subject: [PATCH 11/12] Remove period --- amato/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index 27161d7357..e1e1e4f68e 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -3,7 +3,7 @@ id: amato category: files name: Amato Timer version: "0.0.1.2" -tagline: Simple work timer. +tagline: Simple work timer description: A simple timer to help track your time spent on tasks and boost your productivity. Choose between 5, 10, and 25 minute timers. releaseNotes: "" From 87edbb61500dab83e296d5d4df356865377d40c1 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Tue, 17 Oct 2023 10:09:23 -0700 Subject: [PATCH 12/12] change submitter field --- amato/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amato/umbrel-app.yml b/amato/umbrel-app.yml index e1e1e4f68e..825e3ec635 100644 --- a/amato/umbrel-app.yml +++ b/amato/umbrel-app.yml @@ -19,6 +19,6 @@ defaultUsername: "" defaultPassword: "" repo: https://github.com/ziadgit/amato support: https://github.com/ziadgit/amato/issues -submitter: ziadgit (github) - Ziad Hussain founder of bitparasol +submitter: bitparasol submission: https://github.com/getumbrel/umbrel-apps/pull/729 dependencies: [] \ No newline at end of file