diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 73c536c..f620e78 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ Still, **before contributing, please read this short guide** to make sure you su The app's most up-to-date development version is on the `develop` branch. **You should always submit pull requests against `develop`** and you should be working on this branch locally. -**The `prod` branch is only updated when a new version is released** as it contains the deployed version of the application (found at https://another-pomodoro.netlify.app). +**The `prod` branch is only updated when a new version is released** as it contains the deployed version of the application (found at https://focustide.app). The `preview` branch is for testing production updates early, it is rarely updated -- sometimes the `develop` branch is merged into it before it is merged into `prod` to test new releases. @@ -93,7 +93,7 @@ FocusTide is an open software and such it welcomes others to contribute code (fi [![Crowdin](https://badges.crowdin.net/anotherpomodoro/localized.svg)](https://crowdin.com/project/anotherpomodoro) -Translations are managed through [AnotherPomodoro's Crowdin project](https://crowdin.com/project/anotherpomodoro). If you want to contribute translations for your own language, please [create an issue](https://github.com/Hanziness/AnotherPomodoro/issues/new/choose). +Translations are managed through [FocusTide's Crowdin project](https://crowdin.com/project/anotherpomodoro). If you want to contribute translations for your own language, please [create an issue](https://github.com/Hanziness/AnotherPomodoro/issues/new/choose). ## Technical requirements diff --git a/README.md b/README.md index 364b87d..c816f0a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # ⏳ FocusTide -Free, modern and open-source timer application, right in your browser. +Free, modern and open-source timer application, right in your browser. Formerly AnotherPomodoro. -[](https://www.buymeacoffee.com/imreg?utm_source=github&utm_medium=web&utm_content=readme) FocusTide - Modern & customizable productivity timer | Product Hunt +[](https://www.buymeacoffee.com/imreg?utm_source=github&utm_medium=web&utm_content=readme) FocusTide - Modern & customizable productivity timer | Product Hunt ![Netlify Status](https://api.netlify.com/api/v1/badges/7cb2b7fb-cacd-4acf-803b-8af9dad9f2a8/deploy-status) ![License](https://img.shields.io/github/license/Hanziness/AnotherPomodoro) ![GitHub package.json version](https://img.shields.io/github/package-json/v/Hanziness/AnotherPomodoro) [![Crowdin translation status](https://badges.crowdin.net/anotherpomodoro/localized.svg)](https://crowdin.com/project/anotherpomodoro) @@ -106,6 +106,6 @@ $ yarn generate If you like this project or it has helped you, please consider buying the maintainer a coffee. You won't be annoyed to do so while using the app! -

AnotherPomodoro - Modern & customizable productivity timer | Product Hunt

+

FocusTide - Modern & customizable productivity timer | Product Hunt

diff --git a/components/appBar.vue b/components/appBar.vue index 7e8f2c6..8712b97 100644 --- a/components/appBar.vue +++ b/components/appBar.vue @@ -30,12 +30,14 @@ const settingsStore = useSettings() no-content-theme no-padding inner-class="p-1" + :aria-label="$t('appbar.todo')" @click="openPanels.todo = !openPanels.todo" > -import { defineProps } from 'vue' - const props = defineProps({ value: { type: String, diff --git a/components/error/errorAction.vue b/components/error/errorAction.vue deleted file mode 100644 index 8eb5a1c..0000000 --- a/components/error/errorAction.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - diff --git a/components/error/errorActionBar.vue b/components/error/errorActionBar.vue index b4fc91d..9975e54 100644 --- a/components/error/errorActionBar.vue +++ b/components/error/errorActionBar.vue @@ -5,6 +5,12 @@ const state = reactive({ items: [] as HTMLElement[] }) +const sortOrder = { + recommended: 0, + primary: 1, + secondary: 2 +} + const primary: Ref = ref(null) const secondary: Ref = ref(null) const items: Ref = ref(null) @@ -36,12 +42,6 @@ watch(() => state.items, (newValue) => { }) onMounted(() => { - const sortOrder = { - recommended: 0, - primary: 1, - secondary: 2 - } - // collect all nodes with a `data-row` attribute state.items = [] if (items != null) { diff --git a/components/error/types.ts b/components/error/types.ts new file mode 100644 index 0000000..f02e966 --- /dev/null +++ b/components/error/types.ts @@ -0,0 +1,12 @@ +export enum ErrorActionState { + Recommended = 'recommended', + Default = 'default', + Disabled = 'disabled' +} + +export enum ActionType { + RECOMMEND = 'recommended', + PRIMARY = 'primary', + SECONDARY = 'secondary', + HIDE = 'disabled' +} diff --git a/components/settings/aboutTab.vue b/components/settings/aboutTab.vue index 7fa36c4..043ffc8 100644 --- a/components/settings/aboutTab.vue +++ b/components/settings/aboutTab.vue @@ -81,7 +81,7 @@ const mainStore = useMain() bg-class="bg-[#1da1f2]" inner-class="!p-4 text-slate-50" > - + diff --git a/components/timer/controls/controlsNew.vue b/components/timer/controls/controlsNew.vue index ee12f46..d35528a 100644 --- a/components/timer/controls/controlsNew.vue +++ b/components/timer/controls/controlsNew.vue @@ -33,17 +33,27 @@ const advance = () => { :importance="ButtonImportance.Filled" class="h-16 transition" :class="{ 'scale-0 opacity-0 pointer-events-none' : !scheduleStore.isRunning }" + :aria-label="$t('controls.stop')" @click="reset" > - +
- +
diff --git a/error.vue b/error.vue index 93ee67a..b265c6c 100644 --- a/error.vue +++ b/error.vue @@ -1,219 +1,206 @@ - - - + +