talksik/nirvana-v3
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed stable state

Browse Source
This commit is contained in:
talksik
2022-06-08 06:07:37 -05:00
parent 9bf2507cdc
commit 0156aa692e
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/desktop/package.json
+1 -1
View File
@@ -45,7 +45,7 @@
"port": "4000",
"loggerPort": "9000",
"mainConfig": "./webpack.main.config.js",
"devContentSecurityPolicy": "connect-src 'self' http://localhost:5000 ws://localhost:5000 https://api.quotable.io/random 'unsafe-eval'",
"devContentSecurityPolicy": "default-src * self blob: data: gap:; style-src * self 'unsafe-inline' blob: data: gap:; script-src * 'self' 'unsafe-eval' 'unsafe-inline' blob: data: gap:; object-src * 'self' blob: data: gap:; img-src * self 'unsafe-inline' blob: data: gap:; connect-src self * 'unsafe-inline' blob: data: gap:; frame-src * self blob: data: gap:;",
"renderer": {
"config": "./webpack.renderer.config.js",
"entryPoints": [
packages/desktop/src/api/NirvanaApi.tsx
+2 -2
View File
@@ -6,14 +6,14 @@ import { Line } from '@nirvana/core/models/line.model';
import LoginResponse from '@nirvana/core/responses/login.response';
import MasterLineData from '@nirvana/core/models/masterLineData.model';
import NirvanaResponse from '@nirvana/core/responses/nirvanaResponse';
import UpdateLineMemberState from '@nirvana/core/requests/updateLineMemberState.request';
import { User } from '@nirvana/core/models';
import UserDetailsResponse from '@nirvana/core/responses/userDetails.response';
import UserSearchResponse from '@nirvana/core/responses/userSearch.response';
import UpdateLineMemberState from '@nirvana/core/requests/updateLineMemberState.request';
// export const localHost = process.env.REACT_APP_API_DOMAIN;
export const localHost = 'http://localhost:5000/api';
export const localHost = 'http://localhost:8080/api';
export default class NirvanaApi {
// auth token from google that our backend will use
packages/desktop/src/providers/SocketProvider.tsx
+6 -5
View File
@@ -1,8 +1,9 @@
import React, { useState, useEffect, useContext, useCallback } from 'react';
import toast from 'react-hot-toast';
import { io, Socket } from 'socket.io-client';
import useAuth from './AuthProvider';
import React, { useCallback, useContext, useEffect, useState } from 'react';
import { Socket, io } from 'socket.io-client';
import FlowState from '../tree/protected/FlowState';
import toast from 'react-hot-toast';
import useAuth from './AuthProvider';
interface ISocketProvider {
$ws: Socket;
@@ -46,7 +47,7 @@ export function SocketProvider({ children }: { children: React.ReactNode }) {
return;
}
const socketConnection = io('http://localhost:5000', {
const socketConnection = io('http://localhost:8080', {
query: { token: jwtToken },
transports: ['websocket'],
upgrade: false,