diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 73621eae2..25b0592c7 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -25,7 +25,7 @@ env: VITE_SPARROW_LINKEDIN: ${{ vars.VITE_SPARROW_LINKEDIN }} VITE_WEB_SOCKET_IO_API_URL: ${{ vars.VITE_WEB_SOCKET_IO_API_URL }} ACTIONS_ALLOW_UNSECURE_COMMANDS: true - VITE_SIMPLIFIED_LOGIN: ${{ vars.VITE_SIMPLIFIED_LOGIN }} + CI: false jobs: release_win: diff --git a/.github/workflows/feat-sparrow-refactoring.yaml b/.github/workflows/feat-sparrow-refactoring.yaml index 927ac3a18..eb415d01c 100644 --- a/.github/workflows/feat-sparrow-refactoring.yaml +++ b/.github/workflows/feat-sparrow-refactoring.yaml @@ -24,7 +24,6 @@ env: VITE_BASE_URL: ${{ vars.VITE_BASE_URL }} VITE_SPARROW_LINKEDIN: ${{ vars.VITE_SPARROW_LINKEDIN }} ACTIONS_ALLOW_UNSECURE_COMMANDS: true - VITE_SIMPLIFIED_LOGIN: ${{ vars.VITE_SIMPLIFIED_LOGIN }} jobs: release_win: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0ef6caedc..81c4d79b8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -25,7 +25,7 @@ env: VITE_SPARROW_LINKEDIN: ${{ vars.VITE_SPARROW_LINKEDIN }} VITE_WEB_SOCKET_IO_API_URL: ${{ vars.VITE_WEB_SOCKET_IO_API_URL }} ACTIONS_ALLOW_UNSECURE_COMMANDS: true - VITE_SIMPLIFIED_LOGIN: ${{ vars.VITE_SIMPLIFIED_LOGIN }} + CI: false jobs: release_win: diff --git a/.github/workflows/staging.yaml b/.github/workflows/staging.yaml index 3f8209147..71c5ea3e4 100644 --- a/.github/workflows/staging.yaml +++ b/.github/workflows/staging.yaml @@ -16,7 +16,6 @@ env: VITE_SPARROW_GITHUB: ${{ secrets.VITE_SPARROW_GITHUB }} VITE_SPARROW_DOWNLOAD_LINK: ${{ secrets.VITE_SPARROW_DOWNLOAD_LINK }} ACTIONS_ALLOW_UNSECURE_COMMANDS: true - VITE_SIMPLIFIED_LOGIN: ${{ vars.VITE_SIMPLIFIED_LOGIN }} jobs: release_win: diff --git a/.github/workflows/testflow.yml b/.github/workflows/testflow.yml index f7826be87..8e504ab5d 100644 --- a/.github/workflows/testflow.yml +++ b/.github/workflows/testflow.yml @@ -22,7 +22,6 @@ env: VITE_CANNY_API: ${{ vars.VITE_CANNY_API }} VITE_CANNY_URL: ${{ vars.VITE_CANNY_URL }} ACTIONS_ALLOW_UNSECURE_COMMANDS: true - VITE_SIMPLIFIED_LOGIN: ${{ vars.VITE_SIMPLIFIED_LOGIN }} jobs: release_win: diff --git a/README.md b/README.md index 03788a64e..3ee655961 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,6 @@ cp apps/@sparrow-desktop/.env.example apps/@sparrow-desktop/.env # Copy web app .env.example to .env cp apps/@sparrow-web/.env.example apps/@sparrow-web/.env -# [OPTIONAL] Simplified Login (Bypassing Standard Authentication) -SET VITE_SIMPLIFIED_LOGIN=true in .env file - # Run the desktop app in dev mode yarn desktop-start diff --git a/apps/@sparrow-desktop/.env.example b/apps/@sparrow-desktop/.env.example index 988b58341..6dcb9b3b6 100644 --- a/apps/@sparrow-desktop/.env.example +++ b/apps/@sparrow-desktop/.env.example @@ -15,5 +15,4 @@ VITE_BASE_URL= VITE_SPARROW_LINKEDIN= VITE_CANNY_API="" VITE_CANNY_URL="https://canny.io/api/v1" -VITE_MARKETING_URL="http://localhost:1429" -VITE_SIMPLIFIED_LOGIN=true \ No newline at end of file +VITE_MARKETING_URL="http://localhost:1429" \ No newline at end of file diff --git a/apps/@sparrow-desktop/src/components/App.svelte b/apps/@sparrow-desktop/src/components/App.svelte index 68ddba308..5b9ea1a3e 100644 --- a/apps/@sparrow-desktop/src/components/App.svelte +++ b/apps/@sparrow-desktop/src/components/App.svelte @@ -6,14 +6,15 @@ import Navigate from "../routing/Navigate.svelte"; import Dashboard from "@app/pages/dashboard-page/Dashboard.svelte"; import EntryPoint from "@app/pages/auth-page/Auth.svelte"; + import { maximizeWindow } from "../utils"; import { onMount } from "svelte"; import { user } from "@app/store/auth.store"; import { handleShortcuts } from "@app/utils/shortcuts"; import { AppUpdater } from "@sparrow/common/features"; + import { getCurrentWindow } from "@tauri-apps/api/window"; import LoginPage from "@app/pages/auth-page/sub-pages/login-page/LoginPage.svelte"; import { singleInstanceHandler } from "@app/utils/singleinstance/app.singleinstance"; import { AppViewModel } from "./app.ViewModel"; - import constants from "@app/constants/constants"; import { getScaleFactor, setScaleFactorToDb } from "@app/utils/zoom"; import { listen } from "@tauri-apps/api/event"; import { invoke } from "@tauri-apps/api/core"; @@ -90,7 +91,7 @@
- {#if constants.SIMPLIFIED_LOGIN != "true"} + {#if 1} diff --git a/apps/@sparrow-desktop/src/constants/constants.ts b/apps/@sparrow-desktop/src/constants/constants.ts index ff8f29eb8..d23cccb91 100644 --- a/apps/@sparrow-desktop/src/constants/constants.ts +++ b/apps/@sparrow-desktop/src/constants/constants.ts @@ -22,7 +22,6 @@ const constants = { AZURE_INSIGHTS_CONNECTION_STRING: import.meta.env .VITE_AZURE_INSIGHTS_CONNECTION_STRING, BASE_URL: import.meta.env.VITE_BASE_URL, - SIMPLIFIED_LOGIN: import.meta.env.VITE_SIMPLIFIED_LOGIN, }; export default constants;