Skip to content
This repository was archived by the owner on Aug 8, 2019. It is now read-only.

Commit e321e32

Browse files
author
condef5
committed
Update styles
1 parent 8732675 commit e321e32

6 files changed

Lines changed: 34 additions & 14 deletions

File tree

client/src/components/navbar.js

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function Navbar() {
88
css={{
99
background: "#fff",
1010
borderBottom: "1px solid #e5edef",
11-
padding: "10px 15px",
11+
padding: "15px",
1212
marginBottom: "2em"
1313
}}
1414
>
@@ -18,8 +18,21 @@ function Navbar() {
1818
margin: "auto"
1919
}}
2020
>
21-
<Link to="/">
22-
<h2>Kampu</h2>
21+
<Link to="/" css={{ textDecoration: "none" }}>
22+
<h2
23+
css={{
24+
textDecoration: "none",
25+
margin: "0",
26+
fontSize: "35px",
27+
fontWeight: "500",
28+
backgroundImage:
29+
"-webkit-gradient(linear, 0% 0%, 25% 100%,from(#c5e9a1), to(#00b7c6))",
30+
WebkitBackgroundClip: "text",
31+
WebkitTextFillColor: "transparent"
32+
}}
33+
>
34+
Kampu
35+
</h2>
2336
</Link>
2437
</div>
2538
</nav>

client/src/components/owner-club-circle.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ function OwnerClubCircle({ id, active, name, activeClub, setActiveClub }) {
1212
display: "flex",
1313
cursor: "pointer",
1414
border: "solid #ffffff00 0.5em",
15-
flex: "0 0 80px"
15+
flex: "0 0 80px",
16+
textAlign: "center"
1617
};
1718

1819
const styleActive = {

client/src/components/owner-create-button.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/** @jsx jsx */
22
import React from "react";
33
import { jsx } from "@emotion/core";
4+
import { Link } from "@reach/router";
45

56
function OwnerCreateButton() {
67
const [active, setActive] = React.useState(false);
@@ -59,6 +60,8 @@ function OwnerCreateButton() {
5960

6061
const styleButton = {
6162
background: "none",
63+
display: "block",
64+
textDecoration: "none",
6265
color: "inherit",
6366
border: "none",
6467
padding: "0",
@@ -80,8 +83,12 @@ function OwnerCreateButton() {
8083
return (
8184
<div css={active ? styleListContainer : styleButtonContainer}>
8285
<div css={active ? styleButtonsContainerActive : styleButtonsContainer}>
83-
<button css={styleButton}>Create Club</button>
84-
<button css={styleButton}>Create Sport Field</button>
86+
<Link to="/create-club" css={styleButton}>
87+
Create Club
88+
</Link>
89+
<Link to="/create-sport-field" css={styleButton}>
90+
Create Sport Field
91+
</Link>
8592
</div>
8693
<button css={active ? styleIconActive : styleIcon} onClick={handleClick}>
8794
+

client/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function App() {
2525
maxWidth: "900px",
2626
margin: "0 auto",
2727
boxSizing: "border-box",
28-
"@media (max-width: 480px)": {
28+
"@media (max-width: 720px)": {
2929
padding: "0px 15px"
3030
}
3131
}}

client/src/views/owner-home.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import OwnerCreateButton from "../components/owner-create-button";
88
import { useSetClubs, useSetSportFields } from "../actions/action-hooks";
99
import { useClubs, useSportFields } from "../selectors/selectors";
1010
import { getClubs } from "../services/club";
11-
import { getSportFields } from "../services/sportField";
11+
import { getSportFields } from "../services/sport-field";
1212

1313
function OwnerHome() {
1414
const clubs = useClubs();
@@ -43,15 +43,15 @@ function OwnerHome() {
4343
setClubs(clubs);
4444
setActiveClub(clubs.length ? clubs[0].id : null);
4545
});
46-
}, [setClubs]);
46+
}, []);
4747

4848
React.useEffect(() => {
4949
if (activeClub) {
5050
getSportFields().then(sportFields => {
5151
setSportFields(sportFields);
5252
});
5353
}
54-
}, [setSportFields]);
54+
}, [activeClub]);
5555

5656
const styleSportFieldsContainer = {
5757
display: "flex",
@@ -84,11 +84,10 @@ function OwnerHome() {
8484
</div>
8585
<Title>Sport Fields</Title>
8686
<div css={styleSportFieldsContainer}>
87-
{sportFields ? (
87+
{sportFields.length ? (
8888
sportFields
8989
.filter(sportField => sportField.club_id === activeClub)
9090
.map(sportField => {
91-
//This is a temporal progress
9291
const progress = `${Math.floor(Math.random() * 100) + 1}%`;
9392
return (
9493
<OwnerSportFieldCard

client/src/views/signup.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ function Signup() {
123123
<Link
124124
to="/login"
125125
style={{
126-
color: "Black",
127-
fontSize: "10px",
126+
color: "#000",
127+
fontSize: "14px",
128128
textDecoration: "none",
129129
display: "flex",
130130
justifyContent: "flex-end"

0 commit comments

Comments
 (0)