Skip to content

Commit

Permalink
Revert "Feat/simplify contributor login experience"
Browse files Browse the repository at this point in the history
  • Loading branch information
Astitva877 authored Dec 23, 2024
1 parent 26589a6 commit 22974bc
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/feat-sparrow-refactoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/testflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions apps/@sparrow-desktop/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
VITE_MARKETING_URL="http://localhost:1429"
5 changes: 3 additions & 2 deletions apps/@sparrow-desktop/src/components/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -90,7 +91,7 @@
<Route path="/*"><Navigate to="/guest/" /></Route>
</section>
<section slot="unauthorized">
{#if constants.SIMPLIFIED_LOGIN != "true"}
{#if 1}
<Route path="/init" component={EntryPoint} />
<Route path="/init/*" component={Dashboard} />
<Route path="/*"><Navigate to="/init" /></Route>
Expand Down
1 change: 0 additions & 1 deletion apps/@sparrow-desktop/src/constants/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

0 comments on commit 22974bc

Please sign in to comment.