diff --git a/.github/workflows/nuxtjs.yml b/.github/workflows/nuxtjs.yml index eac03b1..e0abd46 100644 --- a/.github/workflows/nuxtjs.yml +++ b/.github/workflows/nuxtjs.yml @@ -1,90 +1,41 @@ -# Sample workflow for building and deploying a Nuxt site to GitHub Pages -# -# To get started with Nuxt see: https://nuxtjs.org/docs/get-started/installation -# -name: Deploy Nuxt site to Pages - +# https://github.com/actions/deploy-pages#usage +name: Deploy to GitHub Pages on: - # Runs on pushes targeting the default branch - push: - branches: ["master"] - - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: read - pages: write - id-token: write - -# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. -# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. -concurrency: - group: "pages" - cancel-in-progress: false - + push: + branches: + - main jobs: - # Build job build: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Detect package manager - id: detect-package-manager - run: | - if [ -f "${{ github.workspace }}/yarn.lock" ]; then - echo "manager=yarn" >> $GITHUB_OUTPUT - echo "command=install" >> $GITHUB_OUTPUT - exit 0 - elif [ -f "${{ github.workspace }}/package.json" ]; then - echo "manager=npm" >> $GITHUB_OUTPUT - echo "command=ci" >> $GITHUB_OUTPUT - exit 0 - else - echo "Unable to determine package manager" - exit 1 - fi - - name: Setup Node - uses: actions/setup-node@v4 + - uses: actions/checkout@v3 + - run: corepack enable + - uses: actions/setup-node@v3 with: node-version: "20" - cache: ${{ steps.detect-package-manager.outputs.manager }} - - name: Setup Pages - uses: actions/configure-pages@v5 - with: - # Automatically inject router.base in your Nuxt configuration file and set - # target to static (https://nuxtjs.org/docs/configuration-glossary/configuration-target/). - # - # You may remove this line if you want to manage the configuration yourself. - static_site_generator: nuxt - - name: Restore cache - uses: actions/cache@v4 - with: - path: | - dist - .nuxt - key: ${{ runner.os }}-nuxt-build-${{ hashFiles('dist') }} - restore-keys: | - ${{ runner.os }}-nuxt-build- - - name: Install dependencies - run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }} - - name: Static HTML export with Nuxt - run: ${{ steps.detect-package-manager.outputs.manager }} run generate + # Pick your own package manager and build script + - run: npm install + - run: npx nuxt build --preset github_pages - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v1 with: - path: ./dist - + path: ./.output/public # Deployment job deploy: + # Add a dependency to the build job + needs: build + # Grant GITHUB_TOKEN the permissions required to make a Pages deployment + permissions: + pages: write # to deploy to Pages + id-token: write # to verify the deployment originates from an appropriate source + # Deploy to the github_pages environment environment: - name: github-pages + name: github_pages url: ${{ steps.deployment.outputs.page_url }} + # Specify runner + deployment step runs-on: ubuntu-latest - needs: build steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v1 \ No newline at end of file diff --git a/nuxt.config.ts b/nuxt.config.ts index 861de47..4693159 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -1,7 +1,11 @@ // https://nuxt.com/docs/api/configuration/nuxt-config export default defineNuxtConfig({ // runtime config with env variables and exposed via useRuntimeConfig() - runtimeConfig:{}, + runtimeConfig:{ + }, + app: { + baseURL: process.env.NODE_ENV == 'development' ?'/':'/mapping-cities-making-cities-final-project/', + }, modules: [ "@nuxtjs/tailwindcss" ], @@ -10,5 +14,5 @@ export default defineNuxtConfig({ scrollBehaviorType: 'smooth' } }, - css: ["~/assets/css/tailwind.css"] + css: ["~/assets/css/tailwind.css"], }) \ No newline at end of file