added series support

rrrkren · Dec 24, 2020 · 59aca44 · 59aca44
1 parent f00c821
commit 59aca44
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/src/pages/nav.comp.js b/src/pages/nav.comp.js
@@ -18,10 +18,11 @@ const getTopshotOverview = async () => {
         pub let id: UInt32
         pub let setName: String
         pub var locked: Bool
-        init(id: UInt32, setName: String) {
+        pub let series: UInt32
+        init(id: UInt32, setName: String, series: UInt32) {
           self.id = id
           self.setName = setName
-          self.locked = false
+          self.series = series
           self.locked = TopShot.isSetLocked(setID: id)!
         }
       }
@@ -34,7 +35,8 @@ const getTopshotOverview = async () => {
           var sets: [Set] = []
           while setID < TopShot.nextSetID {
             var setName = TopShot.getSetName(setID: setID)
-            sets.append(Set(id: setID, setName: setName!))
+            var series = TopShot.getSetSeries(setID: setID)
+            sets.append(Set(id: setID, setName: setName!, series: series!))
             setID = setID + UInt32(1)
           }
           self.sets = sets
@@ -74,7 +76,7 @@ export function TopShotNav() {
               topshotOverview.sets.map((s) => {
                 return (
                   <NavDropdown.Item key={s.id} href={"/sets/" + s.id}>
-                    {s.id} {s.setName} {s.locked ? <Red>locked</Red> : <Green>open</Green>}
+                    {s.id} {s.setName} S{s.series} {s.locked ? <Red>locked</Red> : <Green>open</Green>} 
                   </NavDropdown.Item>
                 )
               })}

diff --git a/src/pages/plays.comp.js b/src/pages/plays.comp.js
@@ -61,7 +61,8 @@ const config = {
   page_size: 10,
   length_menu: [ 10, 20, 50 ],
   no_data_text: 'No data available!',
-  sort: { column: "playID", order: "desc" }
+  sort: { column: "playID", order: "desc" },
+  key_column: "playID"
 }
 
 export function TopshotPlays() {

diff --git a/src/pages/set.comp.js b/src/pages/set.comp.js
@@ -36,13 +36,14 @@ const getTopshotSet = async (setID) => {
         pub let setName: String
         pub let playIDs: [UInt32]
         pub let editions: [Edition]
-        pub var locked: Bool
+        pub let locked: Bool
+        pub let series: UInt32
         init(id: UInt32, setName: String) {
           self.id = id
           self.setName = setName
           self.playIDs = TopShot.getPlaysInSet(setID: id)!
-          self.locked = false
           self.locked = TopShot.isSetLocked(setID: id)!
+          self.series = TopShot.getSetSeries(setID: id)!
           var editions: [Edition] = []
           var playOrder = UInt32(1)
           for playID in self.playIDs {
@@ -119,7 +120,8 @@ const config = {
   page_size: 10,
   length_menu: [ 10, 20, 50 ],
   no_data_text: 'No data available!',
-  sort: { column: "playOrder", order: "desc" }
+  sort: { column: "playOrder", order: "desc" },
+  key_column: "playID"
 }
 
 export function TopshotSet() {
@@ -167,7 +169,7 @@ export function TopshotSet() {
   return (
     <Root>
       <h1>
-        <Muted>{TopshotSet.set.setName}</Muted>:{" "}
+        <Muted>{TopshotSet.set.setName}</Muted> S{TopshotSet.set.series}:
         {TopshotSet.set.locked ? <Red>locked set</Red> : <Green>open set</Green>}
       </h1>
       <ReactDatatable

diff --git a/src/pages/topshot.comp.js b/src/pages/topshot.comp.js
@@ -16,7 +16,6 @@ const getTopShot = async () => {
         self.id = id
         self.setName = setName
         self.playIDs = TopShot.getPlaysInSet(setID: id)!
-        self.locked = false
         self.locked = TopShot.isSetLocked(setID: id)!
         for playID in self.playIDs {
           var retired = false
@@ -30,8 +29,10 @@ const getTopShot = async () => {
       pub let totalSupply: UInt64
       pub let plays: [TopShot.Play]
       pub let sets: [Set]
+      pub let currentSeries: UInt32
       init() {
         self.totalSupply = TopShot.totalSupply
+        self.currentSeries = TopShot.currentSeries
         self.plays = TopShot.getAllPlays()
         var setID = UInt32(1)
         var sets: [Set] = []
@@ -107,10 +108,16 @@ export function TopShot() {
       </h3>
       <div>
         {topshotData && (
-          <h3>
-            <Muted>Total Supply: </Muted>
-            <span>{topshotData.totalSupply}</span>
-          </h3>
+          <div>
+            <h3>
+              <Muted>Total Supply: </Muted>
+              <span>{topshotData.totalSupply}</span>
+            </h3>
+            <h3>
+              <Muted>Current Series: </Muted>
+              <span>S{topshotData.currentSeries}</span>
+            </h3>
+          </div>
         )}
       </div>