diff --git a/.drone.yml b/.drone.yml index d8cf63c1..0d9eefa7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,8 +13,8 @@ steps: branch: - master environment: - NEXT_PUBLIC_API_HOST: https://vault48.org/api/ - NEXT_PUBLIC_REMOTE_CURRENT: https://vault48.org/static/ + NEXT_PUBLIC_API_HOST: https://pig.vault48.org/ + NEXT_PUBLIC_REMOTE_CURRENT: https://pig.vault48.org/static/ NEXT_PUBLIC_PUBLIC_HOST: https://vault48.org/ NEXT_PUBLIC_BOT_USERNAME: vault48bot settings: diff --git a/.env.local b/.env.local index cf359933..7ce09d99 100644 --- a/.env.local +++ b/.env.local @@ -2,6 +2,6 @@ # NEXT_PUBLIC_REMOTE_CURRENT=https://pig.staging.vault48.org/static/ # NEXT_PUBLIC_API_HOST=http://localhost:7777/ # NEXT_PUBLIC_REMOTE_CURRENT=http://localhost:7777/static/ -NEXT_PUBLIC_API_HOST=https://vault48.org/api/ -NEXT_PUBLIC_REMOTE_CURRENT=https://vault48.org/static/ +NEXT_PUBLIC_API_HOST=https://pig.vault48.org/ +NEXT_PUBLIC_REMOTE_CURRENT=https://pig.vault48.org/static/ NEXT_PUBLIC_BOT_USERNAME=vault48testbot \ No newline at end of file diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml deleted file mode 100644 index 25d067df..00000000 --- a/.forgejo/workflows/build.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Build & Publish - -on: - push: - branches: [master] - -jobs: - push_to_registry: - name: Build & Publish - runs-on: ubuntu-22.04 - permissions: - packages: write - contents: read - attestations: write - id-token: write - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Registry Login - uses: docker/login-action@v3 - with: - registry: git.vault48.org - username: ${{ secrets.username }} - password: ${{ secrets.password }} - - - name: Extract docker metadata - id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: git.vault48.org/${{ env.GITHUB_REPOSITORY }} - - - name: Build and push Docker image - id: push - uses: docker/build-push-action@v6 - with: - context: . - file: ./docker/nextjs/Dockerfile - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: | - NEXT_PUBLIC_API_HOST=https://vault48.org/api/ - NEXT_PUBLIC_REMOTE_CURRENT=https://vault48.org/static/ - NEXT_PUBLIC_PUBLIC_HOST=https://vault48.org/ - NEXT_PUBLIC_BOT_USERNAME=vault48bot \ No newline at end of file diff --git a/next.config.js b/next.config.js index 64e56747..8fb923d7 100644 --- a/next.config.js +++ b/next.config.js @@ -2,10 +2,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({ enabled: process.env.ANALYZE === 'true', }); -const withTM = require('next-transpile-modules')([ - 'ramda', - '@v9v/ts-react-telegram-login', -]); +const withTM = require('next-transpile-modules')(['ramda', '@v9v/ts-react-telegram-login']); module.exports = withBundleAnalyzer( withTM({ @@ -13,37 +10,36 @@ module.exports = withBundleAnalyzer( async rewrites() { return [ { - // everything except 'post' is for backwards compatibility here - source: '/(post|photo|blog|song|video|cell):id', + source: '/post:id', destination: '/node/:id', }, { source: '/~:username', destination: '/profile/:username', - }, + } ]; }, /** don't try to optimize fonts */ optimizeFonts: false, images: { - remotePatterns: [ - { - protocol: 'https', - hostname: 'vault48.org', - pathname: '/static/**', - }, - { - protocol: 'https', - hostname: '*.ytimg.com', - pathname: '/**', - }, - { - protocol: 'http', - hostname: 'localhost', - pathname: '/**', - }, - ], - }, - }), + remotePatterns: [ + { + protocol: 'https', + hostname: '*.vault48.org', + pathname: '/**', + }, + { + protocol: 'https', + hostname: '*.ytimg.com', + pathname: '/**', + }, + { + protocol: 'http', + hostname: 'localhost', + pathname: '/**', + }, + ], + }, + }) );