Subdomain fixes

qixils · Jan 24, 2022 · e7cc9e4 · e7cc9e4
1 parent 76c4d5b
commit e7cc9e4
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/viewer-backend/build.gradle.kts b/viewer-backend/build.gradle.kts
@@ -1,6 +1,6 @@
-val ktor_version: String by project
-val kotlin_version: String by project
-val logback_version: String by project
+val ktorVersion: String by project
+val kotlinVersion: String by project
+val logbackVersion: String by project
 
 plugins {
     application
@@ -20,16 +20,16 @@ repositories {
 }
 
 dependencies {
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-server-host-common:$ktor_version")
-    implementation("io.ktor:ktor-server-compression:$ktor_version")
-    implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
-    implementation("io.ktor:ktor-server-default-headers:$ktor_version")
-    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
-    implementation("io.ktor:ktor-serialization-gson:$ktor_version")
-    implementation("io.ktor:ktor-server-netty:$ktor_version")
-    implementation("ch.qos.logback:logback-classic:$logback_version")
+    implementation("io.ktor:ktor-server-core:$ktorVersion")
+    implementation("io.ktor:ktor-server-host-common:$ktorVersion")
+    implementation("io.ktor:ktor-server-compression:$ktorVersion")
+    implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion")
+    implementation("io.ktor:ktor-server-default-headers:$ktorVersion")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
+    implementation("io.ktor:ktor-serialization-gson:$ktorVersion")
+    implementation("io.ktor:ktor-server-netty:$ktorVersion")
+    implementation("ch.qos.logback:logback-classic:$logbackVersion")
     implementation("io.ktor:ktor-server-cors:2.0.0-beta-1")
-    testImplementation("io.ktor:ktor-server-tests:$ktor_version")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
+    testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
 }
diff --git a/viewer-backend/gradle.properties b/viewer-backend/gradle.properties
@@ -1,4 +1,4 @@
-ktor_version=2.0.0-beta-1
-kotlin_version=1.6.10
-logback_version=1.2.3
+ktorVersion=2.0.0-beta-1
+kotlinVersion=1.6.10
+logbackVersion=1.2.10
 kotlin.code.style=official
diff --git a/viewer-backend/src/main/kotlin/dev/qixils/yahoo/api/plugins/Routing.kt b/viewer-backend/src/main/kotlin/dev/qixils/yahoo/api/plugins/Routing.kt
@@ -141,7 +141,7 @@ fun Application.configureRouting() {
         }
 
         get("/") {
-            call.respondRedirect("https://swagger.yahoo.qixils.dev/", permanent = true)
+            call.respondRedirect("https://swagger.qixils.dev/", permanent = true)
         }
 
         get("/{...}") {

diff --git a/viewer-frontend/src/routes/group/[group]/[page].svelte b/viewer-frontend/src/routes/group/[group]/[page].svelte
@@ -7,7 +7,7 @@
     let main_res: Response;
     let main_res_json: any;
     try {
-      main_res = await fetch(`https://api.yahoo.qixils.dev/v1/messages/${group}/page/${page}`);
+      main_res = await fetch(`https://yahoo.qixils.dev/v1/messages/${group}/page/${page}`);
       main_res_json = await main_res.json();
     } catch (error) {
       return {
@@ -37,7 +37,7 @@
       }
     }
 
-    const sub_res: Response = await fetch(`https://api.yahoo.qixils.dev/v1/messages/${group}/pages`)
+    const sub_res: Response = await fetch(`https://yahoo.qixils.dev/v1/messages/${group}/pages`)
 
     return {
       props: {

diff --git a/viewer-frontend/src/routes/index.svelte b/viewer-frontend/src/routes/index.svelte
@@ -6,7 +6,7 @@
 	interface GroupData {
 		groups: string[];
 	}
-	let groups_promise: Promise<GroupData> = fetch("https://api.yahoo.qixils.dev/v1/groups").then(response => response.json())
+	let groups_promise: Promise<GroupData> = fetch("https://yahoo.qixils.dev/v1/groups").then(response => response.json())
 
     import Error from "$lib/Error.svelte";
 	let selected: string;

diff --git a/viewer-frontend/src/routes/search.svelte b/viewer-frontend/src/routes/search.svelte
@@ -6,7 +6,7 @@
   import type GroupData from '$lib/Constants';
   import Error from "$lib/Error.svelte";
   import LabelFor from "$lib/LabelFor.svelte";
-	const groups_promise: Promise<GroupData> = fetch("https://api.yahoo.qixils.dev/v1/groups").then(response => response.json());
+	const groups_promise: Promise<GroupData> = fetch("https://yahoo.qixils.dev/v1/groups").then(response => response.json());
   const pattern = "[A-Za-z0-9.@_]{4,40}"; // pattern for usernames; here because the {} causes issues when inline
 
   function unixSecondsOf(date: string): number {

diff --git a/viewer-frontend/src/routes/search/[group].svelte b/viewer-frontend/src/routes/search/[group].svelte
@@ -20,7 +20,7 @@
     let res: Response;
     let res_json: any;
     try {
-      res = await fetch(`https://api.yahoo.qixils.dev/v1/messages/${group}/search${query}`);
+      res = await fetch(`https://yahoo.qixils.dev/v1/messages/${group}/search${query}`);
       res_json = await res.json();
     } catch (error) {
       return {
@@ -70,7 +70,7 @@
 
   function load_more() {
     offset += 50;
-    fetch(`https://api.yahoo.qixils.dev/v1/messages/${group}/search${query}&offset=${offset}`)
+    fetch(`https://yahoo.qixils.dev/v1/messages/${group}/search${query}&offset=${offset}`)
     .then(resp => resp.json())
     .then((resp: ResultData) => {
       if (resp.error !== undefined || resp.results.length === 0) {

diff --git a/viewer-frontend/src/routes/user/[user].svelte b/viewer-frontend/src/routes/user/[user].svelte
@@ -5,7 +5,7 @@
     let user_res: Response;
     let user_res_json: any;
     try {
-      user_res = await fetch(`https://api.yahoo.qixils.dev/v1/user/${user}`);
+      user_res = await fetch(`https://yahoo.qixils.dev/v1/user/${user}`);
       user_res_json = await user_res.json();
     } catch (error) {
       return {