Browse Source

Icons and minor fixes

Frans Bergman 8 năm trước cách đây
mục cha
commit
5a2d047269
5 tập tin đã thay đổi với 15 bổ sung8 xóa
  1. 1 1
      deploy.sh
  2. 1 0
      index.html
  3. 10 5
      js/index.js
  4. 1 0
      package.json
  5. 2 2
      php/api.php

+ 1 - 1
deploy.sh

@@ -1 +1 @@
-sftp pi@tankernn.eu:/var/www/todo <<< $'put bundle.js\nput php/api.php php/api.php\nput index.php\nput css/style.css css/style.css'
+sftp pi@tankernn.eu:/var/www/todo <<< $'put bundle.js\nput php/api.php php/api.php\nput index.html\nput css/style.css css/style.css'

+ 1 - 0
index.php → index.html

@@ -5,6 +5,7 @@
     <meta charset="utf-8" />
     <title>Tankernn.eu TODO-list</title>
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
     <link href="css/style.css" rel="Stylesheet" type="text/css"/>
 </head>
 

+ 10 - 5
js/index.js

@@ -8,6 +8,7 @@ var FormGroup = require('react-bootstrap').FormGroup;
 var Panel = require('react-bootstrap').Panel;
 var Modal = require('react-bootstrap').Modal;
 var DatePicker = require('react-bootstrap-date-picker');
+var FontAwesome = require('react-fontawesome');
 var dateFormat = require('dateformat');
 var $ = require('jquery');
 
@@ -63,7 +64,7 @@ var TodoForm = React.createClass({
   render: function() {
     return (
       <div>
-        <Button bsStyle="primary" onClick={this.openModal}>{this.props.edit ? "Edit" : "Add"}</Button>
+        <Button bsStyle="primary" onClick={this.openModal}><FontAwesome name='edit' /> {this.props.edit ? "Edit" : "Add"}</Button>
 
         <Modal show={this.state.showModal} onHide={this.closeModal}>
           <form name="todoForm" onSubmit={this.handleSubmit}>
@@ -95,8 +96,8 @@ var TodoForm = React.createClass({
             </Modal.Body>
             <Modal.Footer>
               <ButtonToolbar>
-                <Button bsStyle="primary" type="submit">Save</Button>
-                <Button onClick={this.closeModal}>Cancel</Button>
+                <Button bsStyle="primary" type="submit"><FontAwesome name='save' /> Save</Button>
+                <Button onClick={this.closeModal}><FontAwesome name='ban' /> Cancel</Button>
               </ButtonToolbar>
             </Modal.Footer>
           </form>
@@ -157,7 +158,7 @@ var Item = React.createClass({
         footer={
           <ButtonToolbar>
             {todoForm}
-            <Button bsStyle="danger" onClick={this.handleDeleteClick}>Delete</Button>
+            <Button bsStyle="danger" onClick={this.handleDeleteClick}><FontAwesome name='trash' /> Delete</Button>
           </ButtonToolbar>
         }
         bsStyle={priorityNames[this.props.priority]}
@@ -200,7 +201,7 @@ var App = React.createClass({
       success: function(data) {
         // Not logged in
         if (data.result == 1) {
-          document.location.href = "https://tankernn.eu/login/";
+          document.location.href = "https://login.tankernn.eu/";
         }
         // Success
         this.setState({list: data.list, result: data.result});
@@ -212,6 +213,10 @@ var App = React.createClass({
   },
   componentDidMount: function() {
     this.updateList();
+    this.timer = setInterval(this.updateList, 5000);
+  },
+  componentWillUnmount: function() {
+    clearInterval(this.timer);
   },
   handleCommentSubmit: function(comment) {
     $.ajax({

+ 1 - 0
package.json

@@ -14,6 +14,7 @@
     "react-bootstrap-date-picker": "^3.7.0",
     "react-datepicker": "^0.32.0",
     "react-dom": "^15.3.2",
+    "react-fontawesome": "^1.5.0",
     "remarkable": "^1.7.1",
     "style-loader": "^0.13.1"
   },

+ 2 - 2
php/api.php

@@ -20,8 +20,8 @@
         case 'edit':
           $id = $_POST['id'];
         case 'add':
-          $title = $_POST['title'];
-          $text = $_POST['text'];
+          $title = $conn->escape_string($_POST['title']);
+          $text = $conn->escape_string($_POST['text']);
           $deadline = $_POST['deadline'];
           $priority = $_POST['priority'];
           if (strtotime($deadline) <= time()) {