Skip to content

[pull] master from Stigmatoz:master #9

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.

Sign up for GitHub

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

Merged
pull merged 2 commits into from
Oct 8, 2024
Merged

[pull] master from Stigmatoz:master #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b01cb63
Review link for edge
Stigmatoz Oct 7, 2024
7f3f5f6
Fix DE description length
Stigmatoz Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_locales/de/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"message": "Web Activity Time Tracker - Websites sperren, Pomodoro & Webanalyse"
},
"extDescription": {
"message": "Verfolgen und begrenzen Sie die Zeit Ihrer Webaktivitäten und blockieren Sie den Zugang zu den Websites. Überwachen Sie Ihre Internetnutzung."
"message": "Verfolgen und begrenzen Sie die Zeit Ihrer Webaktivitäten und blockieren Sie den Zugang zu den Websites."
},
"settings": {
"message": "Einstellungen"
Expand Down
28 changes: 13 additions & 15 deletions src/components/Review.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { injectStorage } from '../storage/inject-storage';
import { StorageParams } from '../storage/storage-params';
import { addDays, startOfToday } from 'date-fns';
import { addHours } from 'date-fns/esm';
import { CHROME_STORE_REVIEW_URL } from '../utils/chrome-url';
import { CHROME_STORE_REVIEW_URL, EDGE_STORE_REVIEW_URL } from '../utils/chrome-url';

const { t } = useI18n();

Expand All @@ -32,20 +32,18 @@ const showReview = ref<boolean>();

onMounted(async () => {
showReview.value = false;
if (__BROWSER__ == 'chrome') {
const reviewDate = await settingsStorage.getValue(StorageParams.REVIEW_DATE);
const reviewDate = await settingsStorage.getValue(StorageParams.REVIEW_DATE);

if (reviewDate == undefined) {
let nextTime = await settingsStorage.getValue(StorageParams.REVIEW_PROMPT_AT);
if (nextTime == undefined) {
await settingsStorage.saveValue(
StorageParams.REVIEW_PROMPT_AT,
addDays(addHours(startOfToday(), PROMPT_AT_TIME_OF_DAY), ADD_DAYS_FIRST).toString(),
);
} else {
nextTime = new Date(nextTime);
if (nextTime < new Date()) showReview.value = true;
}
if (reviewDate == undefined) {
let nextTime = await settingsStorage.getValue(StorageParams.REVIEW_PROMPT_AT);
if (nextTime == undefined) {
await settingsStorage.saveValue(
StorageParams.REVIEW_PROMPT_AT,
addDays(addHours(startOfToday(), PROMPT_AT_TIME_OF_DAY), ADD_DAYS_FIRST).toString(),
);
} else {
nextTime = new Date(nextTime);
if (nextTime < new Date()) showReview.value = true;
}
}
});
Expand All @@ -59,7 +57,7 @@ async function closeBlock() {
}

async function openStore() {
window.open(CHROME_STORE_REVIEW_URL, '_blank');
window.open(__BROWSER__ == 'edge' ? EDGE_STORE_REVIEW_URL : CHROME_STORE_REVIEW_URL, '_blank');
await settingsStorage.saveValue(StorageParams.REVIEW_DATE, new Date().toString());
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "__MSG_extName__",
"short_name": "Web Tracker",
"version": "2.1.5",
"version": "2.1.6",
"description": "__MSG_extDescription__",
"options_page": "src/dashboard.html",
"default_locale": "en",
Expand Down
2 changes: 2 additions & 0 deletions src/utils/chrome-url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ export const CHROME_STORE_REVIEW_URL = `https://chromewebstore.google.com/detail
export const CHROME_STORE_SUPPORT_URL = `https://chromewebstore.google.com/detail/web-activity-time-tracker/${__APP_ID__}/support`;
export const CHROME_STORE_CLEAR_YOUTUBE_URL =
'https://chromewebstore.google.com/detail/clean-youtube-update-yout/kalhfjomailhflienkfajocjodgjipie?utm_source=watt';

export const EDGE_STORE_REVIEW_URL = `https://microsoftedge.microsoft.com/addons/detail/web-activity-time-tracker/${__APP_ID__}#review-section`;
7 changes: 5 additions & 2 deletions vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import webExtension, { readJsonFile } from 'vite-plugin-web-extension';
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
import copy from 'rollup-plugin-copy';

const APPID_CHROME = 'hhfnghjdeddcfegfekjeihfmbjenlomm';
const APP_ID = {
chrome: 'hhfnghjdeddcfegfekjeihfmbjenlomm',
edge: 'eepmlmdenlkkjieghjmedjahpofieogf',
};
const browser = process.env.TARGET || 'chrome';

function generateManifest() {
Expand Down Expand Up @@ -44,7 +47,7 @@ export default defineConfig(({ mode }) => ({
__EXTENSION_MODE__: JSON.stringify(mode),
__DEV__: mode === 'development',
__PROD__: mode === 'production',
__APP_ID__: JSON.stringify(APPID_CHROME),
__APP_ID__: JSON.stringify(APP_ID[browser]),
__BROWSER__: JSON.stringify(browser),
},
plugins: [
Expand Down