Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
22eca63
BanVolunteerConmponent made
bennett-sampson Dec 1, 2022
3e2df4c
Remove ban volunteer component, add ban button
bennett-sampson Dec 1, 2022
fd684a7
removed extra ban button
bennett-sampson Dec 1, 2022
d524f22
updates to add banned
DrDisturbance Dec 1, 2022
3b2e9e0
this
DrDisturbance Dec 1, 2022
40d5386
image and styling
Isabelknelson Dec 1, 2022
7fb300b
Merge branch 'Group_15_Branch' of https://github.com/331F22/Pierre in…
Isabelknelson Dec 1, 2022
7083548
Merge branch 'Group_15_Branch' of https://github.com/331F22/Pierre in…
DrDisturbance Dec 1, 2022
25afa1c
image redo
Isabelknelson Dec 1, 2022
20a13e7
image redo
Isabelknelson Dec 1, 2022
fc776ec
Merge branch 'Group_15_Branch' of https://github.com/331F22/Pierre in…
Isabelknelson Dec 1, 2022
05c2075
Revert "this"
DrDisturbance Dec 1, 2022
b371a48
Merge branch 'Group_15_Branch' of https://github.com/331F22/Pierre in…
DrDisturbance Dec 1, 2022
42e828b
image2.0
Isabelknelson Dec 1, 2022
c3b8fbd
Merge branch 'Group_15_Branch' of https://github.com/331F22/Pierre in…
Isabelknelson Dec 1, 2022
ef03834
image3.0
Isabelknelson Dec 1, 2022
2e17f64
image4.0
Isabelknelson Dec 1, 2022
f633f9b
image5.0
Isabelknelson Dec 1, 2022
6a580f7
image6.0
Isabelknelson Dec 1, 2022
7336870
h1-entries
Isabelknelson Dec 1, 2022
68f60f4
h12.0
Isabelknelson Dec 1, 2022
ef70de4
h13.0
Isabelknelson Dec 1, 2022
7d133ab
h14.0
Isabelknelson Dec 1, 2022
6a5ca2d
font
Isabelknelson Dec 1, 2022
2b72db7
font2.0
Isabelknelson Dec 1, 2022
7c268e1
font3
Isabelknelson Dec 1, 2022
1dfe6ce
confirm email
Isabelknelson Dec 1, 2022
a01a3a9
confirm email2
Isabelknelson Dec 1, 2022
1578a63
entries
Isabelknelson Dec 1, 2022
3745dc2
color changes
Isabelknelson Dec 1, 2022
5f059bb
font again
Isabelknelson Dec 1, 2022
46f7927
color
Isabelknelson Dec 1, 2022
a7a27f9
entry box
Isabelknelson Dec 1, 2022
fb9b538
entry box2
Isabelknelson Dec 1, 2022
522ae57
entry box3
Isabelknelson Dec 1, 2022
263b57c
entry box4
Isabelknelson Dec 1, 2022
94681d0
entry box6
Isabelknelson Dec 1, 2022
4bd3b3b
remove ban entry
Isabelknelson Dec 1, 2022
5e17988
submit btn color
Isabelknelson Dec 1, 2022
585ab0d
submit btn text
Isabelknelson Dec 1, 2022
d72e395
delete entries
Isabelknelson Dec 1, 2022
c2bcaf4
deleted h1 & added padding on entry box
Isabelknelson Dec 1, 2022
21a2de6
deleted top padding
Isabelknelson Dec 1, 2022
abe2469
added bottom padding on image
Isabelknelson Dec 1, 2022
497729e
changed padding on image
Isabelknelson Dec 2, 2022
c73d9c2
padding on sign up
Isabelknelson Dec 2, 2022
4cd6004
entries
Isabelknelson Dec 2, 2022
2a7e609
changed padding again in current entries
Isabelknelson Dec 2, 2022
36d741f
changed padding on editfield
Isabelknelson Dec 2, 2022
741bb31
changed padding back in edit field
Isabelknelson Dec 2, 2022
85a9df5
changed padding on current entries again
Isabelknelson Dec 2, 2022
0f2d2a2
changed padding under image
Isabelknelson Dec 2, 2022
e199026
edit button color
Isabelknelson Dec 2, 2022
bd4b5d3
typo
Isabelknelson Dec 2, 2022
6c273db
typo again
Isabelknelson Dec 2, 2022
9abb498
changed shadow color
Isabelknelson Dec 2, 2022
d4e5af0
changed password input
Isabelknelson Dec 2, 2022
35e5d17
changed passcode input2
Isabelknelson Dec 2, 2022
eaa5bc5
added div and padding after hr
Isabelknelson Dec 2, 2022
4834d4d
padding
Isabelknelson Dec 2, 2022
1e45f82
updated app.js and padding
Isabelknelson Dec 2, 2022
a385ec3
crud fixes
DrDisturbance Dec 2, 2022
5ed6b9a
Changed color of doneButton and submitEmailsButton
Isabelknelson Dec 2, 2022
0ce9b5b
Merge branch 'Group_15_Branch' of https://github.com/331F22/Pierre in…
Isabelknelson Dec 2, 2022
5d89e61
included flex on user box
Isabelknelson Dec 2, 2022
d7f5615
added flex
Isabelknelson Dec 2, 2022
8ab498a
deleted flex
Isabelknelson Dec 2, 2022
4112a83
deleted flex again
Isabelknelson Dec 2, 2022
9faf037
Added Critical Functionality to ban button
DrDisturbance Dec 6, 2022
2c59736
Button front end stuff -Ben
Isabelknelson Dec 6, 2022
a9aff7c
Merge branch 'Group_15_Branch' of https://github.com/331F22/Pierre in…
Isabelknelson Dec 6, 2022
ddae0a4
Fixed it (hopefully) -Ben
Isabelknelson Dec 6, 2022
c779884
Okay actually fixed it
Isabelknelson Dec 6, 2022
531b543
IDK ANYMORE HONESTLY -Ben
Isabelknelson Dec 6, 2022
eca1de2
Hopeful but probs will be let down
Isabelknelson Dec 6, 2022
faa96a1
Please :(
Isabelknelson Dec 6, 2022
828ad0b
Trying to fix it
Isabelknelson Dec 6, 2022
082b730
Trying ban class
Isabelknelson Dec 6, 2022
634299f
fixed ban
Isabelknelson Dec 6, 2022
fe6993a
Delete, Update, Ban buttons front end update
bennett-sampson Dec 6, 2022
036c063
Trying to style buttons
bennett-sampson Dec 6, 2022
397f14d
Isabel is being mean
bennett-sampson Dec 6, 2022
8aea8db
Maybe this?
bennett-sampson Dec 6, 2022
f8ad7bf
changed it
bennett-sampson Dec 6, 2022
f45035c
why
bennett-sampson Dec 6, 2022
d14966a
trying button id for style
bennett-sampson Dec 6, 2022
be915cb
More button stuff
bennett-sampson Dec 6, 2022
b506ee8
Reverting broken buttons
bennett-sampson Dec 6, 2022
192524e
trying this backgroung color
bennett-sampson Dec 6, 2022
17ca053
nope
bennett-sampson Dec 6, 2022
95680a1
trying more styling
bennett-sampson Dec 6, 2022
6ef209f
It is done
DrDisturbance Dec 6, 2022
5c0da56
Merge branch 'Group_15_Branch' of https://github.com/331F22/Pierre in…
DrDisturbance Dec 6, 2022
f07a5bb
Push
DrDisturbance Dec 6, 2022
2d1f4c4
Button styling
bennett-sampson Dec 6, 2022
d991134
Capitals are nice
bennett-sampson Dec 6, 2022
ad4fbbe
displaying banned
bennett-sampson Dec 6, 2022
681137f
index
bennett-sampson Dec 6, 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
1 change: 1 addition & 0 deletions Pierre
Submodule Pierre added at b23f5d
Binary file added client/public/BSF_Image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<img id="BSF_Logo" src="BSF_Image.jpg" alt="BSF Logo">
<div id="root"></div>
</body>`
</html>
70 changes: 62 additions & 8 deletions client/src/components/App/App.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,33 @@
body {
margin:0 10px;
}

#BSF_Logo{
padding: 50px;
padding-bottom: 100px;
display: flex;
width: 50%;
margin-left: auto;
margin-right: auto;
}

.App {
font-family: Arial, Helvetica, sans-serif;
font-family: 'Montserrat',sans-serif;
max-width:600px;
margin: auto;
}

.addEntry{
margin-left: auto;
margin-right: auto;
width: 500px;
padding: 40px;
background: white;
box-sizing: border-box;
box-shadow: 0 15px 25px rgba(28, 28, 28, 0.6);
border-radius: 10px;
}

#userInput {
display: flex;
flex-direction: column;
Expand All @@ -15,13 +37,15 @@ body {
margin: auto;
}
#userInput input{
width: 90%;
margin: 10px;
padding: 10px;
font-size: 2rem;
border-radius: 5px;
color: #333;
background-color:rgba(135, 206, 235, 0.3);
width: 100%;
padding: 10px 0;
font-size: 16px;
color: black;
margin-bottom: 30px;
border: none;
border-bottom: 1px solid black;
outline: none;
background: transparent;
}
#firstLastName {
display: grid;
Expand All @@ -41,6 +65,20 @@ body {
padding: 10px;
width: 50%;
margin: 10px auto;
color: white;
background-color: rgb(175, 20, 20);;
}
#editButton{
color: white;
background-color: rgb(175, 20, 20);
}
.update{
color: white;
background-color: rgb(175, 20, 20);
}
.delete{
color: white;
background-color: rgb(175, 20, 20);
}
.editField{
margin: 20px 0;
Expand Down Expand Up @@ -74,10 +112,26 @@ body {
}
#doneButton{
display: none;
color: white;
background-color: rgb(175, 20, 20);
}
#editPasscodeInput{
visibility: hidden;
width: 50%;
padding: 10px 0;
font-size: 16px;
color: black;
margin-bottom: 30px;
border: none;
border-bottom: 1px solid black;
outline: none;
background: transparent
}
#submitEmailsButton{
display: none;
color: white;
background-color: rgb(175, 20, 20);
}
#addEntryLine{
padding-bottom: 100px;
}
4 changes: 2 additions & 2 deletions client/src/components/App/App.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import React from 'react';
import './App.css';
import AddEntry from '../AddEntry.jsx';
import BanEntry from '../BanEntry.jsx';
import CurrentEntries from '../CurrentEntries.jsx';
import Footer from '../Footer.jsx'

function App() {

return (
<div className="App">
<h1>Entries</h1>

<AddEntry />
<hr />
<div id ='AddEntryLine'><hr /> </div>
<CurrentEntries />
<hr />
<Footer />
Expand Down
62 changes: 62 additions & 0 deletions client/src/components/BanEntry.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { useState, useRef } from 'react';
import axios from 'axios'

const BanEntry = () => {

const [firstName, setFirstName] = useState('');
const [lastName, setLastName] = useState('');
const [emailAddress, setEmailAddress] = useState('');
const [entryList, setEntryList] = useState([])

const ref1 = useRef(null);
const ref2 = useRef(null);
const ref3 = useRef(null);

// CREATE (POST)
function submitEntry() {
axios.post(`${process.env.REACT_APP_HOST}/api/create`, { first: firstName, last: lastName, email: emailAddress }).then((response) => {
setEntryList([...entryList, { first_name: firstName, last_name: lastName, email_address: emailAddress }]
)
})

ref1.current.value = ""
setFirstName('')
ref2.current.value = ""
setLastName('')
ref3.current.value = ""
setEmailAddress('')
}

function refreshPage() {
window.location.reload(false);
}

return (
<div className="banEntry">
<h2>Ban an Entry</h2>
<div id='userInput'>
<div>
<label htmlFor="firstName">First Name</label>
<input ref={ref1} id="firstName" type="text" name="firstName" onChange={(e) => setFirstName(e.target.value)} />
</div>
<div>
<label htmlFor="lastName">Last Name</label>
<input ref={ref2} id="lastName" type="text" name="lastName" onChange={(e) => setLastName(e.target.value)} />
</div><br />
<div className="emailField" >
<label htmlFor="email">Email Address</label>
<input ref={ref3} id="email" type="email" name="email" onChange={(e) => setEmailAddress(e.target.value)} />
</div>
<button className="submitBtn"
onClick={() => {
if (firstName.length > 0 && lastName.length > 0 && emailAddress.length > 0) {
submitEntry(); refreshPage();
}
}}
>Ban Entry</button>
</div>
</div>
)
}

export default BanEntry;
Loading