feat: implement email validation, CI/CD pipeline, migration history, and web templates
Email validation: - Replace @/. check with net/mail.ParseAddress on register - Add size limit check (max 254 chars, RFC 5321) CI/CD Pipeline: - Add .gitea/workflows/ci.yml (lint → test → build → docker push) - Registry: gitea.mrixs.me/Mrixs/MrixsCraft-server - Push only on main branch Database: - Add migrations/002_migration_history.sql (tracking applied migrations) - Add migrations/README.md (manual apply instructions) Web Templates: - Add base.html with Minecraft-themed layout (dark + green accent) - Add index.html, login.html, register.html with POST forms - Rewrite templates.go for data-driven rendering with pageData struct - Fallback placeholder preserved when templates dir missing
This commit is contained in:
103
internal/templates/html/base.html
Normal file
103
internal/templates/html/base.html
Normal file
@@ -0,0 +1,103 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>{{.Title}} — MrixsCraft</title>
|
||||
<style>
|
||||
:root {
|
||||
--bg: #1a1a2e;
|
||||
--surface: #16213e;
|
||||
--accent: #4ade80;
|
||||
--accent-hover: #22c55e;
|
||||
--text: #e2e8f0;
|
||||
--text-muted: #94a3b8;
|
||||
--error: #f87171;
|
||||
--border: #334155;
|
||||
}
|
||||
*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body {
|
||||
font-family: system-ui, -apple-system, sans-serif;
|
||||
background: var(--bg);
|
||||
color: var(--text);
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
a { color: var(--accent); text-decoration: none; }
|
||||
a:hover { text-decoration: underline; }
|
||||
header {
|
||||
background: var(--surface);
|
||||
border-bottom: 1px solid var(--border);
|
||||
padding: 0.75rem 0;
|
||||
}
|
||||
header .container {
|
||||
max-width: 960px;
|
||||
margin: 0 auto;
|
||||
padding: 0 1rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
header .logo { font-size: 1.25rem; font-weight: 700; color: var(--accent); }
|
||||
header nav a { margin-left: 1rem; font-size: 0.9rem; }
|
||||
main { flex: 1; padding: 2rem 1rem; }
|
||||
.container { max-width: 960px; margin: 0 auto; }
|
||||
h1, h2 { margin-bottom: 1rem; }
|
||||
p { margin-bottom: 0.75rem; color: var(--text-muted); line-height: 1.6; }
|
||||
form { max-width: 360px; }
|
||||
label { display: block; margin-bottom: 0.25rem; font-size: 0.85rem; color: var(--text-muted); }
|
||||
input[type="text"], input[type="email"], input[type="password"] {
|
||||
width: 100%;
|
||||
padding: 0.6rem 0.75rem;
|
||||
margin-bottom: 1rem;
|
||||
background: var(--surface);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 6px;
|
||||
color: var(--text);
|
||||
font-size: 1rem;
|
||||
}
|
||||
input:focus { outline: none; border-color: var(--accent); }
|
||||
.btn {
|
||||
display: inline-block;
|
||||
background: var(--accent);
|
||||
color: #000;
|
||||
border: none;
|
||||
padding: 0.7rem 1.5rem;
|
||||
border-radius: 6px;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
}
|
||||
.btn:hover { background: var(--accent-hover); text-decoration: none; }
|
||||
.card {
|
||||
background: var(--surface);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
padding: 2rem;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
footer {
|
||||
text-align: center;
|
||||
padding: 1rem;
|
||||
color: var(--text-muted);
|
||||
font-size: 0.8rem;
|
||||
border-top: 1px solid var(--border);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<div class="container">
|
||||
<span class="logo">MrixsCraft</span>
|
||||
<nav>
|
||||
<a href="/">Главная</a>
|
||||
<a href="/login">Вход</a>
|
||||
<a href="/register">Регистрация</a>
|
||||
</nav>
|
||||
</div>
|
||||
</header>
|
||||
<main><div class="container">{{template "content" .}}</div></main>
|
||||
<footer>MrixsCraft Server © 2026</footer>
|
||||
</body>
|
||||
</html>
|
||||
17
internal/templates/html/index.html
Normal file
17
internal/templates/html/index.html
Normal file
@@ -0,0 +1,17 @@
|
||||
{{define "content"}}
|
||||
<div class="card">
|
||||
<h1>Добро пожаловать в MrixsCraft</h1>
|
||||
<p>Приватный Minecraft-сервер с модпаками. Зарегистрируйся, скачай лаунчер и играй.</p>
|
||||
<p>
|
||||
<a href="/register" class="btn">Начать играть</a>
|
||||
</p>
|
||||
</div>
|
||||
<div class="card">
|
||||
<h2>Как начать</h2>
|
||||
<ol style="margin-left: 1.25rem; color: var(--text-muted); line-height: 1.8;">
|
||||
<li>Зарегистрируйся на сайте</li>
|
||||
<li>Скачай лаунчер для своей ОС</li>
|
||||
<li>Авторизуйся, выбирай модпак и нажимай PLAY</li>
|
||||
</ol>
|
||||
</div>
|
||||
{{end}}
|
||||
42
internal/templates/html/login.html
Normal file
42
internal/templates/html/login.html
Normal file
@@ -0,0 +1,42 @@
|
||||
{{define "content"}}
|
||||
<div class="card">
|
||||
<h1>Вход</h1>
|
||||
<form id="loginForm">
|
||||
<label for="username">Логин или Email</label>
|
||||
<input type="text" id="username" name="username" required autocomplete="username">
|
||||
|
||||
<label for="password">Пароль</label>
|
||||
<input type="password" id="password" name="password" required autocomplete="current-password">
|
||||
|
||||
<button type="submit" class="btn">Войти</button>
|
||||
</form>
|
||||
<p id="error" style="color: var(--error); margin-top: 0.75rem; display: none;"></p>
|
||||
<p style="margin-top: 1rem;">Нет аккаунта? <a href="/register">Зарегистрироваться</a></p>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
document.getElementById('loginForm').addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
const form = new FormData(e.target);
|
||||
const res = await fetch('/api/web/login', {
|
||||
method: 'POST',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({
|
||||
username: form.get('username'),
|
||||
password: form.get('password')
|
||||
})
|
||||
});
|
||||
const data = await res.json();
|
||||
if (!res.ok) {
|
||||
document.getElementById('error').textContent = data.error || 'Ошибка входа';
|
||||
document.getElementById('error').style.display = 'block';
|
||||
return;
|
||||
}
|
||||
// Save token to localStorage and redirect.
|
||||
localStorage.setItem('token', data.token);
|
||||
localStorage.setItem('uuid', data.uuid);
|
||||
localStorage.setItem('username', data.username);
|
||||
window.location.href = '/';
|
||||
});
|
||||
</script>
|
||||
{{end}}
|
||||
43
internal/templates/html/register.html
Normal file
43
internal/templates/html/register.html
Normal file
@@ -0,0 +1,43 @@
|
||||
{{define "content"}}
|
||||
<div class="card">
|
||||
<h1>Регистрация</h1>
|
||||
<form id="regForm">
|
||||
<label for="username">Никнейм</label>
|
||||
<input type="text" id="username" name="username" required minlength="3" maxlength="20" autocomplete="username">
|
||||
|
||||
<label for="email">Email</label>
|
||||
<input type="email" id="email" name="email" required autocomplete="email">
|
||||
|
||||
<label for="password">Пароль</label>
|
||||
<input type="password" id="password" name="password" required minlength="6" autocomplete="new-password">
|
||||
|
||||
<button type="submit" class="btn">Создать аккаунт</button>
|
||||
</form>
|
||||
<p id="error" style="color: var(--error); margin-top: 0.75rem; display: none;"></p>
|
||||
<p style="margin-top: 1rem;">Уже есть аккаунт? <a href="/login">Войти</a></p>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
document.getElementById('regForm').addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
const form = new FormData(e.target);
|
||||
const res = await fetch('/api/web/register', {
|
||||
method: 'POST',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({
|
||||
username: form.get('username'),
|
||||
email: form.get('email'),
|
||||
password: form.get('password')
|
||||
})
|
||||
});
|
||||
const data = await res.json();
|
||||
if (!res.ok) {
|
||||
document.getElementById('error').textContent = data.error || 'Ошибка регистрации';
|
||||
document.getElementById('error').style.display = 'block';
|
||||
return;
|
||||
}
|
||||
// Registration successful — go to login.
|
||||
window.location.href = '/login';
|
||||
});
|
||||
</script>
|
||||
{{end}}
|
||||
Reference in New Issue
Block a user