refactor to read more from package.json

This commit is contained in:
undergroundwires
2020-09-22 20:41:12 +01:00
parent 19a092dd31
commit 784a67afff
30 changed files with 374 additions and 158 deletions

View File

@@ -74,7 +74,7 @@
public async mounted() {
const state = await this.getCurrentStateAsync();
this.repositoryUrl = state.app.repositoryUrl;
this.repositoryUrl = state.app.info.repositoryWebUrl;
state.filter.filterRemoved.on(() => {
this.isSearching = false;
});

View File

@@ -17,7 +17,7 @@
<script lang="ts">
import { Component, Vue } from 'vue-property-decorator';
import { Environment } from '@/application/Environment/Environment';
import { OperatingSystem } from '@/application/Environment/OperatingSystem';
import { OperatingSystem } from '@/domain/OperatingSystem';
import DownloadUrlListItem from './DownloadUrlListItem.vue';
@Component({

View File

@@ -12,7 +12,7 @@
import { Component, Prop, Watch } from 'vue-property-decorator';
import { StatefulVue } from '@/presentation/StatefulVue';
import { Environment } from '@/application/Environment/Environment';
import { OperatingSystem } from '@/application/Environment/OperatingSystem';
import { OperatingSystem } from '@/domain/OperatingSystem';
@Component
export default class DownloadUrlListItem extends StatefulVue {
@@ -39,7 +39,7 @@ export default class DownloadUrlListItem extends StatefulVue {
private async getDownloadUrlAsync(os: OperatingSystem): Promise<string> {
const state = await this.getCurrentStateAsync();
return `${state.app.repositoryUrl}/releases/download/${state.app.version}/${getFileName(os, state.app.version)}`;
return state.app.info.getDownloadUrl(os);
}
}
@@ -62,18 +62,6 @@ function getOperatingSystemName(os: OperatingSystem): string {
}
}
function getFileName(os: OperatingSystem, version: string): string {
switch (os) {
case OperatingSystem.Linux:
return `privacy.sexy-${version}.AppImage`;
case OperatingSystem.macOS:
return `privacy.sexy-${version}.dmg`;
case OperatingSystem.Windows:
return `privacy.sexy-Setup-${version}.exe`;
default:
throw new Error(`Unsupported os: ${OperatingSystem[os]}`);
}
}
</script>
<style scoped lang="scss">

View File

@@ -48,8 +48,8 @@ export default class TheFooter extends StatefulVue {
public async mounted() {
const state = await this.getCurrentStateAsync();
this.repositoryUrl = state.app.repositoryUrl;
this.feedbackUrl = `${state.app.repositoryUrl}/issues`;
this.repositoryUrl = state.app.info.repositoryWebUrl;
this.feedbackUrl = state.app.info.feedbackUrl;
}
}
</script>

View File

@@ -4,7 +4,7 @@
<div class="footer__section">
<span v-if="isDesktop" class="footer__section__item">
<font-awesome-icon class="icon" :icon="['fas', 'globe']" />
<span>Online version at <a href="https://privacy.sexy" target="_blank">https://privacy.sexy</a></span>
<span>Online version at <a :href="homepageUrl" target="_blank">{{ homepageUrl }}</a></span>
</span>
<span v-else class="footer__section__item">
<DownloadUrlList />
@@ -66,6 +66,7 @@ export default class TheFooter extends StatefulVue {
public repositoryUrl: string = '';
public releaseUrl: string = '';
public feedbackUrl: string = '';
public homepageUrl: string = '';
constructor() {
super();
@@ -74,12 +75,15 @@ export default class TheFooter extends StatefulVue {
public async mounted() {
const state = await this.getCurrentStateAsync();
this.version = state.app.version;
this.repositoryUrl = state.app.repositoryUrl;
this.releaseUrl = `${state.app.repositoryUrl}/releases/tag/${state.app.version}`;
this.feedbackUrl = `${state.app.repositoryUrl}/issues`;
const info = state.app.info;
this.version = info.version;
this.homepageUrl = info.homepage;
this.repositoryUrl = info.repositoryWebUrl;
this.releaseUrl = info.releaseUrl;
this.feedbackUrl = info.feedbackUrl;
}
}
</script>
<style scoped lang="scss">

View File

@@ -16,7 +16,7 @@ export default class TheHeader extends StatefulVue {
public async mounted() {
const state = await this.getCurrentStateAsync();
this.title = state.app.name;
this.title = state.app.info.name;
}
}
</script>