Skip to content

Commit

Permalink
Rename _site folder to live
Browse files Browse the repository at this point in the history
  • Loading branch information
farhan687 committed May 8, 2017
1 parent 6dc43b4 commit cdb5ab4
Show file tree
Hide file tree
Showing 167 changed files with 48 additions and 59 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -80,7 +80,7 @@ $ npm run build_gh_pages

#### Contributing

The source code is under the ``_site/src`` directory.
The source code is under the ``live/src`` directory.
You can make pull requests against the ``dev`` branch.

---
Expand Down
36 changes: 0 additions & 36 deletions _site/importer/index.html

This file was deleted.

9 changes: 2 additions & 7 deletions importer.webpack.production.config.js
Expand Up @@ -2,17 +2,12 @@ var path = require('path');
var webpack = require('webpack');

module.exports = {
entry: ["babel-polyfill", path.join(__dirname, '_site/importer/js/app.js')],
entry: ["babel-polyfill", path.join(__dirname, 'importer/js/app.js')],
output: {
path: path.join(__dirname, './_site/importer/dist'),
path: path.join(__dirname, './importer/dist'),
filename: 'main.js'
},
devtool: false,
devServer: {
inline: true,
port: 8000,
contentBase: './_site'
},
module: {
loaders: [{
test: /.jsx?$/,
Expand Down
36 changes: 36 additions & 0 deletions importer/index.html
@@ -0,0 +1,36 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8" />
<title>Dejavu, the missing Web UI for Elasticsearch</title>
<!-- Favicon Here -->
<link rel="apple-touch-icon" sizes="57x57" href="../live/assets/img/fevicon/apple-icon-57x57.png" />
<link rel="apple-touch-icon" sizes="60x60" href="../live/assets/img/fevicon/apple-icon-60x60.png" />
<link rel="apple-touch-icon" sizes="72x72" href="../live/assets/img/fevicon/apple-icon-72x72.png" />
<link rel="apple-touch-icon" sizes="76x76" href="../live/assets/img/fevicon/apple-icon-76x76.png" />
<link rel="apple-touch-icon" sizes="114x114" href="../live/assets/img/fevicon/apple-icon-114x114.png" />
<link rel="apple-touch-icon" sizes="120x120" href="../live/assets/img/fevicon/apple-icon-120x120.png" />
<link rel="apple-touch-icon" sizes="144x144" href="../live/assets/img/fevicon/apple-icon-144x144.png" />
<link rel="apple-touch-icon" sizes="152x152" href="../live/assets/img/fevicon/apple-icon-152x152.png" />
<link rel="apple-touch-icon" sizes="180x180" href="../live/assets/img/fevicon/apple-icon-180x180.png" />
<link rel="icon" type="image/png" sizes="192x192" href="../live/assets/img/fevicon/android-icon-192x192.png" />
<link rel="icon" type="image/png" sizes="32x32" href="../live/assets/img/fevicon/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="96x96" href="../live/assets/img/fevicon/favicon-96x96.png" />
<link rel="icon" type="image/png" sizes="16x16" href="../live/assets/img/fevicon/favicon-16x16.png" />
<link rel="manifest" href="../live/assets/img/fevicon/manifest.json" />
<meta name="msapplication-TileColor" content="#ffffff" />
<meta name="msapplication-TileImage" content="../live/assets/img/fevicon/ms-icon-144x144.png" />
<meta name="theme-color" content="#ffffff" />
<!-- CSS HERE -->
<link rel="stylesheet" type="text/css" href="../live/dist/css/vendor.min.css" />
<link rel="stylesheet" type="text/css" href="../live/dist/css/style.min.css" />
</head>

<body>
<div class="container-fluid mainContainer" id="main"></div>
<script type="text/javascript" src="../live/dist/js/vendor.min.js"></script>
<script src="dist/main.js"></script>
</body>

</html>
4 changes: 2 additions & 2 deletions _site/importer/js/app.js → importer/js/app.js
@@ -1,14 +1,14 @@
var React = require('react');
var ReactDOM = require('react-dom');
var Importer = require('../../src/js/features/Importer.js');
var Importer = require('../../live/src/js/features/Importer.js');

function onClose() {
const isDejavuUrl = sessionStorage.getItem("dejavuUrl");
if(isDejavuUrl) {
sessionStorage.removeItem("dejavuUrl");
window.location.href = isDejavuUrl;
} else {
window.location.href = "../index.html";
window.location.href = "../live/index.html";
}
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion _site/src/js/HomePage.js → live/src/js/HomePage.js
Expand Up @@ -1585,7 +1585,7 @@ var HomePage = createReactClass({
</a>
{
this.state && this.state.splash ? (
<a className="btn btn-default m-l10" href="./importer/index.html">
<a className="btn btn-default m-l10" href="../importer/index.html">
Import JSON or CSV files
</a>
) : null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -5,7 +5,7 @@ var GoBackToDejavu = require('./GoBackToDejavu.js');
class ImporterSidebar extends React.Component {
open = () => {
sessionStorage.setItem("dejavuUrl", window.location.href);
window.location.href = "./importer/index.html"
window.location.href = "../importer/index.html"
};

render() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 3 additions & 4 deletions webpack.config.js
Expand Up @@ -4,17 +4,16 @@ var webpack = require('webpack');
const debug = process.env.NODE_ENV !== "production";

module.exports = {
entry: ["babel-polyfill", path.join(__dirname, '_site/src/js/app.js')],
entry: ["babel-polyfill", path.join(__dirname, 'live/src/js/app.js')],
output: {
path: path.join(__dirname, './_site/dist/js'),
path: path.join(__dirname, './live/dist/js'),
publicPath: '/dist/js/',
filename: 'main.js'
},
devtool: 'inline-sourcemap',
devServer: {
inline: true,
port: 8000,
contentBase: './_site'
port: 1358
},
module: {
loaders: [{
Expand Down
9 changes: 2 additions & 7 deletions webpack.production.config.js
Expand Up @@ -2,18 +2,13 @@ var path = require('path');
var webpack = require('webpack');

module.exports = {
entry: ["babel-polyfill", path.join(__dirname, '_site/src/js/app.js')],
entry: ["babel-polyfill", path.join(__dirname, 'live/src/js/app.js')],
output: {
path: path.join(__dirname, './_site/dist/js'),
path: path.join(__dirname, './live/dist/js'),
publicPath: '/dist/js/',
filename: 'main.js'
},
devtool: false,
devServer: {
inline: true,
port: 8000,
contentBase: './_site'
},
module: {
loaders: [{
test: /.jsx?$/,
Expand Down

0 comments on commit cdb5ab4

Please sign in to comment.