Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3a0de88
create react app with added router and apollo
Graleszczur Sep 27, 2019
55e10d3
installed antd and less; set up basic generic layout
konieczka Sep 27, 2019
d01ec04
Merge branch 'master' of https://github.com/urbrob/BrickSchool
Graleszczur Sep 27, 2019
c80e1c8
created early layout for search view (home page)
konieczka Sep 27, 2019
b5f0f38
Merge branch 'base-layout' of https://github.com/urbrob/BrickSchool i…
Graleszczur Sep 27, 2019
3463556
added nav menu
konieczka Sep 27, 2019
c1b4409
socket for welcome component
konieczka Sep 27, 2019
6f724cc
add base starting card component
Graleszczur Sep 27, 2019
87931df
conflict fix
Graleszczur Sep 27, 2019
0f9c4fb
added logo and moved repeatable elements to separate components
konieczka Sep 28, 2019
a09fab8
minor adjustments
Graleszczur Sep 28, 2019
840c7bb
resolve conflict
Graleszczur Sep 28, 2019
960a670
resolve conflict
Graleszczur Sep 28, 2019
be4de55
edited theme
konieczka Sep 28, 2019
52b3675
add carousel component
Graleszczur Sep 28, 2019
dbfa4d6
solve conflict
Graleszczur Sep 28, 2019
d455f04
fixed css
konieczka Sep 28, 2019
1a260e0
changed components to custom
konieczka Sep 28, 2019
69b72ba
added functional buttons to navbar
konieczka Sep 28, 2019
e28dfcc
fixed layout proportions
konieczka Sep 28, 2019
62a9655
Merge branch 'base-layout' of https://github.com/urbrob/BrickSchool i…
Graleszczur Sep 28, 2019
c336217
added gradients to backgrounds
konieczka Sep 28, 2019
3df3463
add home page build
Graleszczur Sep 28, 2019
030a46b
Merge branch 'base-layout' of https://github.com/urbrob/BrickSchool i…
Graleszczur Sep 28, 2019
ff5a6ae
created fixed list for records
konieczka Sep 28, 2019
73160ed
add better filter list
Graleszczur Sep 28, 2019
d1bc843
redesigned list
konieczka Sep 28, 2019
3e52f8e
Merge branch 'base-layout' of https://github.com/urbrob/BrickSchool i…
konieczka Sep 28, 2019
3708557
adjust filteres
Graleszczur Sep 28, 2019
9a81085
Merge branch 'base-layout' of https://github.com/urbrob/BrickSchool i…
Graleszczur Sep 28, 2019
7cea88a
minor homepage adjustments
Graleszczur Sep 28, 2019
12b90a3
added badges
konieczka Sep 28, 2019
841a877
Merge branch 'base-layout' of https://github.com/urbrob/BrickSchool i…
konieczka Sep 28, 2019
8c2364f
handle Home page display for mobile devices
konieczka Sep 28, 2019
bb77c07
hacked
konieczka Sep 28, 2019
9f83ba7
Update .gitignore
konieczka Sep 28, 2019
b2044e4
add full school detail view
Graleszczur Sep 28, 2019
0ca9870
Merge branch 'base-layout' of https://github.com/urbrob/BrickSchool i…
Graleszczur Sep 28, 2019
6e71f95
Merge branch 'master' into base-layout
urbrob Sep 28, 2019
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
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,6 @@ venv.bak/

# mypy
.mypy_cache/
app/package-lock.json
app/package.json
.DS_Store
2 changes: 1 addition & 1 deletion app/package-lock.json

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

2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@
"last 1 safari version"
]
}
}
}
2 changes: 2 additions & 0 deletions app/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ApolloProvider } from "react-apollo";
import NotFound from "./views/404";
import Home from "./views/Home";
import SearchResults from "./views/SearchResults";
import SchoolDetails from "./components/SchoolDetails/SchoolDetails";


export const client = new ApolloClient({
Expand All @@ -25,6 +26,7 @@ function App() {
<Route exact path="/" component={Home} />
<Route exact path="/404" component={NotFound} />
<Route exact path="/records" component={SearchResults} />
<Route exact path="/detail" component={SchoolDetails} />
<Redirect to="/404" />
</Switch>
</Router>
Expand Down
17 changes: 17 additions & 0 deletions app/src/components/SchoolDetails/DetailWrapper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from "react";

const DetailWrapper = ({ children }) => {
return (
<div
style={{
backgroundColor: "#505050",
minHeight: "87vh",

}}
>
{children}
</div>
);
};

export default DetailWrapper;
78 changes: 78 additions & 0 deletions app/src/components/SchoolDetails/SchoolCard.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import React, {Component} from "react";
import { Row, Col } from 'antd';
import { Card, Avatar } from 'antd';


export class SchoolCard extends Component {

render() {

return (
<div
style={{
margin:"3%"
}}
>
<Row gutter={10}>
<Col xs={8} sm={8} md={9} lg={9} xl={9}>
<Card

headStyle={{
backgroundColor:"#5a5a5a"
}}
bodyStyle={{
backgroundColor:"#5a5a5a"
}}
cover={
<img
alt="example"
src="https://i.imgur.com/z5K1cVi.jpg"
/>
}
style={{
minHeight:"80vh",
backgroundColor:"#5a5a5a"
}}

>
<Row gutter={2} >
<Col xs={6} sm={6} md={7} lg={8} xl={8}>
<Avatar shape="square" size={128} src={"https://i.imgur.com/o5vbzhA.png"} />
</Col>
<Col xs={10} sm={10} md={14} lg={16} xl={16}
>
<h4>Szkoła im. Twojej starej</h4>
<p>Adres: Chujowa 8</p>
<p>Strona www: chujcinakurwe.pl</p>
<p>Telefon: 669987576</p>

</Col>
</Row>
</Card>
</Col>
<Col xs={14} sm={14} md={14} lg={14} xl={14} style={{

}}>
<Card title="Informacje szczegółowe"
style={{
minHeight:"80vh",
backgroundColor:"#5a5a5a"
}}
>
<p>xDDDDDDD</p>
<p>Card content</p>
<p>Card content</p>
<p>xD</p>
<p>xD</p>
<p>xD</p>
<p>XD</p>
</Card>
</Col>
</Row>
</div>

);
}
}

export default SchoolCard;
20 changes: 20 additions & 0 deletions app/src/components/SchoolDetails/SchoolDetails.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from "react";
import HeaderMenu from "../HeaderMenu";
import FooterCredits from "../FooterCredits";
import DetailWrapper from "./DetailWrapper"
import SchoolCard from "../SchoolDetails/SchoolCard"
import "./SchoolDetailsLayout.css";

const SchoolDetails = () => {
return (
<div className="Layout">
<HeaderMenu />
<DetailWrapper>
<SchoolCard/>
</DetailWrapper>
<FooterCredits />
</div>
);
};

export default SchoolDetails;
6 changes: 6 additions & 0 deletions app/src/components/SchoolDetails/SchoolDetailsLayout.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.Layout {
display: flex;
flex-direction: column;
align-content: center;
height: 100vh;
}