Merge branch 'rename_domains'

Author: Marek Rozmus

README.md

@@ -1,6 +1,5 @@
 # EOC - End Of Coffee App
 
-[![Build status](http://eoc.sanddev.com:8080/buildStatus/icon)](http://eoc.sanddev.com:8080/job/EOC%20MBP/job/master/)
 [![Greenkeeper badge](https://badges.greenkeeper.io/sandstreamdev/eoc.svg)](https://greenkeeper.io/)
 ![last commit](https://img.shields.io/github/last-commit/sandstreamdev/eoc)
 [![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)

client/src/modules/privacy-policy/components/CookiePolicy.en.md

@@ -1,6 +1,6 @@
 # Cookie Policy
 
-This is the Cookie Policy for EOC, accessible from [app.eoc.sanddev.com](https://app.eoc.sanddev.com)
+This is the Cookie Policy for EOC, accessible from [app.eoc.sandstreamdev.com](https://app.eoc.sandstreamdev.com)
 
 ## What Are Cookies
 

client/src/modules/privacy-policy/components/PrivacyPolicy.en.md

@@ -4,9 +4,9 @@ _Last updated November 8, 2019_
 
 Thank you for choosing to be part of our community at **Sandstream Development Sp. z o.o.** ("company", "we", "us", or "our"). We are committed to protecting your personal information and your right to privacy. If you have any questions or concerns about our policy or our practices with regards to your personal information, please contact us at [[email protected]](mailto:[email protected]).
 
-When you visit our website [app.eoc.sanddev.com](https://app.eoc.sanddev.com), mobile application, and use our services, you trust us with your personal information. We take your privacy very seriously. In this privacy notice, we describe our privacy policy. We seek to explain to you in the clearest way possible what information we collect, how we use it and what rights you have in relation to it. We hope you take some time to read through it carefully, as it is important. If there are any terms in this privacy policy that you do not agree with, please discontinue the use of our Sites or Apps and our services.
+When you visit our website [app.eoc.sandstreamdev.com](https://app.eoc.sandstreamdev.com), mobile application, and use our services, you trust us with your personal information. We take your privacy very seriously. In this privacy notice, we describe our privacy policy. We seek to explain to you in the clearest way possible what information we collect, how we use it and what rights you have in relation to it. We hope you take some time to read through it carefully, as it is important. If there are any terms in this privacy policy that you do not agree with, please discontinue the use of our Sites or Apps and our services.
 
-This privacy policy applies to all information collected through our website (such as [app.eoc.sanddev.com](https://app.eoc.sanddev.com)), mobile application, ("**Apps**"), and/or any related services, sales, marketing or events (we refer to them collectively in this privacy policy as the "**Sites**").
+This privacy policy applies to all information collected through our website (such as [app.eoc.sandstreamdev.com](https://app.eoc.sandstreamdev.com)), mobile application, ("**Apps**"), and/or any related services, sales, marketing or events (we refer to them collectively in this privacy policy as the "**Sites**").
 
 **Please read this privacy policy carefully as it will help you make informed decisions about sharing your personal information with us.**
 
@@ -141,7 +141,7 @@ We only share and disclose your information with the following third parties. We
 
 **_In Short:_** We may use cookies and other tracking technologies to collect and store your information.
 
-We may use cookies and similar tracking technologies (like web beacons and pixels) to access or store information. Specific information about how we use such technologies and how you can refuse certain cookies is set out in our [Cookie Policy](www.app.eoc.sanddev.com/cookie-policy).
+We may use cookies and similar tracking technologies (like web beacons and pixels) to access or store information. Specific information about how we use such technologies and how you can refuse certain cookies is set out in our [Cookie Policy](www.app.eoc.sandstreamdev.com/cookie-policy).
 
 ### [6. HOW DO WE HANDLE YOUR SOCIAL LOGINS?](#6-how-do-we-handle-your-social-logins)
 

client/src/modules/privacy-policy/components/TermsOfUse.en.md

@@ -1,10 +1,10 @@
-# Sandstream Terms of Use of the app.eoc.sanddev.com
+# Sandstream Terms of Use of the app.eoc.sandstreamdev.com
 
 Welcome to the EOC website (the "EOC").
 
 ## 1\. Terms
 
-By accessing the website at [eoc.app.sanddev.com](https://eoc.app.sanddev.com), you are agreeing to be bound by these Terms of Use. In addition, when you use any of our Services, you will be subject to the rules, guidelines, policies, terms, and conditions applicable to such service, and they are incorporated into this Terms of Use by this reference.
+By accessing the website at [eoc.app.sandstreamdev.com](https://eoc.app.sandstreamdev.com), you are agreeing to be bound by these Terms of Use. In addition, when you use any of our Services, you will be subject to the rules, guidelines, policies, terms, and conditions applicable to such service, and they are incorporated into this Terms of Use by this reference.
 
 These Terms of Use are effective as of November 8, 2019
 

init-letsencrypt.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-domains=(eoc.sanddev.com app.eoc.sanddev.com)
+domains=(eoc.sandstreamdev.com app.eoc.sandstreamdev.com)
 data_path="/data/certbot"
 staging=0
 

landing/cookie-policy.html

@@ -51,7 +51,7 @@
         "@context": "https://schema.org/",
         "@type": "WebSite",
         "name": "EOC APP",
-        "url": "app.eoc.sanddev.com"
+        "url": "app.eoc.sandstreamdev.com"
       }
     </script>
     <link
@@ -145,7 +145,9 @@ <h1 class="wow fadeInDown rodo-title">
               <div class="info wow fadeInRight rodo-content">
                 <p>
                   This is the Cookie Policy for EOC, accessible from
-                  <a href="https://app.eoc.sanddev.com">app.eoc.sanddev.com</a>
+                  <a href="https://app.eoc.sandstreamdev.com"
+                    >app.eoc.sandstreamdev.com</a
+                  >
                 </p>
               </div>
             </div>

landing/index.html

@@ -35,7 +35,7 @@
         "@context": "https://schema.org/",
         "@type": "WebSite",
         "name": "EOC APP",
-        "url": "app.eoc.sanddev.com"
+        "url": "app.eoc.sandstreamdev.com"
       }
     </script>
     <link
@@ -120,10 +120,12 @@ <h1 class="wow fadeInDown">
               End of coffee helps you track all the stuff you care about!
             </p>
             <div class="bnts wow fadeInUp">
-              <a href="https://app.eoc.sanddev.com" class="btn2">Try Now</a>
+              <a href="https://app.eoc.sandstreamdev.com" class="btn2"
+                >Try Now</a
+              >
               <a
                 class="btn2"
-                href="https://app.eoc.sanddev.com/auth/demo"
+                href="https://app.eoc.sandstreamdev.com/auth/demo"
                 rel="noopener noreferrer"
                 target="_blank"
               >
@@ -284,7 +286,9 @@ <h2 class="wow fadeInUp">Intuitive dashboard</h2>
                   <div class="clear"></div>
                 </div>
               </div>
-              <a href="https://app.eoc.sanddev.com" class="acc wow fadeInUp"
+              <a
+                href="https://app.eoc.sandstreamdev.com"
+                class="acc wow fadeInUp"
                 >CHECK THE DASHBOARD</a
               >
             </div>
@@ -310,7 +314,9 @@ <h2>Mobile friendly</h2>
             </p>
 
             <div class="clear"></div>
-            <a href="https://app.eoc.sanddev.com" class="acc">WORK ANYWHERE</a>
+            <a href="https://app.eoc.sandstreamdev.com" class="acc"
+              >WORK ANYWHERE</a
+            >
           </div>
           <div class="col-xs-12 col-sm-12 col-md-7 col-md-pull-5"></div>
         </div>
@@ -339,7 +345,7 @@ <h2>Real time cooperation</h2>
                 with your friends to get things done faster and be more
                 productive.
               </p>
-              <a href="https://app.eoc.sanddev.com" class="acc"
+              <a href="https://app.eoc.sandstreamdev.com" class="acc"
                 >WORK TOGETHER</a
               >
             </div>
@@ -403,7 +409,7 @@ <h2>Start your own journey</h2>
               You won't forget about things that matter!
             </p>
             <div class="getbtn">
-              <a href="https://app.eoc.sanddev.com" class="get"
+              <a href="https://app.eoc.sandstreamdev.com" class="get"
                 >ORGANIZE YOUR STUFF</a
               >
             </div>

landing/privacy-policy.html

@@ -51,7 +51,7 @@
         "@context": "https://schema.org/",
         "@type": "WebSite",
         "name": "EOC APP",
-        "url": "app.eoc.sanddev.com"
+        "url": "app.eoc.sandstreamdev.com"
       }
     </script>
     <link
@@ -150,7 +150,7 @@ <h1 class="wow fadeInDown rodo-title">
                   information, please contact us at <a href="mailto:[email protected]">[email protected]</a>.
                 </p>
                 <p>
-                  When you visit our website <a href="https://app.eoc.sanddev.com">app.eoc.sanddev.com</a>, mobile application, and
+                  When you visit our website <a href="https://app.eoc.sandstreamdev.com">app.eoc.sandstreamdev.com</a>, mobile application, and
                   use our services, you trust us with your personal information. We take your privacy very seriously. In this privacy
                   notice, we describe our privacy policy. We seek to explain to you in the clearest way possible what information we
                   collect, how we use it and what rights you have in relation to it. We hope you take some time to read through it
@@ -160,7 +160,7 @@ <h1 class="wow fadeInDown rodo-title">
                 <p>
                 </p>
                   This privacy policy applies to all information collected through our website (such as
-                  <a href="https://app.eoc.sanddev.com">app.eoc.sanddev.com</a>), mobile application, ("<strong>Apps</strong>"), and/or
+                  <a href="https://app.eoc.sandstreamdev.com">app.eoc.sandstreamdev.com</a>), mobile application, ("<strong>Apps</strong>"), and/or
                     any related services, sales, marketing or events (we refer to them collectively in this privacy policy as the
                     "<strong>Sites</strong>").
                 </p>
@@ -620,7 +620,7 @@ <h4 id="information-collected-from-other-sources">Information collected from oth
                 <p>
                   We may use cookies and similar tracking technologies (like web beacons and pixels) to access or store information.
                   Specific information about how we use such technologies and how you can refuse certain cookies is set out in our
-                  <a href="www.app.eoc.sanddev.com/cookie-policy">Cookie Policy</a>.
+                  <a href="www.app.eoc.sandstreamdev.com/cookie-policy">Cookie Policy</a>.
                 </p>
               </div>
             </div>

landing/terms-of-use.html

@@ -51,7 +51,7 @@
         "@context": "https://schema.org/",
         "@type": "WebSite",
         "name": "EOC APP",
-        "url": "app.eoc.sanddev.com"
+        "url": "app.eoc.sandstreamdev.com"
       }
     </script>
     <link
@@ -166,8 +166,9 @@ <h2 class="wow fadeInRight rodo-header">
                 <p>Welcome to the EOC website (the "EOC").</p>
                 <p>
                   By accessing the website at
-                  <a href="https://eoc.app.sanddev.com">eoc.app.sanddev.com</a>,
-                  you are agreeing to be bound by these Terms of Use. In
+                  <a href="https://eoc.app.sandstreamdev.com"
+                    >eoc.app.sandstreamdev.com</a
+                  >, you are agreeing to be bound by these Terms of Use. In
                   addition, when you use any of our Services, you will be
                   subject to the rules, guidelines, policies, terms, and
                   conditions applicable to such service, and they are

nginx/eoc.conf

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name eoc.sanddev.com app.eoc.sanddev.com;
+    server_name eoc.sandstreamdev.com app.eoc.sandstreamdev.com;
     server_tokens off;
 
     location /.well-known/acme-challenge/ {
@@ -14,33 +14,30 @@ server {
 
 server {
     listen 443 ssl;
-    server_name eoc.sanddev.com;
+    server_name eoc.sandstreamdev.com;
 
-    ssl_certificate /etc/letsencrypt/live/eoc.sanddev.com/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/eoc.sanddev.com/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/eoc.sandstreamdev.com/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/eoc.sandstreamdev.com/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 
     location / {
-        auth_basic "Restricted Content - EOC";
-        auth_basic_user_file /etc/nginx/.htpasswd;
-
         proxy_pass http://eoc-landing:80;
         proxy_set_header HOST $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
 
     location /app {
-        return 301 $scheme://app.eoc.sanddev.com;
+        return 301 $scheme://app.eoc.sandstreamdev.com;
     }
 }
 
 server {
     listen 443 ssl;
-    server_name app.eoc.sanddev.com;
+    server_name app.eoc.sandstreamdev.com;
 
-    ssl_certificate /etc/letsencrypt/live/eoc.sanddev.com/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/eoc.sanddev.com/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/eoc.sandstreamdev.com/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/eoc.sandstreamdev.com/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 
@@ -54,9 +51,6 @@ server {
     }
 
     location / {
-        auth_basic "Restricted Content - EOC APP";
-        auth_basic_user_file /etc/nginx/.htpasswd;
-
         proxy_pass http://eoc-server:8080;
         proxy_set_header HOST $host;
         proxy_set_header X-Real-IP $remote_addr;