chapter 16 updated

Author: tib

Chapter 16/myProject/.gitignore

@@ -0,0 +1,77 @@
+# ================================
+# Build image
+# ================================
+FROM swift:5.7-jammy as build
+
+# Install OS updates and, if needed, sqlite3
+RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
+    && apt-get -q update \
+    && apt-get -q dist-upgrade -y\
+    && rm -rf /var/lib/apt/lists/*
+
+# Set up a build area
+WORKDIR /build
+
+# First just resolve dependencies.
+# This creates a cached layer that can be reused
+# as long as your Package.swift/Package.resolved
+# files do not change.
+COPY ./Package.* ./
+RUN swift package resolve
+
+# Copy entire repo into container
+COPY . .
+
+# Build everything, with optimizations
+RUN swift build -c release --static-swift-stdlib
+
+# Switch to the staging area
+WORKDIR /staging
+
+# Copy main executable to staging area
+RUN cp "$(swift build --package-path /build -c release --show-bin-path)/Run" ./
+
+# Copy resources bundled by SPM to staging area
+RUN find -L "$(swift build --package-path /build -c release --show-bin-path)/" -regex '.*\.resources$' -exec cp -Ra {} ./ \;
+
+# Copy any resources from the public directory and views directory if the directories exist
+# Ensure that by default, neither the directory nor any of its contents are writable.
+RUN [ -d /build/Public ] && { mv /build/Public ./Public && chmod -R a-w ./Public; } || true
+RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w ./Resources; } || true
+
+# ================================
+# Run image
+# ================================
+FROM ubuntu:jammy
+
+# Make sure all system packages are up to date, and install only essential packages.
+RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
+    && apt-get -q update \
+    && apt-get -q dist-upgrade -y \
+    && apt-get -q install -y \
+      ca-certificates \
+      tzdata \
+# If your app or its dependencies import FoundationNetworking, also install `libcurl4`.
+      # libcurl4 \
+# If your app or its dependencies import FoundationXML, also install `libxml2`.
+      # libxml2 \
+    && rm -r /var/lib/apt/lists/*
+
+# Create a vapor user and group with /app as its home directory
+RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
+
+# Switch to the new home directory
+WORKDIR /app
+
+# Copy built executable and any staged resources from builder
+COPY --from=build --chown=vapor:vapor /staging /app
+
+# Ensure all further commands run as the vapor user
+USER vapor:vapor
+
+# Let Docker bind to port 8080
+EXPOSE 8080
+
+# Start the Vapor service when the image is run, default to listening on 8080 in production environment
+ENTRYPOINT ["./Run"]
+CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]

Chapter 16/myProject/Dockerfile

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(
@@ -10,13 +10,34 @@ let package = Package(
         .library(name: "AppApi", targets: ["AppApi"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/vapor", from: "4.54.0"),
-        .package(url: "https://github.com/vapor/fluent", from: "4.4.0"),
-        .package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.1.0"),
-        .package(url: "https://github.com/binarybirds/liquid", from: "1.3.0"),
-        .package(url: "https://github.com/binarybirds/liquid-local-driver", from: "1.3.0"),
-        .package(url: "https://github.com/binarybirds/swift-html", from: "1.2.0"),
-        .package(url: "https://github.com/binarybirds/spec", from: "1.2.0"),
+        .package(
+            url: "https://github.com/vapor/vapor",
+            from: "4.70.0"
+        ),
+        .package(
+            url: "https://github.com/vapor/fluent",
+            from: "4.4.0"
+        ),
+        .package(
+            url: "https://github.com/vapor/fluent-sqlite-driver",
+            from: "4.1.0"
+        ),
+        .package(
+            url: "https://github.com/binarybirds/liquid",
+            from: "1.3.0"
+        ),
+        .package(
+            url: "https://github.com/binarybirds/liquid-local-driver",
+            from: "1.3.0"
+        ),
+        .package(
+            url: "https://github.com/binarybirds/swift-html",
+            from: "1.7.0"
+        ),
+        .package(
+            url: "https://github.com/binarybirds/spec",
+            from: "1.2.0"
+        ),
     ],
     targets: [
         .target(name: "AppApi", dependencies: []),
@@ -25,10 +46,9 @@ let package = Package(
             .product(name: "Fluent", package: "fluent"),
             .product(name: "FluentSQLiteDriver", package: "fluent-sqlite-driver"),
             .product(name: "Liquid", package: "liquid"),
-            .product(name: "LiquidLocalDriver", package: "liquid-local-driver"),
+            .product(name: "LiquidLocalDriver", package: "liquid-local-driver"),            
             .product(name: "SwiftHtml", package: "swift-html"),
             .product(name: "SwiftSvg", package: "swift-html"),
-
             .target(name: "AppApi")
         ]),
         .executableTarget(name: "Run", dependencies: ["App"]),
@@ -39,6 +59,6 @@ let package = Package(
         ]),
         .testTarget(name: "AppApiTests", dependencies: [
             .target(name: "AppApi"),
-        ])
+        ]),
     ]
 )

Chapter 16/myProject/Makefile

@@ -1,10 +1,3 @@
 tr {
-    grid-template-columns: 4rem 1fr 4rem;
     column-gap: 1rem;
 }
-td img {
-    display: block;
-}
-th {
-    text-align: left;
-}

Chapter 16/myProject/Package.swift

@@ -4,3 +4,4 @@ document.addEventListener("keydown", function(e) {
         document.forms[0].submit();
     }
 }, false);
+

Chapter 16/myProject/Public/assets/blog/post/071C8D44-4AD8-495D-850B-64DCFB467DC7_2020-04-02_08-41-38.jpg

@@ -1,13 +1,7 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 01. 03..
-//
-
 import SwiftSvg
 
 extension Svg {
+
     static func menuIcon() -> Svg {
         Svg {
             Line(x1: 3, y1: 12, x2: 21, y2: 12)

Chapter 16/myProject/Public/css/admin.css

@@ -1,14 +1,9 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 01. 09..
-//
-
 import Vapor
+import AppApi
 
 extension ApiModelInterface {
 
-    static var pathIdComponent: PathComponent { .init(stringLiteral: ":" + pathIdKey) }
+    static var pathIdComponent: PathComponent {
+        .init(stringLiteral: ":" + pathIdKey)
+    }
 }
-

Chapter 16/myProject/Public/js/admin.js

@@ -1,17 +1,14 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2021. 12. 31..
-//
-
 import Vapor
 
 public struct AuthenticatedUser {
+
     public let id: UUID
     public let email: String
 
-    public init(id: UUID, email: String) {
+    public init(
+        id: UUID,
+        email: String
+    ) {
         self.id = id
         self.email = email
     }
@@ -20,4 +17,3 @@ public struct AuthenticatedUser {
 extension AuthenticatedUser: SessionAuthenticatable {
     public var sessionID: UUID { id }
 }
-