Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Minor cleanups #308

Merged
merged 11 commits into from
Dec 22, 2022
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

[<img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" height="54">](https://www.buymeacoffee.com/imreg?utm_source=github&utm_medium=web&utm_content=readme) <a href="https://www.producthunt.com/posts/anotherpomodoro?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-anotherpomodoro" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=327185&theme=light" alt="FocusTide - Modern & customizable productivity timer | Product Hunt" width="250" height="54" /></a>
[<img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" height="54">](https://www.buymeacoffee.com/imreg?utm_source=github&utm_medium=web&utm_content=readme) <a href="https://www.producthunt.com/posts/anotherpomodoro?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-focustide" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=327185&theme=light" alt="FocusTide - Modern & customizable productivity timer | Product Hunt" width="250" height="54" /></a>

![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)

Expand Down Expand Up @@ -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!

<p align="center"><a href="https://www.producthunt.com/posts/anotherpomodoro?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-anotherpomodoro" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=327185&theme=light" alt="AnotherPomodoro - Modern & customizable productivity timer | Product Hunt" width="250" height="54" /></a></p>
<p align="center"><a href="https://www.producthunt.com/posts/anotherpomodoro?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-focustide" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=327185&theme=light" alt="FocusTide - Modern & customizable productivity timer | Product Hunt" width="250" height="54" /></a></p>

<p align="center"><a href="https://www.buymeacoffee.com/imreg?utm_source=github&utm_medium=web&utm_content=readme"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" width="250"></a></p>
2 changes: 2 additions & 0 deletions components/appBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
<ChecklistIcon class="inline-block" />
</CButton>
<CButton
circle
:aria-label="$t('appbar.settings')"
:importance="ButtonImportance.Filled"
:theme="ButtonTheme.Neutral"
class="h-11"
Expand Down
2 changes: 0 additions & 2 deletions components/base/inputText.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import { defineProps } from 'vue'

const props = defineProps({
value: {
type: String,
Expand Down
59 changes: 0 additions & 59 deletions components/error/errorAction.vue

This file was deleted.

12 changes: 6 additions & 6 deletions components/error/errorActionBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ const state = reactive({
items: [] as HTMLElement[]
})

const sortOrder = {
recommended: 0,
primary: 1,
secondary: 2
}

const primary: Ref<HTMLElement | null> = ref(null)
const secondary: Ref<HTMLElement | null> = ref(null)
const items: Ref<HTMLElement | null> = ref(null)
Expand Down Expand Up @@ -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) {
Expand Down
12 changes: 12 additions & 0 deletions components/error/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export enum ErrorActionState {
Recommended = 'recommended',
Default = 'default',
Disabled = 'disabled'
}

export enum ActionType {
RECOMMEND = 'recommended',
PRIMARY = 'primary',
SECONDARY = 'secondary',
HIDE = 'disabled'
}
6 changes: 3 additions & 3 deletions components/settings/aboutTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const mainStore = useMain()
bg-class="bg-[#1da1f2]"
inner-class="!p-4 text-slate-50"
>
<BrandTwitterIcon :aria-label="$t('index.alt.links.share.twitter')" size="24" />
<BrandTwitterIcon :aria-label="$t('support.share.twitter')" size="24" />
</Button>
<Button
link
Expand All @@ -94,7 +94,7 @@ const mainStore = useMain()
bg-class="bg-[#1877f2]"
inner-class="!p-4 text-slate-50"
>
<BrandFacebookIcon :aria-label="$t('index.alt.links.share.facebook')" size="24" class="translate-x-[-1px]" />
<BrandFacebookIcon :aria-label="$t('support.share.facebook')" size="24" class="translate-x-[-1px]" />
</Button>
<Button
link
Expand All @@ -107,7 +107,7 @@ const mainStore = useMain()
bg-class="bg-[#ff4500]"
inner-class="!p-4 text-slate-50"
>
<BrandRedditIcon :aria-label="$t('index.alt.links.share.reddit')" size="24" />
<BrandRedditIcon :aria-label="$t('support.share.reddit')" size="24" />
</Button>
</div>
</div>
Expand Down
12 changes: 11 additions & 1 deletion components/timer/controls/controlsNew.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
<PlayerStopIcon :size="24" />
</CButton>

<CButton inner-class="p-6 px-8 transition" bg-class="rounded-full" :theme="ButtonTheme.NeutralDark" :importance="ButtonImportance.Filled" @click="playPause">
<CButton
:aria-label="$t('controls.play')"
inner-class="p-6 px-8 transition"
bg-class="rounded-full"
class="h-20 w-28"
:theme="ButtonTheme.NeutralDark"
:importance="ButtonImportance.Filled"
@click="playPause"
>
<PlayerPlayIcon v-if="scheduleStore.timerState !== TimerState.RUNNING" :size="28" />
<PlayerPauseIcon v-else :size="28" />
</CButton>

<CButton
:aria-label="$t('controls.advance')"
circle
inner-class="p-5"
:theme="ButtonTheme.Secondary"
Expand Down
2 changes: 1 addition & 1 deletion components/tutorial/onboarding/page0_welcome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const settingsStore = useSettings()
<template>
<OnboardingPage>
<div class="py-3 flex gap-2 text-3xl flex-col md:flex-row justify-center items-center">
<img class="w-10" src="/favicon.svg" role="note">
<img width="40" height="40" class="w-10" src="/favicon.svg" role="note">
<span v-text="$t('tutorials.onboarding.pages.0.title')" />
</div>

Expand Down
Loading