From 31d79fb67bb839b192000683adf776a2fdd5bba0 Mon Sep 17 00:00:00 2001
From: mbecker20 <becker.maxh@gmail.com>
Date: Sun, 13 Mar 2022 01:26:26 -0800
Subject: [PATCH] some changes / fixes

---
 core/package.json                    |  3 +++
 frontend/src/components/App/App.tsx  | 12 +++------
 frontend/src/components/Login.tsx    |  5 ++--
 frontend/src/components/UserInfo.tsx |  5 +---
 frontend/src/index.tsx               |  2 --
 frontend/src/util/client.ts          |  2 +-
 frontend/src/util/helpers.ts         | 39 ++++++----------------------
 periphery/package.json               |  3 +++
 types/types.d.ts                     |  6 +++++
 9 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/core/package.json b/core/package.json
index a3709de5a..5277a5c6c 100644
--- a/core/package.json
+++ b/core/package.json
@@ -4,6 +4,9 @@
   "main": "index.js",
   "author": "mbecker20",
   "license": "MIT",
+  "scripts": {
+    "start": "tsc && node build/main.js"
+  },
   "devDependencies": {
     "@types/dockerode": "^3.3.3",
     "@types/fs-extra": "^9.0.13",
diff --git a/frontend/src/components/App/App.tsx b/frontend/src/components/App/App.tsx
index 7e97be8ec..86e676f59 100644
--- a/frontend/src/components/App/App.tsx
+++ b/frontend/src/components/App/App.tsx
@@ -1,19 +1,13 @@
-import { Component, createEffect, createResource, Match, Switch } from "solid-js";
-import { client, redirectTo } from "../..";
+import { Component, createResource, Match, Switch } from "solid-js";
+import { client } from "../..";
 import styles from "./App.module.css";
 import UserInfo from "../UserInfo";
-import { User } from "@oauth2/types"
+import { User } from "@monitor/types"
 import Login from "../Login";
 
 const App: Component = () => {
   const [user, { mutate }] = createResource(() => client.getUser());
 
-  createEffect(() => {
-    if (redirectTo && user()) {
-      location.replace(`${redirectTo.url}/?token=${client.token}`)
-    }
-  })
-
   return (
     <div class={styles.App}>
       <Switch>
diff --git a/frontend/src/components/Login.tsx b/frontend/src/components/Login.tsx
index 8333601f7..4e433fb4b 100644
--- a/frontend/src/components/Login.tsx
+++ b/frontend/src/components/Login.tsx
@@ -1,11 +1,11 @@
 import { Component } from "solid-js";
-import { loginGithub, loginGoogle } from "../util/helpers";
+import { loginGithub } from "../util/helpers";
 import Input from "./util/Input";
 import Grid from "./util/layout/Grid";
 import { createStore } from "solid-js/store";
 import Flex from "./util/layout/Flex";
 import { client, pushNotification } from "..";
-import { User } from "@oauth2/types";
+import { User } from "@monitor/types";
 
 const Login: Component<{ setUser: (user: User | false) => void }> = (p) => {
   const [info, set] = createStore({
@@ -60,7 +60,6 @@ const Login: Component<{ setUser: (user: User | false) => void }> = (p) => {
         <button onClick={signup}>sign up</button>
       </Flex>
       <button onClick={loginGithub}>log in with github</button>
-      <button onClick={loginGoogle}>log in with google</button>
     </Grid>
   );
 };
diff --git a/frontend/src/components/UserInfo.tsx b/frontend/src/components/UserInfo.tsx
index 187acb833..f9342dbbc 100644
--- a/frontend/src/components/UserInfo.tsx
+++ b/frontend/src/components/UserInfo.tsx
@@ -2,7 +2,7 @@ import { Component, Show } from "solid-js";
 import { getAuthProvider } from "../util/helpers";
 import Flex from "./util/layout/Flex";
 import Grid from "./util/layout/Grid";
-import { User } from "@oauth2/types";
+import { User } from "@monitor/types";
 import { pushNotification } from "..";
 
 const UserInfo: Component<{ user: User; logout: () => void }> = (p) => {
@@ -15,9 +15,6 @@ const UserInfo: Component<{ user: User; logout: () => void }> = (p) => {
           <img src={p.user.avatar} style={{ width: "2rem", height: "2rem" }} />
         </Show>
       </Flex>
-      <Show when={p.user.email}>
-        <div>email: {p.user.email}</div>
-      </Show>
       <button style={{ width: "100%" }} onClick={() => {
         p.logout();
         pushNotification("ok", "logged out");
diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
index 75fc5cd80..447d1703b 100644
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -4,12 +4,10 @@ import { render } from 'solid-js/web';
 import './index.css';
 import App from './components/App/App';
 import Client from './util/client';
-import { getRedirectTo } from './util/helpers';
 import makeNotifications from './components/util/notification/Notifications';
 
 export const URL = "http://localhost:2020";
 export const client = new Client(URL);
-export const redirectTo = getRedirectTo();
 
 export const { Notifications, pushNotification } = makeNotifications();
 
diff --git a/frontend/src/util/client.ts b/frontend/src/util/client.ts
index 761d856bf..1cda2ce0c 100644
--- a/frontend/src/util/client.ts
+++ b/frontend/src/util/client.ts
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { URL } from "..";
-import { User } from "@oauth2/types";
+import { User } from "@monitor/types";
 
 export default class Client {
   token = localStorage.getItem("access_token");
diff --git a/frontend/src/util/helpers.ts b/frontend/src/util/helpers.ts
index 18175b12c..19e723042 100644
--- a/frontend/src/util/helpers.ts
+++ b/frontend/src/util/helpers.ts
@@ -1,44 +1,21 @@
-import { client, redirectTo, URL } from "..";
-import { User } from "@oauth2/types";
-import axios from "axios";
+import { URL } from "..";
+import { User } from "@monitor/types";
 
 export function combineClasses(...classes: (string | undefined)[]) {
   return classes.filter((c) => (c ? true : false)).join(" ");
 }
 
-export function getAuthProvider(user: User) {
-  if (user.githubID) return "Github";
-  else if (user.googleID) return "Google";
-  else return "Local";
+export function inPx(num: number) {
+  return `${num}px`;
 }
 
-export function getRedirectTo() {
-  const params = new URLSearchParams(location.search);
-  const redirect = params.get("redirect");
-  if (redirect) {
-    if (redirect === "consumer") {
-      return {
-        service: "consumer",
-        url: "http://localhost:3000"
-      }
-    }
-  }
+export function getAuthProvider(user: User) {
+  if (user.githubID) return "Github";
+  else return "Local";
 }
 
 export function loginGithub() {
   window.location.replace(
-    `${URL}/login/github${redirectTo ? "/" + redirectTo.service : ""}`
+    `${URL}/login/github`
   );
 }
-
-export function loginGoogle() {
-  window.location.replace(
-    `${URL}/login/google${
-      redirectTo ? "/" + redirectTo.service : ""
-    }`
-  );
-}
-
-export function inPx(num: number) {
-  return `${num}px`;
-}
\ No newline at end of file
diff --git a/periphery/package.json b/periphery/package.json
index ceb4d15b1..baf670aea 100644
--- a/periphery/package.json
+++ b/periphery/package.json
@@ -4,6 +4,9 @@
   "main": "index.js",
   "author": "mbecker20",
   "license": "MIT",
+  "scripts": {
+    "start": "tsc && node build/main.js"
+  },
   "devDependencies": {
     "@types/dockerode": "^3.3.3",
     "typescript": "^4.6.2"
diff --git a/types/types.d.ts b/types/types.d.ts
index e69de29bb..5494c7675 100644
--- a/types/types.d.ts
+++ b/types/types.d.ts
@@ -0,0 +1,6 @@
+export type User = {
+	_id: string;
+	username: string;
+	githubID?: string;
+	avatar?: string;
+}
\ No newline at end of file