diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 73e1ad1..493b0bd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,12 +19,11 @@ jobs: run: chmod +x gradlew - name: build run: | - ./gradlew jsBrowserProductionWebpack - cp build/kotlin-webpack/js/productionExecutable/* build/processedResources/js/main/ + ./gradlew build - name: deploy uses: JamesIves/github-pages-deploy-action@3.7.1 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: github-pages - FOLDER: torisetsu/build/processedResources/js/main + FOLDER: torisetsu/build/dist/js/productionExecutable CLEAN: true diff --git a/torisetsu/build.gradle.kts b/torisetsu/build.gradle.kts index e90da39..1f85227 100644 --- a/torisetsu/build.gradle.kts +++ b/torisetsu/build.gradle.kts @@ -67,4 +67,4 @@ tasks.register("copyStaticPages") { into("src/jsMain/resources/") } -tasks["jsProcessResources"].dependsOn("copyStaticPages") \ No newline at end of file +tasks["jsProcessResources"].dependsOn("copyStaticPages") diff --git a/torisetsu/src/jsMain/kotlin/components/base/XShareButton.kt b/torisetsu/src/jsMain/kotlin/components/base/XShareButton.kt index 6f6223c..65559f1 100644 --- a/torisetsu/src/jsMain/kotlin/components/base/XShareButton.kt +++ b/torisetsu/src/jsMain/kotlin/components/base/XShareButton.kt @@ -11,7 +11,7 @@ import org.jetbrains.compose.web.dom.Text @Composable fun XShareButton() { A( - href = "https://twitter.com/intent/tweet?text=私のトリタイプはハシビロコウです!&url=https://example.com&hashtags=トリタイプ診断", + href = "https://twitter.com/intent/tweet?text=私のトリタイプはハシビロコウです!&url=https://m3dev.github.io/torisetsu&hashtags=トリタイプ診断", attrs = { target(ATarget.Blank) classes(XShareButtonStyle.rootElm) @@ -27,4 +27,4 @@ fun XShareButton() { Text("Xでシェア") } } -} \ No newline at end of file +} diff --git a/torisetsu/src/jsMain/kotlin/components/pages/ResultPage.kt b/torisetsu/src/jsMain/kotlin/components/pages/ResultPage.kt index 47b14e6..a22202f 100644 --- a/torisetsu/src/jsMain/kotlin/components/pages/ResultPage.kt +++ b/torisetsu/src/jsMain/kotlin/components/pages/ResultPage.kt @@ -123,7 +123,7 @@ fun ResultPage(diagnosis: Diagnosis?, onClickBack: () -> Unit) { Text(diagnosis!!.postText) } A( - href = "https://example.com", + href = "https://jobs.m3.com/engineer/", attrs = { target(ATarget.Blank) } @@ -155,4 +155,4 @@ fun ResultPage(diagnosis: Diagnosis?, onClickBack: () -> Unit) { } } -} \ No newline at end of file +}