From c4bbc16e24fece2b7aa363e5ff433b51b9b53d4e Mon Sep 17 00:00:00 2001 From: Kfey8 <71234213+Kfey8@users.noreply.github.com> Date: Fri, 8 Apr 2022 12:07:25 -0500 Subject: [PATCH 1/4] stuff for kam (#37) * Adding Account Pages * Home page commit * account page stuff * Account update --- src/App.js | 1 - src/Pages/AccountPage/AccountPage.css | 27 ++++++---------- src/Pages/AccountPage/AccountPage.js | 44 +++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 19 deletions(-) diff --git a/src/App.js b/src/App.js index 974cd5e..0a98d54 100644 --- a/src/App.js +++ b/src/App.js @@ -6,7 +6,6 @@ import Product from "./Pages/ProductPage/ProductPage" import Login from "./Pages/SignInPage/SignInPage" import Cart from "./Pages/ShoppingCart/ShoppingCart" import Account from "./Pages/AccountPage/AccountPage" - import "./GeneralStyles.css"; import "./App.css" import home from "../src/images/homebutton.png" diff --git a/src/Pages/AccountPage/AccountPage.css b/src/Pages/AccountPage/AccountPage.css index cc6aa0c..9f84cce 100644 --- a/src/Pages/AccountPage/AccountPage.css +++ b/src/Pages/AccountPage/AccountPage.css @@ -1,15 +1,9 @@ @import url('https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700&display=swap'); -.body{ - /* height: 500%; - width:500%; */ - display: flex; - justify-content: center; - align-items: center; - padding: 100px; - background: linear-gradient(135deg, #71b7e6, #9b59b6); +body +{ + background-image:url("../../images/oceanimagedesktop.jpg"); } - .nav { background-color: grey; height: 30px; @@ -19,7 +13,6 @@ color: white; margin-right: 2em; text-decoration: none; - } .container{ position: fixed; @@ -40,13 +33,13 @@ } .container .title::before{ content: ""; - position: absolute; + position: fixed; left: auto; bottom: auto; height: 3px; width: 30px; border-radius: 5px; - background: linear-gradient(135deg, #71b7e6, #9b59b6); + background: linear-gradient(135deg, #71b7e6, #314fa1); } .content form .user-details{ display: flex; @@ -54,9 +47,6 @@ justify-content: space-between; margin: 20px 0 12px 0; } -.positioning{ - width: 8em; -} form .user-details .input-box{ margin-bottom: 15px; width: calc(100% / 2 - 20px); @@ -130,11 +120,11 @@ form .input-box span.details{ letter-spacing: 1px; cursor: pointer; transition: all 0.3s ease; - background: linear-gradient(135deg, #71b7e6, #9b59b6); + background: linear-gradient(135deg, #71b7e6, #314fa1); } form .button input:hover{ /* transform: scale(0.99); */ - background: linear-gradient(-135deg, #71b7e6, #9b59b6); + background: linear-gradient(-135deg, #71b7e6, #314fa1); } @media(max-width: 584px){ .container{ @@ -154,7 +144,8 @@ form .user-details .input-box{ .user-details::-webkit-scrollbar{ width: 5px; } - } +} + @media(max-width: 459px){ .container .content .category{ flex-direction: column; diff --git a/src/Pages/AccountPage/AccountPage.js b/src/Pages/AccountPage/AccountPage.js index a637c91..f5f11f0 100644 --- a/src/Pages/AccountPage/AccountPage.js +++ b/src/Pages/AccountPage/AccountPage.js @@ -6,6 +6,50 @@ import { useHistory } from "react-router-dom"; function getAccountInformation() { + + return ( + +
+
Profile
+
+
+
+
+ First Name + +
+
+ Last Name + +
+
+ Username + +
+
+ Email + +
+
+ Phone Number + +
+
+ Address + +
+
+
+ +
+
+
+
+ + ); + +} +======= return ( From 6d70f11a48beb6010f92cd7ebea20df3d28012f6 Mon Sep 17 00:00:00 2001 From: KylePancamo <50267605+KylePancamo@users.noreply.github.com> Date: Fri, 8 Apr 2022 12:14:40 -0500 Subject: [PATCH 2/4] fix formatting & remove double return --- src/Pages/AccountPage/AccountPage.css | 156 +++++++++++++++----------- src/Pages/AccountPage/AccountPage.js | 112 ++++++------------ 2 files changed, 123 insertions(+), 145 deletions(-) diff --git a/src/Pages/AccountPage/AccountPage.css b/src/Pages/AccountPage/AccountPage.css index 9f84cce..94225c8 100644 --- a/src/Pages/AccountPage/AccountPage.css +++ b/src/Pages/AccountPage/AccountPage.css @@ -1,20 +1,21 @@ @import url('https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700&display=swap'); -body -{ - background-image:url("../../images/oceanimagedesktop.jpg"); +body { + background-image: url("../../images/oceanimagedesktop.jpg"); } + .nav { background-color: grey; height: 30px; } -.a{ - + +.a { color: white; margin-right: 2em; text-decoration: none; } -.container{ + +.container { position: fixed; left: 25%; margin-top: 5%; @@ -24,14 +25,16 @@ body padding: 25px 30px; border-radius: 10px; border: blue; - box-shadow: 0 5px 10px rgba(0,0,0,0.15); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.15); } -.container .title{ + +.container .title { font-size: 25px; font-weight: 500; position: relative; } -.container .title::before{ + +.container .title::before { content: ""; position: fixed; left: auto; @@ -41,22 +44,26 @@ body border-radius: 5px; background: linear-gradient(135deg, #71b7e6, #314fa1); } -.content form .user-details{ + +.content form .user-details { display: flex; flex-wrap: wrap; justify-content: space-between; margin: 20px 0 12px 0; } -form .user-details .input-box{ + +form .user-details .input-box { margin-bottom: 15px; width: calc(100% / 2 - 20px); } -form .input-box span.details{ + +form .input-box span.details { display: block; font-weight: 500; margin-bottom: 20px; } -.user-details .input-box input{ + +.user-details .input-box input { height: 45px; width: 100%; outline: none; @@ -67,26 +74,31 @@ form .input-box span.details{ border-bottom-width: 2px; transition: all 0.3s ease; } + .user-details .input-box input:focus, -.user-details .input-box input:valid{ +.user-details .input-box input:valid { border-color: #9b59b6; } - form .gender-details .gender-title{ + +form .gender-details .gender-title { font-size: 20px; font-weight: 500; - } - form .category{ - display: flex; - width: 80%; - margin: 14px 0 ; - justify-content: space-between; - } - form .category label{ - display: flex; - align-items: center; - cursor: pointer; - } - form .category label .dot{ +} + +form .category { + display: flex; + width: 80%; + margin: 14px 0; + justify-content: space-between; +} + +form .category label { + display: flex; + align-items: center; + cursor: pointer; +} + +form .category label .dot { height: 18px; width: 18px; border-radius: 50%; @@ -95,59 +107,69 @@ form .input-box span.details{ border: 5px solid transparent; transition: all 0.3s ease; } - #dot-1:checked ~ .category label .one, - #dot-2:checked ~ .category label .two, - #dot-3:checked ~ .category label .three{ - background: #9b59b6; - border-color: #d9d9d9; - } - form .input[type="radio"]{ - display: none; - } - form .button{ - height: 45px; - margin: 35px 0 - } - form .button input{ - height: 100%; - width: 100%; - border-radius: 5px; - border: none; - color: rgb(229, 236, 238); - font: bold; - font-size: 18px; - font-weight: 500; - letter-spacing: 1px; - cursor: pointer; - transition: all 0.3s ease; - background: linear-gradient(135deg, #71b7e6, #314fa1); - } - form .button input:hover{ + +#dot-1:checked~.category label .one, +#dot-2:checked~.category label .two, +#dot-3:checked~.category label .three { + background: #9b59b6; + border-color: #d9d9d9; +} + +form .input[type="radio"] { + display: none; +} + +form .button { + height: 45px; + margin: 35px 0 +} + +form .button input { + height: 100%; + width: 100%; + border-radius: 5px; + border: none; + color: rgb(229, 236, 238); + font: bold; + font-size: 18px; + font-weight: 500; + letter-spacing: 1px; + cursor: pointer; + transition: all 0.3s ease; + background: linear-gradient(135deg, #71b7e6, #314fa1); +} + +form .button input:hover { /* transform: scale(0.99); */ background: linear-gradient(-135deg, #71b7e6, #314fa1); - } - @media(max-width: 584px){ - .container{ - max-width: 100%; } -form .user-details .input-box{ + +@media(max-width: 584px) { + .container { + max-width: 100%; + } + + form .user-details .input-box { margin-bottom: 15px; width: 100%; } - form .category{ + + form .category { width: 100%; } - .content form .user-details{ + + .content form .user-details { max-height: 300px; overflow-y: scroll; } - .user-details::-webkit-scrollbar{ + + .user-details::-webkit-scrollbar { width: 5px; } } - @media(max-width: 459px){ - .container .content .category{ +@media(max-width: 459px) { + .container .content .category { flex-direction: column; } @@ -158,4 +180,4 @@ form .user-details .input-box{ color: red !important; } -} +} \ No newline at end of file diff --git a/src/Pages/AccountPage/AccountPage.js b/src/Pages/AccountPage/AccountPage.js index f5f11f0..a841d19 100644 --- a/src/Pages/AccountPage/AccountPage.js +++ b/src/Pages/AccountPage/AccountPage.js @@ -9,88 +9,44 @@ function getAccountInformation() { return ( -
-
Profile
-
-
-
-
- First Name - -
-
- Last Name - -
-
- Username - -
-
- Email - -
-
- Phone Number - -
-
- Address - -
+
+
Profile
+
+ +
+
+ First Name +
-
- +
+ Last Name +
- -
+
+ Username + +
+
+ Email + +
+
+ Phone Number + +
+
+ Address + +
+
+
+ +
+
- +
+ ); - } -======= - -return ( - -
-
Profile
-
-
-
-
- Full Name - -
-
- Username - -
-
- Email - -
-
- Phone Number - -
-
- Password - -
-
- Confirm Password - -
-
-
- -
-
-
-
- -); - } export default getAccountInformation; From 512f4547798f71f4706d2362d07a315acb9a4c9d Mon Sep 17 00:00:00 2001 From: Kfey8 <71234213+Kfey8@users.noreply.github.com> Date: Fri, 8 Apr 2022 12:33:58 -0500 Subject: [PATCH 3/4] Development test (#38) * Adding Account Pages * Home page commit * account page stuff * Account update * stuff for kam (#37) * Adding Account Pages * Home page commit * account page stuff * Account update * fix formatting & remove double return * adding Admin and checking Co-authored-by: KylePancamo <50267605+KylePancamo@users.noreply.github.com> --- src/Pages/AdminPortal/adminPortal.css | 183 ++++++++++++++++++++++++++ src/Pages/AdminPortal/adminPortal.js | 5 + 2 files changed, 188 insertions(+) create mode 100644 src/Pages/AdminPortal/adminPortal.css create mode 100644 src/Pages/AdminPortal/adminPortal.js diff --git a/src/Pages/AdminPortal/adminPortal.css b/src/Pages/AdminPortal/adminPortal.css new file mode 100644 index 0000000..94225c8 --- /dev/null +++ b/src/Pages/AdminPortal/adminPortal.css @@ -0,0 +1,183 @@ +@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700&display=swap'); + +body { + background-image: url("../../images/oceanimagedesktop.jpg"); +} + +.nav { + background-color: grey; + height: 30px; +} + +.a { + color: white; + margin-right: 2em; + text-decoration: none; +} + +.container { + position: fixed; + left: 25%; + margin-top: 5%; + max-width: 700px; + width: 100%; + background-color: rgb(255, 255, 255); + padding: 25px 30px; + border-radius: 10px; + border: blue; + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.15); +} + +.container .title { + font-size: 25px; + font-weight: 500; + position: relative; +} + +.container .title::before { + content: ""; + position: fixed; + left: auto; + bottom: auto; + height: 3px; + width: 30px; + border-radius: 5px; + background: linear-gradient(135deg, #71b7e6, #314fa1); +} + +.content form .user-details { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + margin: 20px 0 12px 0; +} + +form .user-details .input-box { + margin-bottom: 15px; + width: calc(100% / 2 - 20px); +} + +form .input-box span.details { + display: block; + font-weight: 500; + margin-bottom: 20px; +} + +.user-details .input-box input { + height: 45px; + width: 100%; + outline: none; + font-size: 16px; + border-radius: 5px; + padding-left: 15px; + border: 1px solid black; + border-bottom-width: 2px; + transition: all 0.3s ease; +} + +.user-details .input-box input:focus, +.user-details .input-box input:valid { + border-color: #9b59b6; +} + +form .gender-details .gender-title { + font-size: 20px; + font-weight: 500; +} + +form .category { + display: flex; + width: 80%; + margin: 14px 0; + justify-content: space-between; +} + +form .category label { + display: flex; + align-items: center; + cursor: pointer; +} + +form .category label .dot { + height: 18px; + width: 18px; + border-radius: 50%; + margin-right: 10px; + background-color: #15a05a; + border: 5px solid transparent; + transition: all 0.3s ease; +} + +#dot-1:checked~.category label .one, +#dot-2:checked~.category label .two, +#dot-3:checked~.category label .three { + background: #9b59b6; + border-color: #d9d9d9; +} + +form .input[type="radio"] { + display: none; +} + +form .button { + height: 45px; + margin: 35px 0 +} + +form .button input { + height: 100%; + width: 100%; + border-radius: 5px; + border: none; + color: rgb(229, 236, 238); + font: bold; + font-size: 18px; + font-weight: 500; + letter-spacing: 1px; + cursor: pointer; + transition: all 0.3s ease; + background: linear-gradient(135deg, #71b7e6, #314fa1); +} + +form .button input:hover { + /* transform: scale(0.99); */ + background: linear-gradient(-135deg, #71b7e6, #314fa1); +} + +@media(max-width: 584px) { + .container { + max-width: 100%; + } + + form .user-details .input-box { + margin-bottom: 15px; + width: 100%; + } + + form .category { + width: 100%; + } + + .content form .user-details { + max-height: 300px; + overflow-y: scroll; + } + + .user-details::-webkit-scrollbar { + width: 5px; + } +} + +@media(max-width: 459px) { + .container .content .category { + flex-direction: column; + } + + .nav { + background-color: grey; + height: 30px; + padding-left: 20px; + color: red !important; + + } +} \ No newline at end of file diff --git a/src/Pages/AdminPortal/adminPortal.js b/src/Pages/AdminPortal/adminPortal.js new file mode 100644 index 0000000..f5cfa7c --- /dev/null +++ b/src/Pages/AdminPortal/adminPortal.js @@ -0,0 +1,5 @@ +import { useState } from "react"; +import "./AccountPage.css" +import Axios from "axios"; +import { useHistory } from "react-router-dom"; + From 7e90aeadefbeb922ab20e7fc67a2e543c9dfc4ab Mon Sep 17 00:00:00 2001 From: miketitan58 <71028526+miketitan58@users.noreply.github.com> Date: Fri, 8 Apr 2022 13:28:55 -0500 Subject: [PATCH 4/4] style updates (#34) * Update HomePage.css change home page image * Update HomePage.css - opacity * IP change - changed from localhost to server ip * Logo Update - created new website logo and changed to show in browser - changed website name from "React App" to "WorldWide Frames" --- public/index.html | 6 +++--- public/logo123.ico | Bin 0 -> 4286 bytes public/logo123.jpg | Bin 0 -> 10300 bytes public/manifest.json | 12 ++++++------ server.js | 2 +- src/Pages/RegistrationPage/RegistrationPage.js | 2 +- src/Pages/SignInPage/SignInPage.js | 5 ++--- 7 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 public/logo123.ico create mode 100644 public/logo123.jpg diff --git a/public/index.html b/public/index.html index aa069f2..dfd3157 100644 --- a/public/index.html +++ b/public/index.html @@ -2,14 +2,14 @@ - + - + - React App + WorldWide Frames diff --git a/public/logo123.ico b/public/logo123.ico new file mode 100644 index 0000000000000000000000000000000000000000..f741ca24f127aa455dc00c9311e80e27a7f46826 GIT binary patch literal 4286 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 { + Axios.post("http://3.93.4.5:5000/register", data).then((response) => { if (response.data.error) { alert(response.data.error); console.log("error!"); diff --git a/src/Pages/SignInPage/SignInPage.js b/src/Pages/SignInPage/SignInPage.js index 3fc1048..23b8fdd 100644 --- a/src/Pages/SignInPage/SignInPage.js +++ b/src/Pages/SignInPage/SignInPage.js @@ -16,7 +16,7 @@ function SignIn() { let history = useHistory(); const login = () => { - Axios.post("http://localhost:5000/signin", + Axios.post("http://3.93.4.5:5000/signin", { username: username, password: password, @@ -28,12 +28,11 @@ function SignIn() { window.location.reload(true); history.push("/"); } - }); }; useEffect(() => { - Axios.get("http://localhost:5000/signin").then((response) => { + Axios.get("http://3.93.4.5:5000/signin").then((response) => { if (response.data.user) { history.push("/"); }