Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

promote: stage release to master #1932

Merged
merged 2 commits into from
Aug 21, 2023
Merged

promote: stage release to master #1932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b406a70
fix: access environment variables is changed in services (#1930)
gurusainath Aug 21, 2023
eb50ade
Merge pull request #1931 from makeplane/develop
pablohashescobar Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/space/app/[workspace_slug]/[project_slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ const WorkspaceProjectPage = observer(() => {

const { workspace_slug, project_slug } = routerParams as { workspace_slug: string; project_slug: string };
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
useEffect(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/space/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @type {import('next').NextConfig} */
const path = require('path')
const path = require("path");

const nextConfig = {
reactStrictMode: false,
Expand All @@ -8,7 +8,7 @@ const nextConfig = {
outputFileTracingRoot: path.join(__dirname, "../../"),
appDir: true,
},
output: 'standalone'
output: "standalone",
};

module.exports = nextConfig;
6 changes: 2 additions & 4 deletions apps/space/services/api.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import axios from "axios";
// js cookie
import Cookies from "js-cookie";

const base_url: string | null = "http://localhost:8000";

abstract class APIService {
protected baseURL: string;
protected headers: any = {};

constructor(baseURL: string) {
this.baseURL = base_url ? base_url : baseURL;
constructor(_baseURL: string) {
this.baseURL = _baseURL;
}

setRefreshToken(token: string) {
Expand Down
4 changes: 1 addition & 3 deletions apps/space/services/issue.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// services
import APIService from "services/api.service";

const { NEXT_PUBLIC_API_BASE_URL } = process.env;

class IssueService extends APIService {
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> {
Expand Down
4 changes: 1 addition & 3 deletions apps/space/services/project.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// services
import APIService from "services/api.service";

const { NEXT_PUBLIC_API_BASE_URL } = process.env;

class ProjectService extends APIService {
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> {
Expand Down
4 changes: 1 addition & 3 deletions apps/space/services/user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// services
import APIService from "services/api.service";

const { NEXT_PUBLIC_API_BASE_URL } = process.env;

class UserService extends APIService {
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> {
Expand Down
9 changes: 8 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6558,13 +6558,20 @@ prosemirror-menu@^1.2.1:
prosemirror-history "^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"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.1.tgz#1d5d6b6de7b983ee67a479dc607165fdef3935bd"
integrity sha512-IxSVBKAEMjD7s3n8cgtwMlxAXZrC7Mlag7zYsAKDndAqnDScvSmp/UdnRTV/B33lTCVU3CCm7dyAn/rVVD0mcw==
dependencies:
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:
version "1.2.2"
resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.2.tgz#6695f5175e4628aab179bf62e5568628b9cfe6c7"
Expand Down