diff --git a/handler/auth/google/setup/setup.go b/handler/auth/google/setup/setup.go index 4eace7f..8243f6b 100644 --- a/handler/auth/google/setup/setup.go +++ b/handler/auth/google/setup/setup.go @@ -61,7 +61,7 @@ func GET(w http.ResponseWriter, r *http.Request) { http.Redirect(w, r, "/signup", http.StatusSeeOther) return } - component := authView.GoogleSetup("Setup page", types.Message{ + component := authView.GoogleSetup("Filekeeper - Setup Page", types.Message{ Code: 3, Message: "", }) @@ -91,7 +91,7 @@ func POST(w http.ResponseWriter, r *http.Request) { isValid := utils.ValidatePassword(password) if !isValid { - component := authView.GoogleSetup("Setup page", types.Message{ + component := authView.GoogleSetup("Filekeeper - Setup Page", types.Message{ Code: 0, Message: "Password is invalid", }) @@ -115,7 +115,7 @@ func POST(w http.ResponseWriter, r *http.Request) { err = db.DB.CreateUser(&newUser) if err != nil { - component := signupView.Main("Sign up Page", types.Message{ + component := signupView.Main("Filekeeper - Sign up Page", types.Message{ Code: 0, Message: "Email or Username has been registered", }) diff --git a/handler/download/download.go b/handler/download/download.go index b41fc4d..ba353a1 100644 --- a/handler/download/download.go +++ b/handler/download/download.go @@ -34,7 +34,7 @@ func GET(w http.ResponseWriter, r *http.Request) { }) } - component := downloadView.Main("Download Page", filesData) + component := downloadView.Main("Filekeeper - Download Page", filesData) err = component.Render(r.Context(), w) if err != nil { w.WriteHeader(http.StatusInternalServerError) diff --git a/handler/forgotPassword/forgotPassword.go b/handler/forgotPassword/forgotPassword.go index 4db9dec..d5c9df9 100644 --- a/handler/forgotPassword/forgotPassword.go +++ b/handler/forgotPassword/forgotPassword.go @@ -65,7 +65,7 @@ func init() { } func GET(w http.ResponseWriter, r *http.Request) { - component := forgotPasswordView.Main("Forgot Password Page", types.Message{ + component := forgotPasswordView.Main("Filekeeper - Forgot Password Page", types.Message{ Code: 3, Message: "", }) @@ -89,9 +89,9 @@ func POST(w http.ResponseWriter, r *http.Request) { user, err := cache.GetUser(emailForm) if errors.Is(err, gorm.ErrRecordNotFound) { - component := forgotPasswordView.Main(fmt.Sprintf("Account with this email address %s is not found", emailForm), types.Message{ + component := forgotPasswordView.Main("Filekeeper - Forgot Password Page", types.Message{ Code: 0, - Message: "", + Message: "Unexpected error has occurred", }) err := component.Render(r.Context(), w) if err != nil { @@ -116,7 +116,7 @@ func POST(w http.ResponseWriter, r *http.Request) { return } - component := forgotPasswordView.EmailSend("Forgot Password Page") + component := forgotPasswordView.EmailSend("Filekeeper - Forgot Password Page") err = component.Render(r.Context(), w) if err != nil { w.WriteHeader(http.StatusInternalServerError) diff --git a/handler/forgotPassword/verify/verify.go b/handler/forgotPassword/verify/verify.go index 223dab2..b1c7dbc 100644 --- a/handler/forgotPassword/verify/verify.go +++ b/handler/forgotPassword/verify/verify.go @@ -33,7 +33,7 @@ func GET(w http.ResponseWriter, r *http.Request) { return } - component := forgotPasswordView.NewPasswordForm("Forgot Password Page", types.Message{ + component := forgotPasswordView.NewPasswordForm("Filekeeper - Forgot Password Page", types.Message{ Code: 3, Message: "", }) @@ -66,7 +66,7 @@ func POST(w http.ResponseWriter, r *http.Request) { password := r.Form.Get("password") isValid := utils.ValidatePassword(password) if !isValid { - component := signupView.Main("Sign up Page", types.Message{ + component := signupView.Main("Filekeeper - Sign up Page", types.Message{ Code: 0, Message: "Password is invalid", }) @@ -100,7 +100,7 @@ func POST(w http.ResponseWriter, r *http.Request) { cache.DeleteUser(data.User.Email) - component := forgotPasswordView.ChangeSuccess("Forgot Password Page") + component := forgotPasswordView.ChangeSuccess("Filekeeper - Forgot Password Page") err = component.Render(r.Context(), w) if err != nil { w.WriteHeader(http.StatusInternalServerError) diff --git a/handler/index/index.go b/handler/index/index.go index 93157e8..59e07a3 100644 --- a/handler/index/index.go +++ b/handler/index/index.go @@ -16,7 +16,7 @@ func init() { func GET(w http.ResponseWriter, r *http.Request) { _, userSession, _ := session.GetSession(r) - component := indexView.Main("main page", userSession) + component := indexView.Main("Secure File Hosting - Filekeeper", userSession) err := component.Render(r.Context(), w) if err != nil { w.WriteHeader(http.StatusInternalServerError) diff --git a/handler/signin/signin.go b/handler/signin/signin.go index e6dde46..d779153 100644 --- a/handler/signin/signin.go +++ b/handler/signin/signin.go @@ -52,7 +52,7 @@ func GET(w http.ResponseWriter, r *http.Request) { Message: message, }) } else { - component = signinView.Main("Sign in Page", types.Message{ + component = signinView.Main("Filekeeper - Sign in Page", types.Message{ Code: 3, Message: "", }) @@ -77,7 +77,7 @@ func POST(w http.ResponseWriter, r *http.Request) { password := r.Form.Get("password") userData, err := cache.GetUser(email) if err != nil { - component := signinView.Main("Sign in Page", types.Message{ + component := signinView.Main("Filekeeper - Sign in Page", types.Message{ Code: 0, Message: "Incorrect Username or Password", }) @@ -128,7 +128,7 @@ func POST(w http.ResponseWriter, r *http.Request) { http.Redirect(w, r, cookie.Value, http.StatusSeeOther) return } - component := signinView.Main("Sign in Page", types.Message{ + component := signinView.Main("Filekeeper - Sign in Page", types.Message{ Code: 0, Message: "Incorrect Username or Password", }) diff --git a/handler/signup/signup.go b/handler/signup/signup.go index 6400fb5..976bed6 100644 --- a/handler/signup/signup.go +++ b/handler/signup/signup.go @@ -64,7 +64,7 @@ func init() { } func GET(w http.ResponseWriter, r *http.Request) { - component := signupView.Main("Sign up Page", types.Message{ + component := signupView.Main("Filekeeper - Sign up Page", types.Message{ Code: 3, Message: "", }) @@ -88,7 +88,7 @@ func POST(w http.ResponseWriter, r *http.Request) { password := r.Form.Get("password") isValid := utils.ValidatePassword(password) if !isValid { - component := signupView.Main("Sign up Page", types.Message{ + component := signupView.Main("Filekeeper - Sign up Page", types.Message{ Code: 0, Message: "Password is invalid", }) @@ -110,7 +110,7 @@ func POST(w http.ResponseWriter, r *http.Request) { } if registered := db.DB.IsUserRegistered(userEmail, username); registered { - component := signupView.Main("Sign up Page", types.Message{ + component := signupView.Main("Filekeeper - Sign up Page", types.Message{ Code: 0, Message: "Email or Username has been registered", }) @@ -130,7 +130,7 @@ func POST(w http.ResponseWriter, r *http.Request) { return } - component := signupView.EmailSend("Sign up Page") + component := signupView.EmailSend("Filekeeper - Sign up Page") err = component.Render(r.Context(), w) if err != nil { w.WriteHeader(http.StatusInternalServerError) diff --git a/handler/signup/verify/verify.go b/handler/signup/verify/verify.go index a735b20..13f759c 100644 --- a/handler/signup/verify/verify.go +++ b/handler/signup/verify/verify.go @@ -27,7 +27,7 @@ func GET(w http.ResponseWriter, r *http.Request) { err := db.DB.CreateUser(data.User) if err != nil { - component := signupView.Main("Sign up Page", types.Message{ + component := signupView.Main("Filekeeper - Sign up Page", types.Message{ Code: 0, Message: "Email or Username has been registered", }) @@ -43,7 +43,7 @@ func GET(w http.ResponseWriter, r *http.Request) { delete(signupHandler.VerifyUser, code) delete(signupHandler.VerifyEmail, data.User.Email) - component := signupView.VerifySuccess("Verify page") + component := signupView.VerifySuccess("Filekeeper - Verify Page") err = component.Render(r.Context(), w) if err != nil { diff --git a/handler/upload/upload.go b/handler/upload/upload.go index 569fe4c..a27f3fb 100644 --- a/handler/upload/upload.go +++ b/handler/upload/upload.go @@ -19,7 +19,7 @@ func init() { } func GET(w http.ResponseWriter, r *http.Request) { - component := filesView.Main("upload page") + component := filesView.Main("Filekeeper - Upload") if err := component.Render(r.Context(), w); err != nil { w.WriteHeader(http.StatusInternalServerError) return diff --git a/handler/user/user.go b/handler/user/user.go index daa58dc..1abe5f7 100644 --- a/handler/user/user.go +++ b/handler/user/user.go @@ -17,7 +17,7 @@ func init() { func GET(w http.ResponseWriter, r *http.Request) { userSession := r.Context().Value("user").(types.User) - component := userView.Main("User Page", userSession, session.GetSessions(userSession.Email)) + component := userView.Main("Filekeeper - User Page", userSession, session.GetSessions(userSession.Email)) err := component.Render(r.Context(), w) if err != nil { w.WriteHeader(http.StatusInternalServerError) diff --git a/view/error/error.templ b/view/error/error.templ index 82039e6..6bf5868 100644 --- a/view/error/error.templ +++ b/view/error/error.templ @@ -38,7 +38,7 @@ templ InternalServerError(title string){ @layout.Base(title){
- brand image + Cute Icon

Oops! Something went wrong.

diff --git a/view/index/index.templ b/view/index/index.templ index c5b3e47..5de6c4b 100644 --- a/view/index/index.templ +++ b/view/index/index.templ @@ -10,7 +10,7 @@ templ content(title string, user types.User) {

@layout.Navbar(user)
-

Your files, always within reach.

+

Your files, always within reach

Store, access, and share your files from anywhere. We offer secure and reliable file storage, so you can focus on what matters most. diff --git a/view/layout/base.templ b/view/layout/base.templ index 2557d27..6dabc6e 100644 --- a/view/layout/base.templ +++ b/view/layout/base.templ @@ -8,7 +8,7 @@ templ Base(title string){ - + @@ -24,7 +24,7 @@ templ Navbar(user types.User) {

- brand image + Filekeeper Logo Filekeeper
@@ -85,7 +85,7 @@ templ Footer() {