Merge branch 'release/v0.3.0'

jupiny · Dec 19, 2016 · fa70d0f · fa70d0f
2 parents 764335e + fc74586
commit fa70d0f
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 16 deletions.
diff --git a/english_diary/english_diary/static/js/home.js b/english_diary/english_diary/static/js/home.js
@@ -21,9 +21,9 @@ $( document ).ready(function() {
                 data: data,
                 success: function(data) {
                     if(data.result) {
-                        alert("저장되었습니다.");
                         $('.diary-selected').addClass('diary-written');
                         $('#diary-delete').attr("disabled", false);
+                        toastr.success('일기가 저장되었습니다.');
                     }
                     else {
                         alert("한글을 쓰시면 안되요!");
@@ -53,6 +53,7 @@ $( document ).ready(function() {
                     $('#diary-content').val("");
                     $('#diary-translated-content').val("");
                     $('.diary-selected').removeClass('diary-written');
+                    toastr.warning("일기가 삭제되었습니다.");
                 },
                 error: function(error) {
                     console.log(error);
@@ -110,17 +111,17 @@ $( document ).ready(function() {
             var diaryTranslateAPIUrl = "/api/naver/translate/";
             var diaryContentTextareaElement = $("#diary-content");
             var diaryTranslatedContentTextareaElement = $("#diary-translated-content");
-           
+
             // input 타입의 .val()로 받으세요(.text로 썼기에 에러났었음)
             var data = {
                 content: diaryContentTextareaElement.val()
             };
-            
+
             $.ajax({
                 type:"POST",
                 data: data,
                 url: diaryTranslateAPIUrl,
-           
+
                 // translate.py 의 response 받기
                 success: function(data) {
                     var diaryTranslatedContent = data.content;
@@ -141,23 +142,23 @@ $( document ).ready(function() {
     });
     $('[data-toggle="tooltip"]').tooltip({
             trigger : 'focus'
-    }) 
+    })
 
 
     // Analysis
     $('#analysis-basic').click(function() {
-        
+
         //count diary written
         var diaryWrittenElement = $(".day.diary-written").not(".new").not(".old");
-        var countDiaryWritten = diaryWrittenElement.length; 
-        
+        var countDiaryWritten = diaryWrittenElement.length;
+
         //count days in a present month
         var countDaysInMonth = $(".day").not(".new").not(".old").length;
 
         //calculate achievement
         var achievementInt = Math.round(countDiaryWritten / countDaysInMonth * 100);
         var achievementString =  achievementInt.toString() + "%";
-       
+
         //var achievementMessage = " 달성중"
 
         // Setting progress bar
@@ -203,3 +204,40 @@ $( document ).ready(function() {
         });
     });
 });
+
+//autoSave
+var autosave_trigger = 0;
+
+function autoSave(event) {
+  // if(event.key == " ") { ++autosave_trigger; }
+  ++autosave_trigger;
+
+    if(autosave_trigger >= 20)
+    {
+      autosave_trigger = 0;
+
+      var diaryContent = $('#diary-content').val();
+      var diaryDatetime = $('#selected-datetime').val();
+      var diaryCreateAPIUrl = "/api/diary/";
+      var data = {
+          datetime: diaryDatetime,
+          content: diaryContent
+      };
+      $.ajax({
+          type: "POST",
+          url: diaryCreateAPIUrl,
+          data: data,
+          success: function(data) {
+              if(data.result) {
+                  $('.diary-selected').addClass('diary-written');
+                  $('#diary-delete').attr("disabled", false);
+                  toastr.success('일기가 자동저장 되었습니다.');
+              }
+          },
+          error: function(error) {
+              console.log(error);
+          }
+      });
+    return false;
+  }
+}
diff --git a/english_diary/english_diary/templates/base.html b/english_diary/english_diary/templates/base.html
@@ -14,6 +14,9 @@
     <!-- jQuery -->
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-growl/1.0.0/jquery.bootstrap-growl.js"></script>
+    <!-- toastr is a Javascript library for non-blocking notifications. jQuery is required. The goal is to create a simple core library that can be customized and extended. -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.3/toastr.min.js"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css">
 
     <!-- Latest compiled and minified CSS -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -26,7 +29,7 @@
 
     <!-- clipboard.js CDN -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.12/clipboard.min.js"></script>
-    
+
     <!-- Favicon -->
     <link rel="icon" href="{% static "favicon/engdiary_favicon.png" %}">
 
@@ -53,7 +56,7 @@
 
 
     <!-- Custom JavaScript -->
-    {% javascript "english_diary" %} 
+    {% javascript "english_diary" %}
     {% block custom_javascripts %}
     {% endblock %}
 </body>
diff --git a/english_diary/english_diary/templates/home.html b/english_diary/english_diary/templates/home.html
@@ -1,6 +1,5 @@
-{% extends 'base.html' %} 
+{% extends 'base.html' %}
 {% load pipeline %}
-
 {% block content %}
 <section>
     <div class="container">
@@ -30,7 +29,7 @@
                             </button>
                         </div>
                     </div>
-                    <textarea id="diary-content" name="" class="form-control" placeholder="일기를 적어주세요" required></textarea>
+                    <textarea id="diary-content" name="" class="form-control" onkeyup="autoSave(event);" placeholder="일기를 적어주세요"  required></textarea>
                 </form>
                 <div class="row">
                     <div class="col-md-2 col-sm-2 col-xs-2">
@@ -41,7 +40,7 @@
                             <input type="text" id="find-word" class="form-control" placeholder="사전 검색">
                             <span class="input-group-btn">
                                 <button type="button" id="dictionary" class="btn btn-dictionary" data-toggle="modal" data-target="#dictionaryModal">
-                                   <i class="fa fa-search" aria-hidden="true"></i> 
+                                   <i class="fa fa-search" aria-hidden="true"></i>
                                 </button>
                             </span>
                         </div>
@@ -99,5 +98,5 @@
 </div>
 {% endblock %}
 {% block custom_javascripts %}
-{% javascript "home" %} 
+{% javascript "home" %}
 {% endblock %}