From a704ccc81a01264ade1b7ad17641f9e81be7f763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Bryxi=CC=81?= Date: Wed, 25 Sep 2024 08:20:02 +0200 Subject: [PATCH 1/7] chore: Break down Avatar component --- app/components/avatar/badge.gjs | 84 +++++++++++++++++++++ app/components/avatar/image.gjs | 7 ++ app/components/avatar/index.gjs | 14 ++++ app/components/open-to/files/preview.gjs | 93 +----------------------- 4 files changed, 107 insertions(+), 91 deletions(-) create mode 100644 app/components/avatar/badge.gjs create mode 100644 app/components/avatar/image.gjs create mode 100644 app/components/avatar/index.gjs diff --git a/app/components/avatar/badge.gjs b/app/components/avatar/badge.gjs new file mode 100644 index 0000000..693382c --- /dev/null +++ b/app/components/avatar/badge.gjs @@ -0,0 +1,84 @@ +import Component from '@glimmer/component'; +import { inject as service } from '@ember/service'; + +export default class OpenToFiles extends Component { + @service settings; + + +} diff --git a/app/components/avatar/image.gjs b/app/components/avatar/image.gjs new file mode 100644 index 0000000..89956b8 --- /dev/null +++ b/app/components/avatar/image.gjs @@ -0,0 +1,7 @@ +import Component from '@glimmer/component'; + +export default class OpenToFiles extends Component { + +} diff --git a/app/components/avatar/index.gjs b/app/components/avatar/index.gjs new file mode 100644 index 0000000..e582469 --- /dev/null +++ b/app/components/avatar/index.gjs @@ -0,0 +1,14 @@ +import Component from '@glimmer/component'; +import AvatarImage from './image'; +import AvatarBadge from './badge'; + +export default class OpenToFiles extends Component { + +} diff --git a/app/components/open-to/files/preview.gjs b/app/components/open-to/files/preview.gjs index 551fddc..3bedb5b 100644 --- a/app/components/open-to/files/preview.gjs +++ b/app/components/open-to/files/preview.gjs @@ -1,101 +1,12 @@ import Component from '@glimmer/component'; -import FileDropzone from 'ember-file-upload/components/file-dropzone'; -import { inject as service } from '@ember/service'; -import FileQueueService from 'ember-file-upload/services/file-queue'; -import { t } from 'ember-intl'; +import Avatar from '../../avatar'; export default class OpenToFiles extends Component { - @service fileQueue; - @service settings; - objectURL(file) { return URL.createObjectURL(file); } } From f899252f52be7056705e328656c26168ccc6974f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Bryxi=CC=81?= Date: Wed, 25 Sep 2024 08:29:20 +0200 Subject: [PATCH 2/7] feat: Unicorn placeholder --- app/components/avatar/index.gjs | 4 ++-- app/components/open-to/files/upload.gjs | 16 ++++++++++++---- public/images/unicorn.webp | Bin 0 -> 88436 bytes 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 public/images/unicorn.webp diff --git a/app/components/avatar/index.gjs b/app/components/avatar/index.gjs index e582469..c93b654 100644 --- a/app/components/avatar/index.gjs +++ b/app/components/avatar/index.gjs @@ -4,8 +4,8 @@ import AvatarBadge from './badge'; export default class OpenToFiles extends Component { } From 8667d573e7e22a7a5b6287b71bc4c9aa8b917a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Bryxi=CC=81?= Date: Wed, 25 Sep 2024 08:56:07 +0200 Subject: [PATCH 6/7] fix: Different starting colours --- app/services/settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/settings.js b/app/services/settings.js index 5fb8a11..a611fa9 100644 --- a/app/services/settings.js +++ b/app/services/settings.js @@ -3,6 +3,6 @@ import { tracked } from '@glimmer/tracking'; export default class SettingsService extends Service { @tracked text = '#OpenTo...'; - @tracked colourStart = '#00e503'; - @tracked colourStop = '#12e500'; + @tracked colourStart = '#a855f7'; + @tracked colourStop = '#ec4899'; } From f7b391aac97a179d3d5d45f981911796af816c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Bryxi=CC=81?= Date: Wed, 25 Sep 2024 11:35:11 +0200 Subject: [PATCH 7/7] fix: Add mobile file selector --- app/components/open-to/files/index.gjs | 37 ++++++----- app/components/open-to/files/upload/index.gjs | 61 +++++++++---------- .../open-to/files/upload/instructions.gjs | 2 +- 3 files changed, 48 insertions(+), 52 deletions(-) diff --git a/app/components/open-to/files/index.gjs b/app/components/open-to/files/index.gjs index 1d60584..77ff2fd 100644 --- a/app/components/open-to/files/index.gjs +++ b/app/components/open-to/files/index.gjs @@ -1,30 +1,29 @@ import Component from '@glimmer/component'; import FileDropzone from 'ember-file-upload/components/file-dropzone'; -import { inject as service } from '@ember/service'; -import FileQueueService from 'ember-file-upload/services/file-queue'; import OpenToFilesPreview from 'open-to-dot-dot-dot/components/open-to/files/preview'; +import fileQueue from 'ember-file-upload/helpers/file-queue'; import OpenToFilesUpload from 'open-to-dot-dot-dot/components/open-to/files/upload'; import { t } from 'ember-intl'; export default class OpenToFiles extends Component { - @service fileQueue; - } diff --git a/app/components/open-to/files/upload/index.gjs b/app/components/open-to/files/upload/index.gjs index cd18fae..62453b3 100644 --- a/app/components/open-to/files/upload/index.gjs +++ b/app/components/open-to/files/upload/index.gjs @@ -1,45 +1,42 @@ import Component from '@glimmer/component'; import FileDropzone from 'ember-file-upload/components/file-dropzone'; -// import fileQueue from 'ember-file-upload/helpers/file-queue'; +import fileQueue from 'ember-file-upload/helpers/file-queue'; import { t } from 'ember-intl'; -// import { inject as service } from '@ember/service'; import Avatar from '../../../avatar'; import Instructions from './instructions'; export default class OpenToFilesUpload extends Component { - // @service fileQueue; - - // uploadPhoto() {} - } diff --git a/app/components/open-to/files/upload/instructions.gjs b/app/components/open-to/files/upload/instructions.gjs index eee2e62..6ed07d7 100644 --- a/app/components/open-to/files/upload/instructions.gjs +++ b/app/components/open-to/files/upload/instructions.gjs @@ -6,7 +6,7 @@ export default class OpenToFilesUploadInstructions extends Component { class='absolute top-0 left-0 w-full aspect-square text-center flex justify-center items-center' > {{yield}}