Merge pull request #116 from codeitcodes/dev

benhatsor · web-flow · commit 5864559941c0 · 2022-03-26T09:51:33.000+03:00
Dev
diff --git a/api-link-parser.js b/api-link-parser.js
@@ -23,6 +23,14 @@ function decodeLink(url) {
   const isGithub = url.startsWith('https://github.com/');
   if (isGithub) url = url.slice('https://github.com/'.length);
   
+  // if link is a Git URL
+  if (isGithub && url.endsWith('.git')) {
+    
+    // slice .git ending
+    url = url.slice(0, -('.git'.length));
+    
+  }
+  
   
   let baseURL = 'https://codeit.codes';
   if (isDev) baseURL = 'https://dev.codeit.codes';
@@ -106,7 +114,7 @@ function decodeLink(url) {
   } else {
 
     // show codeit link
-    linkData.redirect = baseURL;
+    linkData.redirect = baseURL + '/full';
     linkData.redirectText = 'Open Codeit';
 
   }
@@ -144,6 +152,8 @@ function decodeLink(url) {
     
   }
   
+  if (isEmbed) resp += '&embed=true';
+  
   
   return resp;
 
diff --git a/api/link.js b/api/link.js
@@ -92,17 +92,17 @@ const html = `
   
   const isDev = (window.location.hostname === 'dev.codeit.codes');
   
-  if (link && !link.startsWith('https://cde.run')
-      && !link.startsWith('https://dev.cde.run')) {
+  if (link && link.startsWith('https:/github.com')) {
     
-    if (!isDev) link = 'https://cde.run/' + link;
-    else link = 'https://dev.cde.run/' + link;
+    link = link.replace('https:/github.com', 'https://github.com');
     
   }
   
-  if (link && link.startsWith('https:/github.com')) {
+  if (link && !link.startsWith('https://cde.run')
+      && !link.startsWith('https://dev.cde.run')) {
     
-    link = link.replace('https:/github.com', 'https://github.com');
+    if (!isDev) link = 'https://cde.run/' + link;
+    else link = 'https://dev.cde.run/' + link;
     
   }
   
diff --git a/api/oembed.js b/api/oembed.js
@@ -15,7 +15,7 @@ export default function handler(request, response) {
     
     html = `
     <oembed>
-      <html><iframe src="`+ url +`/api/link?url=`+ query.url +`&embed=true" width="700" height="480"></html>
+      <html><iframe src="`+ url +`/api/link?url=`+ query.url +`&embed=true" width="700" height="480"></iframe></html>
       <width>700</width>
       <height>480</height>
     </oembed>
diff --git a/filebrowser.js b/filebrowser.js
@@ -176,6 +176,9 @@ async function renderSidebarHTML() {
       // show title
       sidebarLogo.innerText = 'Repositories';
       
+      // hide branch button
+      sidebarBranch.classList.remove('visible');
+      
       
       // scroll to start of title
       sidebarLogo.scrollTo(0, 0);
@@ -206,6 +209,9 @@ async function renderSidebarHTML() {
     // change sidebar title
     sidebarLogo.innerText = 'Repositories';
     
+    // hide branch button
+    sidebarBranch.classList.remove('visible');
+    
     // scroll to start of repo name
     sidebarLogo.scrollTo(0, 0);
     scrolledSidebarTitle();
@@ -413,6 +419,9 @@ async function renderSidebarHTML() {
       // show title
       sidebarLogo.innerText = 'Repositories';
       
+      // hide branch button
+      sidebarBranch.classList.remove('visible');
+      
       // scroll to start of repo name
       sidebarLogo.scrollTo(0, 0);
       sidebarLogo.classList.add('notransition');
@@ -567,9 +576,6 @@ async function renderSidebarHTML() {
       // change header options
       header.classList.add('out-of-repo');
       
-      // hide branch button
-      sidebarBranch.classList.remove('visible');
-      
       
       // get rendered repos
       let renderedRepos = {};
@@ -642,7 +648,9 @@ async function renderSidebarHTML() {
           const modRepo = modifiedRepos[modRepoName];
           
           // if repo isn't rendered
-          if (!renderedRepos[modRepoName]) {
+          // and user has push access in repo
+          if (!renderedRepos[modRepoName]
+              && modRepo.pushAccess) {
             
             // render repo
 
@@ -1260,7 +1268,7 @@ async function renderBranchMenuHTML(renderAll) {
   // check if repository object exists
   
   const fullName = user + '/' + repoName;
-  const repoObj = modifiedRepos[fullName];
+  let repoObj = modifiedRepos[fullName];
   
   let branchResp;
   
@@ -1329,16 +1337,20 @@ async function renderBranchMenuHTML(renderAll) {
   // if selected branch is not defined
   if (!selectedBranch) {
     
+    repoObj = modifiedRepos[fullName];
+    
     // if default branch isn't fetched yet
     if (!repoObj.selBranch) {
-      
+        
       // await fetch
       await repoPromise;
-      
+        
+      repoObj = modifiedRepos[fullName];
+              
     }
     
     // add branch to tree
-    treeLoc[1] = repo.split(':')[0] + ':' + repoObj.selBranch;
+    treeLoc[1] = repo + ':' + repoObj.selBranch;
     saveTreeLocLS(treeLoc);
     
     // update selected branch
diff --git a/full.html b/full.html
@@ -38,7 +38,6 @@
   <link rel="canonical" href="https://codeit.codes/">
   <meta name="next-head-count" content="24">
   <meta name="robots" content="all">
-  <script nonce>if (top != window && !document.referrer.startsWith(window.location.origin)) { top.location.href = window.location.href }</script>
   <script defer data-domain="codeit.codes" src="https://plausible.io/js/plausible.js"></script>
 
   <link rel="shortcut icon" href="/icons/android-app-512.png">
diff --git a/git/gitauth.js b/git/gitauth.js
@@ -134,3 +134,4 @@ async function getGithubToken(gitCode) {
   renderSidebarHTML();
 
 }
+
diff --git a/index.html b/index.html
@@ -39,7 +39,7 @@
   <link rel="canonical" href="https://codeit.codes/">
   <meta name="next-head-count" content="24">
   <meta name="robots" content="all">
-  <script nonce>if (top != window) { top.location.href = 'https://codeit.codes/' }</script>
+  <script nonce>if (top !== window) { top.location.href = 'https://codeit.codes/' }</script>
   <script defer data-domain="codeit.codes" src="https://plausible.io/js/plausible.js"></script>
 
   <link rel="shortcut icon" href="/icons/android-app-512.png">
diff --git a/links.js b/links.js
@@ -104,6 +104,12 @@ function decodeLink(url) {
 
     }
     
+    if (link.get('embed')) {
+      
+      linkData.embed = true;
+      
+    }
+    
     
     
     // legacy link type
diff --git a/live-view/live-view.js b/live-view/live-view.js
@@ -2,6 +2,11 @@
 // setup live view
 async function setupLiveView() {
 
+  // if link is embed
+  if (linkData.embed) {
+    body.classList.add('embed');
+  }
+
   // if URL has a file
   if (linkData.file) {
 
@@ -832,6 +837,15 @@ async function renderLiveViewHTML(file) {
   }
 
 
+  // if service worker isn't installed yet
+  if (workerInstallPromise) {
+        
+    // wait until finished installing
+    await workerInstallPromise;
+            
+  }
+
+
   liveView.innerHTML = '<iframe src="'+ livePath +'" name="' + file.name + '" title="' + file.name + '" class="live-frame" allow="accelerometer; camera; encrypted-media; display-capture; geolocation; gyroscope; microphone; midi; clipboard-read; clipboard-write" allowfullscreen="true" allowpaymentrequest="true" loading="lazy" sandbox="allow-downloads allow-forms allow-modals allow-pointer-lock allow-popups allow-presentation allow-same-origin allow-scripts allow-top-navigation-by-user-activation" scrolling="yes" frameborder="0"></iframe>';
 
 
diff --git a/service-worker.js b/service-worker.js
@@ -53,21 +53,11 @@ const FILES_TO_CACHE = [
 
 ];
 
-self.addEventListener('install', (evt) => {
-
-  // precache static resources
-  evt.waitUntil(
-    caches.open(WORKER_NAME).then((cache) => {
-      return cache.addAll(FILES_TO_CACHE);
-    })
-  );
-
-  self.skipWaiting();
-
-});
-
 self.addEventListener('activate', (evt) => {
-
+  
+  self.clients.claim();
+  
+  
   // remove previous cached data from disk
   evt.waitUntil(
     caches.keys().then((keyList) => {
@@ -78,13 +68,20 @@ self.addEventListener('activate', (evt) => {
       }));
     })
   );
+  
+  // precache static resources
+  evt.waitUntil(
+    caches.open(WORKER_NAME).then((cache) => {
+      return cache.addAll(FILES_TO_CACHE);
+    })
+  );
 
-  self.clients.claim();
+  self.skipWaiting();
   
   
   // send reload request to client
-  workerChannel.postMessage({
+  /*workerChannel.postMessage({
     type: 'reload'
-  });
+  });*/
 
 });
diff --git a/worker/client-channel.js b/worker/client-channel.js
@@ -4,7 +4,7 @@
 
 
 // update worker name when updating worker
-const WORKER_NAME = 'codeit-worker-v484';
+const WORKER_NAME = 'codeit-worker-v487';
 
 
 // internal paths
@@ -153,6 +153,7 @@ let enableDevLogs = false;
 workerChannel.addEventListener('message', (event) => {
   
   if (event.data.type === 'enableDevLogs') enableDevLogs = true;
+  if (event.data.type === 'hello') workerChannel.postMessage('hello!');
   
 });
 
@@ -191,8 +192,27 @@ function handleFetchRequest(request) {
       resolve(sendRequestToClient(request));
 
     } else { // if fetch is external
-
+      
+      /*
+      let resp = await fetch(request);
+      
+      // if fetch is an internal Git fetch
+      // with an error code
+      if (request.url.startsWith('https://api.github.com')
+          && resp.status === 403) {
+        
+        console.log('[ServiceWorker] Intercepted Github API request', request);
+        
+        // return an identical response without the error code
+        resp = new Response(resp.body, {
+          headers: resp.headers,
+          status: 200
+        });
+        
+      }*/
+      
       // return response from network
+      //resolve(resp);
       resolve(fetch(request));
 
     }
@@ -208,3 +228,4 @@ self.addEventListener('fetch', (evt) => {
   evt.respondWith(handleFetchRequest(evt.request));
 
 });
+
diff --git a/worker/worker-channel.js b/worker/worker-channel.js
@@ -4,14 +4,20 @@
 
 
 let workerChannel;
+let workerInstallPromise;
 
 
 // setup worker channel
 async function setupWorkerChannel() {
 
   // register service worker
-  await navigator.serviceWorker.register('/service-worker.js');
-
+  
+  workerInstallPromise = navigator.serviceWorker.register('/service-worker.js');
+  
+  await workerInstallPromise;
+  
+  workerInstallPromise = null;
+  
 
   // create worker channel
   workerChannel = new BroadcastChannel('worker-channel');
@@ -53,7 +59,7 @@ async function setupWorkerChannel() {
   window.addEventListener('load', () => {
     
     if (getStorage('workerDevLogs')) {
-      
+            
       workerChannel.postMessage({
         type: 'enableDevLogs'
       });

Original file line number	Diff line number	Diff line change
`@@ -134,3 +134,4 @@ async function getGithubToken(gitCode) {`
`134`	`134`	`renderSidebarHTML();`
`135`	`135`
`136`	`136`	`}`
	`137`	`+`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,12 @@ function decodeLink(url) {`
`104`	`104`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ if (link.get('embed')) {`
	`108`	`+`
	`109`	`+ linkData.embed = true;`
	`110`	`+`
	`111`	`+ }`
	`112`	`+`
`107`	`113`
`108`	`114`
`109`	`115`	`// legacy link type`