github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1931 from makeplane/develop

Browse Source 
fix: access environment variables is changed in services (#1930)
This commit is contained in:
Nikhil 2023-08-22 01:14:56 +05:30 committed by GitHub
commit eb50ade5e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/space/app/[workspace_slug]/[project_slug]/page.tsx
View File

@ -26,7 +26,9 @@ const WorkspaceProjectPage = observer(() => {
const { workspace_slug, project_slug } = routerParams as { workspace_slug: string; project_slug: string }; const { workspace_slug, project_slug } = routerParams as { workspace_slug: string; project_slug: string };
const board = const board =
routerSearchparams && routerSearchparams.get("board") != null && (routerSearchparams.get("board") as TIssueBoardKeys | ""); routerSearchparams &&
routerSearchparams.get("board") != null &&
(routerSearchparams.get("board") as TIssueBoardKeys | "");
// updating default board view when we are in the issues page // updating default board view when we are in the issues page
useEffect(() => { useEffect(() => {

4
apps/space/next.config.js
View File

@ -1,5 +1,5 @@
/** @type {import('next').NextConfig} */ /** @type {import('next').NextConfig} */
const path = require('path') const path = require("path");
const nextConfig = { const nextConfig = {
reactStrictMode: false, reactStrictMode: false,
@ -8,7 +8,7 @@ const nextConfig = {
outputFileTracingRoot: path.join(__dirname, "../../"), outputFileTracingRoot: path.join(__dirname, "../../"),
appDir: true, appDir: true,
}, },
output: 'standalone' output: "standalone",
}; };
module.exports = nextConfig; module.exports = nextConfig;

6
apps/space/services/api.service.ts
View File

@ -3,14 +3,12 @@ import axios from "axios";
// js cookie // js cookie
import Cookies from "js-cookie"; import Cookies from "js-cookie";
const base_url: string | null = "http://localhost:8000";
abstract class APIService { abstract class APIService {
protected baseURL: string; protected baseURL: string;
protected headers: any = {}; protected headers: any = {};
constructor(baseURL: string) { constructor(_baseURL: string) {
this.baseURL = base_url ? base_url : baseURL; this.baseURL = _baseURL;
} }
setRefreshToken(token: string) { setRefreshToken(token: string) {

4
apps/space/services/issue.service.ts
View File

@ -1,11 +1,9 @@
// services // services
import APIService from "services/api.service"; import APIService from "services/api.service";
const { NEXT_PUBLIC_API_BASE_URL } = process.env;
class IssueService extends APIService { class IssueService extends APIService {
constructor() { constructor() {
super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000"); super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
} }
async getPublicIssues(workspace_slug: string, project_slug: string): Promise<any> { async getPublicIssues(workspace_slug: string, project_slug: string): Promise<any> {

4
apps/space/services/project.service.ts
View File

@ -1,11 +1,9 @@
// services // services
import APIService from "services/api.service"; import APIService from "services/api.service";
const { NEXT_PUBLIC_API_BASE_URL } = process.env;
class ProjectService extends APIService { class ProjectService extends APIService {
constructor() { constructor() {
super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000"); super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
} }
async getProjectSettingsAsync(workspace_slug: string, project_slug: string): Promise<any> { async getProjectSettingsAsync(workspace_slug: string, project_slug: string): Promise<any> {

4
apps/space/services/user.service.ts
View File

@ -1,11 +1,9 @@
// services // services
import APIService from "services/api.service"; import APIService from "services/api.service";
const { NEXT_PUBLIC_API_BASE_URL } = process.env;
class UserService extends APIService { class UserService extends APIService {
constructor() { constructor() {
super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000"); super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
} }
async currentUser(): Promise<any> { async currentUser(): Promise<any> {

9
yarn.lock
View File

@ -6558,13 +6558,20 @@ prosemirror-menu@^1.2.1:
prosemirror-history "^1.0.0" prosemirror-history "^1.0.0"
prosemirror-state "^1.0.0" prosemirror-state "^1.0.0"
prosemirror-model@1.18.1, prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.1, prosemirror-model@^1.19.0, prosemirror-model@^1.8.1: prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.1, prosemirror-model@^1.8.1:
version "1.18.1" version "1.18.1"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.1.tgz#1d5d6b6de7b983ee67a479dc607165fdef3935bd" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.1.tgz#1d5d6b6de7b983ee67a479dc607165fdef3935bd"
integrity sha512-IxSVBKAEMjD7s3n8cgtwMlxAXZrC7Mlag7zYsAKDndAqnDScvSmp/UdnRTV/B33lTCVU3CCm7dyAn/rVVD0mcw== integrity sha512-IxSVBKAEMjD7s3n8cgtwMlxAXZrC7Mlag7zYsAKDndAqnDScvSmp/UdnRTV/B33lTCVU3CCm7dyAn/rVVD0mcw==
dependencies: dependencies:
orderedmap "^2.0.0" orderedmap "^2.0.0"
prosemirror-model@^1.19.0:
version "1.19.3"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.19.3.tgz#f0d55285487fefd962d0ac695f716f4ec6705006"
integrity sha512-tgSnwN7BS7/UM0sSARcW+IQryx2vODKX4MI7xpqY2X+iaepJdKBPc7I4aACIsDV/LTaTjt12Z56MhDr9LsyuZQ==
dependencies:
orderedmap "^2.0.0"
prosemirror-schema-basic@^1.2.0: prosemirror-schema-basic@^1.2.0:
version "1.2.2" version "1.2.2"
resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.2.tgz#6695f5175e4628aab179bf62e5568628b9cfe6c7" resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.2.tgz#6695f5175e4628aab179bf62e5568628b9cfe6c7"