diff --git a/.env.test b/.env.test index 0fbca9e..2e62731 100644 --- a/.env.test +++ b/.env.test @@ -1,7 +1,7 @@ PROTOCOL=http -HOST=staging.mwhitnessing.com +HOST=staging.mwitnessing.com PORT= -NEXT_PUBLIC_PUBLIC_URL=https://staging.mwhitnessing.com +NEXT_PUBLIC_PUBLIC_URL=https://staging.mwitnessing.com # Linux: `openssl rand -hex 32` or go to https://generate-secret.now.sh/32 NEXTAUTH_SECRET=1dd8a5457970d1dda50600be28e935ecc4513ff27c49c431849e6746f158d638 diff --git a/_deploy/deoloy.azure.demo.yml b/_deploy/deoloy.azure.demo.yml index 924858a..d81bbbb 100644 --- a/_deploy/deoloy.azure.demo.yml +++ b/_deploy/deoloy.azure.demo.yml @@ -1,6 +1,6 @@ version: "3" services: - nextjs-app: # https://sofia.mwhitnessing.com/ + nextjs-app: # https://sofia.mwitnessing.com/ hostname: jwpw-app-staging # jwpw-nextjs-app-1 image: docker.d-popov.com/jwpw:latest volumes: diff --git a/_deploy/deoloy.azure.production.yml b/_deploy/deoloy.azure.production.yml index 1ebca74..d653294 100644 --- a/_deploy/deoloy.azure.production.yml +++ b/_deploy/deoloy.azure.production.yml @@ -1,6 +1,6 @@ version: "3" services: - nextjs-app: # https://sofia.mwhitnessing.com/ + nextjs-app: # https://sofia.mwitnessing.com/ hostname: jwpw-app # jwpw-nextjs-app-1 image: docker.d-popov.com/jwpw:latest deploy: diff --git a/_deploy/entrypoint.sh b/_deploy/entrypoint.sh index 8a7d603..f0ea095 100644 --- a/_deploy/entrypoint.sh +++ b/_deploy/entrypoint.sh @@ -10,7 +10,7 @@ if [ "$UPDATE_CODE_FROM_GIT" = "true" ]; then mkdir /tmp/clone # Clone the repository - git clone -b ${GIT_BRANCH:-main} --depth 1 https://$GIT_USERNAME:${GIT_PASSWORD//@/%40}@git.d-popov.com/popov/mwhitnessing.git /tmp/clone || exit 1 + git clone -b ${GIT_BRANCH:-main} --depth 1 https://$GIT_USERNAME:${GIT_PASSWORD//@/%40}@git.d-popov.com/popov/mwitnessing.git /tmp/clone || exit 1 # Synchronize all files except package.json and package-lock.json to /app rsync -av --delete --exclude 'package.json' --exclude 'package-lock.json' /tmp/clone/ /app/ || echo "Rsync failed: Issue synchronizing files" diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts index e0acd8a..675ea24 100644 --- a/pages/api/auth/[...nextauth].ts +++ b/pages/api/auth/[...nextauth].ts @@ -29,7 +29,7 @@ export const authOptions: NextAuthOptions = { //adapter: PrismaAdapter(prisma), providers: [ // register new URL at https://console.cloud.google.com/apis/credentials/oauthclient/926212607479-d3m8hm8f8esp3rf1639prskn445sa01v.apps.googleusercontent.com?project=grand-forge-108716 - //Request details: redirect_uri=http://20.101.62.76:8005/api/auth/callback/google https://s.mwhitnessing.com/ + //Request details: redirect_uri=http://20.101.62.76:8005/api/auth/callback/google https://s.mwitnessingmwitnessing.com/ GoogleProvider({ clientId: process.env.GOOGLE_ID, clientSecret: process.env.GOOGLE_SECRET, diff --git a/pages/api/index.ts b/pages/api/index.ts index a6ee908..42f47c6 100644 --- a/pages/api/index.ts +++ b/pages/api/index.ts @@ -617,6 +617,7 @@ export async function filterPublishers(selectFields, searchText, filterDate, fet dayOfMonth: null, dayofweek: dayOfWeekEnum, } + ] } }; }