diff --git a/.env b/.env index 2024230..4bff4b3 100644 --- a/.env +++ b/.env @@ -7,6 +7,5 @@ APP_DESCRIPTION=Vue 3 Feedback Application. APP_GITHUB_URL=https://github.com/cssnr APP_DISCORD_URL=https://discord.gg/wXy6m2X8wY APP_KOFI_URL=https://ko-fi.com/cssnr -#APP_RELAY_URL=https://relay.cssnr.com/discord/1258944618389569566 # prod -APP_RELAY_URL=https://relay.cssnr.com/discord/1376046470926438440 # dev +APP_RELAY_URL=https://relay.cssnr.com/discord/1258944618389569566 APP_WEBSITE_URL=https://cssnr.github.io/ diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 60360ec..9adbf11 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -6,6 +6,7 @@ on: branches-ignore: [master] paths: - ".github/workflows/preview.yaml" + - ".env" - "public/**" - "src/**" - "package*.json" diff --git a/README.md b/README.md index 0539ad6..6eb20e6 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ # Feedback Vue -Feedback Vue +Feedback Vue - [Development](#development) - [Contributing](#contributing) @@ -31,6 +31,8 @@ More details coming soon... See [Vite Configuration Reference](https://vite.dev/config/). +- https://vite.dev/guide/env-and-mode#env-files + ### Project Setup ```sh diff --git a/src/components/FeedbackForm.vue b/src/components/FeedbackForm.vue index 77f82da..6a8e155 100644 --- a/src/components/FeedbackForm.vue +++ b/src/components/FeedbackForm.vue @@ -8,11 +8,11 @@ import SupportLinks from '@/components/SupportLinks.vue' const props = defineProps<{ app: App - version?: string + version: string + id: string }>() const textArea = ref(null) - const inputText = ref('') const hasFocus = ref(false) @@ -77,6 +77,7 @@ async function processForm() { const lines = [ `**${props.app.name}** Uninstall, Version: \`${props.version}\``, + `**ID**: \`${props.id}\``, `**Browser**: ${ua.browser.name} ${ua.browser.major} (${ua.engine.name} - ${ua.browser.version})`, `**System**: ${ua.os.name} ${ua.os.version} (${ua.cpu.architecture})`, `${getIcon(values['not-used'])} Not Used`, @@ -92,7 +93,14 @@ async function processForm() { // await new Promise((resolve) => setTimeout(resolve, 2000)) - const response = await axios.post(appConfig.relay_url, { content }) + // const data = { content, username: props.app.name } + const data = { + content, + username: props.app.name, + ...(props.app.icon?.endsWith('png') && { avatar_url: props.app.icon }), + } + console.debug('data:', data) + const response = await axios.post(appConfig.relay_url, data) console.debug('response:', response) console.debug('response.status:', response.status) diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 9e599e9..818ad7f 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -12,11 +12,13 @@ const name = url.searchParams.get('name') || '' console.log('name:', name) const version = url.searchParams.get('version') || 'unknown' console.log('version:', version) - -const id = camelCase(name) +const id = url.searchParams.get('id') || 'unknown' console.log('id:', id) -const app: App = apps[id as keyof typeof apps] +const key = camelCase(name) +console.log('key:', key) + +const app: App = apps[key as keyof typeof apps] console.log('app:', app) function processApp(app?: App) { @@ -40,7 +42,7 @@ onUnmounted(() => {