From 24e034808c147e0cd0953d773fffa51a63240c0b Mon Sep 17 00:00:00 2001
From: David <David@MacBook-Pro-de-David.local>
Date: Wed, 8 Apr 2020 17:11:53 -0500
Subject: [PATCH 1/4] resolve path present assets #1268

---
 server/routes/asset.routes.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/routes/asset.routes.js b/server/routes/asset.routes.js
index 4e236e7d..db593b6d 100644
--- a/server/routes/asset.routes.js
+++ b/server/routes/asset.routes.js
@@ -9,6 +9,7 @@ router.get('/full/:project_id/*', getProjectAsset);
 router.get('/:username/full/:project_id/*', getProjectAsset);
 router.get('/embed/:project_id/*', getProjectAsset);
 router.get('/:username/embed/:project_id/*', getProjectAsset);
+router.get('/:username/present/:project_id/*', getProjectAsset);
 
 router.get('/sketches/:project_id/assets/*?', getFileContent);
 

From a85068b25e0439573f54bd17ae7cb928ffce5e0b Mon Sep 17 00:00:00 2001
From: David <David@MacBook-Pro-de-David.local>
Date: Wed, 8 Apr 2020 23:03:59 -0500
Subject: [PATCH 2/4] remove title from nav

---
 client/components/Nav.jsx      | 4 ++--
 client/components/NavBasic.jsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/Nav.jsx b/client/components/Nav.jsx
index 4a1212c9..8e9cde7a 100644
--- a/client/components/Nav.jsx
+++ b/client/components/Nav.jsx
@@ -227,7 +227,7 @@ class Nav extends React.PureComponent {
 
   renderDashboardMenu(navDropdownState) {
     return (
-      <ul className="nav__items-left" title="project-menu">
+      <ul className="nav__items-left">
         <li className="nav__item-logo">
           <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
         </li>
@@ -245,7 +245,7 @@ class Nav extends React.PureComponent {
 
   renderProjectMenu(navDropdownState) {
     return (
-      <ul className="nav__items-left" title="project-menu">
+      <ul className="nav__items-left">
         <li className="nav__item-logo">
           <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
         </li>
diff --git a/client/components/NavBasic.jsx b/client/components/NavBasic.jsx
index 92913add..88c9f313 100644
--- a/client/components/NavBasic.jsx
+++ b/client/components/NavBasic.jsx
@@ -13,7 +13,7 @@ class NavBasic extends React.PureComponent {
   render() {
     return (
       <nav className="nav" title="main-navigation" ref={(node) => { this.node = node; }}>
-        <ul className="nav__items-left" title="project-menu">
+        <ul className="nav__items-left">
           <li className="nav__item-logo">
             <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
           </li>

From e9ddf6a8ea9d5102f98c771b91225bf103c48f31 Mon Sep 17 00:00:00 2001
From: David <David@MacBook-Pro-de-David.local>
Date: Wed, 8 Apr 2020 23:18:40 -0500
Subject: [PATCH 3/4] Revert "remove title from nav"

This reverts commit a85068b25e0439573f54bd17ae7cb928ffce5e0b.
---
 client/components/Nav.jsx      | 4 ++--
 client/components/NavBasic.jsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/Nav.jsx b/client/components/Nav.jsx
index 8e9cde7a..4a1212c9 100644
--- a/client/components/Nav.jsx
+++ b/client/components/Nav.jsx
@@ -227,7 +227,7 @@ class Nav extends React.PureComponent {
 
   renderDashboardMenu(navDropdownState) {
     return (
-      <ul className="nav__items-left">
+      <ul className="nav__items-left" title="project-menu">
         <li className="nav__item-logo">
           <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
         </li>
@@ -245,7 +245,7 @@ class Nav extends React.PureComponent {
 
   renderProjectMenu(navDropdownState) {
     return (
-      <ul className="nav__items-left">
+      <ul className="nav__items-left" title="project-menu">
         <li className="nav__item-logo">
           <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
         </li>
diff --git a/client/components/NavBasic.jsx b/client/components/NavBasic.jsx
index 88c9f313..92913add 100644
--- a/client/components/NavBasic.jsx
+++ b/client/components/NavBasic.jsx
@@ -13,7 +13,7 @@ class NavBasic extends React.PureComponent {
   render() {
     return (
       <nav className="nav" title="main-navigation" ref={(node) => { this.node = node; }}>
-        <ul className="nav__items-left">
+        <ul className="nav__items-left" title="project-menu">
           <li className="nav__item-logo">
             <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
           </li>

From ce1628cd6964a625963fa03dd7ed4754e50620a5 Mon Sep 17 00:00:00 2001
From: Cassie Tarakajian <ctarakajian@gmail.com>
Date: Fri, 10 Apr 2020 18:30:07 -0400
Subject: [PATCH 4/4] Fixes #1268 - fix issue with default protocol of https
 for local development

---
 server/controllers/embed.controller.js | 2 +-
 server/routes/asset.routes.js          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/controllers/embed.controller.js b/server/controllers/embed.controller.js
index 644a3441..67edcd04 100644
--- a/server/controllers/embed.controller.js
+++ b/server/controllers/embed.controller.js
@@ -25,7 +25,7 @@ export function serveProject(req, res) {
         const sketchDoc = window.document;
 
         const base = sketchDoc.createElement('base');
-        const fullUrl = `https://${req.get('host')}${req.originalUrl}`;
+        const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`;
         base.href = `${fullUrl}/`;
         sketchDoc.head.appendChild(base);
 
diff --git a/server/routes/asset.routes.js b/server/routes/asset.routes.js
index db593b6d..ab3f52a0 100644
--- a/server/routes/asset.routes.js
+++ b/server/routes/asset.routes.js
@@ -7,9 +7,10 @@ const router = new Router();
 router.get('/:username/sketches/:project_id/*', getProjectAsset);
 router.get('/full/:project_id/*', getProjectAsset);
 router.get('/:username/full/:project_id/*', getProjectAsset);
+router.get('/present/:project_id/*', getProjectAsset);
+router.get('/:username/present/:project_id/*', getProjectAsset);
 router.get('/embed/:project_id/*', getProjectAsset);
 router.get('/:username/embed/:project_id/*', getProjectAsset);
-router.get('/:username/present/:project_id/*', getProjectAsset);
 
 router.get('/sketches/:project_id/assets/*?', getFileContent);