From 754cac54e2b10a2a4b238ccc110f82137ddc031c Mon Sep 17 00:00:00 2001
From: Chris Jean-Marie <chris.jeanmarie@gmail.com>
Date: Thu, 26 Sep 2024 19:09:57 +0000
Subject: [PATCH] Fix SQLx database migration

---
 .gitignore                                    |  1 -
 backend/db/.gitkeep                           |  0
 .../20221012234646_initial_setup.sql          | 12 ---------
 .../20240926181906_initial_setup.down.sql     |  1 +
 .../20240926181906_initial_setup.up.sql       | 25 +++++++++++++++++++
 backend/src/main.rs                           |  2 +-
 backend/templates/index.html                  | 10 +++++---
 7 files changed, 34 insertions(+), 17 deletions(-)
 delete mode 100644 backend/db/.gitkeep
 delete mode 100644 backend/migrations/20221012234646_initial_setup.sql
 create mode 100644 backend/migrations/20240926181906_initial_setup.down.sql
 create mode 100644 backend/migrations/20240926181906_initial_setup.up.sql

diff --git a/.gitignore b/.gitignore
index 0a1abd8..64aadb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 backend/target
 backend/db
-backend/db/db.sqlite3
diff --git a/backend/db/.gitkeep b/backend/db/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/backend/migrations/20221012234646_initial_setup.sql b/backend/migrations/20221012234646_initial_setup.sql
deleted file mode 100644
index 90f3313..0000000
--- a/backend/migrations/20221012234646_initial_setup.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Add migration script here
-CREATE TABLE IF NOT EXISTS accounts (
-    user_id serial primary key,
-    created_on timestamp not null,
-    last_login timestamp,
-    last_name varchar(50) not null,
-    first_name varchar(50) not null,
-    discord_id varchar(50),
-    discord_avatar varchar(255),
-    discord_username varchar(50),
-    discord_discriminator varchar(50)
-);
\ No newline at end of file
diff --git a/backend/migrations/20240926181906_initial_setup.down.sql b/backend/migrations/20240926181906_initial_setup.down.sql
new file mode 100644
index 0000000..d2f607c
--- /dev/null
+++ b/backend/migrations/20240926181906_initial_setup.down.sql
@@ -0,0 +1 @@
+-- Add down migration script here
diff --git a/backend/migrations/20240926181906_initial_setup.up.sql b/backend/migrations/20240926181906_initial_setup.up.sql
new file mode 100644
index 0000000..f1d5474
--- /dev/null
+++ b/backend/migrations/20240926181906_initial_setup.up.sql
@@ -0,0 +1,25 @@
+-- Add up migration script here
+CREATE TABLE "oauth2_state_storage" (
+    "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "csrf_state" text NOT NULL,
+    "pkce_code_verifier" text NOT NULL,
+    "return_url" text NOT NULL
+);
+
+CREATE TABLE "user_sessions" (
+    "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "user_id" integer NOT NULL,
+    "session_token_p1" text NOT NULL,
+    "session_token_p2" text NOT NULL,
+    "created_at" integer NOT NULL,
+    "expires_at" integer NOT NULL
+);
+
+CREATE TABLE "users" (
+	"id"	integer NOT NULL,
+	"email"	text NOT NULL UNIQUE,
+	"name"	text NOT NULL,
+	"family_name"	text NOT NULL,
+	"given_name"	text NOT NULL,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
diff --git a/backend/src/main.rs b/backend/src/main.rs
index 9cde9db..da9f61b 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -114,7 +114,7 @@ async fn index<T>(
     Extension(user_data): Extension<Option<UserData>>,
     _request: Request<T>,
 ) -> impl IntoResponse {
-    let user_email = user_data.map(|s| s.email);
+    let user_email = user_data.map(|s| s.name);
     let logged_in = user_email.is_some();
     let name = user_email.unwrap_or_default();
 
diff --git a/backend/templates/index.html b/backend/templates/index.html
index d07128b..2b80b89 100644
--- a/backend/templates/index.html
+++ b/backend/templates/index.html
@@ -6,6 +6,10 @@
     <p>This will be the private information area for the extended Jean-Marie family.</p>
     <div>
         <h2>Web links</h2>
+        <h3>TLC Creations</h3>
+        <ul>
+            <li><a href="https://www.tlccreations.ca">TLC Creations</a></li>
+        </ul>
         <h3>Fonts</h3>
         <ul>
             <li><a href="https://fonts.google.com">Google fonts</a></li>
@@ -31,21 +35,21 @@
   
     <div class="carousel-inner">
       <div class="carousel-item active">
-        <img src="assets/images/slide-01.jpg" alt="View from the dock" class="d-block w-100">
+        <img src="assets/images/slide-01.jpg" alt="View from the dock" class="d-block w-50">
         <div class="carousel-caption">
           <h3>Jean-Marie Family</h3>
           <p>View from the dock</p>
         </div>
       </div>
       <div class="carousel-item">
-        <img src="assets/images/slide-02.jpg" alt="Sunset at 3 sisters" class="d-block w-100">
+        <img src="assets/images/slide-02.jpg" alt="Sunset at 3 sisters" class="d-block w-50">
         <div class="carousel-caption">
           <h3>Jean-Marie Family</h3>
           <p>Sunset over the 3 sisters</p>
         </div>
       </div>
       <div class="carousel-item">
-        <img src="assets/images/slide-03.jpg" alt="Purple sunset" class="d-block w-100">
+        <img src="assets/images/slide-03.jpg" alt="Purple sunset" class="d-block w-50">
         <div class="carousel-caption">
           <h3>Jean-Marie Family</h3>
           <p>Purple sunset</p>