Merge ~marcustomlinson/snapweb:master into snapweb:master

[Marcus Tomlinson]

8e97ac9... by Marcus Tomlinson on 2016-12-19

Fix merge conflicts

e7612e4... by Marcus Tomlinson on 2016-12-20

anchors.fill: parent

0f6fa8e... by Marcus Tomlinson on 2016-12-20

Remove network-bind from ups

c189f6d... by Marcus Tomlinson on 2016-12-20

Ubuntu Personal Store

c38f0b5... by Marcus Tomlinson on 2016-12-22

Revert unnecessary changes

0e9f8d9... by Marcus Tomlinson on 2016-12-22

Remove snapcraft.yaml

7e2436b... by Marcus Tomlinson on 2016-12-22

Some changes not in trunk yet

Unmerged commits

7e2436b... by Marcus Tomlinson on 2016-12-22

Some changes not in trunk yet

0e9f8d9... by Marcus Tomlinson on 2016-12-22

Remove snapcraft.yaml

c38f0b5... by Marcus Tomlinson on 2016-12-22

Revert unnecessary changes

c189f6d... by Marcus Tomlinson on 2016-12-20

Ubuntu Personal Store

0f6fa8e... by Marcus Tomlinson on 2016-12-20

Remove network-bind from ups

e7612e4... by Marcus Tomlinson on 2016-12-20

anchors.fill: parent

8e97ac9... by Marcus Tomlinson on 2016-12-19

Fix merge conflicts

ab8dec9... by Marcus Tomlinson on 2016-12-19

Merge trunk

66fc69a... by Marcus Tomlinson on 2016-12-19

Remove allow-sandbox: true

56d7020... by Marcus Tomlinson on 2016-11-30

Merge branch 'master' of https://github.com/snapcore/snapweb

diff --git a/cmd/snapweb/handlers.go b/cmd/snapweb/handlers.go
index 821c004..e3d549d 100644
--- a/cmd/snapweb/handlers.go
+++ b/cmd/snapweb/handlers.go
@@ -233,6 +233,7 @@ func tokenFilename() string {
 
 // SimpleCookieCheck is a simple authorization mechanism
 func SimpleCookieCheck(w http.ResponseWriter, r *http.Request) error {
+	return nil
 	cookie, _ := r.Cookie(SnapwebCookieName)
 	if cookie != nil {
 		token, err := ioutil.ReadFile(tokenFilename())
diff --git a/cmd/snapweb/main.go b/cmd/snapweb/main.go
index 20aa711..b743b7a 100644
--- a/cmd/snapweb/main.go
+++ b/cmd/snapweb/main.go
@@ -30,8 +30,8 @@ import (
 var logger *log.Logger
 
 const (
-	httpAddr  string = ":4200"
-	httpsAddr string = ":4201"
+	httpAddr  string = ":5200"
+	httpsAddr string = ":5201"
 )
 
 func init() {
diff --git a/ubuntu-personal-store/pkg/meta/snap.yaml b/ubuntu-personal-store/pkg/meta/snap.yaml
index 57a57cf..1644c8a 100644
--- a/ubuntu-personal-store/pkg/meta/snap.yaml
+++ b/ubuntu-personal-store/pkg/meta/snap.yaml
@@ -14,12 +14,7 @@ apps:
   ubuntu-personal-store:
     command: command-ubuntu-personal-store.wrapper
     plugs:
-    - browser-sandbox
+    - browser-support
     - network
-    - network-bind
     - opengl
     - unity7
-plugs:
-  browser-sandbox:
-    allow-sandbox: true
-    interface: browser-support
diff --git a/ubuntu-personal-store/setup/gui/ubuntu-personal-store.desktop b/ubuntu-personal-store/setup/gui/ubuntu-personal-store.desktop
index 44f336d..1fbde5a 100644
--- a/ubuntu-personal-store/setup/gui/ubuntu-personal-store.desktop
+++ b/ubuntu-personal-store/setup/gui/ubuntu-personal-store.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
-Name=Ubuntu Store
-GenericName=Ubuntu Store
+Name=Ubuntu Personal Store
+GenericName=Ubuntu Personal Store
 Comment=Snapweb in a WebView
 Type=Application
 Icon=${SNAP}/meta/gui/icon.png
diff --git a/ubuntu-personal-store/snapcraft.yaml.in b/ubuntu-personal-store/snapcraft.yaml.in
index 5bba454..ad42e39 100644
--- a/ubuntu-personal-store/snapcraft.yaml.in
+++ b/ubuntu-personal-store/snapcraft.yaml.in
@@ -10,17 +10,11 @@ apps:
   ubuntu-personal-store:
     command: ubuntu-personal-store.launcher
     plugs:
-      - browser-sandbox
+      - browser-support
       - network
-      - network-bind
       - opengl
       - unity7
 
-plugs:
-  browser-sandbox:
-    interface: browser-support
-    allow-sandbox: true
-
 parts:
   ubuntu-personal-store-qml:
     plugin: dump
diff --git a/ubuntu-personal-store/ubuntu-personal-store.qml b/ubuntu-personal-store/ubuntu-personal-store.qml
index 5604698..9a5f44e 100644
--- a/ubuntu-personal-store/ubuntu-personal-store.qml
+++ b/ubuntu-personal-store/ubuntu-personal-store.qml
@@ -15,20 +15,25 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Window 2.1
 import Ubuntu.Web 0.2
 
-WebView {
-  id: webView
-  focus: true
-
-  url: "http://127.0.0.1:4200"
-
+Window {
+  title: "Ubuntu Personal Store"
   width: 500
   height: 500
 
-  onCertificateError: {
-    if (error.overridable) {
-      error.allow()
+  WebView {
+    anchors.fill: parent
+    id: webView
+    focus: true
+
+    url: "http://localhost:5201/store"
+
+    onCertificateError: {
+      if (error.overridable) {
+        error.allow()
+      }
     }
   }
 }
diff --git a/www/src/js/templates/layout-banner.hbs b/www/src/js/templates/layout-banner.hbs
index a7aebaa..9f27684 100644
--- a/www/src/js/templates/layout-banner.hbs
+++ b/www/src/js/templates/layout-banner.hbs
@@ -1,6 +1,6 @@
 <header class="p-navigation" role="banner" id="navigation">
   <div class="p-navigation__logo">
-    <a class="p-navigation__link" href="/">
+    <a class="p-navigation__link" href="/store">
       <svg xmlns="http://www.w3.org/2000/svg" width="120" height="26" viewBox="0 0 285 64"><g fill="none" fill-rule="evenodd"><circle cx="267.36" cy="17.017" r="16.966" fill="#DD4814"/><path fill="#fff" d="M256.78 14.978c-1.12 0-2.03.912-2.03 2.04 0 1.122.91 2.036 2.03 2.036 1.13 0 2.04-.914 2.04-2.037 0-1.127-.91-2.04-2.04-2.04zm14.56 9.266c-.98.56-1.31 1.807-.75 2.78.56.976 1.81 1.308 2.79.747.97-.56 1.3-1.8.74-2.78-.56-.97-1.81-1.31-2.78-.74zm-10.13-7.227c0-2.016 1-3.797 2.53-4.873l-1.49-2.498c-1.78 1.19-3.11 3.014-3.66 5.148.65.525 1.05 1.324 1.05 2.223 0 .893-.4 1.69-1.05 2.22.55 2.132 1.88 3.954 3.66 5.145l1.49-2.496c-1.53-1.076-2.53-2.855-2.53-4.87zm5.95-5.957c3.12 0 5.67 2.385 5.94 5.43l2.9-.047c-.14-2.244-1.12-4.26-2.63-5.742-.78.3-1.67.25-2.45-.19-.77-.447-1.26-1.2-1.39-2.02-.75-.207-1.55-.322-2.37-.322-1.4 0-2.74.333-3.92.92l1.42 2.536c.76-.356 1.61-.555 2.5-.555zm0 11.908c-.89 0-1.74-.197-2.5-.553l-1.42 2.537c1.18.588 2.52.916 3.92.916.82 0 1.62-.11 2.37-.32.13-.82.62-1.572 1.39-2.02.78-.448 1.67-.49 2.45-.196 1.51-1.484 2.49-3.5 2.63-5.746l-2.9-.04c-.27 3.04-2.82 5.422-5.94 5.422zm4.18-13.18c.97.562 2.22.23 2.78-.747.56-.97.23-2.21-.74-2.78-.98-.56-2.23-.23-2.79.75-.56.978-.23 2.22.75 2.787z"/><path fill="#333" d="M34.798 61.53c-1.725.432-4 .89-6.826 1.374-2.83.483-6.102.726-9.817.726-3.23 0-5.952-.472-8.16-1.413-2.208-.94-3.985-2.274-5.33-3.998-1.35-1.73-2.317-3.76-2.91-6.11-.593-2.34-.888-4.94-.888-7.795V20.73H8.38v21.975c0 5.117.808 8.78 2.424 10.986 1.616 2.21 4.334 3.32 8.16 3.32.808 0 1.64-.03 2.504-.082.86-.053 1.67-.122 2.425-.202.752-.08 1.44-.16 2.06-.24.618-.08 1.063-.173 1.333-.283v-35.47H34.8V61.53h-.002zm18.336-38.94c.915-.59 2.304-1.21 4.16-1.856s4-.97 6.423-.97c3.016 0 5.696.54 8.04 1.616 2.34 1.078 4.32 2.584 5.937 4.523 1.614 1.94 2.84 4.256 3.675 6.947.83 2.695 1.25 5.656 1.25 8.888 0 3.392-.5 6.45-1.5 9.168-1 2.72-2.41 5.02-4.24 6.907-1.83 1.885-4.04 3.34-6.626 4.362-2.584 1.023-5.493 1.535-8.725 1.535-3.5 0-6.597-.244-9.29-.728-2.69-.485-4.9-.97-6.623-1.454V1.348L53.135.053V22.59zm0 33.607c.755.216 1.818.42 3.192.605 1.373.19 3.082.284 5.13.284 4.038 0 7.27-1.334 9.692-4 2.425-2.665 3.637-6.45 3.637-11.348 0-2.153-.216-4.173-.646-6.062-.44-1.883-1.14-3.514-2.11-4.886-.97-1.37-2.224-2.45-3.758-3.23s-3.38-1.17-5.533-1.17c-2.05 0-3.93.35-5.654 1.05-1.727.7-3.045 1.43-3.96 2.185V56.2zm71.416 5.333c-1.73.432-4 .89-6.83 1.374-2.83.483-6.1.726-9.82.726-3.23 0-5.95-.472-8.154-1.413-2.21-.94-3.986-2.274-5.33-3.998-1.35-1.73-2.316-3.76-2.91-6.11-.593-2.34-.89-4.94-.89-7.795V20.73h7.513v21.975c0 5.117.8 8.78 2.42 10.986 1.62 2.21 4.34 3.32 8.16 3.32.81 0 1.65-.03 2.51-.082.86-.053 1.66-.122 2.42-.202.76-.08 1.44-.16 2.06-.24.62-.08 1.06-.173 1.33-.283v-35.47h7.52V61.53zm10.82-39.583c1.72-.432 4.01-.89 6.87-1.375 2.85-.484 6.14-.727 9.85-.727 3.34 0 6.11.473 8.32 1.414 2.21.94 3.97 2.26 5.29 3.95 1.32 1.695 2.25 3.73 2.79 6.1.54 2.372.81 4.983.81 7.836v23.59h-7.52V40.77c0-2.584-.17-4.79-.52-6.624s-.93-3.313-1.74-4.442c-.8-1.133-1.88-1.953-3.23-2.465-1.34-.52-3.02-.77-5.01-.77-.81 0-1.64.02-2.5.08-.86.05-1.68.12-2.46.2-.79.08-1.48.172-2.1.28-.62.11-1.07.19-1.34.24v35.47h-7.51V21.944zm51.29-1.213h15.92v6.3h-15.92v19.39c0 2.1.17 3.84.49 5.21s.81 2.452 1.45 3.23c.65.78 1.46 1.333 2.43 1.656.97.324 2.1.487 3.39.487 2.31 0 4.15-.258 5.49-.77 1.35-.512 2.27-.875 2.75-1.09l1.62 6.14c-.76.378-2.09.863-4 1.453-1.92.593-4.08.89-6.51.89-2.85 0-5.21-.363-7.07-1.09-1.85-.73-3.35-1.817-4.48-3.273-1.13-1.453-1.92-3.243-2.38-5.372-.46-2.126-.69-4.59-.69-7.39V9.02l7.51-1.292v13.006zm56.8 40.796c-1.73.432-4 .89-6.83 1.374-2.83.483-6.1.726-9.81.726-3.24 0-5.96-.472-8.17-1.413s-3.98-2.274-5.33-3.998c-1.34-1.73-2.31-3.76-2.91-6.11-.59-2.34-.89-4.94-.89-7.795V20.73h7.52v21.975c0 5.117.81 8.78 2.42 10.986 1.62 2.21 4.34 3.32 8.16 3.32.81 0 1.64-.03 2.51-.082.86-.053 1.66-.122 2.42-.202.75-.08 1.44-.16 2.06-.24.62-.08 1.06-.173 1.33-.283v-35.47h7.52V61.53z"/></g></svg>
     </a>
   </div>
@@ -12,17 +12,9 @@
             <a href="#main-content">Jump to main content</a>
         </span>
         <div class="p-navigation__links">
-            <a class="p-navigation__link {{#if isStoreActive }} active{{/if}}" href="/store">
-                <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 96 96.000001"><g transform="matrix(0 -.9996 -1 0 441.362 437.83)" color="#333"><path style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#333;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" d="M429.997 437.362h-4v-10.21l-54.02-6v-55.79h4v52.21l6.003.667v-59.335l32.013-10.285v73.176l16.004 1.777v13.79zm-20.006-16.01v-67.244l-24.008 7.713v56.864l24.01 2.667z" font-family="sans-serif" white-space="normal" overflow="visible" solid-color="#333333" fill="gray"/><ellipse cx="-413.362" cy="-357.971" transform="matrix(0 -1 -1 0 0 0)" rx="8" ry="8.003" overflow="visible" fill="gray"/><ellipse ry="8.003" rx="8" transform="matrix(0 -1 -1 0 0 0)" cy="-357.971" cx="-373.362" overflow="visible" fill="gray"/></g></svg>
-                <span class="anchor">Store</span>
-            </a>
-            <a class="p-navigation__link {{#if isSettingsActive }} active{{/if}}" href="/settings">
-                <svg class="icon" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" id="svg4874" height="24" viewBox="0 0 96 96.000001" width="24" version="1.1"><g id="layer1" transform="translate(67.857 -78.505)"><g id="g4845" transform="matrix(0 -1 -1 0 373.51 516.51)"><g id="g4778" transform="matrix(-.99960 0 0 1 575.94 -611)"><g id="g4780" transform="matrix(-1 0 0 1 576 611)"><rect id="rect4782" style="color:#333333" transform="scale(-1,1)" height="96" width="96.038" y="345.36" x="-438" fill="none"/><path id="path5417" style="color-rendering:auto;text-decoration-color:#333333;color:#333333;font-variant-numeric:normal;shape-rendering:auto;solid-color:#333333;text-decoration-line:none;font-variant-position:normal;mix-blend-mode:normal;block-progression:tb;font-feature-settings:normal;shape-padding:0;font-variant-alternates:normal;text-indent:0;font-variant-caps:normal;image-rendering:auto;white-space:normal;text-decoration-style:solid;font-variant-ligatures:none;isolation:auto;text-transform:none" d="m371.94 362.17c17.198-9.916 39.261-3.9844 49.209 13.223 9.9478 17.207 4.0587 39.254-13.139 49.17s-39.261 3.9861-49.208-13.221c-9.9478-17.207-4.0597-39.255 13.138-49.171zm2.003 3.4646c-15.322 8.8344-20.543 28.371-11.676 43.709 8.8672 15.338 28.419 20.591 43.741 11.756 15.322-8.8344 20.543-28.371 11.676-43.709-8.8672-15.338-28.419-20.591-43.741-11.756z" fill="#808080"/><path id="path4168" style="color:#333333" d="m54.902 5.582l-13.804 2.0625v7.0975a34.033 33.971 43.145 0 1 13.804 0.028v-9.186-0.002zm-28.246 6.244l-10.517 8.942 5.181 6.175a34.033 33.971 43.145 0 1 10.58 -8.867l-5.244-6.25zm42.631 0.067l-5.207 6.207a34.033 33.971 43.145 0 1 0.895 0.474 34.033 33.971 43.145 0 1 9.673 8.406l5.272-6.281-10.633-8.806zm-60.889 22.115l-2.3105 13.611 7.9471 1.402a34.033 33.971 43.145 0 1 2.387 -13.597l-8.0236-1.416zm79.118 0.015l-7.987 1.409a34.033 33.971 43.145 0 1 2.432 13.588l8.039-1.416-2.484-13.581zm-71.758 24.622l-7.0881 4.093h-0.0019l6.98 11.91 7.018-4.05a34.033 33.971 43.145 0 1 -6.908 -11.953zm64.512 0.015a34.033 33.971 43.145 0 1 -2.805 6.371 34.033 33.971 43.145 0 1 -4.059 5.608l7.022 4.054 6.826-12-6.984-4.033zm-50.122 18.207l-2.804 7.703 13.004 4.639 2.757-7.58a34.033 33.971 43.145 0 1 -12.08 -4.195 34.033 33.971 43.145 0 1 -0.877 -0.567zm35.733 0.08a34.033 33.971 43.145 0 1 -12.979 4.707l2.782 7.639 12.941-4.807-2.744-7.539z" transform="matrix(0 -1 -1.0004 0 438 441.36)" fill="#808080"/><path id="ellipse4539" style="color-rendering:auto;text-decoration-color:#333333;color:#333333;font-variant-numeric:normal;shape-rendering:auto;solid-color:#333333;text-decoration-line:none;font-variant-position:normal;mix-blend-mode:normal;block-progression:tb;font-feature-settings:normal;shape-padding:0;font-variant-alternates:normal;text-indent:0;font-variant-caps:normal;image-rendering:auto;white-space:normal;text-decoration-style:solid;font-variant-ligatures:none;isolation:auto;text-transform:none" d="m377.95 372.56c11.464-6.6099 26.189-2.6521 32.819 8.8167 6.6303 11.469 2.7009 26.185-8.763 32.795-11.464 6.6099-26.191 2.6514-32.822-8.8174-6.6303-11.469-2.6983-26.184 8.7656-32.794zm2.002 3.463c-9.588 5.5283-12.85 17.732-7.3007 27.332 5.5497 9.5996 17.764 12.88 27.352 7.3518 9.588-5.5283 12.85-17.732 7.3007-27.332-5.5497-9.5996-17.764-12.88-27.352-7.3518z" fill="#808080"/></g></g></g></g></svg>
-                <span class="anchor">Settings</span>
-            </a>
-            <a class="p-navigation__link" href="#">
+            <a class="p-navigation__link" href="/">
                 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="24px" width="24px" version="1.1" viewBox="0 0 15 15"><g id="Page-1" fill-rule="evenodd" fill="none"><g id="profile" fill="#808080"><path id="path4116" d="m7.5 1.7764e-15c-4.1379 0-7.5 3.365-7.5 7.5059 1.1102e-13 4.1411 3.3621 7.5061 7.5 7.5061 4.138 0 7.5-3.365 7.5-7.5061 0-4.1409-3.362-7.5059-7.5-7.5059v1.7764e-15zm0 0.71485c3.752 0 6.785 3.0362 6.785 6.791 0 1.6665-0.598 3.1902-1.59 4.3712-0.216-0.498-0.51-0.947-0.882-1.339-0.35-0.369-0.77-0.6774-1.254-0.928-0.204 0.1799-0.426 0.3395-0.6598 0.479 0.5698 0.244 1.0318 0.557 1.3948 0.941 0.386 0.406 0.67 0.876 0.859 1.419-1.214 1.145-2.85 1.848-4.653 1.848-1.8098 0-3.4509-0.708-4.6666-1.861 0.2005-0.538 0.4832-1.005 0.8535-1.407 0.3943-0.416 0.9027-0.75 1.5405-1.002 0.6262-0.2467 1.3806-0.3763 2.267-0.3769 0.0019 0 0.0037 0.0004 0.0056 0.0004 0.5154 0 1.0023-0.0907 1.4502-0.2754l0.0028-0.0014 0.0031-0.0018c0.4445-0.1929 0.8322-0.4676 1.1519-0.8178 0.328-0.3505 0.582-0.7688 0.757-1.245 0.178-0.4814 0.264-1.0137 0.264-1.5903v-0.0003c0-0.5685-0.086-1.096-0.264-1.5767-0.175-0.4836-0.428-0.9066-0.757-1.2576-0.3197-0.3511-0.7092-0.6223-1.1554-0.8067-0.4483-0.194-0.9362-0.2904-1.4526-0.2904-0.5163 0-1.0043 0.0964-1.4526 0.2904-0.4463 0.1844-0.8394 0.4545-1.1677 0.8042l-0.0018 0.0021-0.0021 0.0021c-0.3199 0.3515-0.567 0.7741-0.7418 1.2573l-0.0004 0.0007c-0.1767 0.4802-0.2626 1.0069-0.2626 1.5746 0 0.5766 0.0859 1.1092 0.2633 1.5906 0.1751 0.4748 0.4225 0.8921 0.7415 1.2426l0.0021 0.0021 0.0018 0.0017c0.2193 0.2337 0.4679 0.433 0.7411 0.5976-0.2274 0.0581-0.4464 0.1269-0.655 0.2091-0.7195 0.2836-1.324 0.6748-1.7986 1.1758l-0.0017 0.002-0.0018 0.002c-0.3585 0.389-0.6468 0.833-0.867 1.325-0.9873-1.18-1.5821-2.6997-1.5821-4.3611 0.00003-3.7548 3.0337-6.791 6.7854-6.791v-0.00005zm0 1.7868c0.4299 0 0.8166 0.0783 1.1719 0.2325l0.0031 0.0014 0.0028 0.0014c0.3564 0.1469 0.6537 0.3543 0.9047 0.63l0.0018 0.0021 0.0017 0.0021c0.2596 0.2765 0.462 0.611 0.608 1.0157l0.001 0.0014v0.0011c0.145 0.3921 0.219 0.8331 0.219 1.3295 0 0.5057-0.074 0.9514-0.219 1.3428-0.146 0.396-0.3483 0.7272-0.609 1.0049l-0.0017 0.0021-0.0018 0.0021c-0.2514 0.2762-0.5505 0.4887-0.9082 0.6443-0.3557 0.1461-0.7435 0.2206-1.1743 0.2206-0.4309 0-0.8189-0.0744-1.1747-0.2206-0.3576-0.1556-0.6618-0.3693-0.9228-0.6467-0.2521-0.2776-0.4514-0.6097-0.5978-1.0067-0.1443-0.3914-0.219-0.8371-0.219-1.3428 0-0.4964 0.0744-0.9374 0.219-1.3295l0.0003-0.0011 0.0007-0.0014c0.1467-0.4057 0.3458-0.7411 0.5968-1.0174 0.2605-0.277 0.5633-0.4856 0.9197-0.6325l0.0028-0.0014 0.0031-0.0014c0.3553-0.1542 0.742-0.2325 1.1719-0.2325z"/></g></g></svg>
-                <span class="anchor">Profile</span>
+                <span class="anchor">My Snaps</span>
             </a>
         </div>
     </nav>