Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7ca8326
stuff
Kfey8 Mar 21, 2022
f61f8c6
deleting accidental uploads
Kfey8 Mar 21, 2022
46fb5dc
Merge branch 'KylePancamo:express-js-react-app' into express-js-react…
Kfey8 Mar 21, 2022
8149103
accountPages
Kfey8 Mar 25, 2022
d10c5c2
Merge branch 'KylePancamo:express-js-react-app' into express-js-react…
Kfey8 Mar 25, 2022
3ef9d59
Merge branch 'KylePancamo:express-js-react-app' into express-js-react…
Kfey8 Mar 25, 2022
98086c3
account
Kfey8 Mar 25, 2022
c025280
Merge branch 'KylePancamo:express-js-react-app' into express-js-react…
Kfey8 Mar 25, 2022
77649a6
Update AccountPage.js
Kfey8 Mar 26, 2022
04895df
Sign in page updates
miketitan58 Mar 28, 2022
df6654b
Merge pull request #26 from miketitan58/express-js-react-app
KylePancamo Mar 28, 2022
345991a
fixing account stuff
Kfey8 Mar 28, 2022
2986b44
Register Page style update
miketitan58 Mar 28, 2022
40a3506
Merge branch 'express-js-react-app' of https://github.com/miketitan58…
miketitan58 Mar 28, 2022
d60dbc9
Merge pull request #27 from miketitan58/express-js-react-app
KylePancamo Mar 28, 2022
a8e4891
Update SignInPage.css
miketitan58 Mar 28, 2022
8973221
Merge branch 'express-js-react-app' into express-js-react-app
KylePancamo Mar 28, 2022
cd7bdac
Merge pull request #28 from miketitan58/express-js-react-app
KylePancamo Mar 28, 2022
03941fd
Update GeneralStyles.css
miketitan58 Mar 28, 2022
478e1f7
Merge pull request #29 from miketitan58/express-js-react-app
KylePancamo Mar 28, 2022
955d7a4
Merge pull request #25 from Kfey8/express-js-react-app
KylePancamo Mar 28, 2022
157f8c6
package.json
KylePancamo Mar 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"configurations": [
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [],
"macFrameworkPath": [
"/System/Library/Frameworks",
"/Library/Frameworks"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"cppStandard": "c++98",
"intelliSenseMode": "macos-clang-x64"
}
],
"version": 4
}
79 changes: 79 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
"@testing-library/user-event": "^12.8.3",
"axios": "^0.26.0",
"body-parser": "^1.19.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"express": "^4.17.1",
"express-session": "^1.17.2",
"font-awesome": "^4.7.0",
"mysql": "^2.18.1",
"path": "^0.12.7",
"react": "^17.0.2",
Expand Down
1 change: 1 addition & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Account from "./Pages/AccountPage/AccountPage";
import React, { useEffect, useState } from "react";
import Registration from "./Pages/RegistrationPage/RegistrationPage";
import Home from "./Pages/HomePage/HomePage"
Expand Down
2 changes: 1 addition & 1 deletion src/GeneralStyles.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
button {
border: none;
margin-left: 1%;
background-color: rgb(102, 255, 0);
background-color: lightseagreen;
border-radius: 10px;
}

Expand Down
170 changes: 170 additions & 0 deletions src/Pages/AccountPage/AccountPage.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
@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);
}

.nav {
background-color: grey;
height: 30px;
}
.a{
color: white;
margin-right: 2em;
text-decoration: none;

}
.container{
max-width: 700px;
width: 100%;
background-color: #fff;
padding: 25px 30px;
border-radius: 5px;
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: absolute;
left: auto;
bottom: auto;
height: 3px;
width: 30px;
border-radius: 5px;
background: linear-gradient(135deg, #71b7e6, #9b59b6);
}
.content form .user-details{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
margin: 20px 0 12px 0;
}
div.positioning{
margin-left: auto;
margin-right: auto;
width: 8em
}
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, #9b59b6);
}
form .button input:hover{
/* transform: scale(0.99); */
background: linear-gradient(-135deg, #71b7e6, #9b59b6);
}
@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;

}
}
52 changes: 52 additions & 0 deletions src/Pages/AccountPage/AccountPage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { useState } from "react";
import "./AccountPage.css"
import Axios from "axios";
import { useHistory } from "react-router-dom";



function getAccountInformation() {

return (
<positioning>
<div class="container">
<div class="title">Profile</div>
<div class="content">
<form action="#">
<div class="user-details">
<div class="input-box">
<span class="details"><strong>Full Name</strong></span>
<input type="text" required></input>
</div>
<div class="input-box">
<span class="details"><strong>Username</strong></span>
<input type="text"required></input>
</div>
<div class="input-box">
<span class="details"><strong>Email</strong></span>
<input type="text" required></input>
</div>
<div class="input-box">
<span class="details"> <strong>Phone Number</strong></span>
<input type="text" required></input>
</div>
<div class="input-box">
<span class="details"><strong>Password</strong></span>
<input type="text" required></input>
</div>
<div class="input-box">
<span class="details"><strong>Confirm Password</strong></span>
<input type="text" required></input>
</div>
</div>
<div class="button">
<input type="submit" value="Profile"></input>
</div>
</form>
</div>
</div>
</positioning>
);

}
export default getAccountInformation;
Loading