diff --git a/README.md b/README.md index 193b0c4..231cee4 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,6 @@ permissions: ["see_deleted_message"] ``` #### Fixes: -- delete -forum from forum name - Admin deleting other admins. - send public to common/public @@ -76,8 +75,8 @@ permissions: ["see_deleted_message"] - add ban button to user profile #### Fixes: -- BETTER SETUP PAGE -- better user.ejs +- BETTER SETUP PAGE: use setup everytime +- better user.ejs: https://github.com/mdbootstrap/bootstrap-profiles - add threads, messages etc. to extra folder - add category to threads - working reset button diff --git a/config.json.example b/config.json.example index 1fca741..b738ec6 100644 --- a/config.json.example +++ b/config.json.example @@ -3,8 +3,8 @@ "codename": "bootstrap_black", "language": "en" }, - "forum_name": "akf", - "description": "Akf-forum!", + "forum_name": "akf-forum", + "description": "Akf-forum offical site!", "limits": { "title": 128, "message": 1024, diff --git a/src/routes/register.js b/src/routes/register.js index 29995c9..525928d 100644 --- a/src/routes/register.js +++ b/src/routes/register.js @@ -43,7 +43,7 @@ app.post("/", RL(24 * 60 * 60_000, 5), async (req, res) => { to: email, subject: name + ", please verify your email", html: ` - <h1>Verify your email in ${forum_name}-forum</h1> + <h1>Verify your email in ${forum_name}</h1> <a href="${host}/auth/email?code=${user.email_code}">Click here to verify your email</a> ` }, (err) => { diff --git a/src/themes/bootstrap_black/views/extra/meta.ejs b/src/themes/bootstrap_black/views/extra/meta.ejs index f639d2f..dc77660 100644 --- a/src/themes/bootstrap_black/views/extra/meta.ejs +++ b/src/themes/bootstrap_black/views/extra/meta.ejs @@ -1,7 +1,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title><%= title || dataset.forum_name +"-forum" %></title> + <title><%= title || dataset.forum_name %></title> <meta name="description" content="<%= dataset.description %>"> <link rel="icon" type="image/x-icon" href="/favicon.ico"> <link href="/themes/bootstrap_black/bootstrap-night.min.css" rel="stylesheet"> diff --git a/src/themes/bootstrap_black/views/extra/navbar.ejs b/src/themes/bootstrap_black/views/extra/navbar.ejs index 085ee49..cb1af6d 100644 --- a/src/themes/bootstrap_black/views/extra/navbar.ejs +++ b/src/themes/bootstrap_black/views/extra/navbar.ejs @@ -11,7 +11,7 @@ <span class="navbar-toggler-icon"></span> </button> - <a class="navbar-brand" href="/"><%= dataset.forum_name.toUpperCase() %><span>-FORUM</span></a> + <a class="navbar-brand" href="/"><%= dataset.forum_name.toUpperCase() %></a> <div class="collapse navbar-collapse" id="navbarText"> <ul class="navbar-nav me-auto mb-2 mb-lg-0"> diff --git a/src/themes/bootstrap_black/views/index.ejs b/src/themes/bootstrap_black/views/index.ejs index 2bd4347..7a8c00b 100644 --- a/src/themes/bootstrap_black/views/index.ejs +++ b/src/themes/bootstrap_black/views/index.ejs @@ -1,7 +1,7 @@ <!DOCTYPE html> <html lang="en"> -<%- include("extra/meta", {title: "Welcome to the "+dataset.forum_name+"-forum!" }) %> +<%- include("extra/meta", {title: "Welcome to the " + dataset.forum_name }) %> <body> diff --git a/src/themes/common/views/extra/navbar.ejs b/src/themes/common/views/extra/navbar.ejs index 602c135..f9b060c 100644 --- a/src/themes/common/views/extra/navbar.ejs +++ b/src/themes/common/views/extra/navbar.ejs @@ -5,7 +5,7 @@ <% } %> <div class="header"> - <a class="logo" href="/"><%= dataset.forum_name.toUpperCase() %> <span>FORUM</span></a> + <a class="logo" href="/"><%= dataset.forum_name.toUpperCase() %></a> <div class="buttons"> <% if (user){ %> diff --git a/src/themes/common/views/index.ejs b/src/themes/common/views/index.ejs index 23fcef7..29877a2 100644 --- a/src/themes/common/views/index.ejs +++ b/src/themes/common/views/index.ejs @@ -1,7 +1,7 @@ <!DOCTYPE html> <html lang="en"> -<%- include(dataset.getFile(dataset.theme.codename +"/views/extra/meta"), {title: "Welcome to the "+dataset.forum_name+"-forum!" }) %> +<%- include(dataset.getFile(dataset.theme.codename +"/views/extra/meta"), {title: "Welcome to the "+dataset.forum_name }) %> <body> diff --git a/src/themes/common/views/setup.ejs b/src/themes/common/views/setup.ejs index c3cfa62..ae93f78 100644 --- a/src/themes/common/views/setup.ejs +++ b/src/themes/common/views/setup.ejs @@ -11,15 +11,14 @@ <h1 style="color: var(--main);">Setup</h1> <h2 style="color: var(--second);">There is default settings for akf-forum, you not need to edit them, but you can! And, the first registered user will be admin.</h2> <form class="search" method="POST"> - Forum name: - <input class="input" type="text" name="forum_name" value="akf" required> + <input class="input" type="text" name="forum_name" value="akf-forum" required> Forum description: <input class="input" type="text" name="description" value="Akf-forum!" required> Default state for new threads, change with "APPROVAL" for approval system: <input class="input" type="text" name="default_thread_state" value="OPEN" required> Default state for new users, change with "APPROVAL" for approval system: - <input class="input" type="text" name="default_thread_state" value="ACTIVE" required> + <input class="input" type="text" name="default_user_state" value="ACTIVE" required> Domain of the forum, defaulty setted: <input class="input" type="text" name="host" id="domain" value="Akf-forum!" required> diff --git a/src/themes/default_black/views/extra/meta.ejs b/src/themes/default_black/views/extra/meta.ejs index 6fd6a72..cf08a44 100644 --- a/src/themes/default_black/views/extra/meta.ejs +++ b/src/themes/default_black/views/extra/meta.ejs @@ -1,7 +1,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title><%= title || dataset.forum_name +"-forum" %></title> + <title><%= title || dataset.forum_name %></title> <meta name="description" content="<%= dataset.description %>"> <link rel="icon" type="image/x-icon" href="/favicon.ico"> <link rel="stylesheet" href="/themes/default_black/main.css" /> diff --git a/src/themes/default_white/views/extra/meta.ejs b/src/themes/default_white/views/extra/meta.ejs index bc03afc..3163020 100644 --- a/src/themes/default_white/views/extra/meta.ejs +++ b/src/themes/default_white/views/extra/meta.ejs @@ -1,7 +1,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title><%= title || dataset.forum_name +"-forum" %></title> + <title><%= title || dataset.forum_name %></title> <meta name="description" content="<%= dataset.description %>"> <link rel="icon" type="image/x-icon" href="/favicon.ico"> <link rel="stylesheet" href="/themes/default_white/main.css" /> diff --git a/src/themes/xenforo/views/error.ejs b/src/themes/xenforo/views/error.ejs index a6f45b6..49614b9 100644 --- a/src/themes/xenforo/views/error.ejs +++ b/src/themes/xenforo/views/error.ejs @@ -1,6 +1,6 @@ <!DOCTYPE html> <html id="XF" lang="tr-TR" dir="LTR" data-app="public" data-template="forum_list" data-container-key data-content-key data-logged-in="true" data-cookie-prefix="xf_" data-csrf="1685091272,f052c88e4c4aa12fbe73a08e269625fa" class="has-no-js v_2_0 template-forum_list"> -<%- include("extra/meta", {title: "Welcome to the "+dataset.forum_name+"-forum!" }) %> +<%- include("extra/meta", {title: "Error" }) %> <body data-template="forum_list"> <div class="p-pageWrapper" id="top"> diff --git a/src/themes/xenforo/views/extra/meta.ejs b/src/themes/xenforo/views/extra/meta.ejs index 9173045..e052915 100644 --- a/src/themes/xenforo/views/extra/meta.ejs +++ b/src/themes/xenforo/views/extra/meta.ejs @@ -2,14 +2,14 @@ <meta charset="utf-8" /> <meta http-equiv="X-UA-Compatible" content="IE=Edge" /> <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover"> - <title><%= title || dataset.forum_name +"-forum" %></title> + <title><%= title || dataset.forum_name %></title> <meta name="theme-color" content="#1e1e1e" /> <meta name="apple-mobile-web-app-title" content="Silicone"> - <link rel="alternate" type="application/rss+xml" title="RSS feed for <%= title || dataset.forum_name +"-forum" %>" href="/bolum/-/index.rss" /> - <meta property="og:site_name" content="<%= title || dataset.forum_name +"-forum" %>" /> + <link rel="alternate" type="application/rss+xml" title="RSS feed for <%= title || dataset.forum_name %>" href="/bolum/-/index.rss" /> + <meta property="og:site_name" content="<%= title || dataset.forum_name %>" /> <meta property="og:type" content="website" /> - <meta property="og:title" content="<%= title || dataset.forum_name +"-forum" %>" /> - <meta property="twitter:title" content="<%= title || dataset.forum_name +"-forum" %>" /> + <meta property="og:title" content="<%= title || dataset.forum_name %>" /> + <meta property="twitter:title" content="<%= title || dataset.forum_name %>" /> <meta name="description" content="<%= dataset.description %>"> <link rel="icon" type="image/x-icon" href="/favicon.ico"> <meta property="og:description" content="<%= dataset.description %>" /> diff --git a/src/themes/xenforo/views/extra/navbar.ejs b/src/themes/xenforo/views/extra/navbar.ejs index 2572830..6e0634e 100644 --- a/src/themes/xenforo/views/extra/navbar.ejs +++ b/src/themes/xenforo/views/extra/navbar.ejs @@ -1,7 +1,7 @@ <header class="p-header" id="header"> <div class="p-header-inner"> <div class="p-header-content"> - <a style="font-size: 40px;" href="/"><%= dataset.forum_name.toUpperCase() %><span>-FORUM</span></a> + <a style="font-size: 40px;" href="/"><%= dataset.forum_name.toUpperCase() %></a> </div> </div> </header> diff --git a/src/themes/xenforo/views/index.ejs b/src/themes/xenforo/views/index.ejs index cd7be79..018274d 100644 --- a/src/themes/xenforo/views/index.ejs +++ b/src/themes/xenforo/views/index.ejs @@ -12,7 +12,7 @@ <div class="p-body-inner"> <div class="p-body-header"> <div class="p-title "> - <h1 class="p-title-value"><%=dataset.forum_name%>-forum</h1> + <h1 class="p-title-value"><%=dataset.forum_name%></h1> <div class="p-title-pageAction"> <a href="/threads/create" class="button--cta button button--icon button--icon--write" data-xf-click="overlay" rel="nofollow"><span class="button-text"> Create Thread diff --git a/src/themes/xenforo/views/thread.ejs b/src/themes/xenforo/views/thread.ejs index c0a096a..9a9652b 100644 --- a/src/themes/xenforo/views/thread.ejs +++ b/src/themes/xenforo/views/thread.ejs @@ -1,6 +1,6 @@ <!DOCTYPE html> <html id="XF" lang="tr-TR" dir="LTR" data-app="public" data-template="forum_list" data-container-key data-content-key data-logged-in="true" data-cookie-prefix="xf_" data-csrf="1685091272,f052c88e4c4aa12fbe73a08e269625fa" class="has-no-js v_2_0 template-forum_list"> -<%- include("extra/meta", {title: "Welcome to the "+dataset.forum_name+"-forum!" }) %> +<%- include("extra/meta", {title: "Welcome to the " + dataset.forum_name }) %> <body data-template="forum_list"> <div class="p-pageWrapper" id="top">