Merge pull request 'Added historical newsletter section' (#3) from historical_newsletter into main
Reviewed-on: https://brew.bsd.cafe/RideAware/landing/pulls/3
This commit is contained in:
commit
afcd1ea395
7 changed files with 240 additions and 12 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -2,4 +2,5 @@
|
||||||
/.venv/
|
/.venv/
|
||||||
/.github/
|
/.github/
|
||||||
/__pycache__/
|
/__pycache__/
|
||||||
/.env
|
/.env
|
||||||
|
venv
|
||||||
|
|
|
||||||
10
database.py
10
database.py
|
|
@ -25,6 +25,16 @@ def init_db():
|
||||||
email TEXT UNIQUE NOT NULL
|
email TEXT UNIQUE NOT NULL
|
||||||
)
|
)
|
||||||
""")
|
""")
|
||||||
|
|
||||||
|
cursor.execute("""
|
||||||
|
CREATE TABLE IF NOT EXISTS newsletters(
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
subject TEXT NOT NULL,
|
||||||
|
body TEXT NOT NULL,
|
||||||
|
sent_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
conn.commit()
|
conn.commit()
|
||||||
cursor.close()
|
cursor.close()
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
|
||||||
37
server.py
37
server.py
|
|
@ -2,8 +2,9 @@ import os
|
||||||
import smtplib
|
import smtplib
|
||||||
from email.mime.text import MIMEText
|
from email.mime.text import MIMEText
|
||||||
from flask import Flask, render_template, request, jsonify
|
from flask import Flask, render_template, request, jsonify
|
||||||
from database import init_db, add_email, remove_email
|
from database import get_connection, init_db, add_email, remove_email
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
|
from collections import namedtuple
|
||||||
|
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
@ -64,5 +65,39 @@ def unsubscribe():
|
||||||
else:
|
else:
|
||||||
return f"Email {email} was not found or has already been unsubscribed.", 400
|
return f"Email {email} was not found or has already been unsubscribed.", 400
|
||||||
|
|
||||||
|
@app.route("/newsletters")
|
||||||
|
def newsletters():
|
||||||
|
conn = get_connection()
|
||||||
|
cursor = conn.cursor()
|
||||||
|
cursor.execute("SELECT id, subject, body, sent_at FROM newsletters ORDER BY sent_at DESC")
|
||||||
|
results = cursor.fetchall()
|
||||||
|
newsletters = [
|
||||||
|
{"id": rec[0], "subject": rec[1], "body": rec[2], "sent_at": rec[3]}
|
||||||
|
for rec in results
|
||||||
|
]
|
||||||
|
cursor.close()
|
||||||
|
conn.close()
|
||||||
|
return render_template("newsletters.html", newsletters=newsletters)
|
||||||
|
|
||||||
|
@app.route("/newsletter/<int:newsletter_id>")
|
||||||
|
def newsletter_detail(newsletter_id):
|
||||||
|
conn = get_connection()
|
||||||
|
cursor = conn.cursor()
|
||||||
|
cursor.execute("SELECT id, subject, body, sent_at FROM newsletters WHERE id = %s", (newsletter_id,))
|
||||||
|
record = cursor.fetchone()
|
||||||
|
cursor.close()
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
if record is None:
|
||||||
|
return "Newsletter not found.", 404
|
||||||
|
|
||||||
|
newsletter = {
|
||||||
|
"id": record[0],
|
||||||
|
"subject": record[1],
|
||||||
|
"body": record[2],
|
||||||
|
"sent_at": record[3]
|
||||||
|
}
|
||||||
|
return render_template("newsletter_detail.html", newsletter=newsletter)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
app.run(debug=True)
|
app.run(debug=True)
|
||||||
|
|
|
||||||
|
|
@ -32,14 +32,14 @@ header nav a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: #000;
|
color: #000;
|
||||||
margin-left: 20px;
|
margin-left: 20px;
|
||||||
font-size: 18px;
|
font-size: 22px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-section-1 {
|
.hero-section-1 {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
overflow: hidden; /* Hide any overflow if the image is larger */
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-content, .hero-text {
|
.hero-content, .hero-text {
|
||||||
|
|
@ -50,10 +50,10 @@ header nav a {
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-text img {
|
.hero-text img {
|
||||||
width: 70%; /* The image will take up 50% of its container's width */
|
width: 70%;
|
||||||
height: auto; /* Maintain aspect ratio */
|
height: auto;
|
||||||
display: block; /* Remove inline spacing if needed */
|
display: block;
|
||||||
margin: 0 auto; /* Center the image within its container if desired */
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-text h1 {
|
.hero-text h1 {
|
||||||
|
|
@ -179,15 +179,27 @@ main .inner-container {
|
||||||
padding: 10px 20px;
|
padding: 10px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.normal-footer {
|
||||||
footer {
|
|
||||||
background-color: #337cf2;
|
background-color: #337cf2;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
clear: both;
|
clear: both;
|
||||||
|
margin-top: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fixed-footer {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
background-color: #337cf2;
|
||||||
|
color: #fff;
|
||||||
|
padding: 10px;
|
||||||
|
text-align: center;
|
||||||
|
z-index: 1000;
|
||||||
|
}
|
||||||
|
|
||||||
img {
|
img {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
height: auto;
|
height: auto;
|
||||||
|
|
@ -253,3 +265,89 @@ img {
|
||||||
padding: 50px 0;
|
padding: 50px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.newsletter {
|
||||||
|
margin-bottom: 40px;
|
||||||
|
border-bottom: 1px solid #ddd;
|
||||||
|
padding-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter h2 {
|
||||||
|
color: #007bff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter-time {
|
||||||
|
color: #666;
|
||||||
|
font-size: 0.9em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter-detail {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 20px auto;
|
||||||
|
padding: 20px;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
.newsletter-detail h1 {
|
||||||
|
color: #007bff;
|
||||||
|
}
|
||||||
|
.back-link {
|
||||||
|
margin-top: 20px;
|
||||||
|
display: inline-block;
|
||||||
|
color: #007bff;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
.back-link:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
main h1 {
|
||||||
|
text-align: center;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
color: #007bff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cards-container {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter-content {
|
||||||
|
width: 5000px%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter-card {
|
||||||
|
background: #fff;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||||
|
width: 300px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 20px;
|
||||||
|
transition: transform 0.15s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter-card:hover {
|
||||||
|
transform: translateY(-5px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter-card h2 {
|
||||||
|
font-size: 1.5em;
|
||||||
|
color: #007bff;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter-card p.newsletter-time {
|
||||||
|
font-size: 0.8em
|
||||||
|
}
|
||||||
|
|
||||||
|
.newsletter-main {
|
||||||
|
max-width: 1200px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,10 @@
|
||||||
<body>
|
<body>
|
||||||
<header>
|
<header>
|
||||||
<nav>
|
<nav>
|
||||||
<span>Ride</span><span style="color: #1e4e9c;">Aware</span>
|
<a href="/">
|
||||||
|
<span>Ride</span><span style="color: #1e4e9c;">Aware</span>
|
||||||
|
</a>
|
||||||
|
<a href="/newsletters">Newsletters</a>
|
||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
<main>
|
<main>
|
||||||
|
|
@ -84,7 +87,7 @@
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
<footer>
|
<footer class="normal-footer">
|
||||||
Copyright © 2025 RideAware. All rights reserved.
|
Copyright © 2025 RideAware. All rights reserved.
|
||||||
</footer>
|
</footer>
|
||||||
<script src="/static/js/main.js"></script>
|
<script src="/static/js/main.js"></script>
|
||||||
|
|
|
||||||
33
templates/newsletter_detail.html
Normal file
33
templates/newsletter_detail.html
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>RideAware - Newsletter Detail</title>
|
||||||
|
<link rel="stylesheet" href="/static/css/styles.css" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<header>
|
||||||
|
<nav>
|
||||||
|
<a href="/">
|
||||||
|
<span>Ride</span><span style="color: #1e4e9c;">Aware</span>
|
||||||
|
</a>
|
||||||
|
<a href="/newsletters">Newsletters</a>
|
||||||
|
</nav>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<main>
|
||||||
|
<h1>{{ newsletter.subject }}</h1>
|
||||||
|
<div class="newsletter-content">
|
||||||
|
{{ newsletter.body | safe }}
|
||||||
|
</div>
|
||||||
|
<a href="/newsletters" class="back-link">← Back to Newsletters</a>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<footer class="fixed-footer">
|
||||||
|
<p>© 2025 RideAware. All rights reserved.</p>
|
||||||
|
</footer>
|
||||||
|
<script src="/static/js/main.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
48
templates/newsletters.html
Normal file
48
templates/newsletters.html
Normal file
|
|
@ -0,0 +1,48 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>RideAware - Newsletters</title>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<link rel="stylesheet" href="/static/css/styles.css">
|
||||||
|
<style>
|
||||||
|
main {
|
||||||
|
max-width: 1200px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<header>
|
||||||
|
<nav>
|
||||||
|
<a href="/">
|
||||||
|
<span>Ride</span><span style="color: #1e4e9c;">Aware</span>
|
||||||
|
</a>
|
||||||
|
<a href="/newsletters" class="active">Newsletters</a>
|
||||||
|
</nav>
|
||||||
|
</header>
|
||||||
|
<main class="newsletter-main">
|
||||||
|
<h1>RideAware Newsletters</h1>
|
||||||
|
{% if newsletters %}
|
||||||
|
{% for nl in newsletters %}
|
||||||
|
<div class="newsletter">
|
||||||
|
<h2>
|
||||||
|
<a href="{{ url_for('newsletter_detail', newsletter_id=nl['id']) }}">{{ nl['subject'] }}</a>
|
||||||
|
</h2>
|
||||||
|
<p class="newsletter-time">Sent on: {{ nl['sent_at'] }}</p>
|
||||||
|
<a href="{{ url_for('newsletter_detail', newsletter_id=nl['id']) }}" class="read-more">Read More</a>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
<p>No newsletters to display yet.</p>
|
||||||
|
{% endif %}
|
||||||
|
</main>
|
||||||
|
<footer class="fixed-footer">
|
||||||
|
<p>© 2025 RideAware. All rights reserved.</p>
|
||||||
|
</footer>
|
||||||
|
<script src="/static/js/main.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue