Skip to content

Commit 579e9ce

Browse files
prophenprophen
authored
Merge pull request #12 from PopSchools/prophen-correct-capitalization
Update PopSchools capitalization
2 parents 8521f62 + b53dd7b commit 579e9ce

File tree

3 files changed

+187
-146
lines changed

3 files changed

+187
-146
lines changed

‎src/App.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
import React from 'react';
2-
import './App.css';
3-
import './css/tailwind.css';
4-
import 'bulma/css/bulma.css'
5-
import Home from './components/Home.js'
6-
import { BrowserRouter as Router, Route} from "react-router-dom";
1+
import React from "react";
2+
import "./App.css";
3+
import "./css/tailwind.css";
4+
import "bulma/css/bulma.css";
5+
import Home from "./components/Home.js";
6+
import { BrowserRouter as Router, Route } from "react-router-dom";
77
function App() {
88
return (
99
<>
10-
<Router>
11-
<Route exact path="/">
12-
<Home/>
13-
14-
</Route>
15-
</Router>
10+
<Router>
11+
<Route exact path="/">
12+
<Home />
13+
</Route>
14+
</Router>
1615
</>
1716
);
1817
}

‎src/components/Footer.js

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
import React from 'react';
2-
import Logo from '../image/logo.png';
3-
import '../css/tailwind.css';
4-
import '../App.css';
5-
import {GithubFilled,TwitterCircleFilled } from '@ant-design/icons';
1+
import React from "react";
2+
import Logo from "../image/logo.png";
3+
import "../css/tailwind.css";
4+
import "../App.css";
5+
import { GithubFilled, TwitterCircleFilled } from "@ant-design/icons";
66
// import 'bulma/css/bulma.css'
7-
function Footer(){
8-
return(
9-
<>
10-
<div className="mtop">
11-
12-
<div className="container py-8">
13-
14-
<div className="flex flex-wrap ">
15-
<div className="w-full md:w-1/3 ">
16-
<img src={Logo} className="w-64 "alt="popschools" />
17-
</div>
18-
19-
<div className="w-full md:w-2/3">
20-
21-
<div className="grid grid-cols-2 md:grid-cols-3">
22-
23-
<div>
24-
<p className="py-3 px-3 text-gray-600 font-bold">On Social Media</p>
25-
<p className="text-gray-600 py-4 px-3">Follow us on our social media</p>
26-
<hr/>
27-
28-
<a href="https://github.com/PopSchools/popschools.org"><span className=" px-3 text-gray-600 text-4xl inline-block"><GithubFilled /></span> </a>
29-
<a href="https://twitter.com/popschoolsorg"><span className="px-3 text-gray-600 text-4xl inline-block"><TwitterCircleFilled /></span> </a>
30-
</div>
31-
32-
</div>
33-
<div className="grid grid-cols-2 md:grid-cols-2">
34-
<div className="py-6">
35-
<span className="text-left text-gray-600 py-2 px-3"><span dangerouslySetInnerHTML={{ "__html": "&copy;" }} />{(new Date().getFullYear())} Popschools, Inc</span>
36-
</div>
37-
38-
39-
</div>
40-
41-
42-
</div>
43-
44-
7+
function Footer() {
8+
return (
9+
<>
10+
<div className="mtop">
11+
<div className="container py-8">
12+
<div className="flex flex-wrap ">
13+
<div className="w-full md:w-1/3 ">
14+
<img src={Logo} className="w-64 " alt="popschools" />
15+
</div>
4516

17+
<div className="w-full md:w-2/3">
18+
<div className="grid grid-cols-2 md:grid-cols-3">
19+
<div>
20+
<p className="py-3 px-3 text-gray-600 font-bold">
21+
On Social Media
22+
</p>
23+
<p className="text-gray-600 py-4 px-3">
24+
Follow us on our social media
25+
</p>
26+
<hr />
27+
28+
<a href="https://github.com/PopSchools/popschools.org">
29+
<span className=" px-3 text-gray-600 text-4xl inline-block">
30+
<GithubFilled />
31+
</span>{" "}
32+
</a>
33+
<a href="https://twitter.com/popschoolsorg">
34+
<span className="px-3 text-gray-600 text-4xl inline-block">
35+
<TwitterCircleFilled />
36+
</span>{" "}
37+
</a>
4638
</div>
47-
39+
</div>
40+
<div className="grid grid-cols-2 md:grid-cols-2">
41+
<div className="py-6">
42+
<span className="text-left text-gray-600 py-2 px-3">
43+
<span dangerouslySetInnerHTML={{ __html: "&copy;" }} />
44+
{new Date().getFullYear()} PopSchools, Inc.
45+
</span>
46+
</div>
47+
</div>
4848
</div>
49-
49+
</div>
5050
</div>
51-
52-
</>
53-
)
51+
</div>
52+
</>
53+
);
5454
}
5555

56-
export default Footer;
56+
export default Footer;

‎src/components/Home.js

Lines changed: 127 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,139 @@
1-
import React from 'react';
2-
import Navbar from './Navbar';
3-
import '../css/tailwind.css';
4-
import '../App.css';
1+
import React from "react";
2+
import Navbar from "./Navbar";
3+
import "../css/tailwind.css";
4+
import "../App.css";
55
// import 'bulma/css/bulma.css'
6-
import homeimg from '../image/home.png';
7-
import {AnimatedOnScroll} from "react-animated-css-onscroll";
8-
import {CheckCircleFilled,InteractionFilled} from '@ant-design/icons';
9-
import Footer from './Footer';
10-
import 'uikit/dist/css/uikit.css';
11-
import 'uikit/dist/js/uikit';
6+
import homeimg from "../image/home.png";
7+
import { AnimatedOnScroll } from "react-animated-css-onscroll";
8+
import { CheckCircleFilled, InteractionFilled } from "@ant-design/icons";
9+
import Footer from "./Footer";
10+
import "uikit/dist/css/uikit.css";
11+
import "uikit/dist/js/uikit";
1212

13-
function Home(){
14-
return (
15-
<div>
16-
<Navbar/>
17-
<div class="">
18-
13+
function Home() {
14+
return (
15+
<div>
16+
<Navbar />
17+
<div class="">
18+
<div className=" ">
19+
<div className="container">
20+
<div className="flex flex-wrap">
21+
<div className="w-full md:w-3/5 ">
22+
<div className=" px-3 py-16 ">
23+
<p className="font-extrabold text-blue-900 text-center md:text-left text-5xl">
24+
Welcome to{" "}
25+
<span
26+
class="text-6xl text-gray-7
27+
900"
28+
>
29+
PopSchools
30+
</span>{" "}
31+
</p>
32+
<p className="text-gray-600 py-4 text-2xl ">
33+
We exist today to create an inclusive community for
34+
pre-career and early-career software developers, provide
35+
opportunities for networking, and make pathways to paying
36+
work in tech roles
37+
</p>
1938

20-
<div className=" ">
21-
<div className="container">
22-
<div className="flex flex-wrap">
23-
<div className="w-full md:w-3/5 ">
24-
<div className=" px-3 py-16 ">
25-
<p className="font-extrabold text-blue-900 text-center md:text-left text-5xl">Welcome to <span class="text-6xl text-gray-7
26-
900">Popschools</span> </p>
27-
<p className="text-gray-600 py-4 text-2xl ">We exist today to create an inclusive community for pre-career and early-career software developers, provide opportunities for networking, and make pathways to paying work in tech roles</p>
28-
39+
<div className="grid grid-cols-2 md:grid-cols-2 py-4 gap-4">
40+
<div>
41+
<a href="https://circle.popschools.com/c/welcome">
42+
<button class="bg-transparent hover:bg-gray-900 text-gray-700 font-semibold hover:text-white py-2 px-4 border border-gray-500 hover:border-transparent rounded-lg">
43+
Join our community
44+
</button>
45+
</a>
46+
</div>
2947

30-
<div className="grid grid-cols-2 md:grid-cols-2 py-4 gap-4">
31-
32-
<div><a href="https://circle.popschools.com/c/welcome"><button class="bg-transparent hover:bg-gray-900 text-gray-700 font-semibold hover:text-white py-2 px-4 border border-gray-500 hover:border-transparent rounded-lg">
33-
Join our community
34-
</button>
35-
</a>
36-
37-
</div>
38-
39-
<div>
40-
41-
</div>
42-
43-
</div>
48+
<div></div>
49+
</div>
50+
</div>
51+
</div>
52+
<div className="w-full md:w-2/5 ">
53+
<AnimatedOnScroll animationIn="bounceInRight">
54+
<div class="px-3 md:py-24 object-right ">
55+
<img
56+
src={homeimg}
57+
alt=""
58+
className="w-full rounded-lg shadow-lg"
59+
/>
60+
</div>
61+
</AnimatedOnScroll>
62+
</div>
63+
</div>
4464
</div>
45-
</div>
46-
<div className="w-full md:w-2/5 ">
47-
<AnimatedOnScroll animationIn="bounceInRight" >
48-
<div class="px-3 md:py-24 object-right ">
49-
<img src={homeimg} alt="" className="w-full rounded-lg shadow-lg"/>
50-
</div>
51-
</AnimatedOnScroll>
52-
</div>
53-
54-
</div>
55-
</div></div>
56-
57-
5865
</div>
59-
{/* service are placed here */}
60-
<div className=" mb-8 bgpro">
61-
<div className="container">
62-
<p className="text-gray-600 md:px-32 text-4xl font-bold text-center py-2">PopSchools is meant to create access to a safe and inclusive community, mutual aid, and paying work opportunities through apprenticeships to early-career technologists</p>
63-
66+
</div>
67+
{/* service are placed here */}
68+
<div className=" mb-8 bgpro">
69+
<div className="container">
70+
<p className="text-gray-600 md:px-32 text-4xl font-bold text-center py-2">
71+
PopSchools is meant to create access to a safe and inclusive
72+
community, mutual aid, and paying work opportunities through
73+
apprenticeships to early-career technologists
74+
</p>
75+
</div>
76+
<div className="container py-8">
77+
<div className="grid grid-cols-2 md:grid-cols-4 gap-8">
78+
<div
79+
className="ml-3 mr-3 px-4 bg-gray-300 rounded-lg shadow-lg"
80+
data-aos="zoom-in-down"
81+
data-aos-duration="1000"
82+
>
83+
<p className="text-center text-6xl text-gray-800">
84+
<CheckCircleFilled />
85+
</p>
86+
<p className="text-center py-3 text-sm font-bold text-gray-800">
87+
{" "}
88+
Career Guidance
89+
</p>
6490
</div>
65-
<div className="container py-8">
66-
<div className="grid grid-cols-2 md:grid-cols-4 gap-8">
67-
68-
<div className="ml-3 mr-3 px-4 bg-gray-300 rounded-lg shadow-lg" data-aos="zoom-in-down" data-aos-duration="1000">
69-
<p className="text-center text-6xl text-gray-800"><CheckCircleFilled /></p>
70-
<p className="text-center py-3 text-sm font-bold text-gray-800"> Career Guidance</p>
71-
</div>
72-
<div className="ml-3 mr-3 px-4 bg-gray-300 rounded-lg shadow-lg" data-aos="flip-right">
73-
<p className="text-center text-6xl text-gray-800"><InteractionFilled /></p>
74-
<p className="text-center py-3 text-sm font-bold text-gray-800"> Study Group</p>
75-
</div>
76-
<div className=" ml-3 mr-3 px-4 bg-gray-300 rounded-lg shadow-lg" data-aos="fade-down" data-aos-duration="1000">
77-
<p className="text-center text-6xl text-gray-800"><CheckCircleFilled /></p>
78-
<p className="text-center py-3 text-sm font-bold text-gray-800"> Opportunities</p>
79-
</div>
80-
<div className=" ml-3 mr-3 px-4 bg-gray-300 rounded-lg shadow-lg" data-aos="fade-down" data-aos-duration="1000">
81-
<p className="text-center text-6xl text-gray-800"><CheckCircleFilled /></p>
82-
<p className="text-center py-3 text-sm font-bold text-gray-800"> Daily Challenges</p>
83-
</div>
84-
85-
86-
</div>
91+
<div
92+
className="ml-3 mr-3 px-4 bg-gray-300 rounded-lg shadow-lg"
93+
data-aos="flip-right"
94+
>
95+
<p className="text-center text-6xl text-gray-800">
96+
<InteractionFilled />
97+
</p>
98+
<p className="text-center py-3 text-sm font-bold text-gray-800">
99+
{" "}
100+
Study Group
101+
</p>
87102
</div>
103+
<div
104+
className=" ml-3 mr-3 px-4 bg-gray-300 rounded-lg shadow-lg"
105+
data-aos="fade-down"
106+
data-aos-duration="1000"
107+
>
108+
<p className="text-center text-6xl text-gray-800">
109+
<CheckCircleFilled />
110+
</p>
111+
<p className="text-center py-3 text-sm font-bold text-gray-800">
112+
{" "}
113+
Opportunities
114+
</p>
115+
</div>
116+
<div
117+
className=" ml-3 mr-3 px-4 bg-gray-300 rounded-lg shadow-lg"
118+
data-aos="fade-down"
119+
data-aos-duration="1000"
120+
>
121+
<p className="text-center text-6xl text-gray-800">
122+
<CheckCircleFilled />
123+
</p>
124+
<p className="text-center py-3 text-sm font-bold text-gray-800">
125+
{" "}
126+
Daily Challenges
127+
</p>
128+
</div>
129+
</div>
88130
</div>
89-
131+
</div>
90132

91-
{/* footer */}
92-
<Footer/>
93-
</div>
94-
)
133+
{/* footer */}
134+
<Footer />
135+
</div>
136+
);
95137
}
96138

97-
export default Home;
139+
export default Home;

0 commit comments

Comments
 (0)