ab/web-petting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed styling. Added personal data consent
Build and Publish / Build and Publish Docker Image (push) Successful in 1m9s
Details

Browse Source
This commit is contained in:
Ultradesu
2026-05-11 12:52:41 +01:00
parent d1ef66acc1
commit d2d7d0b73f
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1 -1
View File
@@ -3255,7 +3255,7 @@ dependencies = [
[[package]] [[package]]
name = "web-petting" name = "web-petting"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"chrono", "chrono",
"cot", "cot",
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "web-petting" name = "web-petting"
version = "0.1.0" version = "0.1.2"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
src/i18n.rs
+10
View File
@@ -181,7 +181,9 @@ pub struct Translations {
pub landing_thank_you_back: &'static str, pub landing_thank_you_back: &'static str,
pub landing_guarantee: &'static str, pub landing_guarantee: &'static str,
pub landing_testimonials_title: &'static str, pub landing_testimonials_title: &'static str,
pub landing_form_consent: &'static str,
pub landing_footer_text: &'static str, pub landing_footer_text: &'static str,
pub landing_footer_copyright: &'static str,
// Testimonials admin // Testimonials admin
pub nav_testimonials: &'static str, pub nav_testimonials: &'static str,
@@ -442,7 +444,9 @@ static RU: Translations = Translations {
landing_thank_you_back: "Вернуться на главную", landing_thank_you_back: "Вернуться на главную",
landing_guarantee: "Порядочность, честность и строгое выполнение ваших требований гарантировано.", landing_guarantee: "Порядочность, честность и строгое выполнение ваших требований гарантировано.",
landing_testimonials_title: "Отзывы", landing_testimonials_title: "Отзывы",
landing_form_consent: "Я даю согласие на обработку персональных данных",
landing_footer_text: "Пет-ситтинг — забота о вашем питомце", landing_footer_text: "Пет-ситтинг — забота о вашем питомце",
landing_footer_copyright: "Все права защищены",
nav_testimonials: "Отзывы", nav_testimonials: "Отзывы",
testimonials_title: "Отзывы", testimonials_title: "Отзывы",
@@ -635,7 +639,9 @@ static EN: Translations = Translations {
landing_thank_you_back: "Back to Home", landing_thank_you_back: "Back to Home",
landing_guarantee: "Integrity, honesty, and strict fulfillment of your requirements guaranteed.", landing_guarantee: "Integrity, honesty, and strict fulfillment of your requirements guaranteed.",
landing_testimonials_title: "Testimonials", landing_testimonials_title: "Testimonials",
landing_form_consent: "I consent to the processing of my personal data",
landing_footer_text: "Pet Sitting — caring for your pet", landing_footer_text: "Pet Sitting — caring for your pet",
landing_footer_copyright: "All rights reserved",
nav_testimonials: "Testimonials", nav_testimonials: "Testimonials",
testimonials_title: "Testimonials", testimonials_title: "Testimonials",
@@ -657,6 +663,10 @@ static EN: Translations = Translations {
}; };
impl Translations { impl Translations {
pub fn app_version(&self) -> &'static str {
env!("CARGO_PKG_VERSION")
}
pub fn lead_status(&self, status: &str) -> &'static str { pub fn lead_status(&self, status: &str) -> &'static str {
match status { match status {
"new" => self.status_new, "new" => self.status_new,
templates/admin/layout.html
+4 -3
View File
@@ -6,8 +6,8 @@
<title>{{ t.nav_title }} — {% block title %}{% endblock %}</title> <title>{{ t.nav_title }} — {% block title %}{% endblock %}</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1/css/bulma.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1/css/bulma.min.css">
<style> <style>
:root { --accent: #6c63ff; } :root { --accent: #6c63ff; color-scheme: light; }
body { padding-bottom: 4rem; min-height: 100vh; background: #f5f5f5; } body { padding-bottom: 4rem; min-height: 100vh; background: #f5f5f5; color: #333; }
/* ── Top bar ── */ /* ── Top bar ── */
.top-header { .top-header {
@@ -85,13 +85,14 @@
/* ── Forms ── */ /* ── Forms ── */
.form-card { background: #fff; border-radius: 10px; padding: 1.25rem; border: 1px solid #eee; } .form-card { background: #fff; border-radius: 10px; padding: 1.25rem; border: 1px solid #eee; }
input, textarea, select { background-color: #fff; color: #333; }
</style> </style>
</head> </head>
<body> <body>
<!-- Top header --> <!-- Top header -->
<div class="top-header"> <div class="top-header">
<a class="brand" href="/admin/?lang={{ lang.code() }}">🐾 {{ t.nav_title }}</a> <a class="brand" href="/admin/?lang={{ lang.code() }}">🐾 {{ t.nav_title }} <span style="font-size:0.7rem;font-weight:400;color:#aaa;">v{{ t.app_version() }}</span></a>
<nav class="desktop-nav"> <nav class="desktop-nav">
<a href="/admin/?lang={{ lang.code() }}" {% if active_page == "dashboard" %}class="is-active"{% endif %}>{{ t.dashboard_title }}</a> <a href="/admin/?lang={{ lang.code() }}" {% if active_page == "dashboard" %}class="is-active"{% endif %}>{{ t.dashboard_title }}</a>
<a href="/admin/leads?lang={{ lang.code() }}" {% if active_page == "leads" %}class="is-active"{% endif %}>{{ t.nav_leads }}</a> <a href="/admin/leads?lang={{ lang.code() }}" {% if active_page == "leads" %}class="is-active"{% endif %}>{{ t.nav_leads }}</a>
templates/landing.html
+6 -1
View File
@@ -26,7 +26,7 @@
<style> <style>
/* ── Reset & Base ── */ /* ── Reset & Base ── */
*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; } *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
html { scroll-behavior: smooth; } html { scroll-behavior: smooth; color-scheme: light; }
body { body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
color: #2d2b55; line-height: 1.6; overflow-x: hidden; color: #2d2b55; line-height: 1.6; overflow-x: hidden;
@@ -402,6 +402,10 @@
<label for="comment">{{ t.landing_form_comment }}</label> <label for="comment">{{ t.landing_form_comment }}</label>
<textarea id="comment" name="comment" placeholder="{{ t.landing_form_comment_placeholder }}"></textarea> <textarea id="comment" name="comment" placeholder="{{ t.landing_form_comment_placeholder }}"></textarea>
</div> </div>
<div style="display:flex;align-items:flex-start;gap:0.5rem;margin-bottom:1.25rem;">
<input type="checkbox" id="consent" name="consent" required style="margin-top:0.2rem;width:auto;flex-shrink:0;">
<label for="consent" style="font-size:0.82rem;font-weight:400;color:#7a7599;cursor:pointer;display:inline;">{{ t.landing_form_consent }}</label>
</div>
<button type="submit" class="form-submit">{{ t.landing_form_submit }}</button> <button type="submit" class="form-submit">{{ t.landing_form_submit }}</button>
</form> </form>
{% if !contact_info.is_empty() %} {% if !contact_info.is_empty() %}
@@ -416,6 +420,7 @@
<!-- Footer --> <!-- Footer -->
<footer class="site-footer"> <footer class="site-footer">
<p>{{ t.landing_footer_text }}</p> <p>{{ t.landing_footer_text }}</p>
<p style="margin-top:0.4rem;">&copy; 2026 {{ t.nav_title }}. {{ t.landing_footer_copyright }}.</p>
</footer> </footer>
<script> <script>