Skip to content

Commit

Permalink
favicon, readme, and general page edits
Browse files Browse the repository at this point in the history
  • Loading branch information
LydiaMT committed Jun 25, 2021
1 parent a3946dd commit 0fab178
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 9 deletions.
42 changes: 40 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
# Slack Bot Front End

## Authors
🤖 [Audrey Patterson](https://github.com/arpatterson31)

🤖 [Ellis Yoo](https://github.com/yjyoo773)

🤖 [Fizzo Pannosch](https://github.com/fizzo999)

🤖 [Lydia Minehan-Tubic](https://github.com/LydiaMT)

## About The Application

A front end admin dashboard for our slack application [CF Slack Bot](https://github.com/CF-Slackbot/slackbot). A resource to see how students are performing on their CF Slack Bot quizzes. Administrators can create user accounts. All users with an active account have the ability to modify the question set for the Slack Bot via the [API server](https://github.com/CF-Slackbot/slackbot-questions-api). Add new questions, retire old outdated questions, or make edits to questions as technologies change.

## Initial Wireframe

![Wireframe](./src/assets/wf.jpg)

## Dependencies

- @auth0/auth0-react
- axios
- bootstrap
- chart.js
- dotenv
- react
- react-awesome-spinners
- react-bootstrap
- react-chartjs-2
- react-dom
- react-if
- react-router-dom
- react-scripts
- react-syntax-highlighter
- sass
- webpack-hot-middleware

## [Learn more about our Project Prep & Planning](https://github.com/CF-Slackbot/project-prep2)

### Resources

[Dynamic Form Fields in React](https://dev.to/fuchodeveloper/dynamic-form-fields-in-react-1h6c)
[How to use chart.js to create charts in React](https://www.educative.io/edpresso/how-to-use-chartjs-to-create-charts-in-react)
- [Dynamic Form Fields in React](https://dev.to/fuchodeveloper/dynamic-form-fields-in-react-1h6c)
- [How to use chart.js to create charts in React](https://www.educative.io/edpresso/how-to-use-chartjs-to-create-charts-in-react)
Empty file added public/favicon.ico
Empty file.
Binary file added public/favicon.png
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 public/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel="shortcut icon" type="image/jpg" href="/favicon.png">
<title>
CF Studybot
</title>
Expand Down
Binary file added src/assets/wf.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/aboutUs/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const About = () => {
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Egestas quis ipsum suspendisse ultrices gravida dictum fusce ut placerat. Tortor vitae purus faucibus ornare suspendisse sed. Sagittis nisl rhoncus mattis rhoncus. Duis convallis convallis tellus id interdum. Facilisis gravida neque convallis a cras semper. Justo donec enim diam vulputate ut pharetra. Arcu felis bibendum ut tristique. Nec feugiat nisl pretium fusce id velit ut tortor. Lacus sed viverra tellus in hac. Tellus mauris a diam maecenas sed enim ut sem. Placerat orci nulla pellentesque dignissim enim sit amet. Porttitor rhoncus dolor purus non enim. Neque sodales ut etiam sit amet nisl purus in mollis. Pellentesque habitant morbi tristique senectus et.</p>
</div>
<div className="connect">
<a href="hhttps://github.com/fizzo999" alt="fizzon github" target="_blank" rel="noopener noreferrer"><img className="social-icon"src={github}/></a>
<a href="https://github.com/fizzo999" alt="fizzon github" target="_blank" rel="noopener noreferrer"><img className="social-icon"src={github}/></a>
<a href="https://www.linkedin.com/in/fizzopannosch/" alt="fizzo linkedIn" target="_blank" rel="noopener noreferrer"><img className="social-icon"src={linkedin}/></a>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/adminPage/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ const Admin = (props) => {
return isAuthenticated&& (
<Container fluid>
<h1>Admin Portal</h1>
<h3>Create new user accounts and assign roles</h3>
<If condition={loggedInUser ? loggedInUser.data.user_metadata.role === 'admin' : false}>
<Row style= {{marginTop:'16px'}}>
<Col >
Expand Down
1 change: 1 addition & 0 deletions src/components/questions/questions.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ const Questions = () => {
isAuthenticated && (
<Container fluid>
<h1>Questions</h1>
<h3>Modify questions in the Slack Bot database</h3>
<Row style={{ marginTop: "16px" }}>
<Col>
<QuestionsForm addQuestion={addQuestion} />
Expand Down
12 changes: 11 additions & 1 deletion src/style/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,14 @@
.form-label{
padding:1.2vh;
}
}
}

.form-label{
font-size: 18px;
font-weight: bold;
}

//====== FORM BUTTON ======
.x{
margin-right: 5px;
}
5 changes: 0 additions & 5 deletions src/style/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,3 @@ button.close {
border-color: $purple;
color: $black;
}

//====== FORM BUTTON ======
.x{
margin-right: 5px;
}

0 comments on commit 0fab178

Please sign in to comment.