pedrocx486/rumor-party-line
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update requests to use the new composable that avoids chaos

Browse source
This commit is contained in:
pedrocx486 2025-01-27 23:48:11 -03:00
parent ae9c59fce3
commit ccbb150013
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/src/components/JoinPartyLine.vue
View file

@ -12,6 +12,7 @@
import { computed, onMounted, ref } from 'vue'; import { computed, onMounted, ref } from 'vue';
import { usePartyLineStore } from '../stores/partyLine'; import { usePartyLineStore } from '../stores/partyLine';
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
import { useGetServer } from "@/composables/useGetServer.ts";
const partyLineName = ref(''); const partyLineName = ref('');
const status = ref(''); const status = ref('');
@ -48,7 +49,7 @@ const joinPartyLine = async () => {
await partyLineStore.disconnectCurrentPartyLine(); await partyLineStore.disconnectCurrentPartyLine();
} }
fetch(`http://localhost:3000/joinPartyLine?partyLine=${encodeURIComponent(partyLineName.value)}`, { fetch(`${useGetServer()}/joinPartyLine?partyLine=${encodeURIComponent(partyLineName.value)}`, {
method: 'GET', method: 'GET',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',

3
client/src/components/SendRumor.vue
View file

@ -10,6 +10,7 @@
import { computed, ref } from 'vue'; import { computed, ref } from 'vue';
import { usePartyLineStore } from "@/stores/partyLine.ts"; import { usePartyLineStore } from "@/stores/partyLine.ts";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
import { useGetServer } from "@/composables/useGetServer.ts";
const partyLineStore = usePartyLineStore(); const partyLineStore = usePartyLineStore();
const { partyLine } = storeToRefs(partyLineStore); const { partyLine } = storeToRefs(partyLineStore);
@ -27,7 +28,7 @@ const partyLineModel = computed({
const sendRumor = async () => { const sendRumor = async () => {
if (partyLine.value.trim() && rumor.value.trim()) { if (partyLine.value.trim() && rumor.value.trim()) {
try { try {
const response = await fetch('http://localhost:3000/rumor', { const response = await fetch(useGetServer() + '/rumor', {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',

7
client/src/composables/useGetServer.ts Normal file
View file

@ -0,0 +1,7 @@
export const useGetServer = (): string => {
if (Boolean(import.meta.env.VITE_STATIC)) {
return window.location.origin;
} else {
return import.meta.env.VITE_SERVER;
}
}

9
client/src/stores/partyLine.ts
View file

@ -1,5 +1,6 @@
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { ref } from 'vue'; import { ref } from 'vue';
import { useGetServer } from "@/composables/useGetServer.ts";
export const usePartyLineStore = defineStore('partyLine', () => { export const usePartyLineStore = defineStore('partyLine', () => {
const partyLine = ref(''); const partyLine = ref('');
@ -16,7 +17,7 @@ export const usePartyLineStore = defineStore('partyLine', () => {
await disconnectCurrentPartyLine(); // Ensure we disconnect first await disconnectCurrentPartyLine(); // Ensure we disconnect first
console.log(`Connecting to party line: ${currentPartyLine}`); console.log(`Connecting to party line: ${currentPartyLine}`);
eventSource.value = new EventSource(`http://localhost:3000/connectPartyLine?partyLine=${encodeURIComponent(currentPartyLine)}`); eventSource.value = new EventSource(`${useGetServer()}/connectPartyLine?partyLine=${encodeURIComponent(currentPartyLine)}`);
eventSource.value.addEventListener('open', () => { eventSource.value.addEventListener('open', () => {
console.log('Connected to party line:', currentPartyLine); console.log('Connected to party line:', currentPartyLine);
@ -54,7 +55,7 @@ export const usePartyLineStore = defineStore('partyLine', () => {
const fetchPartyLines = async () => { const fetchPartyLines = async () => {
try { try {
const response = await fetch('http://localhost:3000/partyLines'); const response = await fetch(useGetServer() + '/partyLines');
const data = await response.json(); const data = await response.json();
partyLines.value = data.allPartyLines; partyLines.value = data.allPartyLines;
} catch (error: any) { } catch (error: any) {
@ -64,7 +65,7 @@ export const usePartyLineStore = defineStore('partyLine', () => {
const createPartyLine = async (partyLine: string) => { const createPartyLine = async (partyLine: string) => {
try { try {
const response = await fetch('http://localhost:3000/createPartyLine', { const response = await fetch(useGetServer() + '/createPartyLine', {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@ -88,7 +89,7 @@ export const usePartyLineStore = defineStore('partyLine', () => {
const deletePartyLine = async (partyLine: string) => { const deletePartyLine = async (partyLine: string) => {
try { try {
const response = await fetch('http://localhost:3000/deletePartyLine', { const response = await fetch(useGetServer() + '/deletePartyLine', {
method: 'DELETE', method: 'DELETE',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',