Merge pull request #247 from makeplane/sync/ce-ee

sync: merge conflicts need to be resolved
This commit is contained in:
sriram veeraghanta
2024-05-14 22:57:17 +05:30
committed by GitHub
7 changed files with 7 additions and 7 deletions

View File

@@ -3,7 +3,7 @@ import { ICsrfTokenData, IEmailCheckData, IEmailCheckResponse } from "@plane/typ
// helpers
import { API_BASE_URL } from "@/helpers/common.helper";
// services
import APIService from "@/services/api.service";
import { APIService } from "@/services/api.service";
export class AuthService extends APIService {
constructor() {

View File

@@ -2,7 +2,7 @@ import axios from "axios";
// helpers
import { API_BASE_URL } from "@/helpers/common.helper";
// services
import APIService from "@/services/api.service";
import { APIService } from "@/services/api.service";
interface UnSplashImage {
id: string;

View File

@@ -1,6 +1,6 @@
import { API_BASE_URL } from "@/helpers/common.helper";
// services
import APIService from "@/services/api.service";
import { APIService } from "@/services/api.service";
class IssueService extends APIService {
constructor() {

View File

@@ -2,7 +2,7 @@
import type { IProjectMember, IProjectMembership } from "@plane/types";
import { API_BASE_URL } from "@/helpers/common.helper";
// services
import APIService from "@/services/api.service";
import { APIService } from "@/services/api.service";
export class ProjectMemberService extends APIService {
constructor() {

View File

@@ -1,6 +1,6 @@
import { API_BASE_URL } from "@/helpers/common.helper";
// services
import APIService from "@/services/api.service";
import { APIService } from "@/services/api.service";
class ProjectService extends APIService {
constructor() {

View File

@@ -3,7 +3,7 @@ import { IUser, TUserProfile } from "@plane/types";
// helpers
import { API_BASE_URL } from "@/helpers/common.helper";
// services
import APIService from "@/services/api.service";
import { APIService } from "@/services/api.service";
export class UserService extends APIService {
constructor() {

View File

@@ -6,7 +6,7 @@ export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL || "";
export const ADMIN_BASE_URL = process.env.NEXT_PUBLIC_ADMIN_BASE_URL || "";
export const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "";
export const SPACE_BASE_URL = process.env.NEXT_PUBLIC_SPACE_BASE_URL || window.location.origin;
export const SPACE_BASE_URL = process.env.NEXT_PUBLIC_SPACE_BASE_URL || "";
export const SPACE_BASE_PATH = process.env.NEXT_PUBLIC_SPACE_BASE_PATH || "";
export const debounce = (func: any, wait: number, immediate: boolean = false) => {