Skip to content

Commit 9691599

Browse files
committed
Remove Twitter widget and share button
1 parent 6e40cab commit 9691599

File tree

2 files changed

+46
-83
lines changed

2 files changed

+46
-83
lines changed

Diff for: index.html

-15
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,7 @@
88
<body>
99
<a href="https://github.com/zoltantothcom/Design-Patterns-JavaScript" target="_blank" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#fff; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z" fill="#e22a23"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
1010
<div id="root" />
11-
<script>window.twttr = (function(d, s, id) {
12-
var js, fjs = d.getElementsByTagName(s)[0],
13-
t = window.twttr || {};
14-
if (d.getElementById(id)) return t;
15-
js = d.createElement(s);
16-
js.id = id;
17-
js.src = "https://platform.twitter.com/widgets.js";
18-
fjs.parentNode.insertBefore(js, fjs);
1911

20-
t._e = [];
21-
t.ready = function(f) {
22-
t._e.push(f);
23-
};
24-
25-
return t;
26-
}(document, "script", "twitter-wjs"));</script>
2712
<!-- Google Analytics -->
2813
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-25262063-2"></script>
2914
<script>

Diff for: src/pages/Game.jsx

+46-68
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { Fragment } from 'react';
1+
import React from 'react';
22
import PropTypes from 'prop-types';
33
import styled from 'styled-components';
44
import { connect } from 'react-redux';
@@ -22,93 +22,71 @@ const Intro = styled.div`
2222

2323
const StartButtonContainer = styled.div`
2424
margin: 3rem auto 1rem;
25-
/* text-align: center; */
2625
`;
2726

2827
const Restart = styled.div`
2928
margin: 3rem 0;
3029
text-align: center;
3130
`;
3231

33-
const TwitterButton = styled.a`
34-
background: #1da1f2;
35-
color: #ffffff;
32+
const GitHubButton = styled.a`
33+
background: #e9ecef;
34+
color: #495057;
3635
padding: 6px 12px;
3736
border-radius: 4px;
3837
margin: 0 8px;
3938
text-decoration: none;
4039
font-size: 0.8rem;
4140
`;
4241

43-
const GitHubButton = styled(TwitterButton)`
44-
background: #e9ecef;
45-
color: #495057;
46-
`;
47-
4842
const ShareContainer = styled.p`
4943
text-align: center;
5044
`;
5145

52-
const Game = ({ intro, current, answers, style, onStart, onRestart }) => {
53-
let correct;
46+
const Game = ({ intro, current, answers, style, onStart, onRestart }) => (
47+
<>
48+
{intro && (
49+
<Intro>
50+
<p>
51+
Each question contains a code snippet and four answer choices.
52+
<br />
53+
Look carefully at the code and choose the one correct answer.
54+
</p>
55+
<p>After answering all 23 questions you'll be shown your results.</p>
56+
<StartButtonContainer>
57+
<Button label="Start Game" id="start" onClick={onStart} />
58+
</StartButtonContainer>
59+
</Intro>
60+
)}
5461

55-
if (!current) {
56-
correct = answers.filter(item => item.correct).length;
57-
}
58-
59-
return (
60-
<Fragment>
61-
{intro && (
62-
<Intro>
63-
<p>
64-
Each question contains a code snippet and four answer choices.
65-
<br />
66-
Look carefully at the code and choose the one correct answer.
67-
</p>
68-
<p>After answering all 23 questions you'll be shown your results.</p>
69-
<StartButtonContainer>
70-
<Button label="Start Game" id="start" onClick={onStart} />
71-
</StartButtonContainer>
72-
</Intro>
73-
)}
74-
75-
{!intro && current && (
76-
<Fragment>
77-
<ProgressBar />
78-
<Code style={style} />
79-
<ButtonContainer />
80-
</Fragment>
81-
)}
62+
{!intro && current && (
63+
<>
64+
<ProgressBar />
65+
<Code style={style} />
66+
<ButtonContainer />
67+
</>
68+
)}
8269

83-
{!intro && !current && (
84-
<Fragment>
85-
<Result />
86-
<Percentage />
87-
<Restart>
88-
<Button label="Try Again" id="try_again" onClick={onRestart} />
89-
</Restart>
90-
<ShareContainer>
91-
<TwitterButton
92-
className="twitter-share-button"
93-
data-dnt="true"
94-
href={`https://twitter.com/intent/tweet?text=I%20scored%20${correct}%20out%20of%2023%20in%20JavaScript%20Design%20Patterns%20game!&url=http://designpatternsgame.com`}
95-
>
96-
Tweet Your Score
97-
</TwitterButton>
98-
99-
<GitHubButton
100-
href="https://github.com/zoltantothcom/Design-Patterns-JavaScript"
101-
aria-label="Star zoltantothcom/Design-Patterns-JavaScript on GitHub"
102-
target="_blank"
103-
>
104-
Star on GitHub
105-
</GitHubButton>
106-
</ShareContainer>
107-
</Fragment>
108-
)}
109-
</Fragment>
110-
);
111-
};
70+
{!intro && !current && (
71+
<>
72+
<Result />
73+
<Percentage />
74+
<Restart>
75+
<Button label="Try Again" id="try_again" onClick={onRestart} />
76+
</Restart>
77+
<ShareContainer>
78+
<GitHubButton
79+
href="https://github.com/zoltantothcom/Design-Patterns-JavaScript"
80+
aria-label="Star zoltantothcom/Design-Patterns-JavaScript on GitHub"
81+
target="_blank"
82+
>
83+
Star on GitHub
84+
</GitHubButton>
85+
</ShareContainer>
86+
</>
87+
)}
88+
</>
89+
);
11290

11391
Game.propTypes = {
11492
style: PropTypes.object.isRequired,

0 commit comments

Comments
 (0)