diff --git a/src/PageContext.tsx b/src/PageContext.tsx index ab9ae2a..f4d37e0 100644 --- a/src/PageContext.tsx +++ b/src/PageContext.tsx @@ -8,10 +8,10 @@ type user = { const PageContext = React.createContext({ colorMode: { - toggleColorMode: () => {} + toggleColorMode: () => {return} }, - setTokenInfo: (token: string, expiration: number) => {}, - setUser: (user: user) => {}, + setTokenInfo: (token: string, expiration: number) => {return}, + setUser: (user: user) => {return}, user: { name: '', id: '', @@ -19,7 +19,7 @@ const PageContext = React.createContext({ }, accessToken: '', expiration: 0, - setCookie: (name: ("mode" | "user" | "token"), value: any, options?: any) => {} + setCookie: (name: ("mode" | "user" | "token"), value: any, options?: any) => {return} }) export default PageContext diff --git a/src/ProfileMenu.tsx b/src/ProfileMenu.tsx index f6d0581..6e6309d 100644 --- a/src/ProfileMenu.tsx +++ b/src/ProfileMenu.tsx @@ -46,7 +46,7 @@ function ProfileMenu(props: {user?: {id: string, avatar: string, name: string}}) anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }} transformOrigin={{ horizontal: 'right', vertical: 'top' }} > - {window.location.href="https://discord.com/api/oauth2/authorize?client_id=852589582733541416&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fauth&response_type=token&scope=identify"}}> + {window.location.href=`https://discord.com/api/oauth2/authorize?client_id=852589582733541416&redirect_uri=${encodeURIComponent(window.location.origin + "/")}auth&response_type=token&scope=identify`}}> Login diff --git a/src/config/permissionDialogs/AllowedForm.tsx b/src/config/permissionDialogs/AllowedForm.tsx index ead64be..eb9f82b 100644 --- a/src/config/permissionDialogs/AllowedForm.tsx +++ b/src/config/permissionDialogs/AllowedForm.tsx @@ -17,6 +17,9 @@ const AllowedForm = (props: { handleAllowedOnChange: (event: SelectChangeEvent)=>void, setAllowed: (s:string)=>void}) => { const botContext = useContext(ConfigContext) + if(botContext.bot === undefined){ + return null + } return( <> {props.permType === 'all' ? (null) : (props.permType === 'rank' ? ( @@ -36,7 +39,7 @@ const AllowedForm = (props: { onChange={(e) => props.setAllowed(e.target.value)} label="Allowed" > - {botContext.bot!.config.ranks.map((rank: rank)=> + {botContext.bot.config.ranks.map((rank: rank)=> {rank.name} @@ -51,12 +54,12 @@ const AllowedForm = (props: { labelId="allowed-input" multiple // Looks like value isnt properly typed for multiple - // @ts-ignore + //@ts-expect-error Select should be accepting this, looks to be MUI error value={props.allowedOn} onChange={props.handleAllowedOnChange} label="AllowedOn" > - {botContext.bot!.config.ranks.map((rank: rank)=> + {botContext.bot.config.ranks.map((rank: rank)=> {rank.name} @@ -82,7 +85,7 @@ const AllowedForm = (props: { onChange={(e) => props.setAllowed(e.target.value)} label="Allowed" > - {botContext.bot!.config.roles.map((rank: rank)=> + {botContext.bot.config.roles.map((rank: rank)=> {rank.name} @@ -97,12 +100,12 @@ const AllowedForm = (props: { labelId="allowed-input" multiple // Looks like value isnt properly typed for multiple - // @ts-ignore + //@ts-expect-error Select should be accepting this, looks to be MUI error value={props.allowedOn} onChange={props.handleAllowedOnChange} label="AllowedOn" > - {botContext.bot!.config.roles.map((rank: rank)=> + {botContext.bot.config.roles.map((rank: rank)=> {rank.name} diff --git a/src/utils/config.tsx b/src/utils/config.tsx index b936214..3ec638f 100644 --- a/src/utils/config.tsx +++ b/src/utils/config.tsx @@ -2,7 +2,7 @@ import ENV_URL from "./env" export async function getConfig(token: string, serverid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/private/getConfig`, { + const res = await fetch(`${ENV_URL}/private/getConfig`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -26,7 +26,7 @@ export async function getConfig(token: string, serverid :string){ export async function getBots(token: string){ try{ - const res = await fetch(`http://web.${ENV_URL}/private/getBots`, { + const res = await fetch(`${ENV_URL}/private/getBots`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -47,7 +47,7 @@ export async function getBots(token: string){ export async function addServer(token: string, serverid: string){ try{ - const res = await fetch(`http://web.${ENV_URL}/private/addServer`, { + const res = await fetch(`${ENV_URL}/private/addServer`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -71,7 +71,7 @@ export async function addServer(token: string, serverid: string){ export async function removeServer(token: string, serverid: string){ try{ - const res = await fetch(`http://web.${ENV_URL}/private/removeServer`, { + const res = await fetch(`${ENV_URL}/private/removeServer`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -95,7 +95,7 @@ export async function removeServer(token: string, serverid: string){ export async function updateConfig(token: string, serverid: string, config: object){ try{ - const res = await fetch(`http://web.${ENV_URL}/private/updateConfig`, { + const res = await fetch(`${ENV_URL}/private/updateConfig`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -120,7 +120,7 @@ export async function updateConfig(token: string, serverid: string, config: obje export async function getUpdateStatus(token: string, serverid: string){ try{ - const res = await fetch(`http://web.${ENV_URL}/private/getUpdateStatus`, { + const res = await fetch(`${ENV_URL}/private/getUpdateStatus`, { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/src/utils/env.tsx b/src/utils/env.tsx index 2b7e8af..39f7198 100644 --- a/src/utils/env.tsx +++ b/src/utils/env.tsx @@ -1,2 +1,2 @@ -const ENV_URL = "localhost:8080" +const ENV_URL = process.env.NODE_ENV === "development" ? "http://web.localhost:8080" : "https://web.reppo.io" export default ENV_URL; diff --git a/src/utils/global.tsx b/src/utils/global.tsx index 5af0df7..9dcc877 100644 --- a/src/utils/global.tsx +++ b/src/utils/global.tsx @@ -82,7 +82,7 @@ export const getDesignTokens = (mode: PaletteMode)=> ({ export async function login(accessToken: string, expiration: string){ try{ - const res = await fetch(`http://web.${ENV_URL}/global/login`, { + const res = await fetch(`${ENV_URL}/global/login`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -105,7 +105,7 @@ export async function login(accessToken: string, expiration: string){ export async function logout(accessToken: string){ try{ - const res = await fetch(`http://web.${ENV_URL}/global/logout`, { + const res = await fetch(`${ENV_URL}/global/logout`, { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/src/utils/homepage.tsx b/src/utils/homepage.tsx index 23aece2..50fb206 100644 --- a/src/utils/homepage.tsx +++ b/src/utils/homepage.tsx @@ -2,7 +2,7 @@ import ENV_URL from "./env" export async function getTotalUserCount(){ try{ - const res = await fetch(`http://web.${ENV_URL}/homepage/getTotalUserCount`, { + const res = await fetch(`${ENV_URL}/homepage/getTotalUserCount`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -21,7 +21,7 @@ export async function getTotalUserCount(){ export async function getTotalServerCount(){ try{ - const res = await fetch(`http://web.${ENV_URL}/homepage/getTotalServerCount`, { + const res = await fetch(`${ENV_URL}/homepage/getTotalServerCount`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -40,7 +40,7 @@ export async function getTotalServerCount(){ export async function search(searchString: string){ try{ - const res = await fetch(`http://web.${ENV_URL}/homepage/search`, { + const res = await fetch(`${ENV_URL}/homepage/search`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -63,7 +63,7 @@ export async function search(searchString: string){ export async function getHourTransactions(){ try{ - const res = await fetch(`http://web.${ENV_URL}/homepage/getHourTransactions`, { + const res = await fetch(`${ENV_URL}/homepage/getHourTransactions`, { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/src/utils/server.tsx b/src/utils/server.tsx index b230bd1..9070af6 100644 --- a/src/utils/server.tsx +++ b/src/utils/server.tsx @@ -2,17 +2,17 @@ import ENV_URL from "./env" export async function getServer(serverid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/server/getServer`, { + const res = await fetch(`${ENV_URL}/server/getServer`, { method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ - serverid - }) + serverid + }) }) if(res.status !== 200){ - const payload = await res.json() + const payload = await res.json() throw new Error(payload.failed) } return (await res.json()).success @@ -25,18 +25,18 @@ export async function getServer(serverid :string){ export async function getTopUsers(serverid :string, num: number){ try{ - const res = await fetch(`http://web.${ENV_URL}/server/getTopUsers`, { + const res = await fetch(`${ENV_URL}/server/getTopUsers`, { method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ - serverid, - num - }) + serverid, + num + }) }) if(res.status !== 200){ - const payload = await res.json() + const payload = await res.json() throw new Error(payload.failed) } return (await res.json()).success @@ -49,17 +49,17 @@ export async function getTopUsers(serverid :string, num: number){ export async function getActivityForDay(serverid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/server/getActivityForDay`, { + const res = await fetch(`${ENV_URL}/server/getActivityForDay`, { method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ - serverid - }) + serverid + }) }) if(res.status !== 200){ - const payload = await res.json() + const payload = await res.json() throw new Error(payload.failed) } return (await res.json()).success @@ -72,17 +72,17 @@ export async function getActivityForDay(serverid :string){ export async function getActivityForMonth(serverid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/server/getActivityForMonth`, { + const res = await fetch(`${ENV_URL}/server/getActivityForMonth`, { method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ - serverid - }) + serverid + }) }) if(res.status !== 200){ - const payload = await res.json() + const payload = await res.json() throw new Error(payload.failed) } return (await res.json()).success @@ -95,17 +95,17 @@ export async function getActivityForMonth(serverid :string){ export async function getActivityForYear(serverid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/server/getActivityForYear`, { + const res = await fetch(`${ENV_URL}/server/getActivityForYear`, { method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ - serverid - }) + serverid + }) }) if(res.status !== 200){ - const payload = await res.json() + const payload = await res.json() throw new Error(payload.failed) } return (await res.json()).success diff --git a/src/utils/user.tsx b/src/utils/user.tsx index 8bddb32..ad525ab 100644 --- a/src/utils/user.tsx +++ b/src/utils/user.tsx @@ -2,7 +2,7 @@ import ENV_URL from "./env" export async function getUser(userid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/user/getUser`, { + const res = await fetch(`${ENV_URL}/user/getUser`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -25,7 +25,7 @@ export async function getUser(userid :string){ export async function getReps(userid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/user/getReps`, { + const res = await fetch(`${ENV_URL}/user/getReps`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -48,7 +48,7 @@ export async function getReps(userid :string){ export async function getRecentTransactions(userid :string, num: number){ try{ - const res = await fetch(`http://web.${ENV_URL}/user/getRecentTransactions`, { + const res = await fetch(`${ENV_URL}/user/getRecentTransactions`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -72,7 +72,7 @@ export async function getRecentTransactions(userid :string, num: number){ export async function getActivityForDay(userid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/user/getActivityForDay`, { + const res = await fetch(`${ENV_URL}/user/getActivityForDay`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -95,7 +95,7 @@ export async function getActivityForDay(userid :string){ export async function getActivityForMonth(userid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/user/getActivityForMonth`, { + const res = await fetch(`${ENV_URL}/user/getActivityForMonth`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -118,7 +118,7 @@ export async function getActivityForMonth(userid :string){ export async function getActivityForYear(userid :string){ try{ - const res = await fetch(`http://web.${ENV_URL}/user/getActivityForYear`, { + const res = await fetch(`${ENV_URL}/user/getActivityForYear`, { method: 'POST', headers: { 'Content-Type': 'application/json',