Compare commits
No commits in common. "b60ac2105aaeffb66783b8ffdcdde2a11d13d126" and "6dcb5a4963facf61a1989138f55cb90cdfadb66b" have entirely different histories.
b60ac2105a
...
6dcb5a4963
5 changed files with 16 additions and 73 deletions
|
|
@ -56,10 +56,6 @@ class FFTCGDB
|
||||||
''', (err) =>
|
''', (err) =>
|
||||||
logger.error err.message if err
|
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":"frosch"}');'''
|
|
||||||
@db.run '''INSERT INTO decks VALUES(2,1,'{"name":"frosch2"}');'''
|
|
||||||
|
|
||||||
logger.info 'OK clear'
|
logger.info 'OK clear'
|
||||||
|
|
||||||
close: ->
|
close: ->
|
||||||
|
|
@ -203,10 +199,10 @@ class FFTCGDB
|
||||||
stmt.all [user], (err, rows) ->
|
stmt.all [user], (err, rows) ->
|
||||||
stmt.finalize()
|
stmt.finalize()
|
||||||
if err
|
if err
|
||||||
logger.warn "getDeck: FAIL db '#{err.code}' for '#{user}'"
|
logger.warn "getDeck: FAIL db '#{err.code}' for '#{deckID}'"
|
||||||
reject messages.db
|
reject messages.db
|
||||||
else
|
else
|
||||||
logger.debug "getDeck: OK '#{user}'"
|
logger.debug "getDeck: OK '#{deckID}'"
|
||||||
resolve (id: row.deck, content: JSON.parse row.json for row, i in rows)
|
resolve (id: row.deck, content: JSON.parse row.json for row, i in rows)
|
||||||
|
|
||||||
delDeck: (deckID) ->
|
delDeck: (deckID) ->
|
||||||
|
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
logger = (require 'logging').default '/decks/list'
|
|
||||||
|
|
||||||
# session storage (volatile data)
|
|
||||||
session = (require '../../session')
|
|
||||||
# fftcg.db (persistent data)
|
|
||||||
fftcgdb = (require '../../db')
|
|
||||||
|
|
||||||
module.exports =
|
|
||||||
url: '/decks/list'
|
|
||||||
method: 'POST'
|
|
||||||
# schema: (require './info.schema')
|
|
||||||
|
|
||||||
handler: (request, reply) ->
|
|
||||||
session.check request.body.session ? ""
|
|
||||||
.then (userid) ->
|
|
||||||
# active session found, get associated user
|
|
||||||
fftcgdb.getDecks (userid)
|
|
||||||
.then (decks) ->
|
|
||||||
logger.debug "OK '#{userid}' got decks"
|
|
||||||
reply.send
|
|
||||||
success: true
|
|
||||||
deck: decks
|
|
||||||
|
|
||||||
.catch (err) ->
|
|
||||||
# couldnt get user details
|
|
||||||
logger.warn "FAIL '#{err}' for user id '#{userid}'"
|
|
||||||
reply.send
|
|
||||||
success: false
|
|
||||||
|
|
||||||
.catch ->
|
|
||||||
# no session found
|
|
||||||
logger.info "FAIL '#{request.body.session}' session not found"
|
|
||||||
reply.send
|
|
||||||
success: false
|
|
||||||
|
|
@ -20,8 +20,6 @@ fastify.route (require "./routes/#{route}") for route in [
|
||||||
'user/logout'
|
'user/logout'
|
||||||
# register user
|
# register user
|
||||||
'user/register'
|
'user/register'
|
||||||
# list decks
|
|
||||||
'decks/list'
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# request logging
|
# request logging
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ class FFTCGSESSION
|
||||||
|
|
||||||
else
|
else
|
||||||
@db.get digest, (err, res) ->
|
@db.get digest, (err, res) ->
|
||||||
logger.debug "OK '#{digest}' resumed"
|
logger.info "OK '#{digest}' resumed"
|
||||||
resolve (JSON.parse res)
|
resolve (JSON.parse res)
|
||||||
|
|
||||||
module.exports = new FFTCGSESSION
|
module.exports = new FFTCGSESSION
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,6 @@
|
||||||
<Header />
|
<Header />
|
||||||
|
|
||||||
<p>user logged in: {{ user.login }}</p>
|
<p>user logged in: {{ user.login }}</p>
|
||||||
|
|
||||||
<ul>
|
|
||||||
<li v-for="deck in decks" :key="deck.id">
|
|
||||||
{{ deck.id }}: {{ deck.content.name }}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<v-btn @click.native="logout">Logout</v-btn>
|
<v-btn @click.native="logout">Logout</v-btn>
|
||||||
</v-container>
|
</v-container>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -28,8 +21,7 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
data: () => ({
|
data: () => ({
|
||||||
user: '',
|
user: ''
|
||||||
decks: ''
|
|
||||||
}),
|
}),
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
|
@ -63,15 +55,6 @@ export default {
|
||||||
this.goHome()
|
this.goHome()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
axios
|
|
||||||
.post('/decks/list', {
|
|
||||||
session: Cookies.get('session')
|
|
||||||
})
|
|
||||||
.then(response => {
|
|
||||||
if (response.data.success) {
|
|
||||||
this.decks = response.data.deck
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Reference in a new issue