Changed url's for prodat.outbo.pl & removed sentry url's

.gitlab-ci.yml

@@ -10,7 +10,7 @@ build-web-release:
 
   variables:
     DOCKER_DRIVER: "overlay2"
-    OUTBO_BACKEND_URL: "https://outbo-api.stage.ermlab.com"
+    OUTBO_BACKEND_URL: "https://prodatapi.outbo.pl"
 
   services:
     - docker:dind
@@ -23,7 +23,7 @@ build-web-release:
   script:
     - docker pull ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} || true
     - docker pull ${CI_REGISTRY_IMAGE}/web:latest || true
-    - docker build -f web.Dockerfile --build-arg outbo_env=staging --build-arg backend_url=https://outbo-api.stage.ermlab.com/ --cache-from ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} --cache-from ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} ./evg-outbo-web
+    - docker build -f web.Dockerfile --build-arg outbo_env=staging --build-arg backend_url=https://prodatapi.outbo.pl --cache-from ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} --cache-from ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} ./evg-outbo-web
     - docker push ${CI_REGISTRY_IMAGE}/web:latest
     - docker push ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA}
 
@@ -50,7 +50,7 @@ build-web-master:
   script:
     - docker pull ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} || true
     - docker pull ${CI_REGISTRY_IMAGE}/web:latest || true
-    - docker build --build-arg outbo_env=production --build-arg backend_url=https://api.outbo.pl/ -f web.Dockerfile --cache-from ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} --cache-from ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} ./evg-outbo-web
+    - docker build --build-arg outbo_env=production --build-arg backend_url=https://prodatapi.outbo.pl -f web.Dockerfile --cache-from ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_BEFORE_SHA} --cache-from ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:latest -t ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA} ./evg-outbo-web
     - docker push ${CI_REGISTRY_IMAGE}/web:latest
     - docker push ${CI_REGISTRY_IMAGE}/web:${CI_COMMIT_SHA}
 

evg-outbo-api/outbo/apps/products/models/product.py

@@ -134,17 +134,17 @@ class Product(TimestampableDeletableMixin, RulesModel):
             self._accept_brief_as_agency(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and (u.is_client and u.is_observer is False),
-                action_url="https://outbo.pl/projects/{id}/products/{pid}",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             )
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in traders and (u.is_client and u.is_observer is False),
-                action_url="https://outbo.pl/projects/{id}/products/{pid}",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             )
         elif self.stage.pk == "waiting_for_brief_accept_by_client":
             self._accept_brief_as_client(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and u.is_agency,
-                action_url="https://outbo.pl/projects/{id}/products/{pid}",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             )
         else:
             raise NotImplementedError()
@@ -188,7 +188,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
             self._reject_brief_as_agency(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and u.is_supplier,
-                action_url="https://outbo.pl/projects/{id}/products/{pid}",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
                 reject=True,
             )
 
@@ -196,7 +196,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
             self._reject_brief_as_client(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and u.is_supplier,
-                action_url="https://outbo.pl/projects/{id}/products/{pid}",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
                 reject=True,
             )
 
@@ -250,7 +250,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_supplier,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
         )
 
     @transition(
@@ -268,7 +268,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_agency,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             reject=True,
         )
 
@@ -287,7 +287,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_agency,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             reject=True,
         )
 
@@ -297,14 +297,14 @@ class Product(TimestampableDeletableMixin, RulesModel):
             result = self._accept_draft_as_supplier(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and (u.is_client and u.is_observer is False),
-                action_url="https://outbo.pl/projects/{id}/products/{pid}/draft",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}/draft",
             )
             return result
         elif self.stage.id == "waiting_for_draft_accept_by_client":
             result = self._accept_draft_as_client(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and u.is_agency,
-                action_url="https://outbo.pl/projects/{id}/products/{pid}/draft",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}/draft",
             )
             return result
         raise NotImplementedError()
@@ -365,7 +365,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_supplier,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}/ff",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}/ff",
         )
 
     @transition(
@@ -383,7 +383,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_agency,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             reject=True,
         )
 
@@ -402,7 +402,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_agency,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             reject=True,
         )
 
@@ -416,18 +416,18 @@ class Product(TimestampableDeletableMixin, RulesModel):
             result = self._accept_ff_as_supplier(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and (u.is_client and u.is_observer is False),
-                action_url="https://outbo.pl/projects/{id}/products/{pid}/ff",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}/ff",
             )
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in traders and (u.is_client and u.is_observer is False),
-                action_url="https://outbo.pl/projects/{id}/products/{pid}",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             )
             return result
         elif self.stage.id == "waiting_for_ff_accept_by_client":
             result = self._accept_ff_as_client(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and (u.is_agency and u.is_observer is False),
-                action_url="https://outbo.pl/projects/{id}/products/{pid}/ff",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}/ff",
             )
             return result
         raise NotImplementedError()
@@ -488,7 +488,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_supplier,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}/pf",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}/pf",
         )
 
     @transition(
@@ -506,7 +506,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_agency,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             reject=True,
         )
 
@@ -525,7 +525,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
         product_users = [member.user for member in self.project.members.all()]
         self.send_action_emails_for_users_passing_test(
             test=lambda u: u in product_users and u.is_agency,
-            action_url="https://outbo.pl/projects/{id}/products/{pid}",
+            action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             reject=True,
         )
 
@@ -535,7 +535,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
             result = self._accept_pf_as_supplier(user=user)
             self.send_action_emails_for_users_passing_test(
                 test=lambda u: u in product_users and (u.is_client and u.is_observer is False),
-                action_url="https://outbo.pl/projects/{id}/products/{pid}/pf",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}/pf",
             )
             return result
         elif self.stage.id == "waiting_for_pf_accept_by_client":
@@ -573,7 +573,7 @@ class Product(TimestampableDeletableMixin, RulesModel):
             stage=stage,
         )
         self.send_action_emails_for_users_passing_test(
-            test=lambda u: u in product_users, action_url="https://outbo.pl/projects/{id}/products/{pid}",
+            test=lambda u: u in product_users, action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
         )
         return "completed"
 

evg-outbo-api/outbo/apps/products/serializers/brief.py

@@ -90,7 +90,7 @@ class BriefSerializer:
             product.publish_brief_as_user(user=current_user)
             product.send_action_emails_for_users_passing_test(
                 test=lambda u: u in members and u.is_agency,
-                action_url="https://outbo.pl/projects/{id}/products/{pid}",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             )
             product.save()
             return instance

evg-outbo-api/outbo/apps/projects/models/project.py

@@ -132,7 +132,7 @@ class Project(TimestampableDeletableMixin, RulesModel):
             product.send_action_emails_for_users_passing_test(
                 test=lambda u: u in [m.user for m in self.members.all()]
                                and u.is_agency,
-                action_url="https://outbo.pl/projects/{id}/products/{pid}",
+                action_url="https://prodat.outbo.pl/projects/{id}/products/{pid}",
             )
             product.publish_brief_as_user(user=user)
             product.save()

evg-outbo-web/src/API/axiosConfig.ts

@@ -10,7 +10,8 @@ let baseURL = process.env.REACT_APP_BACKEND_URL;
 if (!baseURL) {
   // throw new Error('API URL not set')
   // baseURL = 'https://api.outbo.pl/';
-  baseURL = 'https://outbo-api.stage.ermlab.com';
+  //baseURL = 'https://outbo-api.stage.ermlab.com';
+  baseURL = 'https://prodatapi.outbo.pl';
   // baseURL = 'https://f101aae2d6a5.ngrok.io/';
 }
 const api = axios.create({

evg-outbo-web/src/index.tsx

@@ -6,7 +6,7 @@ import * as Sentry from '@sentry/browser';
 import LogRocket from 'logrocket';
 import setupLogRocketReact from 'logrocket-react';
 
-if (process.env.NODE_ENV === 'production') {
+/*if (process.env.NODE_ENV === 'production') {
   Sentry.init({
     dsn: 'https://0c108cf089404f8f8d5dbf247d2f7d0b@sentry.ermlab.software/8',
     environment: process.env.REACT_APP_OUTBO_ENV,
@@ -18,7 +18,7 @@ if (process.env.NODE_ENV === 'production') {
       scope.setExtra('sessionURL', sessionURL);
     });
   });
-}
+}*/
 
 const body = document.querySelector('body');
 const now = new Date();