Compare commits
3 Commits
342a66475d
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| a47646bd5f | |||
| 2c87713818 | |||
| b19d56fd9a |
@@ -1,2 +0,0 @@
|
||||
> 1%
|
||||
last 2 versions
|
||||
@@ -1,27 +0,0 @@
|
||||
module.exports = {
|
||||
root: true,
|
||||
env: {
|
||||
node: true
|
||||
},
|
||||
'extends': [
|
||||
'plugin:vue/essential',
|
||||
'eslint:recommended'
|
||||
],
|
||||
rules: {
|
||||
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
||||
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
|
||||
},
|
||||
parserOptions: {
|
||||
parser: 'babel-eslint'
|
||||
},
|
||||
overrides: [
|
||||
{
|
||||
files: [
|
||||
'**/__tests__/*.{j,t}s?(x)'
|
||||
],
|
||||
env: {
|
||||
mocha: true
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
21
lootalot_front/.gitignore
vendored
21
lootalot_front/.gitignore
vendored
@@ -1,21 +0,0 @@
|
||||
.DS_Store
|
||||
node_modules
|
||||
/dist
|
||||
|
||||
# local env files
|
||||
.env.local
|
||||
.env.*.local
|
||||
|
||||
# Log files
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
|
||||
# Editor directories and files
|
||||
.idea
|
||||
.vscode
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
@@ -1,29 +0,0 @@
|
||||
# lootalot_front
|
||||
|
||||
## Project setup
|
||||
```
|
||||
npm install
|
||||
```
|
||||
|
||||
### Compiles and hot-reloads for development
|
||||
```
|
||||
npm run serve
|
||||
```
|
||||
|
||||
### Compiles and minifies for production
|
||||
```
|
||||
npm run build
|
||||
```
|
||||
|
||||
### Run your tests
|
||||
```
|
||||
npm run test
|
||||
```
|
||||
|
||||
### Lints and fixes files
|
||||
```
|
||||
npm run lint
|
||||
```
|
||||
|
||||
### Customize configuration
|
||||
See [Configuration Reference](https://cli.vuejs.org/config/).
|
||||
@@ -1,5 +0,0 @@
|
||||
module.exports = {
|
||||
presets: [
|
||||
'@vue/app'
|
||||
]
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
{
|
||||
"name": "lootalot_front",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"serve": "vue-cli-service serve",
|
||||
"build": "vue-cli-service build",
|
||||
"lint": "vue-cli-service lint",
|
||||
"test:unit": "vue-cli-service test:unit"
|
||||
},
|
||||
"main": "sass/scroll.scss",
|
||||
"dependencies": {
|
||||
"bulma": "^0.7.5",
|
||||
"core-js": "^2.6.5",
|
||||
"vue": "^2.6.10"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^3.11.0",
|
||||
"@vue/cli-plugin-eslint": "^3.11.0",
|
||||
"@vue/cli-plugin-unit-mocha": "^3.11.0",
|
||||
"@vue/cli-service": "^3.11.0",
|
||||
"@vue/test-utils": "1.0.0-beta.29",
|
||||
"babel-eslint": "^10.0.1",
|
||||
"chai": "^4.1.2",
|
||||
"eslint": "^5.16.0",
|
||||
"eslint-plugin-vue": "^5.0.0",
|
||||
"vue-template-compiler": "^2.6.10"
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
module.exports = {
|
||||
plugins: {
|
||||
autoprefixer: {}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
@@ -1,20 +0,0 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||
<link rel="stylesheet" href="<%= BASE_URL %>css/scroll.css">
|
||||
<title>Loot-a-Lot !</title>
|
||||
<script defer src="<%= BASE_URL %>fontawesome/js/all.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
<noscript>
|
||||
<strong>We're sorry but lootalot_front doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
|
||||
</noscript>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,21 +0,0 @@
|
||||
@charset "utf-8";
|
||||
|
||||
$brown: #757763;
|
||||
$beige: #C9AD6A;
|
||||
$beige-light: #E0E5C1;
|
||||
$beige-lighter: #EEE5CE;
|
||||
$red: #B7321B;
|
||||
$dark-red: #58180D;
|
||||
$yellow-light: #FCF2C5;
|
||||
|
||||
$link: $brown;
|
||||
$primary: $brown;
|
||||
$info: $beige;
|
||||
$danger: $red;
|
||||
|
||||
$table-cell-border: 1px solid $dark-red;
|
||||
$table-striped-row-even-background-color: $yellow-light;
|
||||
|
||||
$button-padding-horizontal: 1em;
|
||||
|
||||
@import "../node_modules/bulma/bulma.sass";
|
||||
@@ -1,190 +0,0 @@
|
||||
<template>
|
||||
<PlayerView
|
||||
:id="player_id"
|
||||
:players="playersId"
|
||||
v-slot="{ player, loot, notifications, actions, claims }"
|
||||
>
|
||||
<main id="app" class="container">
|
||||
<header>
|
||||
<HeaderBar>
|
||||
<template v-slot:title>
|
||||
{{ player.name }}
|
||||
</template>
|
||||
<template v-slot:links>
|
||||
<a class="navbar-item">History of Loot</a>
|
||||
<template v-if="playerIsGroup">
|
||||
<hr class="navbar-divider">
|
||||
<div class="navbar-item heading">Admin</div>
|
||||
<a class="navbar-item">"Resolve claims"</a>
|
||||
<a class="navbar-item">"Add player"</a>
|
||||
</template>
|
||||
<hr class="navbar-divider">
|
||||
<div class="navbar-item heading">Changer</div>
|
||||
<a v-for="(p,i) in playerList" :key="i"
|
||||
@click="setActivePlayer(i)"
|
||||
href="#" class="navbar-item">
|
||||
{{ p.name }}</a>
|
||||
</template>
|
||||
</HeaderBar>
|
||||
<Wealth
|
||||
:wealth="[player.cp, player.sp, player.gp, player.pp]"
|
||||
:debt="player.debt"
|
||||
@update="actions.updateWealth"
|
||||
></Wealth>
|
||||
<p v-show="notifications.length > 0">{{ notifications }}</p>
|
||||
<button class="button" @click="actions.undoLastAction">Annuler action</button>
|
||||
</header>
|
||||
<nav>
|
||||
<div class="tabs is-centered is-boxed is-medium">
|
||||
<ul>
|
||||
<li :class="{ 'is-active': activeView == 'group' }">
|
||||
<a @click="switchView('group')">
|
||||
Coffre de groupe
|
||||
</a>
|
||||
</li>
|
||||
<li v-show="!playerIsGroup" :class="{ 'is-active': activeView == 'player' }">
|
||||
<a @click="switchView('player')">
|
||||
Mon coffre
|
||||
</a>
|
||||
</li>
|
||||
<li :class="{'is-active': activeView == 'adding' }">
|
||||
<a class="has-text-grey-light"
|
||||
@click="switchView('adding')">
|
||||
+ {{ playerIsGroup ? 'Nouveau Loot' : 'Acheter' }}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<main class="section">
|
||||
<template v-if="isAdding">
|
||||
<Loot v-if="playerIsGroup"
|
||||
:inventory="itemsInventory"
|
||||
@addItem="item => pending_loot.push(item)"
|
||||
@confirmAction="addNewLoot"
|
||||
></Loot>
|
||||
<AddingChest
|
||||
:player="player.id"
|
||||
:claims="claims"
|
||||
:items="playerIsGroup ? pending_loot : itemsInShop"
|
||||
:perms="playerIsGroup ? {} : { canBuy: true }"
|
||||
@buy="(data) => { switchView('player'); actions.buyItems(data); }">
|
||||
</AddingChest>
|
||||
</template>
|
||||
<Chest v-else
|
||||
:player="player.id"
|
||||
:claims="claims"
|
||||
:items="showPlayerChest ? loot : groupLoot"
|
||||
:perms="{
|
||||
canGrab: !(showPlayerChest || playerIsGroup),
|
||||
canSell: showPlayerChest || playerIsGroup
|
||||
}"
|
||||
@sell="actions.sellItems"
|
||||
@claim="actions.putClaim"
|
||||
@unclaim="actions.withdrawClaim">
|
||||
</Chest>
|
||||
</main>
|
||||
</main>
|
||||
</PlayerView>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import PlayerView from './components/PlayerView.js'
|
||||
import HeaderBar from './components/HeaderBar.vue'
|
||||
import Wealth from './components/Wealth.vue'
|
||||
import Chest from './components/Chest.vue'
|
||||
import Loot from './components/Loot.vue'
|
||||
import { api } from './lootalot.js'
|
||||
|
||||
function getCookie(cname) {
|
||||
var name = cname + "=";
|
||||
var decodedCookie = decodeURIComponent(document.cookie);
|
||||
var ca = decodedCookie.split(';');
|
||||
for(var i = 0; i <ca.length; i++) {
|
||||
var c = ca[i];
|
||||
while (c.charAt(0) == ' ') {
|
||||
c = c.substring(1);
|
||||
}
|
||||
if (c.indexOf(name) == 0) {
|
||||
return c.substring(name.length, c.length);
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
export default {
|
||||
name: 'app',
|
||||
data () {
|
||||
return {
|
||||
player_id: 0,
|
||||
playerList: [],
|
||||
activeView: 'group',
|
||||
groupLoot: [],
|
||||
itemsInventory: [],
|
||||
itemsInShop: [{id: 1, name: "Item from shop #1", base_price: 2000}],
|
||||
pending_loot: [],
|
||||
initiated: false,
|
||||
};
|
||||
},
|
||||
components: {
|
||||
PlayerView,
|
||||
HeaderBar,
|
||||
'AddingChest': Chest, // Alias to prevent component re-use
|
||||
Chest,
|
||||
Wealth,
|
||||
Loot,
|
||||
},
|
||||
created () {
|
||||
const cookie = getCookie("player_id");
|
||||
this.player_id = cookie ? Number(cookie) : 0;
|
||||
Promise.all([
|
||||
api.fetch("players/", "GET", null),
|
||||
api.fetch("players/0/loot", "GET", null),
|
||||
api.fetch("items", "GET", null),
|
||||
])
|
||||
.then(([players, loot, items]) => {
|
||||
this.$set(this, 'playerList', players.value);
|
||||
this.groupLoot = loot.value;
|
||||
this.itemsInventory = items.value;
|
||||
})
|
||||
.catch(r => alert("Error ! \n" + r))
|
||||
.then(() => this.initiated = true);
|
||||
},
|
||||
methods: {
|
||||
setActivePlayer (idx) {
|
||||
if (idx == 0) this.switchView('group');
|
||||
this.player_id = Number(idx)
|
||||
document.cookie = `player_id=${idx};`;
|
||||
},
|
||||
switchView (viewId) {
|
||||
if (!['group', 'player', 'adding'].includes(viewId)) {
|
||||
console.error("Not a valid view ID :", viewId);
|
||||
}
|
||||
this.activeView = viewId;
|
||||
},
|
||||
addNewLoot () {
|
||||
api.fetch("players/0/loot", "POST", {
|
||||
source_name: "Dummy name",
|
||||
items: this.pending_loot,
|
||||
})
|
||||
.then(() => {
|
||||
this.pending_loot = []
|
||||
this.switchView('group');
|
||||
})
|
||||
.catch(r => alert("Error: " + r));
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
showPlayerChest () { return this.activeView == 'player' },
|
||||
isAdding () { return this.activeView == 'adding' },
|
||||
playerIsGroup () { return this.player_id == 0 },
|
||||
playersId () { return this.playerList.map(p => p.id).filter(i => i != 0); }
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
header {
|
||||
padding-bottom: 1.5em;
|
||||
}
|
||||
</style>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.7 KiB |
@@ -1,166 +0,0 @@
|
||||
<template>
|
||||
<article>
|
||||
<p class="control has-icons-left">
|
||||
<input type="text" class="input" v-model="searchText">
|
||||
<span class="icon is-small is-left"><i class="fas fa-search"></i></span>
|
||||
</p>
|
||||
<table class="table is-fullwidth is-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="100%">Objets</th>
|
||||
<th>Valeur</th>
|
||||
<th>
|
||||
<div v-if="perms.canSell" class="buttons" :class="{'has-addons': is_selling}">
|
||||
<button class="button"
|
||||
:class="is_selling ? 'is-danger' : 'is-warning'"
|
||||
@click="sellSelectedItems"
|
||||
>
|
||||
<span class="icon">
|
||||
<i class="fas fa-coins"></i>
|
||||
</span>
|
||||
<p v-if="!is_selling">Vendre</p>
|
||||
<p v-else>{{ selected_items.length > 0 ? `${totalSelectedValue} po` : 'Annuler' }}</p>
|
||||
</button>
|
||||
<PercentInput v-show="is_selling" v-model="global_mod"></PercentInput>
|
||||
</div>
|
||||
<div v-else-if="perms.canBuy">
|
||||
<button class="button is-danger is-fullwidth"
|
||||
:disabled="selected_items.length == 0"
|
||||
@click="buySelectedItems"
|
||||
>Acheter ({{ totalSelectedValue}}po)</button>
|
||||
</div>
|
||||
<div v-else-if="perms.canGrab">
|
||||
<button class="button is-static is-fullwidth">Demander</button>
|
||||
</div>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-for="(item, idx) in shownItems">
|
||||
<tr :key="`row-${idx}`">
|
||||
<td>
|
||||
<strong>{{item.name}}</strong>
|
||||
</td>
|
||||
<td>
|
||||
{{ is_selling ? item.base_price / 2 : item.base_price }}po
|
||||
</td>
|
||||
<td>
|
||||
<Request
|
||||
v-if="perms.canGrab"
|
||||
:id="player"
|
||||
:claims="claims"
|
||||
:item="item.id"
|
||||
@claim="(data) => $emit('claim', data)"
|
||||
@unclaim="(data) => $emit('unclaim', data)"
|
||||
></Request>
|
||||
<Selector
|
||||
v-else-if="showSelectors"
|
||||
:id="item.id"
|
||||
v-model="selected_items"
|
||||
></Selector>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
</tbody>
|
||||
</table>
|
||||
</article>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Request from './Request.vue'
|
||||
import PercentInput from './PercentInput.vue'
|
||||
import Selector from './Selector.vue'
|
||||
import { api } from '../lootalot.js'
|
||||
/*
|
||||
The chest displays a collection of items.
|
||||
|
||||
A set of permissions is passed as props, to update
|
||||
the possible actions of active user upon these items.
|
||||
|
||||
*/
|
||||
export default {
|
||||
props: {
|
||||
player: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
items: {
|
||||
type: Array,
|
||||
required: true,
|
||||
},
|
||||
perms: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
claims: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
Request,
|
||||
PercentInput,
|
||||
Selector,
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
is_selling: false,
|
||||
selected_items: [],
|
||||
global_mod: 0,
|
||||
searchText: "",
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
buySelectedItems () {
|
||||
this.$emit("buy", this.selected_items);
|
||||
this.selected_items = [];
|
||||
},
|
||||
sellSelectedItems () {
|
||||
if (!this.is_selling) {
|
||||
this.is_selling = true;
|
||||
} else {
|
||||
this.is_selling = false;
|
||||
if (this.selected_items.length > 0) {
|
||||
this.$emit("sell", this.selected_items);
|
||||
this.selected_items = [];
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
shownItems () {
|
||||
if (this.searchText != "") {
|
||||
const searchText = this.searchText.toUpperCase();
|
||||
return this.items.filter(item => item.name.toUpperCase().includes(searchText));
|
||||
} else {
|
||||
return this.items;
|
||||
}
|
||||
},
|
||||
showSelectors () {
|
||||
return !this.perms.canGrab
|
||||
&& (this.is_selling || this.perms.canBuy);
|
||||
},
|
||||
totalSelectedValue () {
|
||||
var total = this.selected_items
|
||||
.map(([id, mod]) => {
|
||||
const item = this.items.find(item => item.id == id);
|
||||
var price = item.base_price * mod;
|
||||
if (this.is_selling) {
|
||||
price = price / 2;
|
||||
}
|
||||
return price;
|
||||
})
|
||||
.reduce((total,value) => total + value, 0);
|
||||
return (1 + this.global_mod / 100) * total;
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.table td, .table th { vertical-align: middle; }
|
||||
.buttons { flex-wrap: nowrap; }
|
||||
label.is-checkbox {
|
||||
background-color: #eee;
|
||||
}
|
||||
</style>
|
||||
@@ -1,36 +0,0 @@
|
||||
<template>
|
||||
<nav class="navbar is-info">
|
||||
<div class="navbar-brand">
|
||||
<p class="navbar-item is-size-4"><slot name="title">...</slot></p>
|
||||
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false"
|
||||
@click="switchMobileVisibility">
|
||||
<span aria-hidden="true"></span>
|
||||
<span aria-hidden="true"></span>
|
||||
<span aria-hidden="true"></span>
|
||||
</a>
|
||||
</div>
|
||||
<div id="menu" class="navbar-menu" :class="{'is-active': showOnMobile }">
|
||||
<div class="navbar-end">
|
||||
<div class="navbar-item has-dropdown is-hoverable">
|
||||
<a class="navbar-link">Autres</a>
|
||||
<div class="navbar-dropdown is-right" @click="switchMobileVisibility">
|
||||
<slot name="links">
|
||||
<a class="navbar-item">History of Loot</a>
|
||||
</slot>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data () { return { showOnMobile: false } },
|
||||
methods: {
|
||||
switchMobileVisibility () {
|
||||
this.showOnMobile = !this.showOnMobile
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -1,109 +0,0 @@
|
||||
<template>
|
||||
<div class="field is-horizontal">
|
||||
<div class="field-label">
|
||||
<label class="label">Nouvel objet</label>
|
||||
</div>
|
||||
<div class="field-body">
|
||||
<div class="field">
|
||||
<div class="control is-expanded">
|
||||
<input type="text"
|
||||
name="name"
|
||||
placeholder="Nom de l'objet"
|
||||
v-model="item.name"
|
||||
@input="autoCompletion"
|
||||
class="input"
|
||||
autocomplete="on"
|
||||
>
|
||||
</div>
|
||||
<div class="dropdown" :class="{'is-active': showCompletionFrame}">
|
||||
<div class="dropdown-menu">
|
||||
<div class="dropdown-content">
|
||||
<a v-for="(result,i) in results"
|
||||
:key="i"
|
||||
@click="setResult(result)"
|
||||
class="dropdown-item"
|
||||
>{{ result.name }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field is-expanded has-addons" v-show="item.name != ''">
|
||||
<p class="control"><a class="button is-static">PO</a></p>
|
||||
<p class="control">
|
||||
<input type="text"
|
||||
name="base_price"
|
||||
placeholder="Prix"
|
||||
class="input"
|
||||
:class="{'is-danger': item.base_price == ''}"
|
||||
v-model.number="item.base_price"
|
||||
>
|
||||
</p>
|
||||
</div>
|
||||
<div class="field">
|
||||
<div class="control">
|
||||
<button class="button is-primary"
|
||||
@click="addItem"
|
||||
:disabled="!isItemValid"
|
||||
>Ajouter</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: ["source"],
|
||||
data () {
|
||||
return {
|
||||
is_loading: false,
|
||||
item: {
|
||||
id: 0,
|
||||
name: '',
|
||||
base_price: '',
|
||||
},
|
||||
results: [],
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
autoCompletion () {
|
||||
// Unset any previous value on input (for every field except item's name)
|
||||
this.item.base_price = '';
|
||||
if (this.item.name == '') {
|
||||
this.results = [];
|
||||
} else {
|
||||
this.results = this.source.filter(
|
||||
item => item.name.toUpperCase().includes(this.item.name.toUpperCase())
|
||||
);
|
||||
}
|
||||
},
|
||||
setResult(result) {
|
||||
this.item.id = result.id;
|
||||
this.item.name = result.name;
|
||||
this.item.base_price = result.base_price;
|
||||
// Clear results to close completionFrame
|
||||
this.results = [];
|
||||
},
|
||||
addItem () {
|
||||
this.$emit("addItem", this.item);
|
||||
this.item = {
|
||||
name: '',
|
||||
base_price: '',
|
||||
};
|
||||
this.results = [];
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
showCompletionFrame () { return this.results.length > 0 },
|
||||
isItemValid () { return this.item.name != '' && this.item.base_price != '' },
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.dropdown, .dropdown-menu {
|
||||
min-width: 100%;
|
||||
margin-top: 0;
|
||||
padding-top: 0;
|
||||
}
|
||||
</style>
|
||||
@@ -1,35 +0,0 @@
|
||||
<template>
|
||||
<div class="box">
|
||||
<ItemInput
|
||||
@addItem="onAddItem"
|
||||
:source="inventory"
|
||||
></ItemInput>
|
||||
<div class="field is-horizontal">
|
||||
<div class="field-label"><label class="label">ou</label></div>
|
||||
<div class="field-body">
|
||||
<div class="field">
|
||||
<div class="control">
|
||||
<button class="button is-primary">Depuis une liste</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button class="button is-danger" @click="$emit('confirmAction')">Finaliser</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ItemInput from './ItemInput.vue'
|
||||
|
||||
export default {
|
||||
props: ["inventory"],
|
||||
components: { ItemInput },
|
||||
data () { return {}; },
|
||||
methods: {
|
||||
onAddItem (item) {
|
||||
this.$emit('addItem', item);
|
||||
},
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
@@ -1,41 +0,0 @@
|
||||
<template>
|
||||
<div class="field has-addons">
|
||||
<div v-show="is_opened" class="control has-icons-left">
|
||||
<input class="input" :value="value" @input="input" type="number" size="3" min="-50" max=50 step=5>
|
||||
<span class="icon is-left">
|
||||
<i class="fas fa-percent"></i>
|
||||
</span>
|
||||
</div>
|
||||
<div class="control">
|
||||
<button class="button" @click="switchOpenedState">
|
||||
<small v-if="!is_opened">Mod.</small>
|
||||
<span v-else class="icon"><i class="fas fa-times-circle"></i></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: ["value"],
|
||||
data () {
|
||||
return {
|
||||
is_opened: false,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
input (event) { this.$emit("input", event.target.value); },
|
||||
switchOpenedState () {
|
||||
this.is_opened = !this.is_opened;
|
||||
// Reset the modifier in closed state
|
||||
if (!this.is_opened) {
|
||||
this.$emit("input", 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.input { width: 6em; }
|
||||
</style>
|
||||
@@ -1,118 +0,0 @@
|
||||
import { api } from '../lootalot.js'
|
||||
|
||||
export default {
|
||||
props: ["id", "players"],
|
||||
data () { return {
|
||||
player: {
|
||||
name: "Loading",
|
||||
id: 0,
|
||||
cp: '-', sp: '-', gp: '-', pp: '-',
|
||||
debt: 0,
|
||||
},
|
||||
notifications: [],
|
||||
loot: [],
|
||||
claims: {},
|
||||
}},
|
||||
created () {
|
||||
api.fetch("claims", "GET", null)
|
||||
.then(r => {
|
||||
for (var idx in r.value) {
|
||||
var claim = r.value[idx];
|
||||
if (!(claim.player_id in this.claims)) {
|
||||
this.$set(this.claims, claim.player_id, []);
|
||||
}
|
||||
this.claims[claim.player_id].push(claim.loot_id);
|
||||
}
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
parseUpdate (update) {
|
||||
if (update.Wealth) {
|
||||
var w = update.Wealth;
|
||||
this.player.cp += w.cp;
|
||||
this.player.sp += w.sp;
|
||||
this.player.gp += w.gp;
|
||||
this.player.pp += w.pp;
|
||||
}
|
||||
else if (update.ItemAdded) {
|
||||
var i = update.ItemAdded;
|
||||
this.loot.push(i);
|
||||
}
|
||||
else if (update.ItemRemoved) {
|
||||
var removed = update.ItemRemoved;
|
||||
var idx = this.loot.findIndex(item => item.id == removed.id);
|
||||
this.loot.splice(idx, 1);
|
||||
}
|
||||
else if (update.ClaimAdded) {
|
||||
var c = update.ClaimAdded;
|
||||
this.claims[c.player_id].push(c.loot_id);
|
||||
}
|
||||
else if (update.ClaimRemoved) {
|
||||
var c = update.ClaimRemoved;
|
||||
this.claims[c.player_id].splice(
|
||||
this.claims[c.player_id].indexOf(c.loot_id),
|
||||
1
|
||||
);
|
||||
}
|
||||
},
|
||||
call (resource, method, payload) {
|
||||
return api.fetch(`players/${this.id}/${resource}`, method, payload)
|
||||
.then(response => {
|
||||
if (response.notification) {
|
||||
this.notifications.push(response.notification)
|
||||
}
|
||||
if (response.errors) {
|
||||
this.notifications.push(response.errors)
|
||||
}
|
||||
if (response.updates) {
|
||||
for (var idx in response.updates) {
|
||||
this.parseUpdate(response.updates[idx]);
|
||||
}
|
||||
}
|
||||
return response.value;
|
||||
})
|
||||
},
|
||||
updateWealth (value) { this.call("wealth", "PUT", Number(value)) },
|
||||
putClaim (itemId) { this.call("claims", "PUT", itemId) },
|
||||
withdrawClaim (itemId) { this.call("claims", "DELETE", itemId) },
|
||||
buyItems(items) { this.call("loot", "PUT", items) },
|
||||
sellItems (items) {
|
||||
let players;
|
||||
if (this.player.id == 0) {
|
||||
players = this.players;
|
||||
} else {
|
||||
players = null;
|
||||
}
|
||||
this.call("loot", "DELETE", { items, global_mod: null, players })
|
||||
},
|
||||
undoLastAction () { this.call("events/last", "DELETE", null) },
|
||||
},
|
||||
watch: {
|
||||
id: {
|
||||
immediate: true,
|
||||
handler: function(newId) {
|
||||
this.call("", "GET", null)
|
||||
.then(p => this.player = p)
|
||||
this.call("loot", "GET", null)
|
||||
.then(l => this.loot = l)
|
||||
}
|
||||
},
|
||||
},
|
||||
computed: {},
|
||||
render () {
|
||||
return this.$scopedSlots.default({
|
||||
player: this.player,
|
||||
loot: this.loot,
|
||||
notifications: this.notifications,
|
||||
actions: {
|
||||
updateWealth: this.updateWealth,
|
||||
putClaim: this.putClaim,
|
||||
withdrawClaim: this.withdrawClaim,
|
||||
buyItems: this.buyItems,
|
||||
sellItems: this.sellItems,
|
||||
undoLastAction: this.undoLastAction,
|
||||
},
|
||||
claims: this.claims,
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
<template>
|
||||
<div class="buttons">
|
||||
<template v-if="isInConflict">
|
||||
<button class="button is-success"
|
||||
@click="cancelRequest">
|
||||
<span class="icon is-small">
|
||||
<i class="fas fa-hand-peace"></i>
|
||||
</span>
|
||||
</button>
|
||||
<button class="button is-danger"
|
||||
@click="hardenRequest">
|
||||
<span class="icon is-small">
|
||||
<i class="fas fa-hand-middle-finger"></i>
|
||||
</span>
|
||||
</button>
|
||||
</template>
|
||||
<button class="button is-primary"
|
||||
@click="putRequest"
|
||||
:disabled="isRequested">
|
||||
<span class="icon is-small">
|
||||
<i class="fas fa-praying-hands"></i>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: {
|
||||
// Id of active player
|
||||
id: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
// Map of all claims
|
||||
claims: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
// Id of item we are bound to
|
||||
item: {
|
||||
type: Number,
|
||||
required: true,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
// Check if item is requested by active player
|
||||
isRequested () {
|
||||
if (this.claims[this.id]) {
|
||||
return this.claims[this.id].includes(this.item);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
// Check if item is requested by multiple players including active one
|
||||
isInConflict () {
|
||||
var reqByPlayer = false;
|
||||
var reqByOther = false;
|
||||
for (var id in this.claims) {
|
||||
const isReq = this.claims[id].includes(this.item);
|
||||
if (isReq) {
|
||||
if (id == this.id) {
|
||||
reqByPlayer = true;
|
||||
} else {
|
||||
reqByOther = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return reqByPlayer && reqByOther;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
// The active player claims the item
|
||||
putRequest () {
|
||||
this.$emit("claim", this.item);
|
||||
},
|
||||
// The active player withdraws his request
|
||||
cancelRequest () {
|
||||
this.$emit("unclaim", this.item);
|
||||
},
|
||||
// The active player insist on his claim
|
||||
// TODO: Find a simple and fun system to express
|
||||
// how much each player want an item
|
||||
hardenRequest () {
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.buttons, .button { margin-bottom: 0; }
|
||||
</style>
|
||||
@@ -1,57 +0,0 @@
|
||||
<template>
|
||||
<div class="buttons has-addons">
|
||||
<label class="button is-fullwidth">
|
||||
<input type="checkbox" class="checkbox" v-model="selected">
|
||||
</label>
|
||||
<PercentInput v-show="selected" v-model.number="mod_value"></PercentInput>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import PercentInput from './PercentInput.vue'
|
||||
|
||||
/* Selector for a specific item, with an associated price modifier.
|
||||
Acts as checkbox on a v-model, except it populates an array with [value, modifier] instead of value alone
|
||||
*/
|
||||
|
||||
export default {
|
||||
props: ["id", "value"],
|
||||
components: { PercentInput },
|
||||
data () {
|
||||
return {
|
||||
selected: false,
|
||||
mod_value: 0,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
modifier () {
|
||||
return 1 + this.mod_value / 100;
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
selected (newState) {
|
||||
let idx = this._findData();
|
||||
var updated = this.value;
|
||||
if (newState == true && idx == -1) {
|
||||
updated.push([this.id, this.modifier]);
|
||||
} else if (newState == false && idx != -1 ) {
|
||||
updated.splice(idx, 1);
|
||||
}
|
||||
this.$emit('input', updated);
|
||||
},
|
||||
mod_value (newState) {
|
||||
let idx = this._findData();
|
||||
var updated = this.value;
|
||||
if (idx != -1) {
|
||||
updated.splice(idx, 1, [this.id, this.modifier]);
|
||||
this.$emit('input', updated);
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
_findData () {
|
||||
return this.value.findIndex(([val,mod]) => this.id == val);
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -1,97 +0,0 @@
|
||||
<template>
|
||||
<section class="level is-mobile">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<span class="icon is-large" @click="editing = !editing">
|
||||
<i class="fas fa-2x fa-piggy-bank"></i>
|
||||
</span>
|
||||
</div>
|
||||
<template v-if="editing">
|
||||
<div class="level-item">
|
||||
<div class="field has-addons">
|
||||
<p class="control">
|
||||
<input class="input" type="number" step="0.01" v-model="edit_value"></input>
|
||||
</p>
|
||||
<p class="control">
|
||||
<a class="button is-static">po</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<button class="button is-danger" @click="updateWealth()">
|
||||
Modifier
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class="level-item ">
|
||||
<p class="is-size-4">{{ pp }}</p>
|
||||
<p class="heading">PP</p>
|
||||
</div>
|
||||
<div class="level-item ">
|
||||
<p class="is-size-4">{{ gp }}</p>
|
||||
<p class="heading">PO</p>
|
||||
</div>
|
||||
<div class="level-item ">
|
||||
<p class="is-size-4 has-text-grey-light">{{ sp }}</p>
|
||||
<p class="heading">PA</p>
|
||||
</div>
|
||||
<div class="level-item ">
|
||||
<p class="is-size-4 has-text-grey-light">{{ cp }}</p>
|
||||
<p class="heading">PC</p>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div class="level-right" v-if="debt">
|
||||
<div class="level-item">
|
||||
<p class="heading is-size-4 has-text-danger">Dette: {{ debt }}gp </p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: ["wealth", "debt"],
|
||||
data () {
|
||||
return {
|
||||
editing: false,
|
||||
edit_value: 0,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
updateWealth () {
|
||||
this.$emit("update", this.edit_value);
|
||||
this.resetValues();
|
||||
},
|
||||
resetValues () {
|
||||
this.editing = false;
|
||||
this.edit_value = 0;
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
pp () {
|
||||
return this.wealth[3];
|
||||
},
|
||||
gp () {
|
||||
const gp = this.wealth[2];
|
||||
if (gp < 10) {
|
||||
return "0" + gp;
|
||||
} else {
|
||||
return gp;
|
||||
}
|
||||
},
|
||||
sp () {
|
||||
return this.wealth[1];
|
||||
},
|
||||
cp () {
|
||||
return this.wealth[0];
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.input { max-width: 9em; }
|
||||
</style>
|
||||
@@ -1,20 +0,0 @@
|
||||
const API_BASEURL = "http://localhost:8088/api/"
|
||||
const API_ENDPOINT = function (tailString) {
|
||||
return API_BASEURL + tailString;
|
||||
}
|
||||
|
||||
export const api = {
|
||||
fetch: function(endpoint, method, payload) {
|
||||
var config = {
|
||||
method,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
};
|
||||
if (payload) {
|
||||
config.body = JSON.stringify(payload);
|
||||
}
|
||||
return fetch(API_ENDPOINT(endpoint), config)
|
||||
.then(r => r.json());
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
import Vue from 'vue'
|
||||
import App from './App.vue'
|
||||
|
||||
Vue.config.productionTip = false
|
||||
|
||||
new Vue({
|
||||
render: h => h(App),
|
||||
}).$mount('#app')
|
||||
@@ -1,5 +0,0 @@
|
||||
module.exports = {
|
||||
env: {
|
||||
mocha: true
|
||||
}
|
||||
}
|
||||
@@ -1,94 +0,0 @@
|
||||
import { expect } from 'chai'
|
||||
import { mount } from '@vue/test-utils'
|
||||
import ItemInput from '@/components/ItemInput.vue'
|
||||
|
||||
const MOCK_SOURCE = [
|
||||
{ id: 1, name: "Épée", base_price: 20 },
|
||||
{ id: 2, name: "Arc", base_price: 30 },
|
||||
]
|
||||
|
||||
const withItemFactory = function (item) {
|
||||
const wrapper = mount(ItemInput, {
|
||||
propsData: {
|
||||
source: MOCK_SOURCE,
|
||||
}
|
||||
})
|
||||
wrapper.setData({ item })
|
||||
return wrapper
|
||||
}
|
||||
|
||||
describe('ItemInput.vue', () => {
|
||||
|
||||
// Tests on validation of the item data
|
||||
it('item with name and price is valid', () => {
|
||||
const localItem = {
|
||||
item: {
|
||||
id: 0,
|
||||
name: 'Epee',
|
||||
base_price: 200
|
||||
}
|
||||
}
|
||||
expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(true)
|
||||
})
|
||||
|
||||
it('item without data is not valid', () => {
|
||||
const localItem = {
|
||||
item: {
|
||||
id: 0,
|
||||
name: '',
|
||||
base_price: ''
|
||||
}
|
||||
}
|
||||
expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(false)
|
||||
})
|
||||
|
||||
it('item without price is not valid', () => {
|
||||
const localItem = {
|
||||
item: {
|
||||
id: 0,
|
||||
name: 'Epee',
|
||||
base_price: ''
|
||||
}
|
||||
}
|
||||
expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(false)
|
||||
})
|
||||
|
||||
it('item without name is not valid', () => {
|
||||
const localItem = {
|
||||
item: {
|
||||
id: 0,
|
||||
name: '',
|
||||
base_price: 200
|
||||
}
|
||||
}
|
||||
expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(false)
|
||||
})
|
||||
|
||||
it('item price must be a number', () => {
|
||||
const localItem = {
|
||||
item: {
|
||||
id: 0,
|
||||
name: 'Epee',
|
||||
base_price: 'cheap'
|
||||
}
|
||||
}
|
||||
expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(false)
|
||||
})
|
||||
|
||||
// Test on auto-completion
|
||||
it('show completion suggestions on input', () => {
|
||||
const wrapper = withItemFactory({ id: 0, name: '', base_price: '' })
|
||||
const input = wrapper.find({ name: "name" })
|
||||
const suggestionBox = wrapper.find('.dropdown')
|
||||
console.log(input)
|
||||
expect(suggestionBox.classes('is-active')).to.equal(true)
|
||||
})
|
||||
|
||||
it('hides suggestion box when no suggestions are available', () => {
|
||||
|
||||
})
|
||||
|
||||
it('click on suggestion sets the item', () => {
|
||||
|
||||
})
|
||||
})
|
||||
@@ -1,14 +0,0 @@
|
||||
import { expect } from 'chai'
|
||||
import { shallowMount } from '@vue/test-utils'
|
||||
import Wealth from '@/components/Wealth.vue'
|
||||
|
||||
describe('Wealth.vue', () => {
|
||||
it('renders wealth when passed', () => {
|
||||
const wealth = [1, 2, 3, 4]
|
||||
const wrapper = shallowMount(Wealth, {
|
||||
propsData: { wealth }
|
||||
})
|
||||
var divs = wrapper.findAll('div')
|
||||
expect(wrapper.text()).to.include(wealth)
|
||||
})
|
||||
})
|
||||
27
src/api.rs
27
src/api.rs
@@ -16,9 +16,16 @@ pub struct BuySellParams {
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct NewGroupLoot {
|
||||
source_name: String,
|
||||
// claims_limit_date: String
|
||||
pub items: ItemList,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct NewPlayer {
|
||||
name : String,
|
||||
wealth : f64,
|
||||
}
|
||||
|
||||
/// A generic response for all queries
|
||||
#[derive(Serialize, Debug, Default)]
|
||||
pub struct ApiResponse {
|
||||
@@ -80,14 +87,12 @@ pub enum ApiActions {
|
||||
BuyItems(i32, BuySellParams),
|
||||
SellItems(i32, BuySellParams),
|
||||
ClaimItems(i32, IdList),
|
||||
ClaimItem(i32, i32),
|
||||
UnclaimItem(i32, i32),
|
||||
UndoLastAction(i32),
|
||||
// Group level
|
||||
AddLoot(NewGroupLoot),
|
||||
// Admin level
|
||||
RefreshShopInventory(ItemList),
|
||||
//AddPlayer(String, f64),
|
||||
AddPlayer(NewPlayer),
|
||||
//AddInventoryItem(pub String, pub i32),
|
||||
//ResolveClaims,
|
||||
//SetClaimsTimeout(pub i32),
|
||||
@@ -235,16 +240,6 @@ pub fn execute(
|
||||
Ok(Some((id, "Vente d'objets")))
|
||||
})?
|
||||
}
|
||||
ApiActions::ClaimItem(id, item) => {
|
||||
response.push_update(db::Claims(conn).add(id, item)?);
|
||||
response.notify("Pour moi !".to_string());
|
||||
None
|
||||
}
|
||||
ApiActions::UnclaimItem(id, item) => {
|
||||
response.push_update(db::Claims(conn).remove(id, item)?);
|
||||
response.notify("Bof! Finalement non.".to_string());
|
||||
None
|
||||
}
|
||||
ApiActions::ClaimItems(id, items) => {
|
||||
conn.transaction(|| -> Result<Option<(i32, &str)>, diesel::result::Error> {
|
||||
let current_claims: HashSet<i32> = db::Claims(conn)
|
||||
@@ -300,6 +295,12 @@ pub fn execute(
|
||||
// Admin actions
|
||||
ApiActions::RefreshShopInventory(items) => {
|
||||
db::Shop(conn).replace_list(items)?;
|
||||
response.notify("Inventaire du marchand renouvelé !");
|
||||
None
|
||||
}
|
||||
ApiActions::AddPlayer(data) => {
|
||||
db::Players(conn).add(&data.name, data.wealth)?;
|
||||
response.notify("Joueur ajouté !");
|
||||
None
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,9 +11,8 @@ use futures::{
|
||||
future::{ok, Either, FutureResult},
|
||||
Future,
|
||||
};
|
||||
use std::env;
|
||||
use serde_json;
|
||||
|
||||
use std::env;
|
||||
|
||||
use crate::api;
|
||||
use lootalot_db as db;
|
||||
@@ -110,7 +109,12 @@ fn configure_api(config: &mut web::ServiceConfig) {
|
||||
web::scope("/players")
|
||||
.service(
|
||||
web::resource("/")
|
||||
.route(web::get().to_async(|pool| db_call(pool, Q::FetchPlayers))), //.route(web::post().to_async(endpoints::new_player))
|
||||
.route(web::get().to_async(|pool| db_call(pool, Q::FetchPlayers)))
|
||||
.route(web::post().to_async(
|
||||
|pool, player: web::Json<api::NewPlayer>| {
|
||||
db_call(pool, Q::AddPlayer(player.into_inner()))
|
||||
},
|
||||
)),
|
||||
) // List of players
|
||||
.service(
|
||||
web::scope("/{player_id}")
|
||||
@@ -135,16 +139,6 @@ fn configure_api(config: &mut web::ServiceConfig) {
|
||||
|pool, (player, data): (PlayerId, IdList)| {
|
||||
db_call(pool, Q::ClaimItems(*player, data.into_inner()))
|
||||
},
|
||||
))
|
||||
.route(web::put().to_async(
|
||||
|pool, (player, data): (PlayerId, ItemId)| {
|
||||
db_call(pool, Q::ClaimItem(*player, *data))
|
||||
},
|
||||
))
|
||||
.route(web::delete().to_async(
|
||||
|pool, (player, data): (PlayerId, ItemId)| {
|
||||
db_call(pool, Q::UnclaimItem(*player, *data))
|
||||
},
|
||||
)),
|
||||
)
|
||||
.service(
|
||||
@@ -223,7 +217,7 @@ struct AuthRequest {
|
||||
#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
|
||||
enum SessionKind {
|
||||
Player(i32),
|
||||
Admin
|
||||
Admin,
|
||||
}
|
||||
|
||||
use std::collections::HashMap;
|
||||
@@ -233,16 +227,18 @@ fn check_key(key: &str, db: HashMap<&str, SessionKind>) -> Option<SessionKind> {
|
||||
}
|
||||
|
||||
fn login(id: Identity, key: web::Query<AuthRequest>) -> HttpResponse {
|
||||
if let Some(session_kind) =
|
||||
check_key(
|
||||
if let Some(session_kind) = check_key(
|
||||
&key.key.to_string(),
|
||||
[("0", SessionKind::Player(0)),
|
||||
[
|
||||
("0", SessionKind::Player(0)),
|
||||
("1", SessionKind::Player(1)),
|
||||
("2", SessionKind::Player(2)),
|
||||
("admin", SessionKind::Admin),
|
||||
].iter().cloned().collect::<HashMap<&str, SessionKind>>()
|
||||
)
|
||||
{
|
||||
]
|
||||
.iter()
|
||||
.cloned()
|
||||
.collect::<HashMap<&str, SessionKind>>(),
|
||||
) {
|
||||
id.remember(serde_json::to_string(&session_kind).expect("Serialize SessionKind error"));
|
||||
HttpResponse::build(StatusCode::TEMPORARY_REDIRECT)
|
||||
.header(header::LOCATION, "/")
|
||||
@@ -250,7 +246,6 @@ fn login(id: Identity, key: web::Query<AuthRequest>) -> HttpResponse {
|
||||
} else {
|
||||
HttpResponse::Forbidden().finish()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fn logout(id: Identity) -> HttpResponse {
|
||||
@@ -278,28 +273,30 @@ fn enter_session(id: Identity, pool: AppPool) -> impl Future<Item = HttpResponse
|
||||
// unlogged case with web::block below
|
||||
.unwrap_or(SessionKind::Player(-1));
|
||||
|
||||
web::block(move || api::execute(&conn, match logged {
|
||||
web::block(move || {
|
||||
api::execute(
|
||||
&conn,
|
||||
match logged {
|
||||
SessionKind::Player(id) => api::ApiActions::FetchPlayer(id),
|
||||
SessionKind::Admin => api::ApiActions::FetchPlayers
|
||||
}
|
||||
)).then(
|
||||
|res| match res {
|
||||
SessionKind::Admin => api::ApiActions::FetchPlayers,
|
||||
},
|
||||
)
|
||||
})
|
||||
.then(|res| match res {
|
||||
Ok(r) => HttpResponse::Ok().json(r.value),
|
||||
Err(e) => {
|
||||
dbg!(&e);
|
||||
HttpResponse::Forbidden().finish()
|
||||
}
|
||||
},
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
pub fn serve() -> std::io::Result<()> {
|
||||
let www_root: String = env::var("WWW_ROOT").expect("WWW_ROOT must be set");
|
||||
let domain: String = env::var("DOMAIN").expect("DOMAIN must be set");
|
||||
let pool = db::create_pool();
|
||||
dbg!(&www_root);
|
||||
println!("Serving Loot-a-lot on {}", domain);
|
||||
|
||||
let key = [0; 32]; // TODO: Use a real key
|
||||
let domain = "http://localhost:8088";
|
||||
|
||||
HttpServer::new(move || {
|
||||
App::new()
|
||||
@@ -307,7 +304,7 @@ pub fn serve() -> std::io::Result<()> {
|
||||
.configure(configure_api)
|
||||
.wrap(
|
||||
Cors::new()
|
||||
.allowed_origin(domain)
|
||||
.allowed_origin(&domain)
|
||||
.allowed_methods(vec!["GET", "POST", "PUT", "DELETE", "OPTIONS"])
|
||||
.max_age(3600),
|
||||
)
|
||||
@@ -321,7 +318,7 @@ pub fn serve() -> std::io::Result<()> {
|
||||
.route("/session", web::get().to_async(enter_session))
|
||||
.route("/login", web::get().to(login))
|
||||
.route("/logout", web::get().to(logout))
|
||||
.service(fs::Files::new("/", www_root.clone()).index_file("index.html"))
|
||||
//.service(fs::Files::new("/", www_root.clone()).index_file("index.html"))
|
||||
})
|
||||
.bind("127.0.0.1:8088")?
|
||||
.run()
|
||||
|
||||
Reference in New Issue
Block a user