Merge Staging into Main (#158)

* Bring Staging up to date with Main (#143) * Merge Staging into Main (#139) * news carousel adjustments * adjust explore and tag pages * work header fixes * profile header updates * adjust profile home page * sizes down work stats on smaller displays * adjusting works and blogs lists * Update +layout.svelte * adding optimizations to section list * Update +page.svelte * Update +page.svelte * Feat/email and recovery (#136) * feat: password resets and email confirmations * updating controllers with confirmation guard * API routes for features now in place * password resets are in * email confirmations are now in * update readme * Feat/work and comments features (#138) * Feat/fixing profile forms (#142) * chore: add beta badge to nav * chore: fix display of beta badge * chore: update about panel and version * adding placeholder for messages panel * profile forms now work * fix: redirect approval/rejection notifications to their intended recipient * adding links form to profile setitngs * feat: adding links to profile pages * fix: address issue with layout of admin badge on mobile * chore: adds unique constraint to the approval queue (#123) adds a `UNIQUE` constraint to the approval queue table on `work_id`, guaranteeing that works can only ever be submitted to the queue once. closes #78 * fix: testing new method of obtaining client IP address * Update Functions.swift * Update Functions.swift * fix: addresses issues with pagination on profile pages * fix: address issue of width on mobile devices for profile pages * fix: remove more tags button when less than 2 tags * fix: one last fix for tags display * fix: make sure transactions are actually being committed * fix: pagination on works and blogs pages * Update version.ts * Update Paginator.svelte * Update version.ts * [FIX] Addresses access token expiry issue (#152) * fix: include parent tags when fetching approval queue * fix: addresses issue with sessions expiring early * chore: remove debug lines * feat: update site version * feat: adding svelte query * chore: update swift dependencies * chore: update client packages * fix: prevent unauthorized users from creating newsposts * chore: update readme with latest version of swift * chore: update version * chore: update API packages to latest versions * chore: update sailfish version
OffprintStudios · May 6, 2023 · 9b5173c · 9b5173c
1 parent af175ff
commit 9b5173c
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 41 deletions.
diff --git a/Client/src/lib/util/constants/version.ts b/Client/src/lib/util/constants/version.ts
@@ -1 +1 @@
-export const VERSION = "v1.0.0-beta.5";
+export const VERSION = "v1.0.0-beta.6";
diff --git a/Package.resolved b/Package.resolved
@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/async-kit.git",
       "state" : {
-        "revision" : "c3329e444bafbb12d1d312af9191be95348a8175",
-        "version" : "1.13.0"
+        "revision" : "a61da00d404ec91d12766f1b9aac7d90777b484d",
+        "version" : "1.17.0"
       }
     },
     {
@@ -41,26 +41,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/fluent.git",
       "state" : {
-        "revision" : "ea707ee318066a073c95b2b2df1aa640fcb67f9e",
-        "version" : "4.4.0"
+        "revision" : "4b4d8bf15a06fd60137e9c543e5503c4b842654e",
+        "version" : "4.8.0"
       }
     },
     {
       "identity" : "fluent-kit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/fluent-kit.git",
       "state" : {
-        "revision" : "a0cae5b53521e7f003a044f3a38aa125be074130",
-        "version" : "1.34.0"
+        "revision" : "e53acf986e32c54fe522b2c12f737baa01828c1c",
+        "version" : "1.42.2"
       }
     },
     {
       "identity" : "fluent-postgres-driver",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/fluent-postgres-driver.git",
       "state" : {
-        "revision" : "a8b2839ea86c44a35c17f66eb0885f9e5b51a531",
-        "version" : "2.4.0"
+        "revision" : "c7cd0203c9d570888e5c6a22595a374ddaa3751d",
+        "version" : "2.6.1"
       }
     },
     {
@@ -131,17 +131,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/postgres-kit.git",
       "state" : {
-        "revision" : "e436a94a95285dc10a02ec772796465e923471d6",
-        "version" : "2.8.1"
+        "revision" : "3a4e63e49534589fe682e934e898211debd7d10e",
+        "version" : "2.10.1"
       }
     },
     {
       "identity" : "postgres-nio",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/postgres-nio.git",
       "state" : {
-        "revision" : "d648c5b4594ffbc2f6173318f70f5531e05ccb4e",
-        "version" : "1.11.0"
+        "revision" : "2df54bc94607f44584ae6ffa74e3cd754fffafc7",
+        "version" : "1.14.2"
       }
     },
     {
@@ -212,26 +212,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/soto-project/soto.git",
       "state" : {
-        "revision" : "a56557ac972515f185ad77777d1e504572ebe137",
-        "version" : "6.1.0"
+        "revision" : "18184ba84e97e598ee6c5a7b803851e049e6eab5",
+        "version" : "6.6.0"
       }
     },
     {
       "identity" : "soto-core",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/soto-project/soto-core.git",
       "state" : {
-        "revision" : "d8b87771ea25868a6db177ab113aab5e746c07f1",
-        "version" : "6.1.2"
+        "revision" : "3462ca704a43ded3b5a2903f5df3280dd5fa6b1f",
+        "version" : "6.5.0"
       }
     },
     {
       "identity" : "sql-kit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/sql-kit.git",
       "state" : {
-        "revision" : "3c5413a229bc2abc962dab17ea66d25e448ad344",
-        "version" : "3.21.0"
+        "revision" : "d547122756534d8224d4599739da0e82e4695623",
+        "version" : "3.25.0"
       }
     },
     {
@@ -248,8 +248,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-atomics.git",
       "state" : {
-        "revision" : "919eb1d83e02121cdb434c7bfc1f0c66ef17febe",
-        "version" : "1.0.2"
+        "revision" : "6c89474e62719ddcc1e9614989fff2f68208fe10",
+        "version" : "1.1.0"
       }
     },
     {
@@ -284,8 +284,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-log.git",
       "state" : {
-        "revision" : "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
-        "version" : "1.4.2"
+        "revision" : "32e8d724467f8fe623624570367e3d50c5638e46",
+        "version" : "1.5.2"
       }
     },
     {
@@ -302,8 +302,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "b4e0a274f7f34210e97e2f2c50ab02a10b549250",
-        "version" : "2.41.1"
+        "revision" : "546eaa261ec5028b9cc5c7fa883fba9dd5881a3b",
+        "version" : "2.52.0"
       }
     },
     {
@@ -329,17 +329,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-ssl.git",
       "state" : {
-        "revision" : "0265283d3539ced108b9b8287eb3328c9d85acdc",
-        "version" : "2.21.0"
+        "revision" : "9d0d5d8798a576fbf674a823734e65e15ca5f2ec",
+        "version" : "2.23.1"
       }
     },
     {
       "identity" : "swift-nio-transport-services",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-transport-services.git",
       "state" : {
-        "revision" : "4e02d9cf35cabfb538c96613272fb027dd0c8692",
-        "version" : "1.13.1"
+        "revision" : "41f4098903878418537020075a4d8a6e20a0b182",
+        "version" : "1.17.0"
       }
     },
     {
@@ -356,8 +356,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/scinfu/SwiftSoup.git",
       "state" : {
-        "revision" : "6778575285177365cbad3e5b8a72f2a20583cfec",
-        "version" : "2.4.3"
+        "revision" : "0e96a20ffd37a515c5c963952d4335c89bed50a6",
+        "version" : "2.6.0"
       }
     },
     {
@@ -374,8 +374,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/vapor.git",
       "state" : {
-        "revision" : "c814b6f6900bd479fd93fa28aea3b45afb6ea342",
-        "version" : "4.65.0"
+        "revision" : "f4b00a5350238fe896d865d96d64f12fcbbeda95",
+        "version" : "4.76.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -8,16 +8,16 @@ let package = Package(
     ],
     dependencies: [
         // 💧 A server-side Swift web framework.
-        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
-        .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0"),
-        .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.0.0"),
-        .package(url: "https://github.com/vapor/jwt.git", from: "4.0.0"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.76.0"),
+        .package(url: "https://github.com/vapor/fluent.git", from: "4.8.0"),
+        .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.6.1"),
+        .package(url: "https://github.com/vapor/jwt.git", from: "4.2.0"),
         .package(url: "https://github.com/tmthecoder/Argon2Swift.git", branch: "main"),
-        .package(url: "https://github.com/malcommac/UAParserSwift.git", from: "1.0.1"),
+        .package(url: "https://github.com/malcommac/UAParserSwift.git", from: "1.2.1"),
         .package(url: "https://github.com/vapor/queues-redis-driver.git", from: "1.0.0"),
         .package(url: "https://github.com/OffprintStudios/NanoID.git", from: "1.0.0"),
-        .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.4.3"),
-        .package(url: "https://github.com/soto-project/soto.git", from: "6.0.0"),
+        .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.6.0"),
+        .package(url: "https://github.com/soto-project/soto.git", from: "6.6.0"),
         .package(url: "https://github.com/PinStudios/lexorank-swift", branch: "main"),
         .package(url: "https://github.com/vapor-community/sendgrid.git", from: "4.0.0")
     ],

diff --git a/Sources/App/routes.swift b/Sources/App/routes.swift
@@ -6,7 +6,7 @@ func routes(_ app: Application) throws {
     }
 
     app.get("version") { req in
-        "1.0.0-beta.5"
+        "1.0.0-beta.6"
     }
 
     try app.register(collection: AdminController())
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const VERSION = "v1.0.0-beta.5";
		export const VERSION = "v1.0.0-beta.6";