From ea5b3812ad9faad44bedc95cab5aef820d3a3721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=98=A4=EC=8A=B9=ED=99=98?= Date: Wed, 26 Jun 2024 14:56:24 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=A6=90=EA=B2=A8=EC=B0=BE=EA=B8=B0=20?= =?UTF-8?q?=EC=9C=A0=ED=98=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index fc95777..7b40a34 100644 --- a/src/index.html +++ b/src/index.html @@ -15,7 +15,7 @@ /> - + From 159513cbdf7912d993a8aa2b1695b9691febcb23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=98=A4=EC=8A=B9=ED=99=98?= Date: Wed, 26 Jun 2024 14:56:41 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=A0=88=EB=8C=80=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.js | 2 +- src/components/ExperimentSheet.svelte | 2 +- src/components/InformationSheet.svelte | 2 +- src/core/ecr.js | 2 +- src/pages/Experiment.page.svelte | 16 ++++++++-------- src/pages/NotFound.page.svelte | 4 ++-- src/pages/Result.page.svelte | 13 ++++++------- src/router/routes.config.js | 6 +++--- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/app.js b/src/app.js index c763fbf..650c8ca 100644 --- a/src/app.js +++ b/src/app.js @@ -1,4 +1,4 @@ -import App from "./App.svelte"; +import App from "~/src/App.svelte"; const app = new App({ target: window.document.body, diff --git a/src/components/ExperimentSheet.svelte b/src/components/ExperimentSheet.svelte index 7750295..8d1b75d 100644 --- a/src/components/ExperimentSheet.svelte +++ b/src/components/ExperimentSheet.svelte @@ -1,6 +1,6 @@ diff --git a/src/pages/Result.page.svelte b/src/pages/Result.page.svelte index 8eee361..e154424 100644 --- a/src/pages/Result.page.svelte +++ b/src/pages/Result.page.svelte @@ -1,12 +1,11 @@ diff --git a/src/app.js b/src/app.js index 650c8ca..122dd12 100644 --- a/src/app.js +++ b/src/app.js @@ -1,4 +1,4 @@ -import App from "~/src/App.svelte"; +import * as App from "~/src/App.svelte"; const app = new App({ target: window.document.body, diff --git a/src/pages/Experiment.page.svelte b/src/pages/Experiment.page.svelte index 35b6f4c..4bee2cd 100644 --- a/src/pages/Experiment.page.svelte +++ b/src/pages/Experiment.page.svelte @@ -3,10 +3,10 @@ import { convertAnswerToParam } from "~/src/core/ecr"; import { href, push } from "~/src/router/helper"; import { PATH_RESULT } from "~/src/router/routes.config"; - import ExperimentSheet from "~/src/components/ExperimentSheet.svelte"; - import ProgressManager from "~/src/components/ProgressManager.svelte"; - import Message from "~/src/components/Message.svelte"; - import InformationSheet from "~/src/components/InformationSheet.svelte"; + import * as ExperimentSheet from "~/src/components/ExperimentSheet.svelte"; + import * as ProgressManager from "~/src/components/ProgressManager.svelte"; + import * as Message from "~/src/components/Message.svelte"; + import * as InformationSheet from "~/src/components/InformationSheet.svelte"; let message = null; let answerList = Array(QuestionList.length).fill(0); diff --git a/src/pages/Result.page.svelte b/src/pages/Result.page.svelte index e154424..6c6c45a 100644 --- a/src/pages/Result.page.svelte +++ b/src/pages/Result.page.svelte @@ -2,10 +2,10 @@ import { beforeUpdate } from "svelte"; import { convertParamToScore, convertScoreToResult } from "~/src/core/ecr"; import { SERVICE_NAME } from "~/src/core/constants"; - import ExperimentSheet from "~/src/components/ExperimentSheet.svelte"; + import * as ExperimentSheet from "~/src/components/ExperimentSheet.svelte"; import { PATH_EXPERIMENT } from "~/src/router/routes.config"; import { href, link } from "~/src/router/helper"; - import InformationSheet from "~/src/components/InformationSheet.svelte"; + import * as InformationSheet from "~/src/components/InformationSheet.svelte"; export let params; diff --git a/src/router/helper.js b/src/router/helper.js index ae2b20b..4859c9c 100644 --- a/src/router/helper.js +++ b/src/router/helper.js @@ -1,6 +1,6 @@ import { parse, compile } from "path-to-regexp"; export * from "svelte-spa-router"; -import queryStringTool from "query-string"; +import { default as queryStringTool } from "query-string"; export { queryStringTool }; export const href = (path, params = {}, options = {}) => { diff --git a/src/router/routes.config.js b/src/router/routes.config.js index 18c8166..f182fa3 100644 --- a/src/router/routes.config.js +++ b/src/router/routes.config.js @@ -1,6 +1,6 @@ -import PageExperiment from "~/src/pages/Experiment.page.svelte"; -import PageResult from "~/src/pages/Result.page.svelte"; -import PageNotFound from "~/src/pages/NotFound.page.svelte"; +import * as PageExperiment from "~/src/pages/Experiment.page.svelte"; +import * as PageResult from "~/src/pages/Result.page.svelte"; +import * as PageNotFound from "~/src/pages/NotFound.page.svelte"; export const PATH_EXPERIMENT = "/"; export const PATH_RESULT = "/results/:result"; From b3fa883ef0508c27eea2891662ca42402f44629e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=98=A4=EC=8A=B9=ED=99=98?= Date: Wed, 26 Jun 2024 15:09:31 +0900 Subject: [PATCH 4/4] =?UTF-8?q?GitHub=20Action=20=EC=8B=A4=ED=96=89=20?= =?UTF-8?q?=EC=8B=9C=20deploy=20=EB=B0=8F=20pull-request=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 3 --- .github/workflows/pullrequest.yml | 32 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/pullrequest.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1f3fb02..e680fa6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,9 +4,6 @@ on: push: branches: - master - pull_request: - branches: - - master jobs: deploy: runs-on: ubuntu-latest diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml new file mode 100644 index 0000000..f733895 --- /dev/null +++ b/.github/workflows/pullrequest.yml @@ -0,0 +1,32 @@ +name: GitHub Actions for Pages Deployment +run-name: ${{ github.actor }} is running out GitHub Actions 🚀 +on: + pull_request: + branches: + - master +jobs: + deploy: + runs-on: ubuntu-latest + permissions: + pages: write + id-token: write + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + steps: + - name: Check out + uses: actions/checkout@v4 + - run: echo "🎉 Event [${{ github.event_name }}] | 🔎 Repository [${{ github.repository }}] | 🐧 OS [${{ runner.os }}] | ⭐ Branch[${{ github.ref }}]" + + - name: Node.js + uses: actions/setup-node@v4 + with: + node-version: 18 + - run: npm ci + - run: npm run build + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + path: './public/'