Add privacy policy and update login buttons (#137)

* Update privacy policy and social app login buttons * Add Privacy Policy link to footer * Add Terms and conditions
Ajapaik · Nov 23, 2023 · db6d4df · db6d4df
1 parent dfb7250
commit db6d4df
Show file tree

Hide file tree

Showing 8 changed files with 595 additions and 24 deletions.
diff --git a/ajapaik/ajapaik/static/css/ajp-style.css b/ajapaik/ajapaik/static/css/ajp-style.css
@@ -636,22 +636,20 @@ a.fullscreen {
 
 .facebook-connect a {
     width: 169px;
-    height: 21px;
+    height: 28px;
     background: url(../images/connect-with-facebook.png) no-repeat;
 }
 
 .wikimedia-commons-connect a {
     width: 169px;
     height: 57px;
     background: url(../images/connect-with-wikimedia-commons.png) no-repeat;
-    margin-top: -5px;
 }
 
 .google-connect a {
     width: 169px;
-    height: 57px;
+    height: 30px;
     background: url(../images/connect-with-google.png) no-repeat;
-    margin-top: -5px;
 }
 
 .ir {

diff --git a/ajapaik/ajapaik/static/images/connect-with-facebook.png b/ajapaik/ajapaik/static/images/connect-with-facebook.png
diff --git a/ajapaik/ajapaik/static/images/connect-with-google.png b/ajapaik/ajapaik/static/images/connect-with-google.png
diff --git a/ajapaik/ajapaik/templates/core/_footer.html b/ajapaik/ajapaik/templates/core/_footer.html
@@ -21,22 +21,22 @@
         </ul>
         <ul class="col-lg-3 m-0 list-unstyled">
             <li>
-                <a href="mailto:[email protected]">[email protected]</a>
+                    <a href="{% url 'privacy' %}" title="{% trans "Privacy policy" %}">{% trans "Privacy policy" %}</a>
             </li>
         </ul>
         <ul class="col-lg-3 m-0 list-unstyled">
             <li>
-                    <a href="{% url 'donate' %}" title="{% trans "Support Ajapaik" %}">{% trans "Support us" %}</a>
+                    <a href="{% url 'terms' %}" title="{% trans "Terms and conditions" %}">{% trans "Terms and conditions" %}</a>
             </li>
         </ul>
         <ul class="col-lg-3 m-0 list-unstyled">
-            <li class="pt-2">
-                <a target="_blank" href="https://www.hotjar.com/?utm_source=badge" rel="noopener nofollow">
-                    <img id="ajp-hotjar-footer-logo" class="lazyload"
-                         src="/static/images/hotjar-badge.png"
-                         data-src="/static/images/hotjar-badge.png"
-                         alt="Hotjar - Unlimited insights from your web and mobile sites" />
-                </a>
+            <li>
+                <a href="mailto:[email protected]">[email protected]</a>
+            </li>
+        </ul>
+        <ul class="col-lg-12 m-0 list-unstyled">
+            <li>
+                    <a href="{% url 'donate' %}" title="{% trans "Support Ajapaik" %}">{% trans "Support us" %}</a>
             </li>
         </ul>
     </div>

diff --git a/ajapaik/ajapaik/templates/t&c/privacy.html b/ajapaik/ajapaik/templates/t&c/privacy.html
diff --git a/ajapaik/ajapaik/templates/t&c/terms.html b/ajapaik/ajapaik/templates/t&c/terms.html
@@ -8,7 +8,76 @@
 {% block layout %}
     <div class='container pt-5'>
         <div class='col-12 pt-5'>
-            Terms 123
+            <strong>Welcome to Ajapaik, a platform dedicated to aggregating historical photographs and crowdsourcing
+                image
+                data. By accessing and using our website ("Ajapaik"), you agree to comply with and be bound by the
+                following terms and conditions of use. Please read these terms carefully before using our
+                services.</strong>
+            <br><br>
+            <h3>1. Definitions</h3>
+            <ul>
+                <li>"Ajapaik" refers to the website, platform, and application operated by MTÜ EESTI FOTOPÄRAND, located
+                    at
+                    Harju maakond, Tallinn, Kesklinna linnaosa, Raekoja tn 6, 10146, and all its related services and
+                    features.
+                </li>
+                <li>"User" refers to any person accessing or using Ajapaik.</li>
+                <li>
+                    "Content" refers to any text, images, data, or other materials uploaded, shared, or accessed on
+                    Ajapaik.
+                </li>
+                <li>"GDPR" refers to the General Data Protection Regulation (EU) 2016/679.</li>
+            </ul>
+            <h3>2. Acceptance of Terms</h3>
+            By using Ajapaik, you acknowledge that you have read, understood, and agree to abide by these Terms and
+            Conditions, as well as our Privacy Policy. If you do not agree with any part of these terms, please do not
+            use our services.
+            <br><br>
+            <h3>3. Data Collection and Usage</h3>
+            Ajapaik is committed to GDPR compliance and the responsible handling of user data. We may collect and
+            store non-sensitive, private data to provide our services. This includes the use of cookies and session
+            storage, which are essential for the proper functioning of the website.
+
+            <ul>
+                <li>Cookies: Ajapaik uses cookies to improve user experience and functionality. By using our website,
+                    you
+                    consent to the use of cookies in accordance with our Privacy Policy.
+                </li>
+
+                <li>Session Storage: We use session storage to maintain user sessions and enhance performance during
+                    your
+                    visit
+                    to Ajapaik.
+                </li>
+
+                <li>Location Data: Users have the option to share their location when using Ajapaik. This information is
+                    used
+                    to enhance the user experience and provide location-based features.
+                </li>
+            </ul>
+            <h3>4. User-Generated Content</h3>
+            Users can upload their historical photographs and share image data on Ajapaik. By uploading content, you
+            grant Ajapaik a non-exclusive, worldwide, royalty-free license to use, display, and distribute the content
+            for the purpose of operating and promoting the platform.
+
+            Users are responsible for the accuracy, legality, and copyright compliance of the content they upload.
+            Ajapaik reserves the right to remove any content that violates these terms or is deemed inappropriate.
+            <br><br>
+            <h3>5. User Responsibilities</h3>
+            Users agree to use Ajapaik in compliance with applicable laws and regulations. You may not engage in any
+            unlawful, fraudulent, or abusive activities while using our platform.
+            <br><br>
+            <h3>6. Contact Information</h3>
+            If you have any questions or concerns regarding these Terms and Conditions or the use of Ajapaik, please
+            contact us at <a href="mailto:[email protected]">[email protected]</a>.
+            <br><br>
+            <h3>7. Changes to Terms and Conditions</h3>
+            Ajapaik reserves the right to update or modify these Terms and Conditions at any time without prior
+            notice. Continued use of our services after such changes constitutes your acceptance of the updated terms.
+            <br><br>
+            <strong>Last updated: October 3, 2023</strong>
+            <br><br>
+            <strong>Thank you for using Ajapaik</strong>
         </div>
     </div>
 {% endblock %}
diff --git a/ajapaik/ajapaik_face_recognition/templates/_footer.html b/ajapaik/ajapaik_face_recognition/templates/_footer.html
@@ -21,20 +21,22 @@
         </ul>
         <ul class="col-lg-3 m-0 list-unstyled">
             <li>
-                <a href="mailto:[email protected]">[email protected]</a>
+                    <a href="{% url 'privacy' %}" title="{% trans "Privacy policy" %}">{% trans "Privacy policy" %}</a>
             </li>
         </ul>
         <ul class="col-lg-3 m-0 list-unstyled">
             <li>
-                    <a href="{% url 'donate' %}" title="{% trans "Support Ajapaik" %}">{% trans "Support us" %}</a>
+                    <a href="{% url 'terms' %}" title="{% trans "Terms and conditions" %}">{% trans "Terms and conditions" %}</a>
             </li>
         </ul>
         <ul class="col-lg-3 m-0 list-unstyled">
-            <li class="pt-2">
-                <a target="_blank" href="https://www.hotjar.com/?utm_source=badge" rel="noopener nofollow">
-                    <img id="ajp-hotjar-footer-logo" class="lazyload" data-src="/static/images/hotjar-badge.png"
-                        alt="Hotjar - Unlimited insights from your web and mobile sites" />
-                </a>
+            <li>
+                <a href="mailto:[email protected]">[email protected]</a>
+            </li>
+        </ul>
+        <ul class="col-lg-12 m-0 list-unstyled">
+            <li>
+                    <a href="{% url 'donate' %}" title="{% trans "Support Ajapaik" %}">{% trans "Support us" %}</a>
             </li>
         </ul>
     </div>

diff --git a/ajapaik/settings/default.py b/ajapaik/settings/default.py
@@ -163,7 +163,7 @@
 LOGIN_REDIRECT_URL = '/'
 REGISTRATION_FORM = 'ajapaik.ajapaik.forms.UserRegistrationForm'
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'admin_tools',
     'admin_tools.theming',
     'admin_tools.menu',
@@ -207,7 +207,7 @@
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     'ajapaik.ajapaik.socialaccount.providers.wikimedia_commons'
-)
+]
 
 # Note: Allauth login's next-parameter redirection doesn't understand wildcards in ALLOWED_HOSTS.
 ALLOWED_HOSTS = ['.ajapaik.ee', '127.0.0.1']