Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added code of conduct page/ #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SKIP_PREFLIGHT_CHECK=true
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* eslint-disable quotes */
module.exports = { "extends": "standard" }
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"eslint.validate": ["javascript"]
}
6,682 changes: 4,200 additions & 2,482 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,13 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"eslint": "^7.13.0",
"eslint-config-standard": "^16.0.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.1.0"
}
}
6 changes: 6 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,9 @@ body{
transform: rotate(360deg);
}
}

.codeconduct{
background-image: url('./image/Popschools.png');
background-size: cover;

}
22 changes: 13 additions & 9 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
import React from "react";
import "./App.css";
import "./css/tailwind.css";
import "bulma/css/bulma.css";
import Home from "./components/Home.js";
import { BrowserRouter as Router, Route } from "react-router-dom";
function App() {
import React from 'react'
import './App.css'
import './css/tailwind.css'
import 'bulma/css/bulma.css'
import Home from './components/Home.js'
import { BrowserRouter as Router, Route } from 'react-router-dom'
import Codeofconduct from './components/codefconduct'
function App () {
return (
<>
<Router>
<Route exact path="/">
<Home />
</Route>
<Route path='/codeofconduct'>
<Codeofconduct/>
</Route>
</Router>
</>
);
)
}

export default App;
export default App
30 changes: 19 additions & 11 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from "react";
import Logo from "../image/logo.png";
import "../css/tailwind.css";
import "../App.css";
import { GithubFilled, TwitterCircleFilled } from "@ant-design/icons";
import React from 'react'
import Logo from '../image/logo.png'
import '../css/tailwind.css'
import '../App.css'
import { GithubFilled, TwitterCircleFilled } from '@ant-design/icons'
// import 'bulma/css/bulma.css'
function Footer() {
function Footer () {
return (
<>
<div className="mtop">
Expand All @@ -28,19 +28,27 @@ function Footer() {
<a href="https://github.com/PopSchools/popschools.org">
<span className=" px-3 text-gray-600 text-4xl inline-block">
<GithubFilled />
</span>{" "}
</span>{' '}
</a>
<a href="https://twitter.com/popschoolsorg">
<span className="px-3 text-gray-600 text-4xl inline-block">
<TwitterCircleFilled />
</span>{" "}
</span>{' '}
</a>
</div>

<div>
<p className="py-3 px-3 text-gray-600 font-bold">
Code of Conduct
</p>
<a href="/codeofconduct"> <span className="px-3 py-4 text-gray-600 text-sm inline-block">View Code</span></a>

</div>
</div>
<div className="grid grid-cols-2 md:grid-cols-2">
<div className="py-6">
<span className="text-left text-gray-600 py-2 px-3">
<span dangerouslySetInnerHTML={{ __html: "&copy;" }} />
<span dangerouslySetInnerHTML={{ __html: '&copy;' }} />
{new Date().getFullYear()} PopSchools, Inc.
</span>
</div>
Expand All @@ -50,7 +58,7 @@ function Footer() {
</div>
</div>
</>
);
)
}

export default Footer;
export default Footer
34 changes: 34 additions & 0 deletions src/components/codefconduct.js

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

Binary file added src/image/Popschools.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.