SplendidBear-Websites/MineSeeker
Private
Public Access
1
0
Fork 0
Code Pull Requests 1 Releases Activity

add google analytics and facebook scripts && improve url share method w/ fb && enforce https in prod

Browse Source
This commit is contained in:
Root
2016-12-11 15:10:25 +01:00
parent c0d75e43f3
commit 875d2d71db
11 changed files with 113 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Resources/views/base.html.twig
View File

@@ -3,11 +3,31 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
{% block metas %}{% endblock %}
<title>{% block title %}Welcome!{% endblock %}</title> <title>{% block title %}Welcome!{% endblock %}</title>
{% block stylesheets %}{% endblock %} {% block stylesheets %}{% endblock %}
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}"/> <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}"/>
<script type="text/javascript">
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-88761060-1', 'auto');
ga('send', 'pageview');
</script>
</head> </head>
<body> <body>
<div id="fb-root"></div>
<header> <header>
{% block header %}{% endblock %} {% block header %}{% endblock %}
</header> </header>
@@ -22,9 +42,12 @@
<script type="text/javascript"> <script type="text/javascript">
window.fbAsyncInit = function () { window.fbAsyncInit = function () {
FB.init({ FB.init({
appId: '320599508311862', appId: '{{ facebook_api }}',
xfbml: true, xfbml: true,
version: 'v2.8' cookie: true,
status: true,
oauth: true,
version: '{{ facebook_api_version }}'
}); });
}; };

3
app/config/config.yml
View File

@@ -40,6 +40,9 @@ framework:
twig: twig:
debug: "%kernel.debug%" debug: "%kernel.debug%"
strict_variables: "%kernel.debug%" strict_variables: "%kernel.debug%"
globals:
facebook_api: "%facebook.api%"
facebook_api_version: "%facebook.version%"
# Doctrine Configuration # Doctrine Configuration
doctrine: doctrine:

4
app/config/config_dev.yml
View File

@@ -32,6 +32,10 @@ monolog:
type: console type: console
channels: [!event, !doctrine] channels: [!event, !doctrine]
parameters:
facebook.api: 320599508311862
facebook.version: 'v2.8'
# Facebook OAuth # Facebook OAuth
hwi_oauth: hwi_oauth:
firewall_names: [secured_area] firewall_names: [secured_area]

4
app/config/config_prod.yml
View File

@@ -23,6 +23,10 @@ monolog:
console: console:
type: console type: console
parameters:
facebook.api: 320597498312063
facebook.version: 'v2.8'
# Facebook OAuth # Facebook OAuth
hwi_oauth: hwi_oauth:
firewall_names: [secured_area] firewall_names: [secured_area]

3
app/config/routing.yml
View File

@@ -4,11 +4,14 @@ fos_user:
JotunheimrUserBundle: JotunheimrUserBundle:
resource: "@JotunheimrUserBundle/Resources/config/routing.yml" resource: "@JotunheimrUserBundle/Resources/config/routing.yml"
prefix: / prefix: /
schemes: [https]
JotunheimrAdminBundle: JotunheimrAdminBundle:
resource: "@JotunheimrAdminBundle/Resources/config/routing.yml" resource: "@JotunheimrAdminBundle/Resources/config/routing.yml"
prefix: / prefix: /
schemes: [https]
MineSeekerBundle: MineSeekerBundle:
resource: "@MineSeekerBundle/Resources/config/routing.yml" resource: "@MineSeekerBundle/Resources/config/routing.yml"
prefix: / prefix: /
schemes: [https]

1
app/config/routing_dev.yml
View File

@@ -12,3 +12,4 @@ _errors:
_main: _main:
resource: routing.yml resource: routing.yml
schemes: [http]

29
src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
View File

@@ -14,10 +14,30 @@
{% endstylesheets %} {% endstylesheets %}
{% endblock %} {% endblock %}
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}"/> <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}"/>
<link href="https://fonts.googleapis.com/css?family=Rajdhani:300,400,500,600,700&amp;subset=latin-ext" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Rajdhani:300,400,500,600,700&amp;subset=latin-ext"
rel="stylesheet">
<script type="text/javascript">
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-88761060-1', 'auto');
ga('send', 'pageview');
</script>
</head> </head>
<body> <body>
<div id="fb-root"></div>
{% if app.request.hasPreviousSession %} {% if app.request.hasPreviousSession %}
{% for type, messages in app.session.flashbag.all() %} {% for type, messages in app.session.flashbag.all() %}
{% for message in messages %} {% for message in messages %}
@@ -42,9 +62,12 @@
<script type="text/javascript"> <script type="text/javascript">
window.fbAsyncInit = function () { window.fbAsyncInit = function () {
FB.init({ FB.init({
appId: '320599508311862', appId: '{{ facebook_api }}',
xfbml: true, xfbml: true,
version: 'v2.8' cookie: true,
status: true,
oauth: true,
version: '{{ facebook_api_version }}'
}); });
}; };

34
src/Mine/SeekerBundle/Resources/public/css/style.mineseeker.css
View File

@@ -96,51 +96,37 @@ main {
#mine-wrapper .game-wrapper .game-overlay .game-overlay-window h1 { #mine-wrapper .game-wrapper .game-overlay .game-overlay-window h1 {
font-weight: bold; font-weight: bold;
font-size: 32px; font-size: 26px;
} }
#mine-wrapper .game-wrapper .game-overlay .game-overlay-window h2 { #mine-wrapper .game-wrapper .game-overlay .game-overlay-window h2 {
font-size: 18px; font-size: 18px;
} }
#mine-wrapper .game-wrapper .game-overlay .game-overlay-window h3 {
font-size: 16px;
color: #386e8c;
}
#mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy { #mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy {
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
margin-bottom: 10px;
} }
#mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy input { #mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy input {
border: 0; border: 0;
height: 40px; height: 40px;
width: 90%; width: 100%;
padding: 0 20px; padding: 0 20px;
-webkit-border-top-left-radius: 3px; -webkit-border-radius: 3px;
border-top-left-radius: 3px; border-radius: 3px;
-webkit-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
} }
#mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy button {
border: 0;
width: 10%;
height: 40px;
cursor: pointer;
-webkit-border-top-right-radius: 3px;
border-top-right-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
border-bottom-right-radius: 3px;
}
#mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy button img {
width: 15px;
height: 15px;
}
#mine-wrapper .game-wrapper .game-overlay .game-overlay-window a { #mine-wrapper .game-wrapper .game-overlay .game-overlay-window a {
background: #d8e3ea; background: #d8e3ea;
display: inline-table; display: inline-table;

32
src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js
View File

@@ -160,6 +160,27 @@ class MineSeeker extends React.Component {
} }
} }
/**
* @see https://developers.facebook.com/docs/reference/javascript/FB.getLoginStatus
* @see https://developers.facebook.com/docs/sharing/reference/send-dialog
* @see https://developers.facebook.com/docs/plugins/share-button/
*/
clickFBShare() {
let display = 'popup';
FB.getLoginStatus(function (response) {
display = response.status === 'connected'
? 'dialog'
: 'popup';
});
FB.ui({
method: 'send',
display: display,
link: window.location.href + '/' + this.state.gameAssoc,
});
}
wInit(session, data, gridClient) { wInit(session, data, gridClient) {
this.setState({session: session}); this.setState({session: session});
@@ -184,14 +205,17 @@ class MineSeeker extends React.Component {
overlaySubTitle: this.state.gameAssoc overlaySubTitle: this.state.gameAssoc
? ?
<div> <div>
<h3>Share this unique link w/ your opponent</h3>
<div className="clippy"> <div className="clippy">
<input id="foo" <input id="foo"
defaultValue={window.location.href + '/' + this.state.gameAssoc}/> defaultValue={window.location.href + '/' + this.state.gameAssoc}/>
<button className="btn">
<img src="/bundles/mineseeker/images/clippy.svg" alt="Copy to clipboard"/>
</button>
</div> </div>
{this.state.env !== 'dev' &&
<a onClick={this.clickFBShare.bind(this)}>Share in Facebook message</a>
}
{this.state.env === 'dev' &&
<a href={"/play/" + this.state.gameAssoc} target="_blank">Play w/ me!</a> <a href={"/play/" + this.state.gameAssoc} target="_blank">Play w/ me!</a>
}
</div> </div>
: '', : '',
renderGridFields: this.state.gameAssoc renderGridFields: this.state.gameAssoc
@@ -349,7 +373,7 @@ class MineSeeker extends React.Component {
/** After rendering */ /** After rendering */
componentDidMount() { componentDidMount() {
this.connectWithWebsocket();
} }
/** /**

2
src/Mine/SeekerBundle/Resources/views/Game/index.html.twig
View File

@@ -12,7 +12,7 @@
<a href="{{ path('MineSeekerBundle_gamePlay') }}">Most játszom egyet!</a> <a href="{{ path('MineSeekerBundle_gamePlay') }}">Most játszom egyet!</a>
<a href="{{ path('fos_user_registration_register') }}" class="small">Regisztrálok</a> &middot; <a href="{{ path('fos_user_registration_register') }}" class="small">Regisztrálok</a> &middot;
<a href="{{ path('fos_user_security_login') }}" class="small">Belépek</a> <a href="{{ path('fos_user_security_login') }}" class="small">Belépek</a>
<h3>version 0.16.11 (beta2) &middot; MineSeeker&copy; &middot; <a href="http://www.laszlolang.com">www.laszlolang.com</a> <h3>version 0.18.11 (beta2) &middot; MineSeeker&copy; &middot; <a href="http://www.laszlolang.com">www.laszlolang.com</a>
</h3> </h3>
</div> </div>
<img src="{{ asset('bundles/mineseeker/images/mine-logo-logo.png') }}" alt="MineSeeker Logo" border="0"/> <img src="{{ asset('bundles/mineseeker/images/mine-logo-logo.png') }}" alt="MineSeeker Logo" border="0"/>

8
src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
View File

@@ -1,5 +1,13 @@
{% extends '::base.html.twig' %} {% extends '::base.html.twig' %}
{% block metas %}
{#<meta property="og:url" content="http://www.your-domain.com/your-page.html" />#}
{#<meta property="og:type" content="website" />#}
{#<meta property="og:title" content="Your Website Title" />#}
{#<meta property="og:description" content="Your description" />#}
{#<meta property="og:image" content="http://www.your-domain.com/path/image.jpg" />#}
{% endblock %}
{% block body %} {% block body %}
<div class="mine-container"> <div class="mine-container">
<div id="mine-wrapper" <div id="mine-wrapper"