From f033a602b2289044779f42ddcdec92280adcf6a1 Mon Sep 17 00:00:00 2001 From: Catherine Larcheveque <79517320+clarcheveque@users.noreply.github.com> Date: Thu, 10 Jun 2021 11:48:52 -0700 Subject: [PATCH 1/2] Co-authored-by: Griffin Silver <74221399+griffinrogersilver@users.noreply.github.com> Co-authored-by: Alex Smith <74221399+ajsmith925@users.noreply.github.com> Co-authored-by: Charles Ryu <78817594+charcharryu@users.noreply.github.com> Co-authored-by: Catherine Larcheveque <79517320+clarcheveque@users.noreply.github.com> Co-authored-by: Lorenzo Guevara <16786959+lo-guevara@users.noreply.github.com> --- package-lock.json | 26 ++++++++++++++++ package.json | 2 ++ server/server.js | 56 +++++++++++++++++++++++++++++++++++ src/components/login/login.js | 15 ++++++++-- src/main/index.js | 3 ++ 5 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 server/server.js diff --git a/package-lock.json b/package-lock.json index d633e3ba..1ecd497a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6005,6 +6005,14 @@ } } }, + "electron-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.7.3.tgz", + "integrity": "sha512-1AVMaxrHXTTMqd7EK0MGWusdqNr07Rpj8Th6bG4at0oNgIi/1LBwa9CjT/0Zy+M0k/tSJPS04nFxHj0SXDVgVw==", + "requires": { + "encoding": "^0.1.13" + } + }, "electron-publish": { "version": "22.8.1", "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.8.1.tgz", @@ -6632,6 +6640,24 @@ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, + "encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "requires": { + "iconv-lite": "^0.6.2" + }, + "dependencies": { + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + } + } + }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", diff --git a/package.json b/package.json index 7d02a6ac..0c123839 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "license": "MIT", "description": "A Docker Visualizer", "author": "Team Docketeer", + "proxy": "http://localhost:3000", "scripts": { "dev": "NODE_ENV=development electron-webpack dev", "compile": "electron-webpack", @@ -34,6 +35,7 @@ "cross-env": "^7.0.2", "css-loader": "^4.2.2", "electron-chartjs": "^1.0.0", + "electron-fetch": "^1.7.3", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.4", "enzyme-to-json": "^3.5.0", diff --git a/server/server.js b/server/server.js new file mode 100644 index 00000000..22d30287 --- /dev/null +++ b/server/server.js @@ -0,0 +1,56 @@ +const path = require('path'); +const express = require('express'); +const app = express(); +const PORT = 3000; + +app.use(express.json()); + +app.use(express.urlencoded({ extended: true })); + + + + + + + +app.get('/', (req, res, next)=>{ + + res.status(200).json('whatchu du (Husker du)'); +}) + + + + +// app.post( , (req, res, next)=>{ +//:( + +// path.join(__dirname, ) + +// res.status(200).json(); +// }) + +app.get('/', (req, res, next, err)=> { + +console.error('You are mistaken', err); +}) + + + + + + + + + + + + + +app.listen(PORT, ()=> { + console.log(`server is listening on port ${PORT}`) +}); + + + + +module.exports = app; \ No newline at end of file diff --git a/src/components/login/login.js b/src/components/login/login.js index ed3753e8..c3fa6047 100644 --- a/src/components/login/login.js +++ b/src/components/login/login.js @@ -3,6 +3,7 @@ import Modal from "react-modal"; import { BrowserRouter as Router, Switch, Route, Redirect } from "react-router-dom"; import App from '../App'; import SignupModal from './signupModal'; +import fetch from 'electron-fetch'; const Login = () => { useEffect(() => { @@ -11,11 +12,21 @@ const Login = () => { const [ loggedIn, setLoggedIn ] = useState(false); const [ modalIsOpen, setIsOpen ] = useState(false); -. + const openModal = () => setIsOpen(true); const closeModal = () => setIsOpen(false); - + // fetch('http://www.google.com') + // .then((response)=>{ + // console.log(response); + // return response.json(); + // }).then((data)=>{ + // console.log('next one'); + // console.log('big BIG DATA', data); + // }).catch((err)=>{ + // console.error('dis is baaad man(error)', err) + // }) + const handleClick = (e) => { e.preventDefault(); const username = document.getElementById('username').value; diff --git a/src/main/index.js b/src/main/index.js index 49f82671..7888a6ec 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -2,6 +2,8 @@ import { app, BrowserWindow, ipcMain } from "electron"; import * as path from "path"; import { format as formatUrl } from "url"; +import server from "../../server/server.js"; + import verifyCode from "./twilio/verifyCode"; import verifyMobileNumber from "./twilio/verifyMobile"; @@ -70,6 +72,7 @@ app.on("activate", () => { // create main BrowserWindow when electron is ready app.on("ready", () => { + // server; mainWindow = createMainWindow(); }); From 04806c3b410e95890e9e70aefd90398db045572b Mon Sep 17 00:00:00 2001 From: Catherine Larcheveque <79517320+clarcheveque@users.noreply.github.com> Date: Thu, 10 Jun 2021 11:59:58 -0700 Subject: [PATCH 2/2] installed electron-fetch module and added server file to listen on port 3000 Co-authored-by: Griffin Silver <74221399+griffinrogersilver@users.noreply.github.com> Co-authored-by: Alex Smith <74221399+ajsmith925@users.noreply.github.com> Co-authored-by: Charles Ryu <78817594+charcharryu@users.noreply.github.com> Co-authored-by: Lorenzo Guevara <16786959+lo-guevara@users.noreply.github.com> --- server/server.js | 3 +-- src/components/login/login.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/server.js b/server/server.js index 22d30287..23978ba3 100644 --- a/server/server.js +++ b/server/server.js @@ -20,9 +20,8 @@ app.get('/', (req, res, next)=>{ - +// reformat // app.post( , (req, res, next)=>{ -//:( // path.join(__dirname, ) diff --git a/src/components/login/login.js b/src/components/login/login.js index c3fa6047..9cf7479d 100644 --- a/src/components/login/login.js +++ b/src/components/login/login.js @@ -26,6 +26,7 @@ const Login = () => { // }).catch((err)=>{ // console.error('dis is baaad man(error)', err) // }) + // change what you need const handleClick = (e) => { e.preventDefault();