Update environment variable to go to dev instance, use http in redire…

…cts.
zetkin · Dec 13, 2023 · 7c480fc · 7c480fc
1 parent 319f859
commit 7c480fc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.env.development b/.env.development
@@ -4,7 +4,7 @@ NEXT_PUBLIC_APP_USE_TLS=0
 # Zetkin API settings
 ZETKIN_API_DOMAIN=dev.zetkin.org
 ZETKIN_API_HOST=api.dev.zetkin.org
-NEXT_PUBLIC_ZETKIN_APP_DOMAIN=https://www.zetk.in/
+NEXT_PUBLIC_ZETKIN_APP_DOMAIN=http://www.dev.zetkin.org
 ZETKIN_CLIENT_ID=a0db63a12bae45ff83d12de70c8992c0
 ZETKIN_CLIENT_SECRET=MWQyZmE2M2UtMzM3Yi00ODUyLWI2NGMtOWY5YTY5NTY3YjU5
 ZETKIN_APP_HOST=localhost:3000

diff --git a/next.config.js b/next.config.js
@@ -32,7 +32,7 @@ module.exports = {
       // redirects to Gen2 for MVP August 2021
       {
         source: '/organize/:orgId/people/:personId/edit',
-        destination: `https://organize.${process.env.ZETKIN_API_DOMAIN}/people/person%3A:personId/?org=:orgId`,
+        destination: `http://organize.${process.env.ZETKIN_API_DOMAIN}/people/person%3A:personId/?org=:orgId`,
         permanent: false,
       },
       {
@@ -60,7 +60,7 @@ module.exports = {
       // all paths with /o redirected to Gen2
       {
         source: '/o/:path*',
-        destination: 'https://zetk.in/o/:path*',
+        destination: `http://${process.env.ZETKIN_API_DOMAIN}/o/:path*`,
         permanent: false,
       },
       {
@@ -72,7 +72,7 @@ module.exports = {
         source: '/organize/:orgId/people/views/:path*',
         destination: '/organize/:orgId/people/lists/:path*',
         permanent: false,
-      }
+      },
     ];
   },
 };
diff --git a/src/features/campaigns/components/CampaignActionButtons.tsx b/src/features/campaigns/components/CampaignActionButtons.tsx
@@ -144,7 +144,7 @@ const CampaignActionButtons: React.FunctionComponent<
                   <Link
                     color="inherit"
                     display="flex"
-                    href={`https://www.zetk.in/o/${orgId}/campaigns/${campaign.id}`}
+                    href={`/o/${orgId}/campaigns/${campId}`}
                     sx={{ alignItems: 'center', gap: 1 }}
                     target="_blank"
                     underline="none"

diff --git a/src/features/surveys/components/SurveyURLCard.tsx b/src/features/surveys/components/SurveyURLCard.tsx
@@ -37,9 +37,9 @@ const SurveyURLCard = ({ isOpen, orgId, surveyId }: SurveyURLCardProps) => {
     >
       <Box display="flex" paddingBottom={2}>
         <ZUITextfieldToClipboard
-          copyText={`${process.env.NEXT_PUBLIC_ZETKIN_APP_DOMAIN}o/${orgId}/surveys/${surveyId}`}
+          copyText={`${process.env.NEXT_PUBLIC_ZETKIN_APP_DOMAIN}/o/${orgId}/surveys/${surveyId}`}
         >
-          {`${process.env.NEXT_PUBLIC_ZETKIN_APP_DOMAIN}o/${orgId}/surveys/${surveyId}`}
+          {`${process.env.NEXT_PUBLIC_ZETKIN_APP_DOMAIN}/o/${orgId}/surveys/${surveyId}`}
         </ZUITextfieldToClipboard>
       </Box>
       <Link