ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

Browse Source
This commit is contained in:
Mashy 2019-10-01 16:35:06 +10:00
commit d44acdffd5
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/assets/styles/styles.less
View File

@ -23,7 +23,7 @@ html body {
/* stops inspector going skitz*/ /* stops inspector going skitz*/
overflow-x: hidden; overflow-x: hidden;
// overflow-y: hidden; overflow-y: hidden;
} }
@media (min-width: 1921px) { @media (min-width: 1921px) {

1
client/assets/styles/styles.mobile.css
View File

@ -11,6 +11,7 @@
height: 100vh; height: 100vh;
max-height: initial; max-height: initial;
min-height: initial; min-height: initial;
overflow-y: initial;
} }
#mnml button { #mnml button {

8
client/index.html
View File

@ -1,13 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>mnml - abstract strategy</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name=apple-mobile-web-app-capable content=yes> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name=apple-mobile-web-app-status-bar-style content=black> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="mnml">
<meta name="description" content="mnml pvp tbs"> <meta name="description" content="mnml pvp tbs">
<meta name="author" content="ntr@smokestack.io"> <meta name="author" content="ntr@smokestack.io">
<title>mnml - abstract strategy</title>
<link rel="manifest" href="manifest.webmanifest"> <link rel="manifest" href="manifest.webmanifest">
<link rel="stylesheet" href="./node_modules/izitoast/dist/css/iziToast.min.css"></script> <link rel="stylesheet" href="./node_modules/izitoast/dist/css/iziToast.min.css"></script>
<link href="https://fonts.googleapis.com/css?family=Jura" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Jura" rel="stylesheet">

1
client/package.json
View File

@ -24,6 +24,7 @@
"keymaster": "^1.6.2", "keymaster": "^1.6.2",
"linkstate": "^1.1.1", "linkstate": "^1.1.1",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"logrocket": "^1.0.3",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"parcel": "^1.12.3", "parcel": "^1.12.3",
"preact": "^8.4.2", "preact": "^8.4.2",

6
client/src/app.jsx
View File

@ -1,6 +1,8 @@
const preact = require('preact'); const preact = require('preact');
// const logger = require('redux-diff-logger'); // const logger = require('redux-diff-logger');
const LogRocket = require('logrocket');
const { Provider, connect } = require('preact-redux'); const { Provider, connect } = require('preact-redux');
const { createStore, combineReducers } = require('redux'); const { createStore, combineReducers } = require('redux');
const { StripeProvider } = require('react-stripe-elements'); const { StripeProvider } = require('react-stripe-elements');
@ -13,6 +15,10 @@ const registerEvents = require('./events');
const Mnml = require('./components/mnml'); const Mnml = require('./components/mnml');
if (process.env.NODE_ENV === 'PRODUCTION') {
LogRocket.init('yh0dy3/mnml');
}
function stripeKey() { function stripeKey() {
if (window.location.host === 'mnml.gg') return 'pk_live_fQGrL1uWww2ot8W1G7vTySAv004ygmnMXq'; if (window.location.host === 'mnml.gg') return 'pk_live_fQGrL1uWww2ot8W1G7vTySAv004ygmnMXq';
return 'pk_test_Cb49tTqTXpzk7nEmlGzRrNJg00AU0aNZDj'; return 'pk_test_Cb49tTqTXpzk7nEmlGzRrNJg00AU0aNZDj';