Skip to content

Commit

Permalink
update server
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxtermax committed Jan 25, 2018
1 parent 5baa6e7 commit e73b59d
Show file tree
Hide file tree
Showing 11 changed files with 40,155 additions and 39,699 deletions.
49,938 changes: 24,969 additions & 24,969 deletions assets/js/pack.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/pack.bundle.js.map

Large diffs are not rendered by default.

29,867 changes: 15,160 additions & 14,707 deletions assets/js/tv.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/tv.bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"scripts": {
"lift": "node --inspect app.js",
"start": "echo $NW_SDK ./ --remote-debugging-port=9222 | bash",
"start": "./nw",
"wrong-address": "echo $NW_SDK ./ --wrong-address | bash",
"watch": "nodemon --watch ./src --exec 'npm run start' -e js,jsx,scss",
"webpack:build": "./node_modules/.bin/webpack --progress --color --display-error-details --bail",
Expand Down
4 changes: 2 additions & 2 deletions src/js/components/Pack.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ export default class Pack extends React.Component {
<div className="wrap-popup-info">
<div>
<i className="material-icons icon-stop">pan_tool</i>
<h1 className="title-info">INFORMACION</h1>
<h1 className="title-info">INFORMACIÓN</h1>
</div>
<p>En este momento no hay ningun recepcionista que pueda atender te.</p>
<p>En este momento no hay ningún recepcionista que pueda atender te.</p>
</div>
}
/>
Expand Down
4 changes: 3 additions & 1 deletion src/js/components/PopUp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export default class PopUp extends React.Component {
componentDidMount() {
let modal = $(`#${this.props.id}`);
this.modal = new Foundation.Reveal(modal);
console.log("ENTRA openPopUp ", this.props);

if(this.props.full === true) {
let modalBackground = this.modal.$element.find(".wrap-perspective").css("background")
Expand All @@ -41,13 +42,14 @@ export default class PopUp extends React.Component {
if(this.props.startDisplayed === false) this.modal.close();
this.modal.openPopUp = this.openPopUp.bind(this);
this.modal.closePopUp = this.closePopUp.bind(this);

}//end componentDidMount

addChildren(name, child) {
this.childrens[name] = child;
}//end addChildren

openPopUp() {
openPopUp() {
let $reveal = this.modal.$element;
const animation = this.props.animation;
$reveal.parent().removeClass("disappear");
Expand Down
28 changes: 14 additions & 14 deletions src/js/components/TV.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
//@ sourceMappingUR=/assets/js/tv.bundle.js.map
import React from 'react';
import $ from 'jquery';
import '../../scss/components/TV.scss';
import './../../../assets/js/dependencies/jquery-2.2.0.min.js';
import './../../../assets/js/dependencies/slick/slick.js';

import PopUp from './PopUp';
import { copyCollection } from '../utils';
//import $ from 'jquery';
//import '../../../assets/js/dependencies/slick/slick.js';
//const { SADDRESS } = require('../../../config/env/address.json');



/**
* Represent TV componnent class
* @constructor
Expand All @@ -29,7 +26,7 @@ export default class TV extends React.Component {
slidesToScroll: -1
}
}
}//end constructor
}

generateTemplate(data = []) {
let result = data.map((element) => {
Expand All @@ -41,14 +38,14 @@ export default class TV extends React.Component {
`
})
return result;
}//end genetate
}

/*
componentDidMount() {
let self = this;
this.SADDRESS = SADDRESS;
const SADDRESS = window.localStorage.getItem('SADDRESS');
const sound = new Audio(`./../../../assets/audio/call.mp3`);

io.sails.url = `http://${SADDRESS}:1337`;
let client = io.sails.connect();
Expand Down Expand Up @@ -83,14 +80,17 @@ export default class TV extends React.Component {
}
})
}//end componentDidMount
}
*/

render() {
return (
<div className="wrap-moduldos">
<ul className="wrap-tokens regular slider">

</ul>
<div>
<PopUp
id="testPopUp"
animation={"rebound"}
type="load"
/>
</div>
)
}//end render
Expand Down
1 change: 1 addition & 0 deletions src/scss/components/TV.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@import '../animations';
@import '../fonts';
@include foundation-global-styles;
@include foundation-reveal;
@include foundation-grid;

body {
Expand Down
1 change: 1 addition & 0 deletions views/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
height: 230
})
*/

}
});

Expand Down
5 changes: 2 additions & 3 deletions views/tv.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
<title>DIGITURNO | TV</title>
<link rel="stylesheet" type="text/css" href="./../assets/js/dependencies//slick/slick.css">
<link rel="stylesheet" type="text/css" href="./../assets/js/dependencies//slick/slick-theme.css">
<script src="./../assets/js/dependencies/sails.io.js" autoConnect="false"></script>
<script src="./../assets/js/tv.bundle.js"/></script>
</head>
<body>
<div id="app"></div>

<script src="./../assets/js/dependencies/sails.io.js" autoConnect="false"></script>
<script src="./../assets/js/tv.bundle.js"/></script>
</body>
</html>

0 comments on commit e73b59d

Please sign in to comment.