CHANGELOG updated

Fix problem of multiple service workers being registered over multiple URLs

CHANGELOG.md

@@ -6,14 +6,16 @@
 
 ## 1.0.0
 
+### Added
  - Unit tests
- - Add Oritentation on manifest.json
- - Add tox
- - Add Coverage
+ - Option `Oritentation` on manifest.json
+ - tox.ini
+ - Coverage
  
  
  ## 1.0.1
  
+ ### Added
  - Add django 2 requirement
  - Use templateviews instead of own implementations
  - Add content_types
@@ -22,5 +24,32 @@
  - Add default_config in `__init__.py`
  - Add basic serviceworker
  - Add default offline page and default icons
+ ### Changed
  - Updated the unit tests
+ 
+ ## 1.0.2
+ 
+ ### Fixed
+ - Fix tox.ini to install pypandoc
+ ### Added
+ - The support to splash screen for iOS Meta tags `apple-touch-startup-image`
+ - Meta tag `mobile-web-app-capable`
+ - Meta tag `application-name`
+ - Meta tag `msapplication-TileColor` and `msapplication-TileImage` for win8
+ - Meta tag `rel="icon"` with default icon
+ - Images for splash screen
+ - Include the new images to `serviceworker.js`
+ ### Changed
+  - Update `CHANGELOG.md`
+  - Update `README.md`
+  
+ ## 1.0.3
+ 
+ ### Fixed
+ - Restored support to oldest Django versions
+ 
+ ## 1.0.4
+  
+  ### Fixed
+  - Fix problem of multiple service workers being registered over multiple URLs
  

README.md

@@ -3,8 +3,9 @@ django-pwa
 [![Build Status](https://travis-ci.org/silviolleite/django-pwa.svg)](https://travis-ci.org/silviolleite/django-pwa)
 [![Maintainability](https://api.codeclimate.com/v1/badges/246542ea921058c4f76f/maintainability)](https://codeclimate.com/github/silviolleite/django-pwa/maintainability)
 [![codecov](https://codecov.io/gh/silviolleite/django-pwa/branch/master/graph/badge.svg)](https://codecov.io/gh/silviolleite/django-pwa) 
-[![PyPI - Downloads](https://img.shields.io/pypi/dd/django-pwa.svg)](https://pypi.org/project/django-pwa/)
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/django-pwa.svg)](https://pypi.org/project/django-pwa/)
 [![PyPI - Downloads](https://img.shields.io/pypi/v/django-pwa.svg)](https://pypi.org/project/django-pwa)
+[![PyPI - Downloads](https://img.shields.io/pypi/djversions/django-pwa.svg)](https://pypi.org/project/django-pwa)
 
 This Django app turns your project into a [progressive web app](https://developers.google.com/web/progressive-web-apps/).  Navigating to your site on an Android phone will prompt you to add the app to your home screen.
 
@@ -36,8 +37,9 @@ INSTALLED_APPS = [
 ]
 ```
 
-Configure your app name, description, and icons in settings.py:
+Configure your app name, description, icons and splash screen images in settings.py:
 ```python
+
 PWA_APP_NAME = 'My App'
 PWA_APP_DESCRIPTION = "My app description"
 PWA_APP_THEME_COLOR = '#0A0302'
@@ -51,20 +53,26 @@ PWA_APP_ICONS = [
         'sizes': '160x160'
     }
 ]
+PWA_APP_SPLASH_SCREEN = [
+    {
+        'src': '/static/images/icons/splash-640x1136.png',
+        'media': '(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)'
+    }
+]
 PWA_APP_DIR = 'ltr'
 PWA_APP_LANG = 'en-US'
 
 ```
 
-All settings are optional, and the app will work fine with its internal defaults.  Highly recommend setting at least `PWA_APP_NAME` and `PWA_APP_DESCRIPTION`.
+All settings are optional, and the app will work fine with its internal defaults.  Highly recommend setting at least `PWA_APP_NAME`, `PWA_APP_DESCRIPTION`, `PWA_APP_ICONS` and `PWA_APP_SPLASH_SCREEN`.
 
 Add the progressive web app URLs to urls.py:
 ```python
-from django.urls import path, include
+from django.urls import url, include
 
 urlpatterns = [
     ...
-    path('', include('pwa.urls')),  # You MUST use an empty string as the URL prefix
+    url('', include('pwa.urls')),  # You MUST use an empty string as the URL prefix
     ...
 ]
 ```
@@ -109,6 +117,16 @@ var filesToCache = [
     '/images/icons/icon-192x192.png',
     '/images/icons/icon-384x384.png',
     '/images/icons/icon-512x512.png',
+    '/static/images/icons/splash-640x1136.png',
+    '/static/images/icons/splash-750x1334.png',
+    '/static/images/icons/splash-1242x2208.png',
+    '/static/images/icons/splash-1125x2436.png',
+    '/static/images/icons/splash-828x1792.png',
+    '/static/images/icons/splash-1242x2688.png',
+    '/static/images/icons/splash-1536x2048.png',
+    '/static/images/icons/splash-1668x2224.png',
+    '/static/images/icons/splash-1668x2388.png',
+    '/static/images/icons/splash-2048x2732.png'
 ];
 
 // Cache on install
@@ -152,10 +170,10 @@ self.addEventListener("fetch", event => {
 
 Adding Your Own Service Worker
 =====
-By default, the service worker implemented by this app is empty.  To add service worker functionality, you'll want to create a `serviceworker.js` or similarly named template in a template directory, and then point at it using the PWA_SERVICE_WORKER_PATH variable (PWA_APP_FETCH_URL is passed through).
+To add service worker functionality, you'll want to create a `serviceworker.js` or similarly named template in a template directory, and then point at it using the PWA_SERVICE_WORKER_PATH variable (PWA_APP_FETCH_URL is passed through).
 
 ```python
-PWA_SERVICE_WORKER_PATH = 'my_app/serviceworker.js'
+PWA_SERVICE_WORKER_PATH = os.path.join(BASE_DIR, 'my_app', 'serviceworker.js')
 
 ```
 

pwa/app_settings.py

@@ -3,8 +3,9 @@ from django.conf import settings
 import os
 
 # Path to the service worker implementation.  Default implementation is empty.
-PWA_SERVICE_WORKER_PATH = getattr(settings, 'PWA_SERVICE_WORKER_PATH', 'serviceworker.js')
-
+PWA_SERVICE_WORKER_PATH = getattr(settings, 'PWA_SERVICE_WORKER_PATH',
+                                  os.path.join(os.path.abspath(os.path.dirname(__file__)), 'templates',
+                                               'serviceworker.js'))
 # App parameters to include in manifest.json and appropriate meta tags
 PWA_APP_NAME = getattr(settings, 'PWA_APP_NAME', 'MyApp')
 PWA_APP_DESCRIPTION = getattr(settings, 'PWA_APP_DESCRIPTION', 'My Progressive Web App')
@@ -18,37 +19,80 @@ PWA_APP_FETCH_URL = getattr(settings, 'PWA_APP_FETCH_URL', '/')
 PWA_APP_ICONS = getattr(settings, 'PWA_APP_ICONS', [
     {
         'src': '/static/images/icons/icon-72x72.png',
-        'sizes': '72x72'
+        'size': '72x72'
     },
     {
         'src': '/static/images/icons/icon-96x96.png',
-        'sizes': '96x96'
+        'size': '96x96'
     },
     {
         'src': '/static/images/icons/icon-128x128.png',
-        'sizes': '128x128'
+        'size': '128x128'
     },
     {
         'src': '/static/images/icons/icon-144x144.png',
-        'sizes': '144x144'
+        'size': '144x144'
     },
     {
         'src': '/static/images/icons/icon-152x152.png',
-        'sizes': '152x152'
+        'size': '152x152'
     },
     {
         'src': '/static/images/icons/icon-192x192.png',
-        'sizes': '192x192'
+        'size': '192x192'
     },
     {
         'src': '/static/images/icons/icon-384x384.png',
-        'sizes': '384x384'
+        'size': '384x384'
     },
     {
         'src': '/static/images/icons/icon-512x512.png',
-        'sizes': '512x512'
+        'size': '512x512'
     }
 ])
+PWA_APP_SPLASH_SCREEN = getattr(settings, 'PWA_APP_SPLASH_SCREEN', [
+    {
+        'src': '/static/images/icons/splash-640x1136.png',
+        'media': '(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)'
+    },
+    {
+        'src': '/static/images/icons/splash-750x1334.png',
+        'media': '(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)'
+    },
+    {
+        'src': '/static/images/icons/splash-1242x2208.png',
+        'media': '(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)'
+    },
+    {
+        'src': '/static/images/icons/splash-1125x2436.png',
+        'media': '(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)'
+    },
+    {
+        'src': '/static/images/icons/splash-828x1792.png',
+        'media': '(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)'
+    },
+    {
+        'src': '/static/images/icons/splash-1242x2688.png',
+        'media': '(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)'
+    },
+    {
+        'src': '/static/images/icons/splash-1536x2048.png',
+        'media': '(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)'
+    },
+    {
+        'src': '/static/images/icons/splash-1668x2224.png',
+        'media': '(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)'
+    },
+    {
+        'src': '/static/images/icons/splash-1668x2388.png',
+        'media': '(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)'
+    },
+    {
+        'src': '/static/images/icons/splash-2048x2732.png',
+        'media': '(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)'
+    }
+
+])
 PWA_APP_DIR = getattr(settings, 'PWA_APP_DIR', 'auto')
 PWA_APP_LANG = getattr(settings, 'PWA_APP_LANG', 'en-US')
 

pwa/templates/pwa.html

@@ -1,27 +1,48 @@
 <!-- Path to manifest.json -->
 <link rel="manifest" href="/manifest.json">
 
-<!-- Icons for Apple Devices -->
-{% for icon in PWA_APP_ICONS %}
-    <link rel="apple-touch-icon" href="{{ icon.src }}" sizes="{{ icon.sizes }}">
-{% endfor %}
+<!-- Add to homescreen for Chrome on Android -->
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="application-name" content="{{ PWA_APP_NAME }}">
 
+
+<!-- Chrome for Android theme color -->
 <meta name="theme-color" content="{{ PWA_APP_THEME_COLOR }}">
+
+<!-- Add to homescreen for Safari on iOS -->
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-title" content="{{ PWA_APP_NAME }}">
 <meta name="apple-mobile-web-app-status-bar-style" content="default">
+{% for icon in PWA_APP_ICONS %}
+<link rel="apple-touch-icon" href="{{ icon.src }}" sizes="{{ icon.size }}">
+{% endfor %}
+
+
+{% for splash in PWA_APP_SPLASH_SCREEN%}
+<link href="{{ splash.src }}" media="{{ splash.media }}" rel="apple-touch-startup-image"/>
+{% endfor %}
+
+
+<!-- Tile for Win8 -->
+<meta name="msapplication-TileColor" content="{{ PWA_APP_BACKGROUND_COLOR }}">
+{% with PWA_APP_ICONS|last as icon %}
+<meta name="msapplication-TileImage" content="{{ icon.src }}">
+
+
+<link rel="icon" sizes="{{ icon.size }}" href="{{ icon.src }}">
+{% endwith %}
 
 <script type="text/javascript">
     // Initialize the service worker
     if ('serviceWorker' in navigator) {
         navigator.serviceWorker.register('/serviceworker.js', {
-            scope: '.' // <--- THIS BIT IS REQUIRED
+            scope: '/'
         }).then(function (registration) {
             // Registration was successful
-            console.log('django-progressive-web-app: ServiceWorker registration successful with scope: ', registration.scope);
+            console.log('django-pwa: ServiceWorker registration successful with scope: ', registration.scope);
         }, function (err) {
             // registration failed :(
-            console.log('django-progressive-web-app: ServiceWorker registration failed: ', err);
+            console.log('django-pwa: ServiceWorker registration failed: ', err);
         });
     }
 </script>

pwa/templates/serviceworker.js

@@ -12,6 +12,16 @@ var filesToCache = [
     '/static/images/icons/icon-192x192.png',
     '/static/images/icons/icon-384x384.png',
     '/static/images/icons/icon-512x512.png',
+    '/static/images/icons/splash-640x1136.png',
+    '/static/images/icons/splash-750x1334.png',
+    '/static/images/icons/splash-1242x2208.png',
+    '/static/images/icons/splash-1125x2436.png',
+    '/static/images/icons/splash-828x1792.png',
+    '/static/images/icons/splash-1242x2688.png',
+    '/static/images/icons/splash-1536x2048.png',
+    '/static/images/icons/splash-1668x2224.png',
+    '/static/images/icons/splash-1668x2388.png',
+    '/static/images/icons/splash-2048x2732.png'
 ];
 
 // Cache on install

pwa/urls.py

@@ -1,10 +1,10 @@
-from django.urls import path
+from django.conf.urls import url
 
-from .views import Manifest, ServiceWorker, OfflineView
+from .views import manifest, service_worker, offline
 
 # Serve up serviceworker.js and manifest.json at the root
 urlpatterns = [
-    path('serviceworker.js', ServiceWorker.as_view(), name='serviceworker'),
-    path('manifest.json', Manifest.as_view(), name='manifest'),
-    path('offline', OfflineView.as_view(), name='offline')
+    url('^serviceworker.js$', service_worker, name='serviceworker'),
+    url('^manifest.json$', manifest, name='manifest'),
+    url('^offline/$', offline, name='offline')
 ]

pwa/views.py

@@ -1,27 +1,21 @@
-from django.views.generic.base import TemplateView
+from django.http import HttpResponse
+from django.shortcuts import render
 
 from . import app_settings
 
 
-class ServiceWorker(TemplateView):
-    content_type = 'application/javascript'
-    template_name = app_settings.PWA_SERVICE_WORKER_PATH
-    
-    def get_context_data(self, **kwargs):
-        kwargs['PWA_APP_FETCH_URL'] = app_settings.PWA_APP_FETCH_URL
-        return super().get_context_data(**kwargs)
+def service_worker(request):
+    response = HttpResponse(open(app_settings.PWA_SERVICE_WORKER_PATH).read(), content_type='application/javascript')
+    return response
 
 
-class Manifest(TemplateView):
-    content_type = 'application/json'
-    template_name = 'manifest.json'
-    
-    def get_context_data(self, **kwargs):
-        for setting_name in dir(app_settings):
-            if setting_name.startswith('PWA_'):
-                kwargs[setting_name] = getattr(app_settings, setting_name)
-        return super().get_context_data(**kwargs)
+def manifest(request):
+    return render(request, 'manifest.json', {
+        setting_name: getattr(app_settings, setting_name)
+        for setting_name in dir(app_settings)
+        if setting_name.startswith('PWA_')
+    })
 
 
-class OfflineView(TemplateView):
-    template_name = "offline.html"
+def offline(request):
+    return render(request, "offline.html")

setup.py

@@ -17,12 +17,12 @@ except RuntimeError:
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 install_requirements = [
-    "django>=2",
+    "django>=1.8",
 ]
 
 setup(
     name='django-pwa',
-    version='1.0.1',
+    version='1.0.4',
     packages=find_packages(),
     install_requires=install_requirements,
     include_package_data=True,
@@ -35,6 +35,10 @@ setup(
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
+        'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
         'Intended Audience :: Developers',

tests/test_template_tag_meta.py

@@ -23,10 +23,25 @@ class CreateMetaTemplateTagTest(TestCase):
             '<link rel="apple-touch-icon" href="/static/images/icons/icon-384x384.png" sizes="384x384">',
             '<link rel="apple-touch-icon" href="/static/images/icons/icon-512x512.png" sizes="512x512">',
             '<link rel="manifest" href="/manifest.json">',
+            '<meta name="mobile-web-app-capable" content="yes">',
             '<meta name="theme-color" content="#000">',
             '<meta name="apple-mobile-web-app-capable" content="yes">',
             '<meta name="apple-mobile-web-app-title" content="MyApp">',
-            '<meta name="apple-mobile-web-app-status-bar-style" content="default">'
+            '<meta name="application-name" content="MyApp">',
+            '<meta name="apple-mobile-web-app-status-bar-style" content="default">',
+            '<link rel="icon" sizes="512x512" href="/static/images/icons/icon-512x512.png">',
+            '<link href="/static/images/icons/splash-640x1136.png" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-750x1334.png" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-1242x2208.png" media="(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-1125x2436.png" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-828x1792.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-1242x2688.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-1536x2048.png" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-1668x2224.png" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-1668x2388.png" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"/>',
+            '<link href="/static/images/icons/splash-2048x2732.png" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image"/>',
+            '<meta name="msapplication-TileColor" content="#fff">',
+            '<meta name="msapplication-TileImage" content="/static/images/icons/icon-512x512.png">'
         ]
         for text in tags:
             with self.subTest():
@@ -38,11 +53,11 @@ class CreateMetaTemplateTagTest(TestCase):
             '<script type="text/javascript">',
             "if ('serviceWorker' in navigator) {",
             "navigator.serviceWorker.register('/serviceworker.js', {",
-            "scope: '.'",
+            "scope: '/'",
             "}).then(function (registration) {",
-            "console.log('django-progressive-web-app: ServiceWorker registration successful with scope: ', registration.scope);",
+            "console.log('django-pwa: ServiceWorker registration successful with scope: ', registration.scope);",
             "}, function (err) {",
-            "console.log('django-progressive-web-app: ServiceWorker registration failed: ', err);",
+            "console.log('django-pwa: ServiceWorker registration failed: ', err);",
             "});",
             "</script>"
         ]

tox.ini

@@ -1,14 +1,26 @@
 [tox]
 envlist =
+    py35-django{18,19,110,111,20,21}
     py36-django{20}
     py36-django{21}
+    py37-django{20}
+    py37-django{21}
 
 [testenv]
 commands = python runtests.py
 setenv =
     DJANGO_SETTINGS_MODULE=tests.settings
     PYTHONPATH={toxinidir}
-basepython = py36: python3.6
+basepython =
+    py35: python3.5
+    py36: python3.6
+    py37: python3.7
 deps =
+    django18: django==1.8
+    django19: django==1.9
+    django110: django==1.10
+    django111: django==1.11
     django20: Django==2.0
-    django21: Django==2.1
+    django21: Django==2.1
+
+    pypandoc==1.3.3