Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into query
Browse files Browse the repository at this point in the history
  • Loading branch information
akshendra committed Jun 10, 2018
2 parents 59f0081 + 2e95a48 commit e58e37c
Show file tree
Hide file tree
Showing 7 changed files with 634 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"presets": ["es2015"],
"presets": ["env"],
"plugins": [
"transform-react-jsx",
"transform-class-properties"
Expand Down
4 changes: 3 additions & 1 deletion client/src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'babel-polyfill';

import App from './components/app';
import React from 'react';
import ReactDOM from 'react-dom';
import App from './components/app';

ReactDOM.render(<App />, document.getElementById("app"));
61 changes: 42 additions & 19 deletions client/src/public/index.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,44 @@
<html>
<head>
<title>jsonstore.io / Store your data just by sending us HTTP Requests</title>

<meta charSet="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<link rel="icon" href="/favicon.png" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,300italic,700,700italic" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/milligram/1.3.0/milligram.min.css" />
<link rel="stylesheet" type="text/css" href="//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" />
<link rel="stylesheet" type="text/css" href="css/main.css" />
</head>
<body>
<div id="app"></div>

<script src="bundle.js"></script>
<script src="js/drift.js"></script>
</body>

<head>
<title>jsonstore.io / Store your data just by sending us HTTP Requests</title>

<meta charSet="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<link rel="icon" href="/favicon.png" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,300italic,700,700italic" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/milligram/1.3.0/milligram.min.css" />
<link rel="stylesheet" type="text/css" href="//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" />
<link rel="stylesheet" type="text/css" href="css/main.css" />


<meta property="description" content="jsonstore offers a free and secured JSON-based cloud datastore for small projects" />

<meta property="og:title" content="jsonstore.io">
<meta property="og:description" content="jsonstore offers a free and secured JSON-based cloud datastore for small projects" />

<meta name="twitter:title" content="jsonstore.io" />
<meta name="twitter:description" content="jsonstore offers a free and secured JSON-based cloud datastore for small projects" />

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-23421052-9"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() { dataLayer.push(arguments); }
gtag('js', new Date());

gtag('config', 'UA-23421052-9');
</script>

</head>

<body>
<div id="app"></div>

<script src="bundle.js"></script>
<script src="js/drift.js"></script>
</body>

</html>
Loading

0 comments on commit e58e37c

Please sign in to comment.