diff --git a/.github/workflows/cd.yml b/.github/workflows/cd-backend.yml similarity index 100% rename from .github/workflows/cd.yml rename to .github/workflows/cd-backend.yml diff --git a/.github/workflows/cd-frontend.yml b/.github/workflows/cd-frontend.yml new file mode 100644 index 0000000..eb05dd2 --- /dev/null +++ b/.github/workflows/cd-frontend.yml @@ -0,0 +1,49 @@ +name: Deploy + +on: + push: + branches: [ "main" ] + +jobs: + build_site: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + cache: npm + + - name: Install dependencies + run: npm install + + - name: build + env: + BASE_PATH: '/${{ github.event.repository.name }}' + run: npm run build + + - name: Upload Artifacts + uses: actions/upload-pages-artifact@v3 + with: + # this should match the `pages` option in your adapter-static options + path: 'build/' + + deploy-site: + needs: build_site + runs-on: ubuntu-latest + + permissions: + pages: write + id-token: write + + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + + steps: + - name: Deploy + id: deployment + uses: actions/deploy-pages@v4 diff --git a/app/src/lib/state.svelte.ts b/app/src/lib/state.svelte.ts index e68ed5e..397b98e 100644 --- a/app/src/lib/state.svelte.ts +++ b/app/src/lib/state.svelte.ts @@ -12,12 +12,12 @@ export class State { turn = $state(-1); // -1 not my turn, 0 might be, 1 is socket: Socket; - constructor(hostname: string, newSession: boolean = true) { + constructor(hostname: string) { // let session = sessionStorage.getItem('session'); this.socket = io(`ws://${hostname}:3000/`, { transports: ['websocket'], - auth: { session: !newSession ? sessionStorage.getItem('session') : null } + auth: { session: sessionStorage.getItem('session') } }); this.socket.on('connect', () => { diff --git a/app/src/routes/+page.svelte b/app/src/routes/+page.svelte index 026446a..e8ab788 100644 --- a/app/src/routes/+page.svelte +++ b/app/src/routes/+page.svelte @@ -43,7 +43,7 @@ class="btn btn-error text-xl" onclick={() => { gameState.socket.emit('leave'); - gameState = new State(window.location.hostname, true); + gameState = new State(window.location.hostname); }}>Leave diff --git a/src/main.rs b/src/main.rs index cf0f535..6bead74 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,7 +23,7 @@ use tracing_subscriber::FmtSubscriber; async fn main() -> Result<(), Box> { tracing::subscriber::set_global_default( FmtSubscriber::builder() - .with_max_level(tracing::Level::ERROR) + .with_max_level(tracing::Level::INFO) .finish(), )?; let _ = dotenv();