diff --git a/packages/desktop/.env.development b/packages/desktop/.env.development
index a206ff1..bc89190 100644
--- a/packages/desktop/.env.development
+++ b/packages/desktop/.env.development
@@ -1,2 +1,2 @@
-GOOGLE_OAUTH_CLIENT_ID=423533244953-banligobgbof8hg89i6cr1l7u0p7c2pk.apps.googleusercontent.com
-GOOGLE_OAUTH_SECRET=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
+REACT_APP_GOOGLE_OAUTH_CLIENT_ID=423533244953-banligobgbof8hg89i6cr1l7u0p7c2pk.apps.googleusercontent.com
+REACT_APP_GOOGLE_OAUTH_SECRET=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
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 24e4f85..c98f88d 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -5,6 +5,8 @@
"dependencies": {
"@emotion/react": "^11.8.2",
"@emotion/styled": "^11.8.1",
+ "@getstation/electron-google-oauth2": "^2.1.0",
+ "@mui/icons-material": "^5.5.0",
"@mui/material": "^5.5.0",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.4",
diff --git a/packages/desktop/public/electron.js b/packages/desktop/public/electron.js
index 06fd2d7..2f5c092 100644
--- a/packages/desktop/public/electron.js
+++ b/packages/desktop/public/electron.js
@@ -1,7 +1,10 @@
-const path = require('path');
+const ElectronGoogleOAuth2 =
+ require("@getstation/electron-google-oauth2").default;
-const { app, BrowserWindow } = require('electron');
-const isDev = require('electron-is-dev');
+const path = require("path");
+
+const { app, BrowserWindow } = require("electron");
+const isDev = require("electron-is-dev");
function createWindow() {
// Create the browser window.
@@ -17,12 +20,12 @@ function createWindow() {
// win.loadFile("index.html");
win.loadURL(
isDev
- ? 'http://localhost:3000'
- : `file://${path.join(__dirname, '../build/index.html')}`
+ ? "http://localhost:3000"
+ : `file://${path.join(__dirname, "../build/index.html")}`
);
// Open the DevTools.
if (isDev) {
- win.webContents.openDevTools({ mode: 'detach' });
+ win.webContents.openDevTools({ mode: "detach" });
}
}
@@ -34,14 +37,29 @@ app.whenReady().then(createWindow);
// Quit when all windows are closed, except on macOS. There, it's common
// for applications and their menu bar to stay active until the user quits
// explicitly with Cmd + Q.
-app.on('window-all-closed', () => {
- if (process.platform !== 'darwin') {
+app.on("window-all-closed", () => {
+ if (process.platform !== "darwin") {
app.quit();
}
});
-app.on('activate', () => {
+app.on("activate", () => {
if (BrowserWindow.getAllWindows().length === 0) {
createWindow();
}
-});
\ No newline at end of file
+});
+
+app.on("ready", () => {
+ console.log(process.env);
+ const myApiOauth = new ElectronGoogleOAuth2(
+ "423533244953-banligobgbof8hg89i6cr1l7u0p7c2pk.apps.googleusercontent.com",
+ "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",
+ [""],
+ { successRedirectURL: "http://localhost:3000" }
+ );
+
+ myApiOauth.openAuthWindowAndGetTokens().then((token) => {
+ // use your token.access_token
+ console.log(`got the user's authentication: ${token}`);
+ });
+});
diff --git a/packages/desktop/src/App.tsx b/packages/desktop/src/App.tsx
index 9e28344..126dc7f 100644
--- a/packages/desktop/src/App.tsx
+++ b/packages/desktop/src/App.tsx
@@ -1,6 +1,7 @@
import "./App.css";
import { Button } from "@mui/material";
+import Login from "./pages/Login";
import Logo from "./components/Logo";
import React from "react";
import logo from "./logo.svg";
@@ -10,10 +11,9 @@ testConnection();
function App() {
return (
-
-
-
-
+ <>
+
+
);
}
diff --git a/packages/desktop/src/components/Logo/index.tsx b/packages/desktop/src/components/Logo/index.tsx
index 6829b29..fe4fb52 100644
--- a/packages/desktop/src/components/Logo/index.tsx
+++ b/packages/desktop/src/components/Logo/index.tsx
@@ -1,4 +1,4 @@
-export default function Logo() {
+export default function Logo({ className }: { className: string }) {
return (