diff --git a/.project b/.project index 1fb066d..94ff2e0 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - leanote-leanote + leanote-public leanote, your own cloud note! diff --git a/app/routes/routes.go b/app/routes/routes.go index 315e5ab..8bd4db2 100644 --- a/app/routes/routes.go +++ b/app/routes/routes.go @@ -75,82 +75,241 @@ func (_ tStatic) ServeModule( } -type tFile struct {} -var File tFile +type tAuth struct {} +var Auth tAuth -func (_ tFile) UploadImage( - renderHtml string, +func (_ tAuth) Login( + email string, ) string { args := make(map[string]string) - revel.Unbind(args, "renderHtml", renderHtml) - return revel.MainRouter.Reverse("File.UploadImage", args).Url + revel.Unbind(args, "email", email) + return revel.MainRouter.Reverse("Auth.Login", args).Url } -func (_ tFile) UploadBlogLogo( +func (_ tAuth) DoLogin( + email string, + pwd string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("File.UploadBlogLogo", args).Url + revel.Unbind(args, "email", email) + revel.Unbind(args, "pwd", pwd) + return revel.MainRouter.Reverse("Auth.DoLogin", args).Url } -func (_ tFile) UploadImageJson( - renderHtml string, +func (_ tAuth) Logout( ) string { args := make(map[string]string) - revel.Unbind(args, "renderHtml", renderHtml) - return revel.MainRouter.Reverse("File.UploadImageJson", args).Url + return revel.MainRouter.Reverse("Auth.Logout", args).Url } - -type tNotebook struct {} -var Notebook tNotebook - - -func (_ tNotebook) Index( - notebook interface{}, - i int, - name string, +func (_ tAuth) Demo( ) string { args := make(map[string]string) - revel.Unbind(args, "notebook", notebook) - revel.Unbind(args, "i", i) - revel.Unbind(args, "name", name) - return revel.MainRouter.Reverse("Notebook.Index", args).Url + return revel.MainRouter.Reverse("Auth.Demo", args).Url } -func (_ tNotebook) DeleteNotebook( +func (_ tAuth) Register( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Auth.Register", args).Url +} + +func (_ tAuth) DoRegister( + email string, + pwd string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "email", email) + revel.Unbind(args, "pwd", pwd) + return revel.MainRouter.Reverse("Auth.DoRegister", args).Url +} + +func (_ tAuth) FindPassword( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Auth.FindPassword", args).Url +} + +func (_ tAuth) DoFindPassword( + email string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "email", email) + return revel.MainRouter.Reverse("Auth.DoFindPassword", args).Url +} + +func (_ tAuth) FindPassword2( + token string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "token", token) + return revel.MainRouter.Reverse("Auth.FindPassword2", args).Url +} + +func (_ tAuth) FindPasswordUpdate( + token string, + pwd string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "token", token) + revel.Unbind(args, "pwd", pwd) + return revel.MainRouter.Reverse("Auth.FindPasswordUpdate", args).Url +} + + +type tBlog struct {} +var Blog tBlog + + +func (_ tBlog) SetNote2Blog( + noteId string, + isBlog bool, + isTop bool, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "noteId", noteId) + revel.Unbind(args, "isBlog", isBlog) + revel.Unbind(args, "isTop", isTop) + return revel.MainRouter.Reverse("Blog.SetNote2Blog", args).Url +} + +func (_ tBlog) SetNotebook2Blog( notebookId string, + isBlog bool, ) string { args := make(map[string]string) revel.Unbind(args, "notebookId", notebookId) - return revel.MainRouter.Reverse("Notebook.DeleteNotebook", args).Url + revel.Unbind(args, "isBlog", isBlog) + return revel.MainRouter.Reverse("Blog.SetNotebook2Blog", args).Url } -func (_ tNotebook) AddNotebook( +func (_ tBlog) Index( + userId string, notebookId string, - title string, ) string { args := make(map[string]string) + revel.Unbind(args, "userId", userId) revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "title", title) - return revel.MainRouter.Reverse("Notebook.AddNotebook", args).Url + return revel.MainRouter.Reverse("Blog.Index", args).Url } -func (_ tNotebook) UpdateNotebookTitle( - notebookId string, - title string, +func (_ tBlog) View( + noteId string, ) string { args := make(map[string]string) - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "title", title) - return revel.MainRouter.Reverse("Notebook.UpdateNotebookTitle", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("Blog.View", args).Url +} + +func (_ tBlog) SearchBlog( + userId string, + key string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "userId", userId) + revel.Unbind(args, "key", key) + return revel.MainRouter.Reverse("Blog.SearchBlog", args).Url +} + +func (_ tBlog) Set( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Blog.Set", args).Url +} + +func (_ tBlog) SetUserBlogBase( + userBlog interface{}, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "userBlog", userBlog) + return revel.MainRouter.Reverse("Blog.SetUserBlogBase", args).Url +} + +func (_ tBlog) SetUserBlogComment( + userBlog interface{}, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "userBlog", userBlog) + return revel.MainRouter.Reverse("Blog.SetUserBlogComment", args).Url +} + +func (_ tBlog) SetUserBlogStyle( + userBlog interface{}, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "userBlog", userBlog) + return revel.MainRouter.Reverse("Blog.SetUserBlogStyle", args).Url +} + +func (_ tBlog) AboutMe( + userId string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "userId", userId) + return revel.MainRouter.Reverse("Blog.AboutMe", args).Url +} + + +type tIndex struct {} +var Index tIndex + + +func (_ tIndex) Index( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Index.Index", args).Url +} + +func (_ tIndex) Suggestion( + addr string, + suggestion string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "addr", addr) + revel.Unbind(args, "suggestion", suggestion) + return revel.MainRouter.Reverse("Index.Suggestion", args).Url +} + + +type tMobile struct {} +var Mobile tMobile + + +func (_ tMobile) Index( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Mobile.Index", args).Url +} + +func (_ tMobile) Logout( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("Mobile.Logout", args).Url } @@ -558,241 +717,82 @@ func (_ tUser) UpdateLeftIsMin( } -type tAuth struct {} -var Auth tAuth +type tFile struct {} +var File tFile -func (_ tAuth) Login( - email string, +func (_ tFile) UploadImage( + renderHtml string, ) string { args := make(map[string]string) - revel.Unbind(args, "email", email) - return revel.MainRouter.Reverse("Auth.Login", args).Url + revel.Unbind(args, "renderHtml", renderHtml) + return revel.MainRouter.Reverse("File.UploadImage", args).Url } -func (_ tAuth) DoLogin( - email string, - pwd string, +func (_ tFile) UploadBlogLogo( ) string { args := make(map[string]string) - revel.Unbind(args, "email", email) - revel.Unbind(args, "pwd", pwd) - return revel.MainRouter.Reverse("Auth.DoLogin", args).Url + return revel.MainRouter.Reverse("File.UploadBlogLogo", args).Url } -func (_ tAuth) Logout( +func (_ tFile) UploadImageJson( + renderHtml string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("Auth.Logout", args).Url + revel.Unbind(args, "renderHtml", renderHtml) + return revel.MainRouter.Reverse("File.UploadImageJson", args).Url } -func (_ tAuth) Demo( + +type tNotebook struct {} +var Notebook tNotebook + + +func (_ tNotebook) Index( + notebook interface{}, + i int, + name string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("Auth.Demo", args).Url + revel.Unbind(args, "notebook", notebook) + revel.Unbind(args, "i", i) + revel.Unbind(args, "name", name) + return revel.MainRouter.Reverse("Notebook.Index", args).Url } -func (_ tAuth) Register( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Auth.Register", args).Url -} - -func (_ tAuth) DoRegister( - email string, - pwd string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "email", email) - revel.Unbind(args, "pwd", pwd) - return revel.MainRouter.Reverse("Auth.DoRegister", args).Url -} - -func (_ tAuth) FindPassword( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Auth.FindPassword", args).Url -} - -func (_ tAuth) DoFindPassword( - email string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "email", email) - return revel.MainRouter.Reverse("Auth.DoFindPassword", args).Url -} - -func (_ tAuth) FindPassword2( - token string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "token", token) - return revel.MainRouter.Reverse("Auth.FindPassword2", args).Url -} - -func (_ tAuth) FindPasswordUpdate( - token string, - pwd string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "token", token) - revel.Unbind(args, "pwd", pwd) - return revel.MainRouter.Reverse("Auth.FindPasswordUpdate", args).Url -} - - -type tBlog struct {} -var Blog tBlog - - -func (_ tBlog) SetNote2Blog( - noteId string, - isBlog bool, - isTop bool, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - revel.Unbind(args, "isBlog", isBlog) - revel.Unbind(args, "isTop", isTop) - return revel.MainRouter.Reverse("Blog.SetNote2Blog", args).Url -} - -func (_ tBlog) SetNotebook2Blog( - notebookId string, - isBlog bool, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "isBlog", isBlog) - return revel.MainRouter.Reverse("Blog.SetNotebook2Blog", args).Url -} - -func (_ tBlog) Index( - userId string, +func (_ tNotebook) DeleteNotebook( notebookId string, ) string { args := make(map[string]string) - revel.Unbind(args, "userId", userId) revel.Unbind(args, "notebookId", notebookId) - return revel.MainRouter.Reverse("Blog.Index", args).Url + return revel.MainRouter.Reverse("Notebook.DeleteNotebook", args).Url } -func (_ tBlog) View( - noteId string, +func (_ tNotebook) AddNotebook( + notebookId string, + title string, ) string { args := make(map[string]string) - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("Blog.View", args).Url + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "title", title) + return revel.MainRouter.Reverse("Notebook.AddNotebook", args).Url } -func (_ tBlog) SearchBlog( - userId string, - key string, +func (_ tNotebook) UpdateNotebookTitle( + notebookId string, + title string, ) string { args := make(map[string]string) - revel.Unbind(args, "userId", userId) - revel.Unbind(args, "key", key) - return revel.MainRouter.Reverse("Blog.SearchBlog", args).Url -} - -func (_ tBlog) Set( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Blog.Set", args).Url -} - -func (_ tBlog) SetUserBlogBase( - userBlog interface{}, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "userBlog", userBlog) - return revel.MainRouter.Reverse("Blog.SetUserBlogBase", args).Url -} - -func (_ tBlog) SetUserBlogComment( - userBlog interface{}, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "userBlog", userBlog) - return revel.MainRouter.Reverse("Blog.SetUserBlogComment", args).Url -} - -func (_ tBlog) SetUserBlogStyle( - userBlog interface{}, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "userBlog", userBlog) - return revel.MainRouter.Reverse("Blog.SetUserBlogStyle", args).Url -} - -func (_ tBlog) AboutMe( - userId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "userId", userId) - return revel.MainRouter.Reverse("Blog.AboutMe", args).Url -} - - -type tIndex struct {} -var Index tIndex - - -func (_ tIndex) Index( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Index.Index", args).Url -} - -func (_ tIndex) Suggestion( - addr string, - suggestion string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "addr", addr) - revel.Unbind(args, "suggestion", suggestion) - return revel.MainRouter.Reverse("Index.Suggestion", args).Url -} - - -type tMobile struct {} -var Mobile tMobile - - -func (_ tMobile) Index( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Mobile.Index", args).Url -} - -func (_ tMobile) Logout( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Mobile.Logout", args).Url + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "title", title) + return revel.MainRouter.Reverse("Notebook.UpdateNotebookTitle", args).Url } diff --git a/app/tmp/main.go b/app/tmp/main.go index acf941e..a0ea4c0 100644 --- a/app/tmp/main.go +++ b/app/tmp/main.go @@ -102,27 +102,83 @@ func main() { }) - revel.RegisterController((*controllers.File)(nil), + revel.RegisterController((*controllers.Auth)(nil), []*revel.MethodType{ &revel.MethodType{ - Name: "UploadImage", + Name: "Login", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "renderHtml", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UploadBlogLogo", + Name: "DoLogin", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "Logout", Args: []*revel.MethodArg{ }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UploadImageJson", + Name: "Demo", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "renderHtml", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "Register", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "DoRegister", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "FindPassword", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "DoFindPassword", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "FindPassword2", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "FindPasswordUpdate", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -130,40 +186,128 @@ func main() { }) - revel.RegisterController((*controllers.Notebook)(nil), + revel.RegisterController((*controllers.Blog)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "SetNote2Blog", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) }, + &revel.MethodArg{Name: "isTop", Type: reflect.TypeOf((*bool)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "SetNotebook2Blog", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "Index", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "View", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "SearchBlog", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "key", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "Set", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "SetUserBlogBase", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogBase)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "SetUserBlogComment", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogComment)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "SetUserBlogStyle", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogStyle)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "AboutMe", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + + revel.RegisterController((*controllers.Index)(nil), []*revel.MethodType{ &revel.MethodType{ Name: "Index", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebook", Type: reflect.TypeOf((*info.Notebook)(nil)) }, - &revel.MethodArg{Name: "i", Type: reflect.TypeOf((*int)(nil)) }, - &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DeleteNotebook", + Name: "Suggestion", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "addr", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "suggestion", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + + revel.RegisterController((*controllers.Mobile)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "Index", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "AddNotebook", + Name: "Logout", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "UpdateNotebookTitle", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -516,83 +660,27 @@ func main() { }) - revel.RegisterController((*controllers.Auth)(nil), + revel.RegisterController((*controllers.File)(nil), []*revel.MethodType{ &revel.MethodType{ - Name: "Login", + Name: "UploadImage", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "renderHtml", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "DoLogin", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Logout", + Name: "UploadBlogLogo", Args: []*revel.MethodArg{ }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "Demo", + Name: "UploadImageJson", Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Register", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "DoRegister", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "FindPassword", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "DoFindPassword", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "FindPassword2", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "FindPasswordUpdate", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "renderHtml", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -600,128 +688,40 @@ func main() { }) - revel.RegisterController((*controllers.Blog)(nil), + revel.RegisterController((*controllers.Notebook)(nil), []*revel.MethodType{ - &revel.MethodType{ - Name: "SetNote2Blog", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) }, - &revel.MethodArg{Name: "isTop", Type: reflect.TypeOf((*bool)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "SetNotebook2Blog", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "isBlog", Type: reflect.TypeOf((*bool)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, &revel.MethodType{ Name: "Index", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebook", Type: reflect.TypeOf((*info.Notebook)(nil)) }, + &revel.MethodArg{Name: "i", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "DeleteNotebook", + Args: []*revel.MethodArg{ &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "View", + Name: "AddNotebook", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "SearchBlog", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "key", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Set", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "SetUserBlogBase", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogBase)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "SetUserBlogComment", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogComment)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "SetUserBlogStyle", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "userBlog", Type: reflect.TypeOf((*info.UserBlogStyle)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "AboutMe", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "userId", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - - revel.RegisterController((*controllers.Index)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "Index", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Suggestion", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "addr", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "suggestion", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - - revel.RegisterController((*controllers.Mobile)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "Index", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Logout", + Name: "UpdateNotebookTitle", Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, diff --git a/bin/leanote-mac b/bin/leanote-mac index 8f5e6ca..35cb3d6 100755 Binary files a/bin/leanote-mac and b/bin/leanote-mac differ diff --git a/public/css/blog/blog_daqi.less b/public/css/blog/blog_daqi.less index a99adab..0257ea4 100644 --- a/public/css/blog/blog_daqi.less +++ b/public/css/blog/blog_daqi.less @@ -79,7 +79,7 @@ a:hover { margin: auto; } #postsContainer { - background: #f5f5f5 url("../images/noise.png"); + background: #f5f5f5 url("../../images/noise.png"); padding-bottom: 5px; } diff --git a/public/css/blog/blog_default.less b/public/css/blog/blog_default.less index 9d2d2b3..014dc68 100644 --- a/public/css/blog/blog_default.less +++ b/public/css/blog/blog_default.less @@ -77,7 +77,7 @@ a:hover { margin: auto; } #postsContainer { - background: #f5f5f5 url("../images/noise.png"); + background: #f5f5f5 url("../../images/noise.png"); // margin-top: @headerHeight; padding-bottom: 5px; } diff --git a/public/css/blog/blog_default2.css b/public/css/blog/blog_default2.css deleted file mode 100644 index 1f1789f..0000000 --- a/public/css/blog/blog_default2.css +++ /dev/null @@ -1,197 +0,0 @@ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url('../../fonts/open-sans2/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff') format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url('../../fonts/open-sans2/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff') format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url('../../fonts/open-sans2/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff') format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../../fonts/open-sans2/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff') format('woff'); -} -/*"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Verdana, Simsun, "Segoe UI", "Segoe UI Web Regular", "Segoe UI Symbol", "BBAlpha Sans", "S60 Sans", Arial, sans-serif;*/ -::selection { - background: #000000; - color: #ffffff; -} -::-moz-selection { - background: #000000; - color: #ffffff; -} -::-webkit-selection { - background: #000000; - color: #ffffff; -} -*, -body { - font-family: 'Open Sans', '微软雅黑', Arial, Tahoma, sans-serif; - font-weight: 300; - font-size: 14px; -} -h1, -h2, -h3 { - font-family: 'Open Sans', '微软雅黑', Arial, Tahoma, sans-serif; - font-weight: 300 !important; -} -a { - cursor: pointer; -} -a:hover { - text-decoration: none !important; -} -#headerAndNav { - position: fixed; - left: 0; - top: 0; - bottom: 0; - width: 200px; - border-right: 1px solid #ebeff2; - text-align: right; -} -#headerContainer { - width: 190px; -} -#headerContainer { - background-color: #fff; -} -#postsContainer { - margin-left: 211px; -} -#postsContainer { - padding-bottom: 5px; -} -#postsContainer .container, -#footerContainer .container { - width: 800px; -} -#postsContainer .container { - margin-left: 12px; -} -/* header */ -#header { - color: #000000; - padding: 0 0 20px 0; - margin-top: 15px; -} -#header h1 { - margin: 0; - font-size: 32px; -} -#header h1 a { - color: #000000; - font-size: 32px; -} -#header h1 a img { - height: 40px; -} -#header #blogDesc { - margin-top: 10px; - padding-bottom: 10px; - border-bottom: 1px dashed #ebeff2; -} -.navbar { - margin-bottom: 0; - border-radius: 0; - border: none; -} -.navbar .container { - width: 200px; -} -.navbar-default { - background: none; - border-color: #e7e7e7; -} -.navbar-collapse { - padding-left: 0; - padding-right: 0; -} -.navbar-form { - padding: 0; -} -.navbar-nav { - float: none; -} -.navbar-nav > li { - float: none; -} -.navbar-default .navbar-nav > .active > a, -.navbar-default .navbar-nav > .active > a:hover, -.navbar-default .navbar-nav > .active > a:focus { - font-weight: bold; - background: none; -} -.navbar-nav > li > a { - padding-top: 10px; - padding-bottom: 10px; -} -/* posts */ -#posts { - width: 800px; -} -#posts .each-post { - border-bottom: 1px solid #ebeff2; - margin-bottom: 10px; - padding: 30px; - padding-top: 10px; -} -#posts .each-post .title { - font-size: 32px; - color: #0fb264; - padding: 0 0 15px 0; -} -#posts .each-post .title a { - font-size: 32px; - color: #0fb264; - padding: 0 0 15px 0; -} -#posts .each-post .created-time { - border-bottom: 1px dashed #eee; - padding-bottom: 3px; - margin-bottom: 5px; -} -#posts .each-post .more { - background: #0fb264; - padding: 9px 10px; - border-radius: 2px; - line-height: 1; - font-size: 13px; - display: inline-block; - text-transform: uppercase; - margin-top: 15px; - margin-bottom: 15px; - color: #fff; -} -#disqus_thread { - border-top: 1px solid #eee; - padding: 5px 0 0 0; -} -#search { - width: 170px; - padding-right: 15px; -} -#footerContainer { - background-color: #ffffff; - color: #666666; -} -#footerContainer #footer a { - color: #666666; -} -#footerContainer #footer ul { - list-style: none; - margin: 0; - padding-left: 20px; -} diff --git a/public/css/bootstrap.css b/public/css/bootstrap.css index 50d7892..bb87038 100644 --- a/public/css/bootstrap.css +++ b/public/css/bootstrap.css @@ -7,31 +7,6 @@ */ /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.woff') format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url('../fonts/OpenSans.woff') format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url('../fonts/OpenSans-Bold.woff') format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url('../fonts/OpenSans-Italic.woff') format('woff'); -} - article, aside, details, @@ -329,7 +304,7 @@ html { } body { - font-family: 'Open Sans', Arial, Tahoma, sans-serif, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: Arial, Tahoma, sans-serif, "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.428571429; color: #333333; @@ -505,7 +480,7 @@ h6, .h4, .h5, .h6 { -font-family: 'Open Sans', Arial, Tahoma, sans-serif, "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Arial,sans-serif; +font-family: Arial, Tahoma, sans-serif, "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue", Helvetica, "Microsoft Yahei", Arial,sans-serif; font-weight: 500; line-height: 1.1; color: inherit;