Browse Source

fix: export to plus url (#6980)

pull/6956/merge
David Luzar 2 years ago committed by GitHub
parent
commit
6abf194281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      .env.development
  2. 5
      .env.production
  3. 4
      src/excalidraw-app/components/AppMainMenu.tsx
  4. 4
      src/excalidraw-app/components/AppWelcomeScreen.tsx
  5. 4
      src/excalidraw-app/components/ExportToExcalidrawPlus.tsx
  6. 2
      src/tests/__snapshots__/MobileMenu.test.tsx.snap
  7. 3
      src/vite-env.d.ts

3
.env.development

@ -10,6 +10,9 @@ VITE_APP_WS_SERVER_URL=http://localhost:3002 @@ -10,6 +10,9 @@ VITE_APP_WS_SERVER_URL=http://localhost:3002
# set this only if using the collaboration workflow we use on excalidraw.com
VITE_APP_PORTAL_URL=
VITE_APP_PLUS_LP=https://plus.excalidraw.com
VITE_APP_PLUS_APP=https://app.excalidraw.com
VITE_APP_FIREBASE_CONFIG='{"apiKey":"AIzaSyCMkxA60XIW8KbqMYL7edC4qT5l4qHX2h8","authDomain":"excalidraw-oss-dev.firebaseapp.com","projectId":"excalidraw-oss-dev","storageBucket":"excalidraw-oss-dev.appspot.com","messagingSenderId":"664559512677","appId":"1:664559512677:web:a385181f2928d328a7aa8c"}'
# put these in your .env.local, or make sure you don't commit!

5
.env.production

@ -5,11 +5,14 @@ VITE_APP_LIBRARY_URL=https://libraries.excalidraw.com @@ -5,11 +5,14 @@ VITE_APP_LIBRARY_URL=https://libraries.excalidraw.com
VITE_APP_LIBRARY_BACKEND=https://us-central1-excalidraw-room-persistence.cloudfunctions.net/libraries
VITE_APP_PORTAL_URL=https://portal.excalidraw.com
VITE_APP_PLUS_LP=https://plus.excalidraw.com
VITE_APP_PLUS_APP=https://app.excalidraw.com
# Fill to set socket server URL used for collaboration.
# Meant for forks only: excalidraw.com uses custom VITE_APP_PORTAL_URL flow
VITE_APP_WS_SERVER_URL=
VITE_APP_FIREBASE_CONFIG='{"apiKey":"AIzaSyAd15pYlMci_xIp9ko6wkEsDzAAA0Dn0RU","authDomain":"excalidraw-room-persistence.firebaseapp.com","databaseURL":"https://excalidraw-room-persistence.firebaseio.com","projectId":"excalidraw-room-persistence","storageBucket":"excalidraw-room-persistence.appspot.com","messagingSenderId":"654800341332","appId":"1:654800341332:web:4a692de832b55bd57ce0c1"}'
VITE_APP_PLUS_APP=https://app.excalidraw.com
VITE_APP_DISABLE_TRACKING=

4
src/excalidraw-app/components/AppMainMenu.tsx

@ -26,7 +26,9 @@ export const AppMainMenu: React.FC<{ @@ -26,7 +26,9 @@ export const AppMainMenu: React.FC<{
<MainMenu.Separator />
<MainMenu.ItemLink
icon={PlusPromoIcon}
href="https://plus.excalidraw.com/plus?utm_source=excalidraw&utm_medium=app&utm_content=hamburger"
href={`${
import.meta.env.VITE_APP_PLUS_LP
}/plus?utm_source=excalidraw&utm_medium=app&utm_content=hamburger`}
className="ExcalidrawPlus"
>
Excalidraw+

4
src/excalidraw-app/components/AppWelcomeScreen.tsx

@ -56,7 +56,9 @@ export const AppWelcomeScreen: React.FC<{ @@ -56,7 +56,9 @@ export const AppWelcomeScreen: React.FC<{
)}
{!isExcalidrawPlusSignedUser && (
<WelcomeScreen.Center.MenuItemLink
href="https://plus.excalidraw.com/plus?utm_source=excalidraw&utm_medium=app&utm_content=welcomeScreenGuest"
href={`${
import.meta.env.VITE_APP_PLUS_LP
}/plus?utm_source=excalidraw&utm_medium=app&utm_content=welcomeScreenGuest`}
shortcut={null}
icon={PlusPromoIcon}
>

4
src/excalidraw-app/components/ExportToExcalidrawPlus.tsx

@ -69,7 +69,9 @@ export const exportToExcalidrawPlus = async ( @@ -69,7 +69,9 @@ export const exportToExcalidrawPlus = async (
}
window.open(
`https://plus.excalidraw.com/import?excalidraw=${id},${encryptionKey}`,
`${
import.meta.env.VITE_APP_PLUS_APP
}/import?excalidraw=${id},${encryptionKey}`,
);
};

2
src/tests/__snapshots__/MobileMenu.test.tsx.snap

@ -197,7 +197,7 @@ exports[`Test MobileMenu > should initialize with welcome screen and hide once u @@ -197,7 +197,7 @@ exports[`Test MobileMenu > should initialize with welcome screen and hide once u
</button>
<a
class="welcome-screen-menu-item "
href="https://plus.excalidraw.com/plus?utm_source=excalidraw&utm_medium=app&utm_content=welcomeScreenGuest"
href="undefined/plus?utm_source=excalidraw&utm_medium=app&utm_content=welcomeScreenGuest"
rel="noreferrer"
target="_blank"
>

3
src/vite-env.d.ts vendored

@ -47,6 +47,9 @@ interface ImportMetaEnv { @@ -47,6 +47,9 @@ interface ImportMetaEnv {
VITE_PKG_VERSION: string;
VITE_IS_EXCALIDRAW_NPM_PACKAGE: string;
VITE_APP_PLUS_LP: string;
VITE_APP_PLUS_APP: string;
VITE_WORKER_ID: string;
MODE: string;
DEV: string;

Loading…
Cancel
Save