backend/db.coffee

@@ -57,7 +57,8 @@ class FFTCGDB
                         logger.error err.message if err
 
                         @db.run '''INSERT INTO users VALUES(1,'jmm','$2b$13$jgDdHHDWqq1RV6PXxf7aOO6AbxqY6tbxIADyIO0FeXt2BlKQCCMzS',NULL);'''
-                        @db.run '''INSERT INTO decks VALUES(1,1,'{"name":"Antipode Bomb Version 6.0","note":"As Seen In Tournament: The North American Water Cup","cards":[{"count":1,"serial":"1-192"},{"count":2,"serial":"7-132"},{"count":2,"serial":"8-037"},{"count":2,"serial":"8-139"},{"count":1,"serial":"5-036"},{"count":3,"serial":"4-048"},{"count":1,"serial":"2-026"},{"count":3,"serial":"8-043"},{"count":3,"serial":"4-021"},{"count":3,"serial":"3-033"},{"count":1,"serial":"8-014"},{"count":2,"serial":"8-006"},{"count":1,"serial":"8-042"},{"count":1,"serial":"6-027"},{"count":3,"serial":"5-019"},{"count":2,"serial":"2-019"},{"count":2,"serial":"5-032"},{"count":3,"serial":"4-026"},{"count":3,"serial":"1-057"},{"count":1,"serial":"1-048"},{"count":2,"serial":"8-036"},{"count":3,"serial":"8-005"},{"count":3,"serial":"2-005"},{"count":1,"serial":"7-017"},{"count":1,"serial":"8-007"}]}');'''
+                        @db.run '''INSERT INTO decks VALUES(1,1,'{"name":"frosch"}');'''
+                        @db.run '''INSERT INTO decks VALUES(2,1,'{"name":"frosch2"}');'''
 
             logger.info 'OK clear'
 
@@ -150,18 +151,18 @@ class FFTCGDB
       .catch ->
         reject messages.empty
 
-  getUser: (userID) ->
+  get: (user) ->
     new Promise (resolve, reject) =>
       # get users table row
       stmt = @db.prepare 'SELECT * FROM users WHERE user = ?'
-      stmt.get [userID], (err, row) =>
+      stmt.get [user], (err, row) =>
         stmt.finalize()
         if err
-          logger.warn "get: FAIL db '#{err.code}' for '#{userID}'"
+          logger.warn "get: FAIL db '#{err.code}' for '#{user}'"
           reject messages.db
 
         else if not row
-          logger.debug "get: FAIL nonexistent '#{userID}'"
+          logger.debug "get: FAIL nonexistent '#{user}'"
           reject messages.noexists # user doesnt exist
 
         else
@@ -170,24 +171,24 @@ class FFTCGDB
             login: row.login
             settings: row.settings
 
-  addDeck: (userID, deckCards) ->
+  addDeck: (user, deckCards) ->
     new Promise (resolve, reject) =>
       # try creating row in decks table
       stmt = @db.prepare 'INSERT INTO decks (user, json) VALUES (?, ?)'
-      stmt.run [userID, JSON.stringify deckCards], (err) ->
+      stmt.run [user, JSON.stringify deckCards], (err) ->
         stmt.finalize()
         if err
-          logger.warn "addDeck: FAIL db '#{err.code}' for '#{userID}'"
+          logger.warn "addDeck: FAIL db '#{err.code}' for '#{user}'"
           reject messages.db
 
         else
           logger.debug "addDeck: OK '#{@lastID}'"
           resolve @lastID
 
-  modDeck: (userID, deckID, deckCards) ->
+  modDeck: (deckID, deckCards) ->
     new Promise (resolve, reject) =>
-      stmt = @db.prepare 'UPDATE decks SET json = ? WHERE deck = ? AND user = ?'
+      stmt = @db.prepare 'UPDATE decks SET json = ? WHERE deck = ?'
-      stmt.run [JSON.stringify deckCards, deckID, userID], (err) ->
+      stmt.run [deckCards, deckID], (err) ->
         stmt.finalize()
         if err
           logger.warn "modDeck: FAIL db '#{err.code}' for '#{deckID}'"
@@ -196,16 +197,16 @@ class FFTCGDB
           logger.debug "modDeck: OK '#{deckID}'"
           resolve deckID
 
-  getDecks: (userID) ->
+  getDecks: (user) ->
     new Promise (resolve, reject) =>
       stmt = @db.prepare 'SELECT decks.deck, decks.json FROM decks INNER JOIN users ON decks.user = users.user WHERE users.user = ?'
-      stmt.all [userID], (err, rows) ->
+      stmt.all [user], (err, rows) ->
         stmt.finalize()
         if err
-          logger.warn "getDecks: FAIL db '#{err.code}' for '#{userID}'"
+          logger.warn "getDeck: FAIL db '#{err.code}' for '#{user}'"
           reject messages.db
         else
-          logger.debug "getDecks: OK '#{userID}'"
+          logger.debug "getDeck: OK '#{user}'"
           resolve (id: row.deck, content: JSON.parse row.json for row, i in rows)
 
   delDeck: (deckID) ->

backend/routes/decks/list.coffee

@@ -19,7 +19,7 @@ module.exports =
         logger.debug "OK '#{userid}' got decks"
         reply.send
           success: true
-          decks: decks
+          deck: decks
 
       .catch (err) ->
         # couldnt get user details

backend/routes/user/info.coffee

@@ -14,7 +14,7 @@ module.exports =
     session.check request.body.session ? ""
     .then (userid) ->
       # active session found, get associated user
-      fftcgdb.getUser (userid)
+      fftcgdb.get (userid)
       .then (user) ->
         logger.debug "OK '#{user.login}' got info"
         reply.send

frontend/src/plugins/ffdecks.js

@@ -1,9 +0,0 @@
-import oldCards from './ffdecks.json'
-
-let CardsDB = {}
-
-for (var i = 0; i < oldCards.cards.length; i++) {
-  CardsDB[oldCards.cards[i].serial_number] = oldCards.cards[i]
-}
-
-export default CardsDB

frontend/src/views/UserCP.vue

@@ -4,23 +4,11 @@
 
     <p>user logged in: {{ user.login }}</p>
 
-    <v-expansion-panel>
-      <v-expansion-panel-content v-for="deck in decks" :key="deck.id">
-        <template v-slot:header>
-          <div>{{ deck.content.name }}</div>
-        </template>
-        <v-card>
-          <v-card-text>
-            {{ deck.content.note }}
     <ul>
-              <li v-for="card in deck.content.cards" :key="card.serial">
+      <li v-for="deck in decks" :key="deck.id">
-                {{ card.serial }}: {{ cardsdb[card.serial].name }}
+        {{ deck.id }}: {{ deck.content.name }}
       </li>
     </ul>
-          </v-card-text>
-        </v-card>
-      </v-expansion-panel-content>
-    </v-expansion-panel>
 
     <v-btn @click.native="logout">Logout</v-btn>
   </v-container>
@@ -29,7 +17,6 @@
 <script>
 import * as Cookies from 'js-cookie'
 import axios from '@/plugins/axios'
-import CardsDB from '@/plugins/ffdecks'
 
 import Header from '@/components/Header.vue'
 
@@ -42,8 +29,7 @@ export default {
 
   data: () => ({
     user: '',
-    decks: '',
+    decks: ''
-    cardsdb: null
   }),
 
   methods: {
@@ -66,8 +52,6 @@ export default {
   },
 
   mounted() {
-    this.cardsdb = CardsDB
-
     axios
       .post('/user/info', {
         session: Cookies.get('session')
@@ -85,7 +69,7 @@ export default {
       })
       .then(response => {
         if (response.data.success) {
-          this.decks = response.data.decks
+          this.decks = response.data.deck
         }
       })
   }