Merge pull request #541 from dappforce/revert

Revert "Merge pull request #540 from dappforce/deploy/path"
dappforce · Feb 15, 2024 · 92cb889 · 92cb889
2 parents 6a14b36 + 53a6d8b
commit 92cb889
Show file tree

Hide file tree

Showing 26 changed files with 97 additions and 266 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -173,8 +173,7 @@ jobs:
           file: docker/mainnet-Dockerfile
           push: true
           build-args: |
-            GH_NEXTAUTH_URL=https://grill.so/c
-            GH_NEXT_PUBLIC_BASE_PATH=/c
+            GH_NEXTAUTH_URL=https://grill.so
             GH_NEXT_PUBLIC_SUBSTRATE_URL=https://para.subsocial.network
             GH_NEXT_PUBLIC_SUBSTRATE_WSS=wss://para.subsocial.network
             GH_NEXT_PUBLIC_DATAHUB_QUERY_URL=https://sub-data-hub.subsocial.network/graphql

diff --git a/ci.env b/ci.env
@@ -2,7 +2,6 @@ NEXT_PUBLIC_APP_ID='$GH_NEXT_PUBLIC_APP_ID'
 SERVER_MNEMONIC='$GH_SERVER_MNEMONIC'
 SERVER_DISCUSSION_CREATOR_MNEMONIC='$GH_SERVER_DISCUSSION_CREATOR_MNEMONIC'
 NEXT_PUBLIC_SPACE_IDS='$GH_NEXT_PUBLIC_SPACE_IDS'
-NEXT_PUBLIC_BASE_PATH='$GH_NEXT_PUBLIC_BASE_PATH'
 MODERATION_URL='$GH_MODERATION_URL'
 MODERATION_TOKEN='$GH_MODERATION_TOKEN'
 NEXT_PUBLIC_NOTIFICATION_APP_ID='$GH_NEXT_PUBLIC_NOTIFICATION_APP_ID'

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -9,7 +9,6 @@ ARG GH_DATAHUB_QUEUE_URL
 ARG GH_NEXT_PUBLIC_NOTIFICATION_APP_ID
 ARG GH_NEXT_PUBLIC_OFFCHAIN_POSTING_HUBS
 ARG GH_NEXT_PUBLIC_SPACE_IDS
-ARG GH_NEXT_PUBLIC_BASE_PATH
 ARG GH_NEXT_PUBLIC_AMP_ID
 ARG GH_NEXT_PUBLIC_SQUID_URL
 ARG GH_NEXT_PUBLIC_COMMUNITY_HUB_ID
@@ -28,7 +27,6 @@ ARG GH_NEXT_PUBLIC_FIREBASE_APP_ID
 
 ENV NEXTAUTH_URL=${GH_NEXTAUTH_URL} \
     NEXT_PUBLIC_SPACE_IDS=${GH_NEXT_PUBLIC_SPACE_IDS} \
-    NEXT_PUBLIC_BASE_PATH=${GH_NEXT_PUBLIC_BASE_PATH} \
     NEXT_PUBLIC_SUBSTRATE_WSS=${GH_NEXT_PUBLIC_SUBSTRATE_WSS} \
     NEXT_PUBLIC_SUBSTRATE_URL=${GH_NEXT_PUBLIC_SUBSTRATE_URL} \
     NEXT_PUBLIC_DATAHUB_QUERY_URL=${GH_NEXT_PUBLIC_DATAHUB_QUERY_URL} \
@@ -75,7 +73,6 @@ ARG GH_DATAHUB_QUEUE_URL
 ARG GH_NEXT_PUBLIC_NOTIFICATION_APP_ID
 ARG GH_NEXT_PUBLIC_OFFCHAIN_POSTING_HUBS
 ARG GH_NEXT_PUBLIC_SPACE_IDS
-ARG GH_NEXT_PUBLIC_BASE_PATH
 ARG GH_NEXT_PUBLIC_AMP_ID
 ARG GH_NEXT_PUBLIC_SQUID_URL
 ARG GH_NEXT_PUBLIC_COMMUNITY_HUB_ID
@@ -94,7 +91,6 @@ ARG GH_NEXT_PUBLIC_FIREBASE_APP_ID
 
 ENV NEXTAUTH_URL=${GH_NEXTAUTH_URL} \
     NEXT_PUBLIC_SPACE_IDS=${GH_NEXT_PUBLIC_SPACE_IDS} \
-    NEXT_PUBLIC_BASE_PATH=${GH_NEXT_PUBLIC_BASE_PATH} \
     NEXT_PUBLIC_SUBSTRATE_WSS=${GH_NEXT_PUBLIC_SUBSTRATE_WSS} \
     NEXT_PUBLIC_SUBSTRATE_URL=${GH_NEXT_PUBLIC_SUBSTRATE_URL} \
     NEXT_PUBLIC_DATAHUB_QUERY_URL=${GH_NEXT_PUBLIC_DATAHUB_QUERY_URL} \

diff --git a/docker/mainnet-Dockerfile b/docker/mainnet-Dockerfile
@@ -9,7 +9,6 @@ ARG GH_DATAHUB_QUEUE_URL
 ARG GH_NEXT_PUBLIC_NOTIFICATION_APP_ID
 ARG GH_NEXT_PUBLIC_OFFCHAIN_POSTING_HUBS
 ARG GH_NEXT_PUBLIC_SPACE_IDS
-ARG GH_NEXT_PUBLIC_BASE_PATH
 ARG GH_NEXT_PUBLIC_AMP_ID
 ARG GH_NEXT_PUBLIC_SQUID_URL
 ARG GH_NEXT_PUBLIC_COMMUNITY_HUB_ID
@@ -18,7 +17,6 @@ ARG GH_NEXT_PUBLIC_APP_ID
 
 ENV NEXTAUTH_URL=${GH_NEXTAUTH_URL} \
     NEXT_PUBLIC_SPACE_IDS=${GH_NEXT_PUBLIC_SPACE_IDS} \
-    NEXT_PUBLIC_BASE_PATH=${GH_NEXT_PUBLIC_BASE_PATH} \
     NEXT_PUBLIC_SUBSTRATE_WSS=${GH_NEXT_PUBLIC_SUBSTRATE_WSS} \
     NEXT_PUBLIC_SUBSTRATE_URL=${GH_NEXT_PUBLIC_SUBSTRATE_URL} \
     NEXT_PUBLIC_DATAHUB_QUERY_URL=${GH_NEXT_PUBLIC_DATAHUB_QUERY_URL} \
@@ -56,7 +54,6 @@ ARG GH_DATAHUB_QUEUE_URL
 ARG GH_NEXT_PUBLIC_NOTIFICATION_APP_ID
 ARG GH_NEXT_PUBLIC_OFFCHAIN_POSTING_HUBS
 ARG GH_NEXT_PUBLIC_SPACE_IDS
-ARG GH_NEXT_PUBLIC_BASE_PATH
 ARG GH_NEXT_PUBLIC_AMP_ID
 ARG GH_NEXT_PUBLIC_SQUID_URL
 ARG GH_NEXT_PUBLIC_COMMUNITY_HUB_ID
@@ -67,7 +64,6 @@ ARG GH_NEXT_PUBLIC_APP_ID
 
 ENV NEXTAUTH_URL=${GH_NEXTAUTH_URL} \
     NEXT_PUBLIC_SPACE_IDS=${GH_NEXT_PUBLIC_SPACE_IDS} \
-    NEXT_PUBLIC_BASE_PATH=${GH_NEXT_PUBLIC_BASE_PATH} \
     NEXT_PUBLIC_SUBSTRATE_WSS=${GH_NEXT_PUBLIC_SUBSTRATE_WSS} \
     NEXT_PUBLIC_SUBSTRATE_URL=${GH_NEXT_PUBLIC_SUBSTRATE_URL} \
     NEXT_PUBLIC_DATAHUB_QUERY_URL=${GH_NEXT_PUBLIC_DATAHUB_QUERY_URL} \

diff --git a/docker/storybook-Dockerfile b/docker/storybook-Dockerfile
@@ -6,7 +6,6 @@ ARG GH_USER_ID_SALT
 ARG GH_CRUST_IPFS_AUTH
 ARG GH_NEXT_PUBLIC_APP_ID
 ARG GH_NEXT_PUBLIC_SPACE_IDS
-ARG GH_NEXT_PUBLIC_BASE_PATH
 ARG GH_MODERATION_URL
 ARG GH_MODERATION_TOKEN
 ARG GH_NEXT_PUBLIC_NOTIFICATION_APP_ID
@@ -38,7 +37,6 @@ ARG GH_NEXTAUTH_URL
 
 ENV NEXT_PUBLIC_APP_ID=${GH_NEXT_PUBLIC_APP_ID} \
     NEXT_PUBLIC_SPACE_IDS=${GH_NEXT_PUBLIC_SPACE_IDS} \
-    NEXT_PUBLIC_BASE_PATH=${GH_NEXT_PUBLIC_BASE_PATH} \
     MODERATION_URL=${GH_MODERATION_URL} \
     MODERATION_TOKEN=${GH_MODERATION_TOKEN} \
     NEXT_PUBLIC_NOTIFICATION_APP_ID=${GH_NEXT_PUBLIC_NOTIFICATION_APP_ID} \
@@ -92,7 +90,6 @@ ARG GH_USER_ID_SALT
 ARG GH_CRUST_IPFS_AUTH
 ARG GH_NEXT_PUBLIC_APP_ID
 ARG GH_NEXT_PUBLIC_SPACE_IDS
-ARG GH_NEXT_PUBLIC_BASE_PATH
 ARG GH_MODERATION_URL
 ARG GH_MODERATION_TOKEN
 ARG GH_NEXT_PUBLIC_NOTIFICATION_APP_ID
@@ -124,7 +121,6 @@ ARG GH_NEXTAUTH_URL
 
 ENV NEXT_PUBLIC_APP_ID=${GH_NEXT_PUBLIC_APP_ID} \
     NEXT_PUBLIC_SPACE_IDS=${GH_NEXT_PUBLIC_SPACE_IDS} \
-    NEXT_PUBLIC_BASE_PATH=${GH_NEXT_PUBLIC_BASE_PATH} \
     MODERATION_URL=${GH_MODERATION_URL} \
     MODERATION_TOKEN=${GH_MODERATION_TOKEN} \
     NEXT_PUBLIC_NOTIFICATION_APP_ID=${GH_NEXT_PUBLIC_NOTIFICATION_APP_ID} \

diff --git a/next.config.js b/next.config.js
@@ -12,7 +12,6 @@ const withPWA = require('next-pwa')({
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  basePath: process.env.NEXT_PUBLIC_BASE_PATH || undefined,
   reactStrictMode: true,
   experimental: {
     scrollRestoration: true,

diff --git a/public/manifestc.json b/public/manifestc.json
diff --git a/src/components/PWAInstall.tsx b/src/components/PWAInstall.tsx
@@ -1,8 +1,6 @@
-import { env } from '@/env.mjs'
 import useIsInIframe from '@/hooks/useIsInIframe'
 import '@khmyznikov/pwa-install'
 import { createPortal } from 'react-dom'
-import urlJoin from 'url-join'
 
 declare global {
   namespace JSX {
@@ -19,10 +17,7 @@ export default function PWAInstall() {
   return createPortal(
     <pwa-install
       id='pwa-install'
-      manifest-url={urlJoin(
-        env.NEXT_PUBLIC_BASE_PATH,
-        `/manifest${env.NEXT_PUBLIC_BASE_PATH.substring(1)}.json`
-      )}
+      manifest-url='/manifest.json'
       manual-chrome='true'
       manual-apple='true'
     ></pwa-install>,

diff --git a/src/components/extensions/secret-box/utils.ts b/src/components/extensions/secret-box/utils.ts
@@ -1,7 +1,7 @@
 import { DecryptRespose } from '@/pages/api/promo-message/decrypt'
 import { EncryptRespose } from '@/pages/api/promo-message/encrypt'
-import { apiInstance } from '@/services/api/utils'
 import mutationWrapper from '@/subsocial-query/base'
+import axios from 'axios'
 
 export const canUsePromoExtensionAccounts = [
   '3tFT2KDqmyfBU7hoGTNSJ8j2aBXQvvSQS5ncBdgtMM6SBQBS',
@@ -16,7 +16,7 @@ type EncodeSecretBoxParams = {
 }
 
 async function encodeSecretBox({ message, address }: EncodeSecretBoxParams) {
-  const res = await apiInstance.post('/api/promo-message/encrypt', {
+  const res = await axios.post('/api/promo-message/encrypt', {
     message,
     address,
   })
@@ -37,7 +37,7 @@ async function decodeSecretBox({
   encryptedMessage,
   nonce,
 }: DecodeSecretBoxParams) {
-  const res = await apiInstance.post('/api/promo-message/decrypt', {
+  const res = await axios.post('/api/promo-message/decrypt', {
     encryptedMessage,
     nonce,
   })

diff --git a/src/env.mjs b/src/env.mjs
@@ -35,7 +35,6 @@ export const env = createEnv({
       .string()
       .default('')
       .transform((val) => val.split(',').filter(Boolean)),
-    NEXT_PUBLIC_BASE_PATH: z.string().default(''),
     NEXT_PUBLIC_OFFCHAIN_POSTING_HUBS: z
       .string()
       .default('')
@@ -64,7 +63,6 @@ export const env = createEnv({
   },
   experimental__runtimeEnv: {
     NEXT_PUBLIC_APP_ID: process.env.NEXT_PUBLIC_APP_ID,
-    NEXT_PUBLIC_BASE_PATH: process.env.NEXT_PUBLIC_BASE_PATH,
     NEXT_PUBLIC_MAIN_SPACE_ID: process.env.NEXT_PUBLIC_SPACE_IDS,
     NEXT_PUBLIC_SPACE_IDS: process.env.NEXT_PUBLIC_SPACE_IDS,
     NEXT_PUBLIC_OFFCHAIN_POSTING_HUBS:

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -1,7 +1,6 @@
 import BadgeManager from '@/components/BadgeManager'
 import ErrorBoundary from '@/components/ErrorBoundary'
 import HeadConfig, { HeadConfigProps } from '@/components/HeadConfig'
-import { env } from '@/env.mjs'
 import useIsInIframe from '@/hooks/useIsInIframe'
 import useNetworkStatus from '@/hooks/useNetworkStatus'
 import {
@@ -54,10 +53,7 @@ export default function App(props: AppProps<AppCommonProps>) {
     : ''
 
   return (
-    <SessionProvider
-      basePath={env.NEXT_PUBLIC_BASE_PATH || undefined}
-      session={props.pageProps.session}
-    >
+    <SessionProvider session={props.pageProps.session}>
       <ConfigProvider>
         <style jsx global>{`
           ${isInIframe