mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
Merge pull request #1718 from makeplane/stage-release
dev: equate stage-release and develop branch
This commit is contained in:
commit
89bf24bd64
@ -19,6 +19,8 @@ NEXT_PUBLIC_ENABLE_SESSION_RECORDER=0
|
|||||||
NEXT_PUBLIC_TRACK_EVENTS=0
|
NEXT_PUBLIC_TRACK_EVENTS=0
|
||||||
# Slack for Slack Integration
|
# Slack for Slack Integration
|
||||||
NEXT_PUBLIC_SLACK_CLIENT_ID=""
|
NEXT_PUBLIC_SLACK_CLIENT_ID=""
|
||||||
|
# For Telemetry, set it to "app.plane.so"
|
||||||
|
NEXT_PUBLIC_PLAUSIBLE_DOMAIN=""
|
||||||
|
|
||||||
# Backend
|
# Backend
|
||||||
# Debug value for api server use it as 0 for production use
|
# Debug value for api server use it as 0 for production use
|
||||||
|
@ -20,17 +20,21 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = ({ handleSignIn }) => {
|
|||||||
callback: handleSignIn,
|
callback: handleSignIn,
|
||||||
});
|
});
|
||||||
|
|
||||||
window?.google?.accounts.id.renderButton(
|
try {
|
||||||
googleSignInButton.current,
|
window?.google?.accounts.id.renderButton(
|
||||||
{
|
googleSignInButton.current,
|
||||||
type: "standard",
|
{
|
||||||
theme: "outline",
|
type: "standard",
|
||||||
size: "large",
|
theme: "outline",
|
||||||
logo_alignment: "center",
|
size: "large",
|
||||||
width: "360",
|
logo_alignment: "center",
|
||||||
text: "signin_with",
|
width: 360,
|
||||||
} as GsiButtonConfiguration // customization attributes
|
text: "signin_with",
|
||||||
);
|
} as GsiButtonConfiguration // customization attributes
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
console.log(err);
|
||||||
|
}
|
||||||
|
|
||||||
window?.google?.accounts.id.prompt(); // also display the One Tap dialog
|
window?.google?.accounts.id.prompt(); // also display the One Tap dialog
|
||||||
|
|
||||||
@ -50,7 +54,7 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = ({ handleSignIn }) => {
|
|||||||
<>
|
<>
|
||||||
<Script src="https://accounts.google.com/gsi/client" async defer onLoad={loadScript} />
|
<Script src="https://accounts.google.com/gsi/client" async defer onLoad={loadScript} />
|
||||||
<div
|
<div
|
||||||
className="overflow-hidden rounded w-full flex justify-center items-center !text-sm !font-medium !text-custom-text-100"
|
className="overflow-hidden rounded w-full"
|
||||||
id="googleSignInButton"
|
id="googleSignInButton"
|
||||||
ref={googleSignInButton}
|
ref={googleSignInButton}
|
||||||
/>
|
/>
|
||||||
|
2
apps/app/google.d.ts
vendored
2
apps/app/google.d.ts
vendored
@ -37,7 +37,7 @@ interface GsiButtonConfiguration {
|
|||||||
text?: "signin_with" | "signup_with" | "continue_with" | "signup_with";
|
text?: "signin_with" | "signup_with" | "continue_with" | "signup_with";
|
||||||
shape?: "rectangular" | "pill" | "circle" | "square";
|
shape?: "rectangular" | "pill" | "circle" | "square";
|
||||||
logo_alignment?: "left" | "center";
|
logo_alignment?: "left" | "center";
|
||||||
width?: string;
|
width?: number;
|
||||||
local?: string;
|
local?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,7 +12,13 @@ class MyDocument extends Document {
|
|||||||
<link rel="manifest" href="/manifest.json" />
|
<link rel="manifest" href="/manifest.json" />
|
||||||
<link rel="apple-touch-icon" href="/icon.png" />
|
<link rel="apple-touch-icon" href="/icon.png" />
|
||||||
<meta name="theme-color" content="#fff" />
|
<meta name="theme-color" content="#fff" />
|
||||||
<script defer data-domain="app.plane.so" src="https://plausible.io/js/script.js" />
|
{process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN && (
|
||||||
|
<script
|
||||||
|
defer
|
||||||
|
data-domain={process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN}
|
||||||
|
src="https://plausible.io/js/script.js"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<script defer src="https://cdn.jsdelivr.net/npm/@supabase/supabase-js@2" />
|
<script defer src="https://cdn.jsdelivr.net/npm/@supabase/supabase-js@2" />
|
||||||
{isSessionRecorderEnabled && process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY && (
|
{isSessionRecorderEnabled && process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY && (
|
||||||
<script
|
<script
|
||||||
|
@ -22,7 +22,8 @@
|
|||||||
"NEXT_PUBLIC_SLACK_CLIENT_ID",
|
"NEXT_PUBLIC_SLACK_CLIENT_ID",
|
||||||
"NEXT_PUBLIC_SLACK_CLIENT_SECRET",
|
"NEXT_PUBLIC_SLACK_CLIENT_SECRET",
|
||||||
"NEXT_PUBLIC_SUPABASE_URL",
|
"NEXT_PUBLIC_SUPABASE_URL",
|
||||||
"NEXT_PUBLIC_SUPABASE_ANON_KEY"
|
"NEXT_PUBLIC_SUPABASE_ANON_KEY",
|
||||||
|
"NEXT_PUBLIC_PLAUSIBLE_DOMAIN"
|
||||||
],
|
],
|
||||||
"pipeline": {
|
"pipeline": {
|
||||||
"build": {
|
"build": {
|
||||||
|
Loading…
Reference in New Issue
Block a user