Merge pull request #3 from Xpirix/separated_qgis_changelog

Separated qgis changelog

Author: Xpirix

README.md

@@ -85,7 +85,7 @@ make superuser
 
 If you wish to make use of [intercom.io](https://www.intercom.io), include a
 `private.py` file in `core.settings` with your `INTERCOM_APP_ID` as a string.
-The necessary code snippet is already included in `project_base.html`.
+The necessary code snippet is already included in `base_with_sidebar.html`.
 
 **google authentication**
 

deployment/.env.example

@@ -1,5 +1,5 @@
 # Copy paste the env variable as .env to use
-COMPOSE_PROJECT_NAME=projecta
+COMPOSE_PROJECT_NAME=qgis_changelog_website
 
 ## Btsync credentials notes:
 # The environment file should define two variables:
@@ -28,11 +28,11 @@ DATABASE_HOST=db
 
 # Django env
 DJANGO_SETTINGS_MODULE=core.settings.prod_docker
-VIRTUAL_HOST=projecta.kartoza.com
+VIRTUAL_HOST=changelog.qgis.org
 VIRTUAL_PORT=8080
 
 # DB Backups
-DUMPPREFIX=PG_projecta
+DUMPPREFIX=PG_QGIS_CHANGELOG
 
 
 # Nginx config
@@ -45,7 +45,7 @@ STATIC_VOLUME=./static
 BACKUPS_VOLUME=./backups
 
 # VALID_DOMAIN
-VALID_DOMAIN=["localhost", "changelog.kartoza.com", "staging.changelog.kartoza.com","changelog.qgis.org", "staging.changelog.qgis.org"]
+VALID_DOMAIN=["localhost", "changelog.qgis.org", "staging.changelog.qgis.org"]
 
 # Email
 EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'

deployment/docker-compose.yml

@@ -71,7 +71,7 @@ services:
       - static-data:/home/web/static:rw
       - media-data:/home/web/media:rw
       - reports-data:/home/web/reports
-    command: bash -c "npm run build && uwsgi --ini /uwsgi.conf"
+    command: bash -c "npm install && npm run build && uwsgi --ini /uwsgi.conf"
     links:
       - db:db
       # - smtp:smtp

django_project/base/forms.py

@@ -14,11 +14,13 @@
 )
 from .models import (
     Project, ProjectScreenshot, Domain, Organisation, ProjectFlatpage)
-from certification.forms import MultiSelectWidget
 
 logger = logging.getLogger(__name__)
 
 
+class MultiSelectWidget(forms.SelectMultiple):
+    template_name = 'widgets/multiselect.html'
+
 class ProjectScreenshotForm(forms.ModelForm):
     """Form to input a screenshot linked to a project."""
 
@@ -40,6 +42,7 @@ def __init__(self, *args, **kwargs):
         self.helper.layout = layout
         self.helper.include_media = False
         self.helper.html5_required = False
+        self.helper.form_class = 'box-content'
         super(ProjectScreenshotForm, self).__init__(*args, **kwargs)
 
 
@@ -181,6 +184,7 @@ def __init__(self, *args, **kwargs):
         self.helper.layout = layout
         self.helper.include_media = False
         self.helper.html5_required = False
+        self.helper.form_class = 'box-content'
         super(ProjectForm, self).__init__(*args, **kwargs)
         self.fields['changelog_managers'].label_from_instance = \
             lambda obj: "%s <%s>" % (obj.get_full_name(), obj)
@@ -274,6 +278,7 @@ def __init__(self, *args, **kwargs):
         )
         self.helper.layout = layout
         self.helper.html5_required = False
+        self.helper.form_class = 'box-content'
         super(RegisterDomainForm, self).__init__(*args, **kwargs)
         self.helper.add_input(Submit('submit', 'Submit', css_class='button is-success pt-2 mt-5'))
 
@@ -307,6 +312,7 @@ def __init__(self, *args, **kwargs):
         )
         self.helper.layout = layout
         self.helper.html5_required = False
+        self.helper.form_class = 'box-content'
         super(OrganisationForm, self).__init__(*args, **kwargs)
         self.helper.add_input(Submit('submit', 'Submit', css_class='button is-success pt-2 mt-5'))
 
@@ -345,6 +351,7 @@ def __init__(self, *args, **kwargs):
         )
         self.helper.layout = layout
         self.helper.html5_required = False
+        self.helper.form_class = 'box-content'
         super(UserForm, self).__init__(*args, **kwargs)
         self.helper.add_input(Submit('submit', 'Submit', css_class='button is-success pt-2 mt-5'))
 

django_project/base/models/project.py

@@ -339,7 +339,7 @@ def get_absolute_url(self):
         :rtype: str
 
         """
-        return reverse('project-detail', kwargs={'slug': self.slug})
+        return reverse('project-detail')
 
     def versions(self):
         """Get all the versions for this project."""

django_project/base/static/js/index.js

@@ -4,6 +4,11 @@ import 'datatables.net';
 import 'datatables.net-dt';
 import 'leaflet';
 import 'leaflet/dist/leaflet.css';
+import 'air-datepicker';
+import 'air-datepicker/air-datepicker.css';
+import 'air-datepicker/locale/en';
+import 'jquery-ui/ui/widgets/sortable';
+import 'jquery-ui/themes/base/sortable.css';
 
 document.addEventListener("DOMContentLoaded", () => {
   // Get all "navbar-burger" elements

django_project/base/static/style/scss/style.scss

@@ -4,6 +4,10 @@
 @import "toogle-switch.scss";
 @import "../../../../node_modules/@creativebulma/bulma-tooltip/src/sass/index.sass";
 
+html {
+  scroll-padding-top: 120px; /* height of your fixed header */
+}
+
 body {
   color: $text-primary1;
   font-weight: 300;
@@ -371,4 +375,8 @@ a.is-active > span {
     box-shadow: $shadow-hover;
     cursor: pointer;
   }
+}
+
+.rounded .rich-right img {
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
 }

django_project/base/templates/account/profile.html

@@ -1,4 +1,4 @@
-{% extends "project_base.html" %}
+{% extends "base_with_sidebar.html" %}
 {% load static %}
 {% block title %}Profile Page{% endblock %}
 

django_project/base/templates/account/update.html

@@ -1,4 +1,4 @@
-{% extends "project_base.html" %}
+{% extends "base_with_sidebar.html" %}
 {% load static %}
 {% load crispy_forms_tags %}
 

django_project/base/templates/custom_domain/delete.html

@@ -1,4 +1,4 @@
-{% extends "project_base.html" %}
+{% extends "base_with_sidebar.html" %}
 {% load custom_markup %}
 
 {% block title %}Domain Deleted - {{ block.super }}{% endblock %}