mirror of
https://github.com/hex248/sprint.git
synced 2026-02-08 02:33:01 +00:00
getServerURL() utility function
This commit is contained in:
@@ -2,6 +2,7 @@ import type { UserRecord } from "@issue/shared";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import Loading from "@/components/loading";
|
||||
import LogInForm from "@/components/login-form";
|
||||
import { getServerURL } from "@/lib/utils";
|
||||
|
||||
type AuthProviderProps = {
|
||||
children: React.ReactNode;
|
||||
@@ -9,8 +10,6 @@ type AuthProviderProps = {
|
||||
};
|
||||
|
||||
export function Auth({ children }: AuthProviderProps) {
|
||||
const serverURL = import.meta.env.VITE_SERVER_URL?.trim() || "http://localhost:3000";
|
||||
|
||||
const [loggedIn, setLoggedIn] = useState<boolean>();
|
||||
const fetched = useRef(false);
|
||||
|
||||
@@ -21,7 +20,7 @@ export function Auth({ children }: AuthProviderProps) {
|
||||
if (!token) {
|
||||
return setLoggedIn(false);
|
||||
}
|
||||
fetch(`${serverURL}/auth/me`, {
|
||||
fetch(`${getServerURL()}/auth/me`, {
|
||||
headers: { Authorization: `Bearer ${token}` },
|
||||
})
|
||||
.then(async (res) => {
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
} from "@/components/ui/dialog";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { cn, getAuthHeaders } from "@/lib/utils";
|
||||
import { cn, getAuthHeaders, getServerURL } from "@/lib/utils";
|
||||
|
||||
export function CreateIssue({
|
||||
projectId,
|
||||
@@ -21,8 +21,6 @@ export function CreateIssue({
|
||||
trigger?: React.ReactNode;
|
||||
completeAction?: (issueId: number) => void | Promise<void>;
|
||||
}) {
|
||||
const serverURL = import.meta.env.VITE_SERVER_URL?.trim() || "http://localhost:3000";
|
||||
|
||||
const userId = JSON.parse(localStorage.getItem("user") || "{}").id as number | undefined;
|
||||
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -90,7 +88,7 @@ export function CreateIssue({
|
||||
setSubmitting(true);
|
||||
|
||||
try {
|
||||
const url = new URL(`${serverURL}/issue/create`);
|
||||
const url = new URL(`${getServerURL()}/issue/create`);
|
||||
url.searchParams.set("projectId", `${projectId}`);
|
||||
url.searchParams.set("title", title.trim());
|
||||
url.searchParams.set("description", description.trim());
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
} from "@/components/ui/dialog";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { cn, getAuthHeaders } from "@/lib/utils";
|
||||
import { cn, getAuthHeaders, getServerURL } from "@/lib/utils";
|
||||
|
||||
const slugify = (value: string) =>
|
||||
value
|
||||
@@ -27,8 +27,6 @@ export function CreateOrganisation({
|
||||
trigger?: React.ReactNode;
|
||||
completeAction?: (organisationId: number) => void | Promise<void>;
|
||||
}) {
|
||||
const serverURL = import.meta.env.VITE_SERVER_URL?.trim() || "http://localhost:3000";
|
||||
|
||||
const userId = JSON.parse(localStorage.getItem("user") || "{}").id as number | undefined;
|
||||
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -90,7 +88,7 @@ export function CreateOrganisation({
|
||||
|
||||
setSubmitting(true);
|
||||
try {
|
||||
const url = new URL(`${serverURL}/organisation/create`);
|
||||
const url = new URL(`${getServerURL()}/organisation/create`);
|
||||
url.searchParams.set("name", name.trim());
|
||||
url.searchParams.set("slug", slug.trim());
|
||||
url.searchParams.set("userId", `${userId}`);
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
} from "@/components/ui/dialog";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { cn, getAuthHeaders } from "@/lib/utils";
|
||||
import { cn, getAuthHeaders, getServerURL } from "@/lib/utils";
|
||||
|
||||
const keyify = (value: string) =>
|
||||
value
|
||||
@@ -27,8 +27,6 @@ export function CreateProject({
|
||||
trigger?: React.ReactNode;
|
||||
completeAction?: (projectId: number) => void | Promise<void>;
|
||||
}) {
|
||||
const serverURL = import.meta.env.VITE_SERVER_URL?.trim() || "http://localhost:3000";
|
||||
|
||||
const userId = JSON.parse(localStorage.getItem("user") || "{}").id as number | undefined;
|
||||
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -96,7 +94,7 @@ export function CreateProject({
|
||||
|
||||
setSubmitting(true);
|
||||
try {
|
||||
const url = new URL(`${serverURL}/project/create`);
|
||||
const url = new URL(`${getServerURL()}/project/create`);
|
||||
url.searchParams.set("key", key);
|
||||
url.searchParams.set("name", name.trim());
|
||||
url.searchParams.set("creatorId", `${userId}`);
|
||||
|
||||
@@ -3,7 +3,7 @@ import { type ChangeEvent, useEffect, useMemo, useState } from "react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { capitalise, cn } from "@/lib/utils";
|
||||
import { capitalise, cn, getServerURL } from "@/lib/utils";
|
||||
|
||||
function Field({
|
||||
label = "label",
|
||||
@@ -46,8 +46,6 @@ function Field({
|
||||
}
|
||||
|
||||
export default function LogInForm() {
|
||||
const serverURL = import.meta.env.VITE_SERVER_URL?.trim() || "http://localhost:3000";
|
||||
|
||||
const [mode, setMode] = useState<"login" | "register">("login");
|
||||
|
||||
const [name, setName] = useState("");
|
||||
@@ -79,7 +77,7 @@ export default function LogInForm() {
|
||||
return;
|
||||
}
|
||||
|
||||
fetch(`${serverURL}/auth/login`, {
|
||||
fetch(`${getServerURL()}/auth/login`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
|
||||
@@ -111,7 +109,7 @@ export default function LogInForm() {
|
||||
return;
|
||||
}
|
||||
|
||||
fetch(`${serverURL}/auth/register`, {
|
||||
fetch(`${getServerURL()}/auth/register`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
|
||||
Reference in New Issue
Block a user