Migrate to the new kobweb route generator

FreshKernel · Mar 12, 2024 · 0be9318 · 0be9318
1 parent 2ab003a
commit 0be9318
Show file tree

Hide file tree

Showing 22 changed files with 71 additions and 57 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-jetbrains-compose = "1.5.11"
-kobweb = "0.15.3"
-kotlin = "1.9.21"
+jetbrains-compose = "1.6.0"
+kobweb = "0.17.0"
+kotlin = "1.9.22"
 
 [libraries]
 kobweb-api = { module = "com.varabyte.kobweb:kobweb-api", version.ref = "kobweb" }

diff --git a/site/.kobweb/site/app.js b/site/.kobweb/site/app.js
diff --git a/site/.kobweb/site/app.js.map b/site/.kobweb/site/app.js.map
diff --git a/...ar/delete_account_instructions/index.html → ...ar/delete-account-instructions/index.html b/...ar/delete_account_instructions/index.html → ...ar/delete-account-instructions/index.html
@@ -28,7 +28,7 @@
   <link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
   <link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
   <link href="/site.webmanifest" rel="manifest">
-  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" referrerpolicy="no-referrer" rel="stylesheet">
+  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" referrerpolicy="no-referrer" rel="stylesheet">
  </head>
  <body>
   <div id="root" style="width: 100%; height: 100%;" class="silk-colors_light">

diff --git a/...eb/site/ar/download_mobile_app/index.html → ...eb/site/ar/download-mobile-app/index.html b/...eb/site/ar/download_mobile_app/index.html → ...eb/site/ar/download-mobile-app/index.html
@@ -28,7 +28,7 @@
   <link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
   <link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
   <link href="/site.webmanifest" rel="manifest">
-  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" referrerpolicy="no-referrer" rel="stylesheet">
+  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" referrerpolicy="no-referrer" rel="stylesheet">
  </head>
  <body>
   <div id="root" style="width: 100%; height: 100%;" class="silk-colors_light">

diff --git a/site/.kobweb/site/ar/index.html b/site/.kobweb/site/ar/index.html
diff --git a/....kobweb/site/ar/privacy_policy/index.html → ....kobweb/site/ar/privacy-policy/index.html b/....kobweb/site/ar/privacy_policy/index.html → ....kobweb/site/ar/privacy-policy/index.html
@@ -28,7 +28,7 @@
   <link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
   <link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
   <link href="/site.webmanifest" rel="manifest">
-  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" referrerpolicy="no-referrer" rel="stylesheet">
+  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" referrerpolicy="no-referrer" rel="stylesheet">
  </head>
  <body>
   <div id="root" style="width: 100%; height: 100%;" class="silk-colors_light">

diff --git a/...te/delete_account_instructions/index.html → ...te/delete-account-instructions/index.html b/...te/delete_account_instructions/index.html → ...te/delete-account-instructions/index.html
@@ -28,7 +28,7 @@
   <link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
   <link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
   <link href="/site.webmanifest" rel="manifest">
-  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" referrerpolicy="no-referrer" rel="stylesheet">
+  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" referrerpolicy="no-referrer" rel="stylesheet">
  </head>
  <body>
   <div id="root" style="width: 100%; height: 100%;" class="silk-colors_light">

diff --git a/...obweb/site/download_mobile_app/index.html → ...obweb/site/download-mobile-app/index.html b/...obweb/site/download_mobile_app/index.html → ...obweb/site/download-mobile-app/index.html
@@ -28,7 +28,7 @@
   <link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
   <link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
   <link href="/site.webmanifest" rel="manifest">
-  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" referrerpolicy="no-referrer" rel="stylesheet">
+  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" referrerpolicy="no-referrer" rel="stylesheet">
  </head>
  <body>
   <div id="root" style="width: 100%; height: 100%;" class="silk-colors_light">

diff --git a/site/.kobweb/site/index.html b/site/.kobweb/site/index.html
diff --git a/site/.kobweb/site/privacy_policy/index.html → site/.kobweb/site/privacy-policy/index.html b/site/.kobweb/site/privacy_policy/index.html → site/.kobweb/site/privacy-policy/index.html
@@ -28,7 +28,7 @@
   <link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
   <link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
   <link href="/site.webmanifest" rel="manifest">
-  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" referrerpolicy="no-referrer" rel="stylesheet">
+  <link crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" referrerpolicy="no-referrer" rel="stylesheet">
  </head>
  <body>
   <div id="root" style="width: 100%; height: 100%;" class="silk-colors_light">

diff --git a/site/.kobweb/site/sitemap.xml b/site/.kobweb/site/sitemap.xml
@@ -18,37 +18,37 @@
                 href="https://alrayada.net/ar/"/>
     </url>
     <url>
-        <loc>https://alrayada.net/privacy_policy</loc>
+        <loc>https://alrayada.net/privacy-policy</loc>
         <lastmod>2023-10-15T12:57:20+00:00</lastmod>
         <priority>0.80</priority>
         <xhtml:link
                 rel="alternate"
                 hreflang="x-default"
-                href="https://alrayada.net/privacy_policy/"/>
+                href="https://alrayada.net/privacy-policy/"/>
         <xhtml:link
                 rel="alternate"
                 hreflang="en"
-                href="https://alrayada.net/privacy_policy/"/>
+                href="https://alrayada.net/privacy-policy/"/>
         <xhtml:link
                 rel="alternate"
                 hreflang="ar"
-                href="https://alrayada.net/ar/privacy_policy/"/>
+                href="https://alrayada.net/ar/privacy-policy/"/>
     </url>
     <url>
-        <loc>https://alrayada.net/download_mobile_app</loc>
+        <loc>https://alrayada.net/download-mobile-app</loc>
         <lastmod>2023-10-15T12:57:20+00:00</lastmod>
         <priority>0.80</priority>
         <xhtml:link
                 rel="alternate"
                 hreflang="x-default"
-                href="https://alrayada.net/download_mobile_app/"/>
+                href="https://alrayada.net/download-mobile-app/"/>
         <xhtml:link
                 rel="alternate"
                 hreflang="en"
-                href="https://alrayada.net/download_mobile_app/"/>
+                href="https://alrayada.net/download-mobile-app/"/>
         <xhtml:link
                 rel="alternate"
                 hreflang="ar"
-                href="https://alrayada.net/ar/download_mobile_app/"/>
+                href="https://alrayada.net/ar/download-mobile-app/"/>
     </url>
 </urlset>
diff --git a/site/build.gradle.kts b/site/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.varabyte.kobweb.gradle.application.extensions.AppBlock
 import com.varabyte.kobweb.gradle.application.util.configAsKobwebApplication
 import kotlinx.html.link
 import kotlinx.html.meta
@@ -131,6 +132,10 @@ kobweb {
             }
             description.set(webDesc)
         }
+
+        // Only legacy sites need this set. Sites built after 0.16.0 should default to DISALLOW.
+        // See https://github.com/varabyte/kobweb#legacy-routes for more information.
+        legacyRouteRedirectStrategy.set(AppBlock.LegacyRouteRedirectStrategy.DISALLOW)
     }
 }
 
@@ -159,11 +164,21 @@ kotlin {
 // Here we will use code generator to generate unique pages that redirect to the original pages
 
 val languages = listOf("ar") // other than English
-val pages = listOf("download_mobile_app", "privacy_policy", "delete_account_instructions") // all the pages in the `page` package
+val pages = listOf("downloadMobileApp", "privacyPolicy", "deleteAccountInstructions") // all the pages in the `page` package
 
 val generateLanguagesPagesTask = tasks.register("generateLanguagesPages") {
     group = "net.freshplatform.alrayada_web"
 
+    fun toKebabCase(input: String): String {
+        var result = input.replace(Regex("([a-z])([A-Z])")) {
+            "${it.groupValues[1]}-${it.groupValues[2]}"
+        }
+
+        result = result.replace("_", "-")
+
+        return result.lowercase()
+    }
+
     doLast {
         val pagesDirectory = project.file("src/jsMain/kotlin/net/freshplatform/alrayada_web")
         languages.forEach { lang ->
@@ -181,7 +196,7 @@ val generateLanguagesPagesTask = tasks.register("generateLanguagesPages") {
                         @Composable
                         @Page
                         fun PrivacyPolicyPage_${lang}() {
-                            rememberPageContext().router.navigateTo("/${page}/?lang=${lang}")
+                            rememberPageContext().router.navigateTo("/${toKebabCase(page)}/?lang=${lang}")
                         }
                     """.trimIndent())
                 }

diff --git a/site/src/jsMain/kotlin/net/freshplatform/alrayada_web/core/router/AppRouter.kt b/site/src/jsMain/kotlin/net/freshplatform/alrayada_web/core/router/AppRouter.kt
@@ -2,6 +2,6 @@ package net.freshplatform.alrayada_web.core.router
 
 object AppRouter {
     // Unfortunately, we can't use those in the pages routeOverride, even though it's a constant in compile time
-    const val PRIVACY_POLICY = "/privacy_policy"
-    const val DOWNLOAD_MOBILE_APP = "/download_mobile_app"
+    const val PRIVACY_POLICY = "/privacy-policy"
+    const val DOWNLOAD_MOBILE_APP = "/download-mobile-app"
 }
diff --git a/...s/ar/delete_account_instructions/Index.kt → ...ges/ar/deleteAccountInstructions/Index.kt b/...s/ar/delete_account_instructions/Index.kt → ...ges/ar/deleteAccountInstructions/Index.kt
@@ -1,4 +1,4 @@
-package net.freshplatform.alrayada_web.pages.ar.delete_account_instructions
+package net.freshplatform.alrayada_web.pages.ar.deleteAccountInstructions
 
 import androidx.compose.runtime.Composable
 import com.varabyte.kobweb.core.Page
@@ -7,5 +7,5 @@ import com.varabyte.kobweb.core.rememberPageContext
 @Composable
 @Page
 fun PrivacyPolicyPage_ar() {
-    rememberPageContext().router.navigateTo("/delete_account_instructions/?lang=ar")
+    rememberPageContext().router.navigateTo("/delete-account-instructions/?lang=ar")
 }
diff --git a/...web/pages/ar/download_mobile_app/Index.kt → ...a_web/pages/ar/downloadMobileApp/Index.kt b/...web/pages/ar/download_mobile_app/Index.kt → ...a_web/pages/ar/downloadMobileApp/Index.kt
@@ -1,4 +1,4 @@
-package net.freshplatform.alrayada_web.pages.ar.download_mobile_app
+package net.freshplatform.alrayada_web.pages.ar.downloadMobileApp
 
 import androidx.compose.runtime.Composable
 import com.varabyte.kobweb.core.Page
@@ -7,5 +7,5 @@ import com.varabyte.kobweb.core.rememberPageContext
 @Composable
 @Page
 fun PrivacyPolicyPage_ar() {
-    rememberPageContext().router.navigateTo("/download_mobile_app/?lang=ar")
+    rememberPageContext().router.navigateTo("/download-mobile-app/?lang=ar")
 }
diff --git a/...yada_web/pages/ar/privacy_policy/Index.kt → ...ayada_web/pages/ar/privacyPolicy/Index.kt b/...yada_web/pages/ar/privacy_policy/Index.kt → ...ayada_web/pages/ar/privacyPolicy/Index.kt
@@ -1,4 +1,4 @@
-package net.freshplatform.alrayada_web.pages.ar.privacy_policy
+package net.freshplatform.alrayada_web.pages.ar.privacyPolicy
 
 import androidx.compose.runtime.Composable
 import com.varabyte.kobweb.core.Page
@@ -7,5 +7,5 @@ import com.varabyte.kobweb.core.rememberPageContext
 @Composable
 @Page
 fun PrivacyPolicyPage_ar() {
-    rememberPageContext().router.navigateTo("/privacy_policy/?lang=ar")
+    rememberPageContext().router.navigateTo("/privacy-policy/?lang=ar")
 }
diff --git a/...ages/delete_account_instructions/Index.kt → .../pages/deleteAccountInstructions/Index.kt b/...ages/delete_account_instructions/Index.kt → .../pages/deleteAccountInstructions/Index.kt
@@ -1,4 +1,4 @@
-package net.freshplatform.alrayada_web.pages.delete_account_instructions
+package net.freshplatform.alrayada_web.pages.deleteAccountInstructions
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -13,7 +13,6 @@ import com.varabyte.kobweb.silk.components.style.toModifier
 import net.freshplatform.alrayada_web.components.core.Center
 import net.freshplatform.alrayada_web.core.data.StringRes
 import net.freshplatform.alrayada_web.core.services.localization.getStringResource
-import net.freshplatform.alrayada_web.core.services.localization.stringResource
 import net.freshplatform.alrayada_web.styles.ReadableTextStyleOnWhiteBackground
 import net.freshplatform.alrayada_web.utils.updateDocument
 import org.jetbrains.compose.web.css.Color

diff --git a/...da_web/pages/download_mobile_app/Index.kt → ...yada_web/pages/downloadMobileApp/Index.kt b/...da_web/pages/download_mobile_app/Index.kt → ...yada_web/pages/downloadMobileApp/Index.kt
@@ -1,4 +1,4 @@
-package net.freshplatform.alrayada_web.pages.download_mobile_app
+package net.freshplatform.alrayada_web.pages.downloadMobileApp
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

diff --git a/...lrayada_web/pages/privacy_policy/Index.kt → ...alrayada_web/pages/privacyPolicy/Index.kt b/...lrayada_web/pages/privacy_policy/Index.kt → ...alrayada_web/pages/privacyPolicy/Index.kt
@@ -1,4 +1,4 @@
-package net.freshplatform.alrayada_web.pages.privacy_policy
+package net.freshplatform.alrayada_web.pages.privacyPolicy
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

diff --git a/site/src/jsMain/resources/public/sitemap.xml b/site/src/jsMain/resources/public/sitemap.xml
@@ -18,37 +18,37 @@
                 href="https://alrayada.net/ar/"/>
     </url>
     <url>
-        <loc>https://alrayada.net/privacy_policy</loc>
+        <loc>https://alrayada.net/privacy-policy</loc>
         <lastmod>2023-10-15T12:57:20+00:00</lastmod>
         <priority>0.80</priority>
         <xhtml:link
                 rel="alternate"
                 hreflang="x-default"
-                href="https://alrayada.net/privacy_policy/"/>
+                href="https://alrayada.net/privacy-policy/"/>
         <xhtml:link
                 rel="alternate"
                 hreflang="en"
-                href="https://alrayada.net/privacy_policy/"/>
+                href="https://alrayada.net/privacy-policy/"/>
         <xhtml:link
                 rel="alternate"
                 hreflang="ar"
-                href="https://alrayada.net/ar/privacy_policy/"/>
+                href="https://alrayada.net/ar/privacy-policy/"/>
     </url>
     <url>
-        <loc>https://alrayada.net/download_mobile_app</loc>
+        <loc>https://alrayada.net/download-mobile-app</loc>
         <lastmod>2023-10-15T12:57:20+00:00</lastmod>
         <priority>0.80</priority>
         <xhtml:link
                 rel="alternate"
                 hreflang="x-default"
-                href="https://alrayada.net/download_mobile_app/"/>
+                href="https://alrayada.net/download-mobile-app/"/>
         <xhtml:link
                 rel="alternate"
                 hreflang="en"
-                href="https://alrayada.net/download_mobile_app/"/>
+                href="https://alrayada.net/download-mobile-app/"/>
         <xhtml:link
                 rel="alternate"
                 hreflang="ar"
-                href="https://alrayada.net/ar/download_mobile_app/"/>
+                href="https://alrayada.net/ar/download-mobile-app/"/>
     </url>
 </urlset>