fcf

nova-ind · Aug 24, 2024 · b84cd5c · b84cd5c
1 parent 1d7fe4f
commit b84cd5c
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 34 deletions.
diff --git a/assets/code/apps.js b/assets/code/apps.js
@@ -85,7 +85,7 @@ var app = {
                 appstorepage.src = "/assets/sysappfiles/appstore/thisdevice.html"
             }, null))
             appstorepage.setAttribute("frameborder", "0")
-            appstorepage.src = "/assets/sysappfiles/appstore/home.html";
+            appstorepage.src = "/assets/sysappfiles/appstore/app.html?eapp";
             appstorepage.style.width = "100%"
             appstorepage.style.height = "100%"
             wc.style.height = "calc(100% - 65px)"
@@ -582,8 +582,19 @@ var app = {
                     })
                     castpeer.on('connection', (conn2) => {
                         conn2.on('data', async function (data) {
+                            console.log(data)
                             if (data == "connAccept") {
-                                castpeer.call(recepient.value + "-cast",await navigator.mediaDevices.getDisplayMedia(displayMediaOptions))
+                                if(navigator.userAgent.toLowerCase().includes('firefox')){
+                                    var w = tk.mbw("Stupid confirmation because firefox sucks", "300px", "auto", false, true, true, "ncast", './assets/img/systemIcons/cast.svg')
+                                    tk.p("Firefox is a bad browser and needs you to hit the button below because the other button isn't direct enough.", "", w.main)
+                                    tk.mkel("h1", [], "FUCK YOU MOZILLA", w.main)
+                                    tk.cb("b1","Start cast forreallz", async function(){
+                                        castpeer.call(recepient.value + "-cast", await navigator.mediaDevices.getDisplayMedia(displayMediaOptions))
+                                    }, w.main);
+                                }
+                                else{
+                                    castpeer.call(recepient.value + "-cast", await navigator.mediaDevices.getDisplayMedia(displayMediaOptions))
+                                }
                             }
                         });
                         conn2.send("hai uwu")
@@ -643,5 +654,16 @@ var app = {
         }
     },
 }
-window.installApp = function(appn, appid, appscript, appico)
-app.cast.connection(30012)
+window.installApp = function (appn, appid, appscripts, appico) {
+    var appc = {
+        runs: true,
+        name: appn,
+        icon: appico
+    }
+    fs.mkdir(`/system/apps/${appid}`, 'opfs')
+    fs.write(`/system/apps/${appid}/meta.json`, JSON.stringify(appc))
+    appscripts.forEach(async function (script) {
+        fs.write(`/system/apps/${appid}/${script.name}`, script.script)
+    })
+}
+// app.cast.connection(30012) 
diff --git a/assets/sysappfiles/appstore/app.html b/assets/sysappfiles/appstore/app.html
@@ -9,20 +9,26 @@
 </head>
 
 <body>
-    <main>
+    <div class="loader">
+        <center>
+            <h1>Loading...</h1>
+            <progress></progress>
+        </center>
+    </div>
+    <main class="hide">
         <br>
         <br>
         <br>
         <div class="meta">
             <img src="https://placehold.co/1024x1024/EEE/31343C" alt="" id="appico">
             <div class="metaetc">
                 <h1 id="appn">AppName</h1>
-                <h3 id="appdesc">AppDescription</h3>
-                <h3 id="appdev">AppDeveloper</h3> -
-                <h3 id="appcat">AppCategory</h3>
+                <h3 id="appdesc">AppDescription</h3><br>
+                <h5 id="appdev">AppDeveloper</h5>
+                <h5 id="appcat">AppCategory</h5>
                 <div class="btnrow">
                     <button class="b1">Install</button>
-                    <button class="b1">QuickRun</button>
+                    <button id="qr" class="b1">QuickRun</button>
                 </div>
             </div>
         </div>

diff --git a/assets/sysappfiles/appstore/app.js b/assets/sysappfiles/appstore/app.js
@@ -1,25 +1,21 @@
 var appid = window.location.search.split("?")[1]
+console.log(appid)
 document.addEventListener('DOMContentLoaded', async function() {
-    document.querySelector("iframe").src=`https://novaos-appstore-repo.pages.dev/app/${appid}`
-    var repoResponse = await fetch('https://novaos-appstore-repo.pages.dev/appstore.json');
-    repoResponse = await repoResponse.json();
-    repoResponse.applications.forEach(app => {
-        if(app.id == appid){
-            console.log(app)
-            var categories = app.category.split(",")
-            // filter categories to remove all starting with "backend"
-            categories = categories.filter(category => !category.startsWith("backend"))
-            // make all categories sentence case
-            categories = categories.map(category => category.charAt(0).toUpperCase() + category.slice(1))
-            // remove empty categories
-            categories = categories.filter(category => category != "")
-            // join categories with a comma
-            categories = categories.join(", ")
-            console.log(categories)
+    document.querySelector("iframe").src=`https://pkgs.os.novafurry.win/${appid}/desc`
+    var repoResponse = await fetch(`https://pkgs.os.novafurry.win/${appid}/meta.json`);
+    document.querySelector('.loader').remove()
+    document.querySelector('main').classList.remove("hide")
+    console.log(repoResponse)
+    app = await repoResponse.json();
             document.querySelector('#appn').innerText = app.name
+            document.querySelector('#appico').src = app.icon
             document.querySelector('#appdesc').innerText = app.description
-            document.querySelector('#appdev').innerText = `${app.author}`
-            document.querySelector('#appcat').innerText = `${categories}`
-        }
-    });
+            document.querySelector('#appdev').innerText = `${app.developer} - `
+            document.querySelector('#appcat').innerText = `${app.category} - ${app.specialTags.includes("Official") ? "Official" : ""} - ${app.specialTags.includes("Featured") ? "Featured" : ""}`
+            if(app.specialTags.includes('quickRun')){
+
+            }
+            else{
+                document.querySelector('#qr').remove()
+            }
 })
diff --git a/assets/sysappfiles/appstore/main.js b/assets/sysappfiles/appstore/main.js
@@ -1,13 +1,13 @@
 document.addEventListener('DOMContentLoaded', async function() {
-    var repoResponse = await fetch('https://novaos-appstore-repo.pages.dev/appstore.json');
+    var repoResponse = await fetch('https://pkgs.os.novafurry.win/allapps.json');
     repoResponse = await repoResponse.json();
     var featuredApps = []
     var officialApps = []
-    repoResponse.applications.forEach(app => {
-        if(app.category.split(",").includes("backendTagFeatured") && featuredApps.length < 4){
+    repoResponse.forEach(app => {
+        if(app.specialTags.includes("Featured") && featuredApps.length < 4){
             featuredApps.push(app)
         }
-        else if(app.category.split(",").includes("backendTagOfficial")){
+        else if(app.specialTags.includes("Official")){
             officialApps.push(app)
         }
     });

diff --git a/assets/sysappfiles/appstore/styles.css b/assets/sysappfiles/appstore/styles.css
@@ -22,6 +22,11 @@
 *{
     transition: all 0.1s cubic-bezier(0.075, 0.82, 0.165, 1);
 }
+
+.hide{
+    display: none;
+}
+
 body {
     margin: 0px;
     overflow-x: hidden;
@@ -218,7 +223,8 @@ cursor: pointer;
     object-fit: cover;
 }
 
-h3 {
+h3,h4,h5 {
     margin-block-start: 0em;
     margin-block-end: 0em;
+    display: inline;
 }