From 26bb7de0187c80e30a21b58cb5b54e440268e3ce Mon Sep 17 00:00:00 2001
From: Alex Muszynski <alexander.muszynski@gmail.com>
Date: Tue, 24 Jun 2025 20:33:29 -0400
Subject: [PATCH 1/3] fix: had to drop db

---
 backend/alembic/README                        |   1 +
 backend/alembic/README.md                     |  25 -----
 backend/alembic/env.py                        |  10 +-
 backend/alembic/versions/1331953dbdf0_.py     |  46 --------
 backend/alembic/versions/273690fd257d_.py     |  32 ------
 backend/alembic/versions/3b78fe6cf60f_.py     |  32 ------
 backend/alembic/versions/4a1e42eba1cf_.py     |  58 ----------
 backend/alembic/versions/a3ac646e53a8_init.py |  41 -------
 backend/alembic/versions/aaeb70eb4cdb_.py     |  32 ------
 .../alembic/versions/b9dcd098debd_1_1_0.py    |  58 ----------
 backend/alembic/versions/d4894b788937_.py     |  28 -----
 backend/alembic/versions/f6c8aa750e08_.py     | 104 ------------------
 12 files changed, 8 insertions(+), 459 deletions(-)
 create mode 100644 backend/alembic/README
 delete mode 100644 backend/alembic/README.md
 delete mode 100644 backend/alembic/versions/1331953dbdf0_.py
 delete mode 100644 backend/alembic/versions/273690fd257d_.py
 delete mode 100644 backend/alembic/versions/3b78fe6cf60f_.py
 delete mode 100644 backend/alembic/versions/4a1e42eba1cf_.py
 delete mode 100644 backend/alembic/versions/a3ac646e53a8_init.py
 delete mode 100644 backend/alembic/versions/aaeb70eb4cdb_.py
 delete mode 100644 backend/alembic/versions/b9dcd098debd_1_1_0.py
 delete mode 100644 backend/alembic/versions/d4894b788937_.py
 delete mode 100644 backend/alembic/versions/f6c8aa750e08_.py

diff --git a/backend/alembic/README b/backend/alembic/README
new file mode 100644
index 0000000..98e4f9c
--- /dev/null
+++ b/backend/alembic/README
@@ -0,0 +1 @@
+Generic single-database configuration.
\ No newline at end of file
diff --git a/backend/alembic/README.md b/backend/alembic/README.md
deleted file mode 100644
index 8498672..0000000
--- a/backend/alembic/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Alembic
-
-Alembic allows for our database migrations to be tracked in a version control system.
-
-To create a new migration run:
-
-```bash
-alembic revision --autogenerate -m 'Describe change here'
-```
-
-It's best practice to review the script post revision creation: `alembic/versions`
-
-To apply the migration:
-
-```bash
-alembic upgrade head
-```
-
-Now you can re-check using `alembic check`
-
-If we need to rollback use:
-
-```bash
-alembic downgrade -i
-```
diff --git a/backend/alembic/env.py b/backend/alembic/env.py
index 2a48bbb..36112a3 100644
--- a/backend/alembic/env.py
+++ b/backend/alembic/env.py
@@ -1,5 +1,5 @@
 from logging.config import fileConfig
-from app.database import Base
+
 from sqlalchemy import engine_from_config
 from sqlalchemy import pool
 
@@ -16,7 +16,9 @@ if config.config_file_name is not None:
 
 # add your model's MetaData object here
 # for 'autogenerate' support
-target_metadata = Base.metadata
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = None
 
 # other values from the config, defined by the needs of env.py,
 # can be acquired:
@@ -62,7 +64,9 @@ def run_migrations_online() -> None:
     )
 
     with connectable.connect() as connection:
-        context.configure(connection=connection, target_metadata=target_metadata)
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
 
         with context.begin_transaction():
             context.run_migrations()
diff --git a/backend/alembic/versions/1331953dbdf0_.py b/backend/alembic/versions/1331953dbdf0_.py
deleted file mode 100644
index 54a8001..0000000
--- a/backend/alembic/versions/1331953dbdf0_.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""empty message
-
-Revision ID: 1331953dbdf0
-Revises: f6c8aa750e08
-Create Date: 2025-06-22 14:23:39.931696
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = '1331953dbdf0'
-down_revision: Union[str, None] = 'f6c8aa750e08'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_users_email'), table_name='users')
-    op.drop_index(op.f('ix_users_id'), table_name='users')
-    op.drop_index(op.f('ix_users_username'), table_name='users')
-    op.drop_table('users')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('users',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('username', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('email', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('hashed_password', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('permissions', postgresql.JSON(astext_type=sa.Text()), autoincrement=False, nullable=False),
-    sa.Column('subscriber', sa.BOOLEAN(), autoincrement=False, nullable=False),
-    sa.PrimaryKeyConstraint('id', name=op.f('users_pkey'))
-    )
-    op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
-    op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=False)
-    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
-    # ### end Alembic commands ###
diff --git a/backend/alembic/versions/273690fd257d_.py b/backend/alembic/versions/273690fd257d_.py
deleted file mode 100644
index 4363820..0000000
--- a/backend/alembic/versions/273690fd257d_.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""empty message
-
-Revision ID: 273690fd257d
-Revises: aaeb70eb4cdb
-Create Date: 2025-06-21 09:08:04.102896
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '273690fd257d'
-down_revision: Union[str, None] = 'aaeb70eb4cdb'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
diff --git a/backend/alembic/versions/3b78fe6cf60f_.py b/backend/alembic/versions/3b78fe6cf60f_.py
deleted file mode 100644
index 9ea0420..0000000
--- a/backend/alembic/versions/3b78fe6cf60f_.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""empty message
-
-Revision ID: 3b78fe6cf60f
-Revises: 1331953dbdf0
-Create Date: 2025-06-22 14:24:52.883175
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '3b78fe6cf60f'
-down_revision: Union[str, None] = '1331953dbdf0'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
diff --git a/backend/alembic/versions/4a1e42eba1cf_.py b/backend/alembic/versions/4a1e42eba1cf_.py
deleted file mode 100644
index 9a3946d..0000000
--- a/backend/alembic/versions/4a1e42eba1cf_.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""empty message
-
-Revision ID: 4a1e42eba1cf
-Revises: b9dcd098debd
-Create Date: 2025-06-21 08:55:29.395985
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = '4a1e42eba1cf'
-down_revision: Union[str, None] = 'b9dcd098debd'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_users_email'), table_name='users')
-    op.drop_index(op.f('ix_users_id'), table_name='users')
-    op.drop_index(op.f('ix_users_username'), table_name='users')
-    op.drop_table('users')
-    op.drop_index(op.f('ix_items_id'), table_name='items')
-    op.drop_index(op.f('ix_items_name'), table_name='items')
-    op.drop_table('items')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('items',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=True),
-    sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=True),
-    sa.Column('body', postgresql.JSON(astext_type=sa.Text()), autoincrement=False, nullable=False),
-    sa.PrimaryKeyConstraint('id', name=op.f('items_pkey'))
-    )
-    op.create_index(op.f('ix_items_name'), 'items', ['name'], unique=False)
-    op.create_index(op.f('ix_items_id'), 'items', ['id'], unique=False)
-    op.create_table('users',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('username', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('email', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('hashed_password', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('permissions', postgresql.JSON(astext_type=sa.Text()), autoincrement=False, nullable=False),
-    sa.Column('subscriber', sa.BOOLEAN(), autoincrement=False, nullable=False),
-    sa.PrimaryKeyConstraint('id', name=op.f('users_pkey'))
-    )
-    op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
-    op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=False)
-    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
-    # ### end Alembic commands ###
diff --git a/backend/alembic/versions/a3ac646e53a8_init.py b/backend/alembic/versions/a3ac646e53a8_init.py
deleted file mode 100644
index 10a722d..0000000
--- a/backend/alembic/versions/a3ac646e53a8_init.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""init
-
-Revision ID: a3ac646e53a8
-Revises: 
-Create Date: 2025-06-04 21:36:22.283823
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'a3ac646e53a8'
-down_revision: Union[str, None] = None
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_items_id'), table_name='items')
-    op.drop_index(op.f('ix_items_name'), table_name='items')
-    op.drop_table('items')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('items',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=True),
-    sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=True),
-    sa.PrimaryKeyConstraint('id', name=op.f('items_pkey'))
-    )
-    op.create_index(op.f('ix_items_name'), 'items', ['name'], unique=False)
-    op.create_index(op.f('ix_items_id'), 'items', ['id'], unique=False)
-    # ### end Alembic commands ###
diff --git a/backend/alembic/versions/aaeb70eb4cdb_.py b/backend/alembic/versions/aaeb70eb4cdb_.py
deleted file mode 100644
index b210a5c..0000000
--- a/backend/alembic/versions/aaeb70eb4cdb_.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""empty message
-
-Revision ID: aaeb70eb4cdb
-Revises: d4894b788937
-Create Date: 2025-06-21 09:06:10.983927
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'aaeb70eb4cdb'
-down_revision: Union[str, None] = 'd4894b788937'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
diff --git a/backend/alembic/versions/b9dcd098debd_1_1_0.py b/backend/alembic/versions/b9dcd098debd_1_1_0.py
deleted file mode 100644
index e42395e..0000000
--- a/backend/alembic/versions/b9dcd098debd_1_1_0.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""1.1.0
-
-Revision ID: b9dcd098debd
-Revises: a3ac646e53a8
-Create Date: 2025-06-14 09:22:14.878105
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = 'b9dcd098debd'
-down_revision: Union[str, None] = 'a3ac646e53a8'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_users_email'), table_name='users')
-    op.drop_index(op.f('ix_users_id'), table_name='users')
-    op.drop_index(op.f('ix_users_username'), table_name='users')
-    op.drop_table('users')
-    op.drop_index(op.f('ix_items_id'), table_name='items')
-    op.drop_index(op.f('ix_items_name'), table_name='items')
-    op.drop_table('items')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('items',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=True),
-    sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=True),
-    sa.Column('body', postgresql.JSON(astext_type=sa.Text()), autoincrement=False, nullable=False),
-    sa.PrimaryKeyConstraint('id', name=op.f('items_pkey'))
-    )
-    op.create_index(op.f('ix_items_name'), 'items', ['name'], unique=False)
-    op.create_index(op.f('ix_items_id'), 'items', ['id'], unique=False)
-    op.create_table('users',
-    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
-    sa.Column('username', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('email', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('hashed_password', sa.VARCHAR(), autoincrement=False, nullable=False),
-    sa.Column('permissions', postgresql.JSON(astext_type=sa.Text()), autoincrement=False, nullable=False),
-    sa.Column('subscriber', sa.BOOLEAN(), autoincrement=False, nullable=False),
-    sa.PrimaryKeyConstraint('id', name=op.f('users_pkey'))
-    )
-    op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
-    op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=False)
-    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
-    # ### end Alembic commands ###
diff --git a/backend/alembic/versions/d4894b788937_.py b/backend/alembic/versions/d4894b788937_.py
deleted file mode 100644
index 44a68db..0000000
--- a/backend/alembic/versions/d4894b788937_.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""empty message
-
-Revision ID: d4894b788937
-Revises: 4a1e42eba1cf
-Create Date: 2025-06-21 08:56:04.467650
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'd4894b788937'
-down_revision: Union[str, None] = '4a1e42eba1cf'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    pass
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    pass
diff --git a/backend/alembic/versions/f6c8aa750e08_.py b/backend/alembic/versions/f6c8aa750e08_.py
deleted file mode 100644
index 7d6388f..0000000
--- a/backend/alembic/versions/f6c8aa750e08_.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""empty message
-
-Revision ID: f6c8aa750e08
-Revises: 273690fd257d
-Create Date: 2025-06-22 14:14:03.560792
-
-"""
-
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = "f6c8aa750e08"
-down_revision: Union[str, None] = "273690fd257d"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f("ix_blogs_author_id"), table_name="blogs")
-    op.drop_index(op.f("ix_blogs_id"), table_name="blogs")
-    op.drop_index(op.f("ix_blogs_title"), table_name="blogs")
-    op.drop_table("blogs")
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "blogs",
-        sa.Column("id", sa.INTEGER(), autoincrement=True, nullable=False),
-        sa.Column("title", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("author_id", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("description", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column(
-            "body",
-            postgresql.JSON(astext_type=sa.Text()),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.Column(
-            "created_at",
-            postgresql.TIMESTAMP(timezone=True),
-            server_default=sa.text("now()"),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.Column(
-            "updated_at",
-            postgresql.TIMESTAMP(timezone=True),
-            autoincrement=False,
-            nullable=True,
-        ),
-        sa.Column(
-            "published_at",
-            postgresql.TIMESTAMP(timezone=True),
-            autoincrement=False,
-            nullable=True,
-        ),
-        sa.Column("word_count", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("version", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("read_time", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("language", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column(
-            "tags",
-            postgresql.JSON(astext_type=sa.Text()),
-            autoincrement=False,
-            nullable=True,
-        ),
-        sa.Column("view_count", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.Column("like_count", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.ForeignKeyConstraint(
-            ["author_id"], ["users.id"], name=op.f("blogs_author_id_fkey")
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("blogs_pkey")),
-    )
-    op.create_index(op.f("ix_blogs_title"), "blogs", ["title"], unique=False)
-    op.create_index(op.f("ix_blogs_id"), "blogs", ["id"], unique=False)
-    op.create_index(op.f("ix_blogs_author_id"), "blogs", ["author_id"], unique=False)
-    op.create_table(
-        "users",
-        sa.Column("id", sa.INTEGER(), autoincrement=True, nullable=False),
-        sa.Column("username", sa.VARCHAR(), autoincrement=False, nullable=False),
-        sa.Column("email", sa.VARCHAR(), autoincrement=False, nullable=False),
-        sa.Column("hashed_password", sa.VARCHAR(), autoincrement=False, nullable=False),
-        sa.Column(
-            "permissions",
-            postgresql.JSON(astext_type=sa.Text()),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.Column("subscriber", sa.BOOLEAN(), autoincrement=False, nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("users_pkey")),
-    )
-    op.create_index(op.f("ix_users_username"), "users", ["username"], unique=True)
-    op.create_index(op.f("ix_users_id"), "users", ["id"], unique=False)
-    op.create_index(op.f("ix_users_email"), "users", ["email"], unique=True)
-    # ### end Alembic commands ###
-- 
2.39.5


From 7242579c1739f8bd5c48ac56a1cd5a7a9078bae3 Mon Sep 17 00:00:00 2001
From: Alex Muszynski <alexander.muszynski@gmail.com>
Date: Tue, 24 Jun 2025 20:38:24 -0400
Subject: [PATCH 2/3] feat: ability to update blog

---
 frontend/Dockerfile               |  8 +--
 frontend/nginx.conf               | 28 +++++++++
 frontend/src/App.tsx              |  3 +-
 frontend/src/utils/BlogViewer.tsx | 18 ++++--
 frontend/src/utils/EditBlog.tsx   | 95 +++++++++++++++++++++++++++++++
 frontend/src/utils/types.ts       |  3 +-
 6 files changed, 143 insertions(+), 12 deletions(-)
 create mode 100644 frontend/nginx.conf
 create mode 100644 frontend/src/utils/EditBlog.tsx

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index edc8ccf..4321151 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,18 +1,14 @@
 # Build stage
 FROM node:20 AS build
-
 WORKDIR /app
-
-COPY package.json package-lock.json ./
+COPY package*.json ./
 RUN npm install
-
 COPY . .
-
 RUN npm run build
 
 # Production stage
 FROM nginx:alpine
-
+COPY nginx.conf /etc/nginx/nginx.conf
 COPY --from=build /app/dist /usr/share/nginx/html
 
 EXPOSE 80
diff --git a/frontend/nginx.conf b/frontend/nginx.conf
new file mode 100644
index 0000000..3f8a88c
--- /dev/null
+++ b/frontend/nginx.conf
@@ -0,0 +1,28 @@
+worker_processes 1;
+
+events { worker_connections 1024; }
+
+http {
+  include       mime.types;
+  default_type  application/octet-stream;
+  sendfile        on;
+  keepalive_timeout  65;
+
+  server {
+    listen       80;
+    server_name  _;
+
+    root   /usr/share/nginx/html;
+    index  index.html;
+
+    location / {
+      # try to serve file directly, otherwise fallback to index.html
+      try_files $uri $uri/ /index.html;
+    }
+
+    # optional: block .git, .env, etc
+    location ~ /\.(?!well-known).* {
+      deny all;
+    }
+  }
+}
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 929020b..fb11991 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -16,6 +16,7 @@ import { useForm } from "react-hook-form";
 import { BlogViewer } from "./utils/BlogViewer";
 import { RequireAdmin } from "./utils/RouteGuard";
 import { AdminPage } from "./utils/AdminPage";
+import { EditBlog } from "./utils/EditBlog";
 import Unauthorized from "./utils/UnauthorizedPage";
 import {
   FaGithub,
@@ -141,7 +142,6 @@ function CreateBlog() {
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
-    // Stubbed API call
     try {
       const body = {
         title: title,
@@ -277,6 +277,7 @@ function App() {
               <Route path="/" element={<LandingPage />} />
               <Route path="/blog" element={<BlogPage />} />
               <Route path="/blog/:slug" element={<BlogViewer />} />
+              <Route path="/blog/:slug/edit" element={<EditBlog />} />
               <Route path="/about" element={<About />} />
               <Route path="/contact" element={<Contact />} />
               <Route
diff --git a/frontend/src/utils/BlogViewer.tsx b/frontend/src/utils/BlogViewer.tsx
index 34fc29c..212972c 100644
--- a/frontend/src/utils/BlogViewer.tsx
+++ b/frontend/src/utils/BlogViewer.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router-dom";
 import { API_URL } from "./constants";
 import type { Blog } from "./types";
 import Markdown from "react-markdown";
@@ -11,6 +11,8 @@ import "../styles/markdown.css";
 export function BlogViewer() {
   const { slug } = useParams<{ slug: string }>();
   const [blog, setBlog] = useState<Blog | null>(null);
+  const navigate = useNavigate();
+  const me = localStorage.getItem("user_id");
 
   useEffect(() => {
     if (!slug) return;
@@ -20,12 +22,20 @@ export function BlogViewer() {
       .catch((err) => console.error(err));
   }, [slug]);
 
-  if (!blog) {
-    return <p>Loading...</p>;
-  }
+  if (!blog) return <p>Loading…</p>;
+
+  const isAuthor = me === String(blog.author_id);
 
   return (
     <div className="max-w-2xl mx-auto py-10 space-y-6">
+      {isAuthor && (
+        <button
+          onClick={() => navigate(`/blog/${slug}/edit`)}
+          className="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700"
+        >
+          Edit this post
+        </button>
+      )}
       <h1 className="text-3xl font-bold">{blog.title.toUpperCase()}</h1>
       <p className="text-sm text-gray-500">By User {blog.author_id}</p>
       <p className="italic text-gray-600 dark:text-gray-400">
diff --git a/frontend/src/utils/EditBlog.tsx b/frontend/src/utils/EditBlog.tsx
new file mode 100644
index 0000000..8850bee
--- /dev/null
+++ b/frontend/src/utils/EditBlog.tsx
@@ -0,0 +1,95 @@
+import { useEffect, useState, type FormEvent } from "react";
+
+import { useParams, useNavigate } from "react-router-dom";
+import { API_URL } from "./constants";
+import type { Blog } from "./types";
+import { countWords } from "./countWords";
+
+export function EditBlog() {
+  const { slug } = useParams<{ slug: string }>();
+  const [blog, setBlog] = useState<Blog | undefined>(undefined);
+  const [title, setTitle] = useState("");
+  const [description, setDescription] = useState("");
+  const [body, setBody] = useState("");
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (!slug) return;
+    fetch(`${API_URL}/blogs/${slug}`)
+      .then((res) => res.json())
+      .then((data: Blog) => {
+        setBlog(data);
+        setTitle(data.title);
+        setDescription(data.description);
+        setBody(data.body);
+      })
+      .catch(console.error);
+  }, [slug]);
+
+  if (!blog) return <p>Loading…</p>;
+
+  async function handleSubmit(e: FormEvent) {
+    e.preventDefault();
+
+    const updatedBlog = {
+      title,
+      description,
+      body,
+      updated_at: new Date().toISOString(),
+      word_count: countWords(body),
+      version: blog ? blog.version : 1,
+    };
+
+    const res = await fetch(`${API_URL}/blogs/${slug}`, {
+      method: "PUT", // or "PATCH" if your API prefers
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(updatedBlog),
+    });
+
+    if (res.ok) {
+      navigate(`/blog/${slug}`); // go back to the viewer
+    } else {
+      console.error("Update failed:", await res.text());
+      alert("Could not update the post. See console for details.");
+    }
+  }
+
+  return (
+    <div className="max-w-2xl mx-auto py-10">
+      <h2 className="text-2xl font-bold mb-4">Edit Blog Post</h2>
+      <form onSubmit={handleSubmit} className="space-y-4">
+        <div>
+          <label className="block font-medium">Title</label>
+          <input
+            value={title}
+            onChange={(e) => setTitle(e.target.value)}
+            className="w-full border px-2 py-1 rounded"
+          />
+        </div>
+        <div>
+          <label className="block font-medium">Description</label>
+          <textarea
+            value={description}
+            onChange={(e) => setDescription(e.target.value)}
+            className="w-full border px-2 py-1 rounded"
+          />
+        </div>
+        <div>
+          <label className="block font-medium">Body (Markdown)</label>
+          <textarea
+            value={body}
+            onChange={(e) => setBody(e.target.value)}
+            rows={10}
+            className="w-full border px-2 py-1 rounded font-mono"
+          />
+        </div>
+        <button
+          type="submit"
+          className="px-4 py-2 bg-green-600 text-white rounded hover:bg-green-700"
+        >
+          Save Changes
+        </button>
+      </form>
+    </div>
+  );
+}
diff --git a/frontend/src/utils/types.ts b/frontend/src/utils/types.ts
index f4afb98..62c52f2 100644
--- a/frontend/src/utils/types.ts
+++ b/frontend/src/utils/types.ts
@@ -1,7 +1,8 @@
 export interface Blog {
   id: number;
   title: string;
-  author_id: number;
+  author_id: string;
   description: string;
   body: string;
+  version: number;
 }
-- 
2.39.5


From 6bda5876ba62f16637dabbdaf7945865601c10ef Mon Sep 17 00:00:00 2001
From: Alex Muszynski <alexander.muszynski@gmail.com>
Date: Tue, 24 Jun 2025 21:14:35 -0400
Subject: [PATCH 3/3] feat: show author name instead of user x

---
 backend/alembic/env.py                        |  9 ++-
 .../c9b28e38d00c_add_author_name_to_blogs.py  | 71 +++++++++++++++++++
 backend/app/models.py                         |  1 +
 backend/app/schemas.py                        |  2 +
 frontend/src/App.tsx                          | 37 +++++-----
 frontend/src/utils/BlogViewer.tsx             | 42 ++++++++---
 frontend/src/utils/EditBlog.tsx               | 21 ++++--
 frontend/src/utils/types.ts                   | 10 ++-
 8 files changed, 154 insertions(+), 39 deletions(-)
 create mode 100644 backend/alembic/versions/c9b28e38d00c_add_author_name_to_blogs.py

diff --git a/backend/alembic/env.py b/backend/alembic/env.py
index 36112a3..157c456 100644
--- a/backend/alembic/env.py
+++ b/backend/alembic/env.py
@@ -5,6 +5,8 @@ from sqlalchemy import pool
 
 from alembic import context
 
+from app.database import Base
+
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config
@@ -17,8 +19,7 @@ if config.config_file_name is not None:
 # add your model's MetaData object here
 # for 'autogenerate' support
 # from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
-target_metadata = None
+target_metadata = Base.metadata
 
 # other values from the config, defined by the needs of env.py,
 # can be acquired:
@@ -64,9 +65,7 @@ def run_migrations_online() -> None:
     )
 
     with connectable.connect() as connection:
-        context.configure(
-            connection=connection, target_metadata=target_metadata
-        )
+        context.configure(connection=connection, target_metadata=target_metadata)
 
         with context.begin_transaction():
             context.run_migrations()
diff --git a/backend/alembic/versions/c9b28e38d00c_add_author_name_to_blogs.py b/backend/alembic/versions/c9b28e38d00c_add_author_name_to_blogs.py
new file mode 100644
index 0000000..5c29427
--- /dev/null
+++ b/backend/alembic/versions/c9b28e38d00c_add_author_name_to_blogs.py
@@ -0,0 +1,71 @@
+"""Add author_name to blogs
+
+Revision ID: c9b28e38d00c
+Revises: 
+Create Date: 2025-06-24 20:51:56.034469
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = 'c9b28e38d00c'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_users_email'), table_name='users')
+    op.drop_index(op.f('ix_users_id'), table_name='users')
+    op.drop_index(op.f('ix_users_username'), table_name='users')
+    op.drop_table('users')
+    op.drop_index(op.f('ix_blogs_author_id'), table_name='blogs')
+    op.drop_index(op.f('ix_blogs_id'), table_name='blogs')
+    op.drop_index(op.f('ix_blogs_title'), table_name='blogs')
+    op.drop_table('blogs')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('blogs',
+    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.VARCHAR(), autoincrement=False, nullable=True),
+    sa.Column('author_id', sa.INTEGER(), autoincrement=False, nullable=False),
+    sa.Column('description', sa.VARCHAR(), autoincrement=False, nullable=True),
+    sa.Column('body', sa.VARCHAR(), autoincrement=False, nullable=False),
+    sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=False),
+    sa.Column('updated_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
+    sa.Column('published_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True),
+    sa.Column('word_count', sa.INTEGER(), autoincrement=False, nullable=True),
+    sa.Column('version', sa.INTEGER(), autoincrement=False, nullable=True),
+    sa.Column('read_time', sa.INTEGER(), autoincrement=False, nullable=True),
+    sa.Column('language', sa.VARCHAR(), autoincrement=False, nullable=True),
+    sa.Column('tags', postgresql.JSON(astext_type=sa.Text()), autoincrement=False, nullable=True),
+    sa.Column('view_count', sa.INTEGER(), autoincrement=False, nullable=False),
+    sa.Column('like_count', sa.INTEGER(), autoincrement=False, nullable=False),
+    sa.PrimaryKeyConstraint('id', name=op.f('blogs_pkey'))
+    )
+    op.create_index(op.f('ix_blogs_title'), 'blogs', ['title'], unique=False)
+    op.create_index(op.f('ix_blogs_id'), 'blogs', ['id'], unique=False)
+    op.create_index(op.f('ix_blogs_author_id'), 'blogs', ['author_id'], unique=False)
+    op.create_table('users',
+    sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
+    sa.Column('username', sa.VARCHAR(), autoincrement=False, nullable=False),
+    sa.Column('email', sa.VARCHAR(), autoincrement=False, nullable=False),
+    sa.Column('hashed_password', sa.VARCHAR(), autoincrement=False, nullable=False),
+    sa.Column('permissions', postgresql.JSON(astext_type=sa.Text()), autoincrement=False, nullable=False),
+    sa.Column('subscriber', sa.BOOLEAN(), autoincrement=False, nullable=False),
+    sa.PrimaryKeyConstraint('id', name=op.f('users_pkey'))
+    )
+    op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
+    op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=False)
+    op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
+    # ### end Alembic commands ###
diff --git a/backend/app/models.py b/backend/app/models.py
index d31ad7d..8ae55b0 100644
--- a/backend/app/models.py
+++ b/backend/app/models.py
@@ -16,6 +16,7 @@ class Blog(Base):
     id = Column(Integer, primary_key=True, index=True)
     title = Column(String, index=True)
     author_id = Column(Integer, nullable=False, index=True)
+    author_name = Column(String, nullable=False, index=True)
     description = Column(String, nullable=True)
     body = Column(String, nullable=False)
     created_at = Column(
diff --git a/backend/app/schemas.py b/backend/app/schemas.py
index 0bcbb8f..4ae8c38 100644
--- a/backend/app/schemas.py
+++ b/backend/app/schemas.py
@@ -5,6 +5,7 @@ from pydantic import AwareDatetime, BaseModel, EmailStr
 class BlogBase(BaseModel):
     title: str
     author_id: int
+    author_name: str
     description: Optional[str] = None
     body: str
     created_at: AwareDatetime
@@ -30,6 +31,7 @@ class BlogUpdate(BaseModel):
 
     title: Optional[str] = None
     description: Optional[str] = None
+    author_name: Optional[str] = None
     body: Optional[str] = None
     created_at: Optional[str] = None
     updated_at: Optional[str] = None
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index fb11991..10af657 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -64,6 +64,7 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
 
   const logout = () => {
     localStorage.removeItem("token");
+    localStorage.removeItem("user_id");
     setIsAuthenticated(false);
     navigate("/signin");
   };
@@ -107,7 +108,10 @@ function BlogPage() {
             className="block p-4 border rounded hover:bg-gray-100 dark:hover:bg-gray-800"
           >
             <h3 className="text-xl font-semibold">{blog.title}</h3>
-            <p className="text-sm text-gray-500">By {blog.author_id}</p>
+            <p className="italic text-gray-600 dark:text-gray-400">
+              {blog.description}
+            </p>
+            <p className="text-sm text-gray-500">By {blog.author_name}</p>
           </Link>
         ))}
       </div>
@@ -118,10 +122,9 @@ function BlogPage() {
 // Page for creating a blog post
 function CreateBlog() {
   const [fileName, setFileName] = useState<string>("");
-  const [title, setTitle] = useState<string>("");
-  const username = localStorage.getItem("user_id") || "";
-  const [author, setAuthor] = useState<string>(username);
-  const [description, setDescription] = useState<string>("");
+  const [title, setTitle] = useState("");
+  const [description, setDescription] = useState("");
+  const [authorName, setAuthorName] = useState("");
   const [content, setContent] = useState<string>("");
   const navigate = useNavigate();
 
@@ -135,33 +138,31 @@ function CreateBlog() {
       setFileName(file.name);
       const baseName = file.name.replace(/\.[^.]+$/, "");
       setTitle(baseName);
-      setAuthor(username);
+      setAuthorName(authorName);
     };
     reader.readAsText(file);
   };
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
+    const userId = Number(localStorage.getItem("user_id"));
     try {
       const body = {
-        title: title,
-        author_id: localStorage.getItem("user_id"),
+        title,
+        author_id: userId, // still from localStorage
+        author_name: authorName, // from the form field
         description: description,
         body: content,
-        created_at: new Date(Date.now()).toISOString(),
-        updated_at: new Date(Date.now()).toISOString(),
-        published_at: new Date(Date.now()).toISOString(),
+        created_at: new Date().toISOString(),
+        updated_at: new Date().toISOString(),
+        published_at: new Date().toISOString(),
         word_count: countWords(content),
-        version: 1,
-        read_time: 0,
-        language: "US",
       };
-      const res = await fetch(`${API_URL}/blogs`, {
+      await fetch(`${API_URL}/blogs`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(body),
       });
-      alert(res);
       navigate("/blog");
     } catch (err: any) {
       alert(err.message);
@@ -203,8 +204,8 @@ function CreateBlog() {
             <input
               id="author"
               type="text"
-              value={author}
-              onChange={(e) => setAuthor(e.target.value)}
+              value={authorName}
+              onChange={(e) => setAuthorName(e.target.value)}
               className="w-full border border-gray-300 dark:border-gray-600 rounded px-3 py-2"
             />
           </div>
diff --git a/frontend/src/utils/BlogViewer.tsx b/frontend/src/utils/BlogViewer.tsx
index 212972c..e9537be 100644
--- a/frontend/src/utils/BlogViewer.tsx
+++ b/frontend/src/utils/BlogViewer.tsx
@@ -26,21 +26,43 @@ export function BlogViewer() {
 
   const isAuthor = me === String(blog.author_id);
 
+  const handleDelete = async () => {
+    if (!window.confirm(`Are you sure you want to delete ${blog.title}`))
+      return;
+
+    try {
+      const res = await fetch(`${API_URL}/blogs/${slug}`, {
+        method: "DELETE",
+        headers: { Accept: "application/json" },
+      });
+      if (!res.ok) throw new Error(await res.text());
+      navigate("/");
+    } catch (err) {
+      console.error("Delete failed:", err);
+      alert("Could not delete post. See console for details.");
+    }
+  };
+
   return (
     <div className="max-w-2xl mx-auto py-10 space-y-6">
       {isAuthor && (
-        <button
-          onClick={() => navigate(`/blog/${slug}/edit`)}
-          className="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700"
-        >
-          Edit this post
-        </button>
+        <div className="flex space-x-4">
+          <button
+            onClick={() => navigate(`/blog/${slug}/edit`)}
+            className="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700"
+          >
+            Edit
+          </button>
+          <button
+            onClick={handleDelete}
+            className="px-4 py-2 bg-red-600 text-white rounded hover:bg-red-700"
+          >
+            Delete
+          </button>
+        </div>
       )}
       <h1 className="text-3xl font-bold">{blog.title.toUpperCase()}</h1>
-      <p className="text-sm text-gray-500">By User {blog.author_id}</p>
-      <p className="italic text-gray-600 dark:text-gray-400">
-        {blog.description}
-      </p>
+      <p className="text-sm text-gray-500">By {blog.author_name}</p>
       <div className="markdown-body mx-auto p-4">
         <Markdown
           remarkPlugins={[remarkGfm, remarkRehype]}
diff --git a/frontend/src/utils/EditBlog.tsx b/frontend/src/utils/EditBlog.tsx
index 8850bee..bd2231e 100644
--- a/frontend/src/utils/EditBlog.tsx
+++ b/frontend/src/utils/EditBlog.tsx
@@ -7,10 +7,11 @@ import { countWords } from "./countWords";
 
 export function EditBlog() {
   const { slug } = useParams<{ slug: string }>();
-  const [blog, setBlog] = useState<Blog | undefined>(undefined);
+  const [blog, setBlog] = useState<Blog | null>(null);
   const [title, setTitle] = useState("");
   const [description, setDescription] = useState("");
   const [body, setBody] = useState("");
+  const [authorName, setAuthorName] = useState("");
   const navigate = useNavigate();
 
   useEffect(() => {
@@ -22,6 +23,7 @@ export function EditBlog() {
         setTitle(data.title);
         setDescription(data.description);
         setBody(data.body);
+        setAuthorName(data.author_name);
       })
       .catch(console.error);
   }, [slug]);
@@ -30,14 +32,14 @@ export function EditBlog() {
 
   async function handleSubmit(e: FormEvent) {
     e.preventDefault();
-
     const updatedBlog = {
       title,
       description,
       body,
+      author_name: authorName, // from the form field
       updated_at: new Date().toISOString(),
       word_count: countWords(body),
-      version: blog ? blog.version : 1,
+      version: blog ? blog.version + 1 : 1,
     };
 
     const res = await fetch(`${API_URL}/blogs/${slug}`, {
@@ -45,9 +47,8 @@ export function EditBlog() {
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(updatedBlog),
     });
-
     if (res.ok) {
-      navigate(`/blog/${slug}`); // go back to the viewer
+      navigate(`/blogs/${slug}`); // go back to the viewer
     } else {
       console.error("Update failed:", await res.text());
       alert("Could not update the post. See console for details.");
@@ -74,6 +75,16 @@ export function EditBlog() {
             className="w-full border px-2 py-1 rounded"
           />
         </div>
+        <div>
+          <label className="block font-medium">Author Name</label>
+          <input
+            type="text"
+            value={authorName}
+            onChange={(e) => setAuthorName(e.target.value)}
+            className="w-full border px-2 py-1 rounded"
+            required
+          />
+        </div>
         <div>
           <label className="block font-medium">Body (Markdown)</label>
           <textarea
diff --git a/frontend/src/utils/types.ts b/frontend/src/utils/types.ts
index 62c52f2..8e93598 100644
--- a/frontend/src/utils/types.ts
+++ b/frontend/src/utils/types.ts
@@ -1,8 +1,16 @@
 export interface Blog {
   id: number;
   title: string;
-  author_id: string;
   description: string;
   body: string;
+  author_id: number;
+  author_name: string;
+  created_at: string;
+  updated_at: string;
+  published_at: string;
+  word_count: number;
   version: number;
+  read_time: number;
+  language: string;
+  tags: string[];
 }
-- 
2.39.5