domain fix (LiteFarmOrg#207)

README.md

@@ -6,7 +6,7 @@ _To meet farmers where they are and equip them with the tools they need to make
 
 LiteFarm version 1.0.0 was released to the public in July 2020. The LiteFarm app is continually being developed, with farmers, researchers, designers and developers working together to create new localized modules and features into the future.  LiteFarm is deployed in Canada, the USA, and Latin America.
 
-If you’re a farmer and would like to join LiteFarm you can sign up today at www.litefarm.org. If you are a researcher or would like to find out more about this project you can contact the [UBC Centre for Sustainable Food Systems](https://ubcfarm.ubc.ca/litefarm/). If your a developer, all the details on how you can contribute to this project are right here, welcome to the team!
+If you’re a farmer and would like to join LiteFarm you can sign up today at app.litefarm.org. If you are a researcher or would like to find out more about this project you can contact the [UBC Centre for Sustainable Food Systems](https://ubcfarm.ubc.ca/litefarm/). If your a developer, all the details on how you can contribute to this project are right here, welcome to the team!
 # Overview
 
 LiteFarm is comprised of two applications which both reside in this monorepo.

RELEASES.md

@@ -2,7 +2,7 @@
 
 We follow the [git flow](http://nvie.com/posts/a-successful-git-branching-model) process which has several special branches:
 
--   **`master`** - Contains the release commits - builds publish a release of the [app](https://www.litefarm.org)
+-   **`master`** - Contains the release commits - builds publish a release of the [app](https://app.litefarm.org)
 -   **`develop`** - Contains the work in progress, code in here must be of release quality or close to release quality- builds publish the App to [CD server](litefarm-webapp-integration.heroku.com)
 -   **`release/v{major}.{minor}.{patch}`** - For preparing a release
 -   **`hotfix/{major}.{minor}.X`** - For releasing a patch

packages/api/doc.api.yaml

@@ -7,7 +7,7 @@ info:
   version: 1.0.0
 servers:
   - url: http://beta.litefarm.org/
-  - url: http://litefarm.org/
+  - url: http://app.litefarm.org/
 tags:
   - name: contact
     description: .

packages/api/researchAPI_README.md

@@ -30,6 +30,6 @@ Order does not matter
  ### Examples
 
   - Get users data  
-    `https://www.litefarm.org/stats/farm?farm_id=xxxxxxxxxxxxx&token=xxxxxxxxxxxxx&users=true`
+    `https://app.litefarm.org/stats/farm?farm_id=xxxxxxxxxxxxx&token=xxxxxxxxxxxxx&users=true`
   - Get users and labour_happiness  
-     `https://www.litefarm.org/stats/farm?farm_id=xxxxxxxxxxxxx&token=xxxxxxxxxxxxx&users=true&labour_happiness=true`
+     `https://app.litefarm.org/stats/farm?farm_id=xxxxxxxxxxxxx&token=xxxxxxxxxxxxx&users=true&labour_happiness=true`

packages/api/src/controllers/createUserController.js

@@ -28,7 +28,7 @@ const farmModel = require('../models/farmModel');
 const { v4: uuidv4 } = require('uuid');
 const environmentMap = {
   integration: 'https://beta.litefarm.org/',
-  production: 'https://litefarm.org/',
+  production: 'https://app.litefarm.org/',
   development: 'http://localhost:3000/',
 }
 const auth0Uri = findAuth0Uri();

packages/api/src/controllers/userFarmController.js

@@ -543,7 +543,7 @@ class userFarmController extends baseController {
           if(environment === 'integration'){
             joinUrl = `https://beta.litefarm.org/sign_up/${token}/${new_user_id}/${farm_id}/${req.body.email}/${rows[0].first_name}/${rows[0].last_name}`;
           }else if(environment === 'production'){
-            joinUrl = `https://www.litefarm.org/sign_up/${token}/${new_user_id}/${farm_id}/${req.body.email}/${rows[0].first_name}/${rows[0].last_name}`;
+            joinUrl = `https://app.litefarm.org/sign_up/${token}/${new_user_id}/${farm_id}/${req.body.email}/${rows[0].first_name}/${rows[0].last_name}`;
           }else{
             joinUrl = `localhost:3000/sign_up/${token}/${new_user_id}/${farm_id}/${req.body.email}/${rows[0].first_name}/${rows[0].last_name}`
           }

packages/api/src/templates/invitation_to_farm_email.html

@@ -1,12 +1,12 @@
-<!-- 
-  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>   
+<!--
+  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
   This file (invitation_to_farm_email.html) is part of LiteFarm.
-  
+
   LiteFarm is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   LiteFarm is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -36,7 +36,7 @@
   <body>
 	<p>Dear {{first_name}},</p>
 
-    <p>The great folks at {{farm}} have invited you to join their team on LiteFarm! LiteFarm is an open-source software tool for helping farmers manage their farms. You can read more about LiteFarm at <a href="litefarm.org">litefarm.org</a>.</p>
+    <p>The great folks at {{farm}} have invited you to join their team on LiteFarm! LiteFarm is an open-source software tool for helping farmers manage their farms. You can read more about LiteFarm at <a href="app.litefarm.org">litefarm.org</a>.</p>
 
     <p>You can accept this invitation (on any device) using the button below:
     </p>

packages/api/src/templates/sendEmailTemplate.js

@@ -1,12 +1,12 @@
-/* 
- *  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>   
+/*
+ *  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  *  This file (sendEmailTemplate.js) is part of LiteFarm.
- *  
+ *
  *  LiteFarm is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  LiteFarm is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -59,7 +59,7 @@ class sendEmailTemplate {
         if(environment === 'integration'){
           homeUrl = 'https://beta.litefarm.org';
         }else if(environment === 'production'){
-          homeUrl = 'https://www.litefarm.org';
+          homeUrl = 'https://app.litefarm.org';
         }else if(environment === 'development'){
           homeUrl = 'localhost:3000'
         }

packages/webapp/src/Auth/Auth.js

@@ -61,7 +61,7 @@ if (NODE_ENV === 'development') {
     auth0Uri = 'https://litefarm-production.auth0.com';
     authorizationAdminRoleId = "8f53c7bd-4ac4-42a4-b581-ea2aef0e4ece";
     authorizationWorkerId = '36456d3b-654b-452c-8d6e-cbf3a2e6cbca';
-    logoutUri = 'https%3A%2F%2Fwww.litefarm.org';
+    logoutUri = 'https%3A%2F%2Fapp.litefarm.org';
   }
 }