Skip to content

Commit

Permalink
Merge pull request #57 from jupiny/feature/words_cloud_d3
Browse files Browse the repository at this point in the history
Feature/words cloud d3
Feature/autosave toastr message
  • Loading branch information
samkugji committed Dec 30, 2016
2 parents 3d981db + 2492b57 commit 8e29968
Show file tree
Hide file tree
Showing 10 changed files with 764 additions and 37 deletions.
4 changes: 4 additions & 0 deletions english_diary/english_diary/settings/partials/static.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
'css/mypage.css',
'css/signin.css',
'css/messages.css',
'css/toastr.css',
'css/wordcloud.css',
),
'output_filename': 'css/english_diary.css',
},
Expand All @@ -49,12 +51,14 @@
'source_filenames': (
'js/bootstrap-datepicker.js',
'js/home.js',
'js/toastr.js',
),
'output_filename': 'js/home.js',
},
'mypage': {
'source_filenames': (
'js/mypage.js',
'js/wordcloud.js',
),
'output_filename': 'js/mypage.js',
},
Expand Down
197 changes: 197 additions & 0 deletions english_diary/english_diary/static/css/toastr.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
.toast-title {
font-weight: bold;
}
.toast-message {
-ms-word-wrap: break-word;
word-wrap: break-word;
}
.toast-message a,
.toast-message label {
color: #ffffff;
}
.toast-message a:hover {
color: #cccccc;
text-decoration: none;
}
.toast-close-button {
position: relative;
right: -0.3em;
top: -0.3em;
float: right;
font-size: 20px;
font-weight: bold;
color: #ffffff;
-webkit-text-shadow: 0 1px 0 #ffffff;
text-shadow: 0 1px 0 #ffffff;
opacity: 0.8;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
filter: alpha(opacity=80);
}
.toast-close-button:hover,
.toast-close-button:focus {
color: #000000;
text-decoration: none;
cursor: pointer;
opacity: 0.4;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
filter: alpha(opacity=40);
}
/*Additional properties for button version
iOS requires the button element instead of an anchor tag.
If you want the anchor version, it requires `href="#"`.*/
button.toast-close-button {
padding: 0;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
}
.toast-top-center {
top: 0;
right: 0;
width: 100%;
}
.toast-bottom-center {
bottom: 0;
right: 0;
width: 100%;
}
.toast-top-full-width {
top: 0;
right: 0;
width: 100%;
}
.toast-bottom-full-width {
bottom: 0;
right: 0;
width: 100%;
}
.toast-top-left {
top: 24px;
left: 12px;
}
.toast-top-right {
top: 60px;
right: 12px;
}
.toast-bottom-right {
right: 60px;
bottom: 12px;
}
.toast-bottom-left {
bottom: 12px;
left: 12px;
}
#toast-container {
position: fixed;
z-index: 999999;
/*overrides*/

}
#toast-container * {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
#toast-container > div {
position: relative;
overflow: hidden;
margin: 0 0 6px;
padding: 15px 15px 15px 50px;
width: 300px;
-moz-border-radius: 3px 3px 3px 3px;
-webkit-border-radius: 3px 3px 3px 3px;
border-radius: 3px 3px 3px 3px;
background-position: 15px center;
background-repeat: no-repeat;
-moz-box-shadow: 0 0 12px #999999;
-webkit-box-shadow: 0 0 12px #999999;
box-shadow: 0 0 12px #999999;
color: #ffffff;
opacity: 0.8;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
filter: alpha(opacity=80);
}
#toast-container > :hover {
-moz-box-shadow: 0 0 12px #000000;
-webkit-box-shadow: 0 0 12px #000000;
box-shadow: 0 0 12px #000000;
opacity: 1;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
filter: alpha(opacity=100);
cursor: pointer;
}
#toast-container > .toast-info {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=") !important;
}
#toast-container > .toast-error {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=") !important;
}
#toast-container > .toast-success {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==") !important;
}
#toast-container > .toast-warning {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=") !important;
}
#toast-container.toast-top-center > div,
#toast-container.toast-bottom-center > div {
width: 300px;
margin: auto;
}
#toast-container.toast-top-full-width > div,
#toast-container.toast-bottom-full-width > div {
width: 96%;
margin: auto;
}
.toast {
background-color: #030303;
}
.toast-success {
background-color: #51a351;
}
.toast-error {
background-color: #bd362f;
}
.toast-info {
background-color: #2f96b4;
}
.toast-warning {
background-color: #f89406;
}
.toast-progress {
position: absolute;
left: 0;
bottom: 0;
height: 4px;
background-color: #000000;
opacity: 0.4;
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
filter: alpha(opacity=40);
}
/*Responsive Design*/
@media all and (max-width: 240px) {
#toast-container > div {
padding: 8px 8px 8px 50px;
width: 11em;
}
#toast-container .toast-close-button {
right: -0.2em;
top: -0.2em;
}
}
@media all and (min-width: 241px) and (max-width: 480px) {
#toast-container > div {
padding: 8px 8px 8px 50px;
width: 18em;
}
#toast-container .toast-close-button {
right: -0.2em;
top: -0.2em;
}
}
@media all and (min-width: 481px) and (max-width: 768px) {
#toast-container > div {
padding: 15px 15px 15px 50px;
width: 25em;
}
}
7 changes: 7 additions & 0 deletions english_diary/english_diary/static/css/wordcloud.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.wordcloud-container {
display: inline-block;
position: relative;
width: 100%;
vertical-align: middle;
overflow: hidden;
}
7 changes: 4 additions & 3 deletions english_diary/english_diary/static/js/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ $( document ).ready(function() {
toastr.success('일기가 저장되었습니다.');
}
else {
alert("한글을 쓰시면 안되요!");
toastr.error("한글을 쓰시면 안되요!", "저장 실패");

}
},
error: function(error) {
Expand Down Expand Up @@ -77,7 +78,7 @@ $( document ).ready(function() {
if(findWord) {
// Check blank and special letters
if(special_pattern.test(findWord))
alert("특수문자는 입력할 수 없습니다.");
toastr.error("특수문자는 입력할 수 없습니다.");
else {
// Blank => "+"
findWord.replace(" ","+");
Expand All @@ -100,7 +101,7 @@ $( document ).ready(function() {
}
}
else {
alert("검색어를 입력하세요");
toastr.error("검색어를 입력하세요");
}
return false;
});
Expand Down
22 changes: 12 additions & 10 deletions english_diary/english_diary/static/js/mypage.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $( document ).ready(function() {

// Initialize radio button
var userEmailNotificationAPIUrl = "/api/user/email_notification/";

$.ajax({
type:"GET",
url: userEmailNotificationAPIUrl,
Expand All @@ -23,9 +23,9 @@ $( document ).ready(function() {
var userEmailAPIUrl = "/api/user/email/";
var newEmail = $("#new-email").val();
var data = {
new_email: newEmail,
new_email: newEmail,
};

$.ajax({
type:"PATCH",
data: data,
Expand All @@ -41,7 +41,7 @@ $( document ).ready(function() {
}
});

// Change Password
// Change Password
$('#change-password').click(function() {
if($("form")[1].checkValidity()) {
var userPasswordAPIUrl = "/api/user/password/";
Expand All @@ -54,7 +54,7 @@ $( document ).ready(function() {
new_password: newPassword,
confirm_new_password: confirmNewPassword,
};

$.ajax({
type:"PATCH",
data: data,
Expand All @@ -66,7 +66,7 @@ $( document ).ready(function() {
else {
if(!data.is_current_password_valid)
alertMessage += "현재 비밀번호가 맞지 않습니다. ";

if(!data.does_match_confirm_password)
alertMessage += "새 비밀번호가 일치하지 않습니다. ";
}
Expand All @@ -86,9 +86,9 @@ $( document ).ready(function() {
var email_notification = $(radioInputElement).val();
var userEmailNotificationAPIUrl= "/api/user/email_notification/";
var data = {
email_notification: email_notification,
email_notification: email_notification,
};

$.ajax({
type:"PATCH",
data: data,
Expand All @@ -103,10 +103,10 @@ $( document ).ready(function() {
return false;
});

// Delete User
// Delete User
$('#delete-user').click(function() {
var userDeleteAPIUrl= "/api/user/delete/";

if (confirm('정말 계정을 삭제하시겠습니까?')) {
$.ajax({
type:"DELETE",
Expand All @@ -121,4 +121,6 @@ $( document ).ready(function() {
}
return false;
});


});
Loading

0 comments on commit 8e29968

Please sign in to comment.