diff --git a/assets/css/style.css b/assets/css/style.css
index a1d8b028..611a9d98 100755
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -2,7 +2,7 @@
* @Author: prpr
* @Date: 2016-01-21 07:57:38
* @Last Modified by: prpr
-* @Last Modified time: 2016-01-21 12:49:17
+* @Last Modified time: 2016-01-21 18:20:11
*/
@font-face {
@@ -227,3 +227,27 @@ body {
background-size: cover;
}
}
+.pure-form {
+ margin: 10px auto;
+ width: 40%;
+}
+.pure-input {
+ margin: 10px 0;
+ width: 100%;
+}
+#keep-label {
+ float: left;
+}
+#login-button {
+ float: right;
+ margin: .5em 0;
+}
+#register-button {
+ margin: .5em 0;
+ width: 100%;
+ float: left;
+}
+#msg {
+ width: 40%;
+ margin: 3.5em auto 0;
+}
diff --git a/assets/js/ajax.js b/assets/js/ajax.js
deleted file mode 100755
index 37b63beb..00000000
--- a/assets/js/ajax.js
+++ /dev/null
@@ -1,94 +0,0 @@
-function checkForm(type, uname, passwd, passwd2) {
- if (type == "login") {
- if (uname === "") {
- showMsg("alert-warning", "Empty Username!");
- $("#uname").focus();
- return false;
- } else if (passwd === ""){
- showMsg("alert-warning", "Empty Password!");
- $("#passwd").focus();
- return false;
- } else {
- return true;
- }
- } else if (type == "register") {
- if (uname === "") {
- showMsg("alert-warning", "Empty Username!");
- $("#uname").focus();
- return false;
- } else if (passwd === ""){
- showMsg("alert-warning", "Empty Password!");
- $("#passwd").focus();
- return false;
- } else if (passwd2 === ""){
- showMsg("alert-warning", "Empty Comfirming Password!");
- $("#cpasswd").focus();
- return false;
- } else if (passwd != passwd2){
- showMsg("alert-warning", "Non-equal password comfirming!");
- $("#cpasswd").focus();
- return false;
- } else {
- return true;
- }
- }
-}
-// Login Button Click Event
-$("body").on("click", "#login", function(){
- var uname = $("#uname").val();
- var passwd = $("#passwd").val();
- if (checkForm("login", uname, passwd)) {
- $.ajax({
- type: "POST",
- url: "ajax.php?action=login",
- dataType: "json",
- data: {"uname":uname,"passwd":passwd},
- beforeSend: function() {
- showMsg("alert-info", "Logging in...");
- },
- success: function(json) {
- if (json.errno == 0) {
- docCookies.setItem("uname", uname, '/');
- docCookies.setItem("token", json.token, '/');
- if ($("#keep").prop("checked")) {
- docCookies.setItem("uname", uname, 604800, '/');
- // 设置长效 token （7天）
- docCookies.setItem("token", json.token, 604800, '/');
- }
- showMsg("alert-success", "Logging succeed!");
- window.setTimeout("window.location = './user/index.php'", 1000);
- } else {
- showMsg("alert-danger", json.msg);
- }
- }
- });
- }
-});
-
-// Register Button Click Event
-$("body").on("click", "#register", function(){
- var uname = $("#uname").val();
- var passwd = $("#passwd").val();
- if (checkForm("register", uname, passwd, $("#cpasswd").val())) {
-
- $.ajax({
- type: "POST",
- url: "ajax.php?action=register",
- dataType: "json",
- data: {"uname":uname, "passwd":passwd},
- beforeSend: function() {
- showMsg("alert-info", "Registering...");
- },
- success: function(json) {
- if (json.errno == 0) {
- showMsg("alert-success", json.msg);
- window.setTimeout("window.location = './index.php?action=login&msg=Successfully Registered, please log in.'", 1000);
- } else {
- showMsg("alert-danger", json.msg);
- }
- }
- });
-
-}});
-
-
diff --git a/assets/js/index.utils.js b/assets/js/index.utils.js
new file mode 100644
index 00000000..ec233551
--- /dev/null
+++ b/assets/js/index.utils.js
@@ -0,0 +1,110 @@
+/*
+* @Author: prpr
+* @Date: 2016-01-21 13:55:44
+* @Last Modified by: prpr
+* @Last Modified time: 2016-01-21 18:18:37
+*/
+
+'use strict';
+
+function showMsg(type, msg) {
+ $("[id=msg]").removeClass().addClass("alert").addClass(type).html(msg);
+}
+
+// Login Button Click Event
+$("body").on("click", "#login-button", function(){
+ var uname = $("#uname").val();
+ var passwd = $("#passwd").val();
+ if (checkForm("login", uname, passwd)) {
+ $.ajax({
+ type: "POST",
+ url: "ajax.php?action=login",
+ dataType: "json",
+ data: {"uname":uname,"passwd":passwd},
+ beforeSend: function() {
+ showMsg("alert-info", "Logging in...");
+ },
+ success: function(json) {
+ if (json.errno == 0) {
+ docCookies.setItem("uname", uname, '/');
+ docCookies.setItem("token", json.token, '/');
+ if ($("#keep").prop("checked")) {
+ docCookies.setItem("uname", uname, 604800, '/');
+ // 设置长效 token （7天）
+ docCookies.setItem("token", json.token, 604800, '/');
+ }
+ showMsg("alert-success", "Logging succeed!");
+ window.setTimeout("window.location = './user/index.php'", 1000);
+ } else {
+ showMsg("alert-danger", json.msg);
+ }
+ }
+ });
+ }
+});
+
+// Register Button Click Event
+$("body").on("click", "#register-button", function(){
+ var uname = $("#reg-uname").val();
+ var passwd = $("#reg-passwd").val();
+ if (checkForm("register", uname, passwd, $("#reg-passwd2").val())) {
+ $.ajax({
+ type: "POST",
+ url: "ajax.php?action=register",
+ dataType: "json",
+ data: {"uname":uname, "passwd":passwd},
+ beforeSend: function() {
+ showMsg("alert-info", "Registering...");
+ },
+ success: function(json) {
+ if (json.errno == 0) {
+ showMsg("alert-success", json.msg);
+ window.setTimeout("window.location = './index.php?action=login&msg=Successfully Registered, please log in.'", 1000);
+ } else {
+ showMsg("alert-danger", json.msg);
+ }
+ }
+ });
+ }
+});
+
+function checkForm(type, uname, passwd, passwd2) {
+ switch(type) {
+ case "login":
+ if (uname === "") {
+ showMsg("alert-warning", "Empty Username!");
+ $("#uname").focus();
+ return false;
+ } else if (passwd === ""){
+ showMsg("alert-warning", "Empty Password!");
+ $("#passwd").focus();
+ return false;
+ } else {
+ return true;
+ }
+ break;
+ case "register":
+ if (uname === "") {
+ showMsg("alert-warning", "Empty Username!");
+ $("#uname").focus();
+ return false;
+ } else if (passwd === ""){
+ showMsg("alert-warning", "Empty Password!");
+ $("#passwd").focus();
+ return false;
+ } else if (passwd2 === ""){
+ showMsg("alert-warning", "Empty Comfirming Password!");
+ $("#cpasswd").focus();
+ return false;
+ } else if (passwd != passwd2){
+ showMsg("alert-warning", "Non-equal password comfirming!");
+ $("#cpasswd").focus();
+ return false;
+ } else {
+ return true;
+ }
+ break;
+ default:
+ return false;
+ }
+}
diff --git a/assets/js/login_utils.js b/assets/js/login_utils.js
deleted file mode 100755
index e4399609..00000000
--- a/assets/js/login_utils.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Auto login
-// null
-
-$('body').css('height', document.documentElement.clientHeight);
-
-function showMsg(type, msg) {
- $("#msg").removeClass().addClass("alert").addClass(type).html(msg);
-}
-
-$("body").on("click", "#login-reg", function(){
- if ($("#login-reg").html() == 'Register') {
- $(".login-container").fadeOut(500);
- window.setTimeout("$('#login-reg').html('Login');changeForm(1)", 500);
- $(".login-container").fadeIn(500);
- } else {
- $(".login-container").fadeOut(500);
- window.setTimeout("$('#login-reg').html('Register');changeForm(0)", 500);
- $(".login-container").fadeIn(500);
- }
-});
-
-function changeForm(code){
- $("#msg").addClass("hide");
- if (code == 1) {
- $(".login-title").html('Register');
- $("#confirm-passwd").show();
- $(".login-group").html('');
- window.history.pushState(null, null, "./index.php?action=register");
- document.title = "Register - Blessing Skin Server 0.1";
- } else {
- $(".login-title").html('Login');
- $("#confirm-passwd").hide();
- $(".login-group").html(' Remember me
');
- window.history.pushState(null, null, "./index.php?action=login");
- document.title = "Login - Blessing Skin Server 0.1";
- }
-}
diff --git a/assets/js/user.utils.js b/assets/js/user.utils.js
new file mode 100644
index 00000000..8f3e6ed9
--- /dev/null
+++ b/assets/js/user.utils.js
@@ -0,0 +1,8 @@
+/*
+* @Author: prpr
+* @Date: 2016-01-21 13:56:40
+* @Last Modified by: prpr
+* @Last Modified time: 2016-01-21 13:56:42
+*/
+
+'use strict';
diff --git a/index.php b/index.php
index 3a09c4a7..9e1ac799 100755
--- a/index.php
+++ b/index.php
@@ -7,6 +7,8 @@
+
+
@@ -18,7 +20,7 @@
@@ -45,5 +47,38 @@
© Blessing Studio 2016
+
+
+
+
+
+
+
+
+