Merge pull request #52 from phaze-the-dumb/OculusDB-rewrite

Did stuff
ComputerElite · Jul 8, 2024 · 6182127 · 6182127
2 parents fa9d9e3 + 7ebf832
commit 6182127
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/OculusDB/frontend/src/Components/DetailsPage/DetailsPage.tsx b/OculusDB/frontend/src/Components/DetailsPage/DetailsPage.tsx
@@ -209,15 +209,19 @@ let DetailsPage = ( props: DetailsPageProps ) => {
                         </label>
 
                         <div class={"dropdown-contents dropdown-contents-version" + index()}>
-                          <Show when={v.downloadable === false}><b>Developer Only Build.</b><br/></Show>
+                          <Show when={v.downloadable === false} fallback={
+                            <><div class="button" onClick={() => window.open('https://meta.phazed.xyz/?bin_id=' + v.id)}>Download</div><br /></>
+                          }>
+                            <div class="button" onClick={() => window.open('https://meta.phazed.xyz/?bin_id=' + v.id)}>Download (Developer Only)</div><br />
+                            <b>Developer Only Build.</b><br/>
+                          </Show>
                           <Show when={v.changelog !== null}><span
                               class="version-key">Changelog:</span> {v.changelog === "" ? "None" : v.changelog}<br/></Show>
 
                           <span class="version-key">Size:</span> {v.sizeFormatted}<br/>
                           <span class="version-key">Required Space:</span> {v.requiredSpaceFormatted}<br/>
                           <span class="version-key">Uploaded:</span> {new Date(v.uploadedDate).toString()}<br/>
-                          <Show when={v.downloadable !== false}><span
-                              class="version-key">Release Channel:</span> {v.releaseChannels.map((x: any) => x.name).join(', ')}<br/></Show>
+                          <span class="version-key">Release Channel:</span> {v.releaseChannels.map((x: any) => x.name).join(', ')}<br/>
                           <span class="version-key">ID:</span> {v.id}<br/>
                           <span class="version-key">Version Code:</span> {v.versionCode}<br/>
 

diff --git a/OculusDB/frontend/src/Components/SearchPage/SearchPage/Result.tsx b/OculusDB/frontend/src/Components/SearchPage/SearchPage/Result.tsx
@@ -27,7 +27,7 @@ let Result = ( { app, setCurrentTab }: ResultProps ) => {
 
         <div class="rating-format">
           <img width="20" src={ comfortRatingIcons[app.comfortRating] } />
-          <div style={{ "margin-left": '10px' }}>{ app.comfortRatingFormatted }</div>
+          <div style={{ "margin-left": '10px' }}>{ app.comfortRatingFormatted }&nbsp;&nbsp;({ app.groupFormatted })</div>
         </div>
 
         <div class="result-price">
@@ -36,9 +36,9 @@ let Result = ( { app, setCurrentTab }: ResultProps ) => {
               <span style={{ color: '#63fac3' }}>Free</span>
             </Match>
             <Match when={app.priceOffer}>
-              <span style={{ "text-decoration": 'line-through', color: '#aaa' }}>{ app.offerPriceFormatted }</span>
+              <span style={{ "text-decoration": 'line-through', color: '#aaa' }}>{ app.priceFormatted }</span>
               <br />
-              <span style={{ color: app.priceIsSelected ? '#63fac3' : '#e59b12' }}>{ app.priceFormatted }</span>
+              <span style={{ color: app.priceIsSelected ? '#63fac3' : '#e59b12' }}>{ app.offerPriceFormatted }</span>
             </Match>
             <Match when={!app.priceOffer}>
               <span style={{ color: app.priceIsSelected ? '#63fac3' : '#e59b12' }}>{ app.priceFormatted }</span>