diff --git a/src/components/ModelCard.vue b/src/components/ModelCard.vue index 7c8a1f74a536038e501345d76d48535fdc85db97..6cd31f9567e6ae0b842178cfec61e9c58304f342 100644 --- a/src/components/ModelCard.vue +++ b/src/components/ModelCard.vue @@ -16,8 +16,10 @@ </b-taglist> </div> </div> - <div class="media-right"> - <h2 class="title is-4">{{model.votes}} votes</h2> + <div class="media-right details"> + <h2 class="title">{{model.votes}} votes</h2> + <h2>{{model.parameterCount}} parameters</h2> + <h2>{{model.performance}} {{model.performanceUnit}}</h2> </div> </article> </a> @@ -39,4 +41,8 @@ export default { .box { margin-bottom: 10px; } + +.details { + text-align: right; +} </style> diff --git a/src/main.js b/src/main.js index aeaa0a34ddcfb7f26ab87c459650cf5b6a1a9c62..33ad0b8f8fd649d8c90e9d0e1438fcb487d51707 100644 --- a/src/main.js +++ b/src/main.js @@ -9,7 +9,7 @@ Vue.use(Buefy) Vue.config.productionTip = false // Vue.prototype.$serverurl = process.env.VUE_APP_SERVER_URL -Vue.prototype.$serverurl = 'https://mozen.gltronic.ovh/' +Vue.prototype.$serverurl = 'http://localhost:8181/' new Vue({ router, diff --git a/src/views/Admin.vue b/src/views/Admin.vue index 2d47afb646350a3a954dce1d84fc61e72c660933..52099b934769786d4ab7732008cb022dbb70ce11 100644 --- a/src/views/Admin.vue +++ b/src/views/Admin.vue @@ -23,6 +23,7 @@ </b-table-column> <b-table-column label="" centered> + <b-button class="actionButton" icon-left="eye" type="is-info" tag="router-link" :to="{ name: 'Model', query: { id: props.row.id } }" outlined/> <b-button class="actionButton" icon-left="delete" type="is-danger" @click="removePrompt(props.row.id, props.row.name, 'model')" outlined/> </b-table-column> </template> @@ -77,6 +78,9 @@ </template> </b-table> </b-tab-item> + + <b-tab-item label="Comments"> + </b-tab-item> </b-tabs> </div> </div> diff --git a/src/views/Model.vue b/src/views/Model.vue index fec946b73b293d55e0eb2b7ec89090df203aefa3..06aea1ffe4ba348d6c2afcf4fb2771cbd1bf1c0c 100644 --- a/src/views/Model.vue +++ b/src/views/Model.vue @@ -26,17 +26,15 @@ <br> <small>Last modification: </small><strong>{{new Date(model.lastModified).toLocaleDateString()}}</strong> <br> + <small>parameters: </small><strong>{{model.parameterCount}}</strong> <br> - <b-button type="is-primary" size="is-medium" icon-left="download"> + <small>{{model.performanceUnit}}: </small><strong>{{model.performance}}</strong> + <br> + <br> + <b-button v-if="model.checksum" type="is-primary" size="is-medium" icon-left="download"> Download model </b-button> - <a - class="button is-primary is-medium" - icon-left="download" - :href="downloadUrl" - download> - Download model - </a> + <h2 v-else class="title is-5">No file provided</h2> <hr> <strong>{{model.customLayers.length}} customs layers</strong> <br> @@ -55,11 +53,14 @@ <b-tab-item label="Layers"> </b-tab-item> + + <b-tab-item label="Comments"> + <div class="box"> + <Comments v-bind:comments="model.comments"/> + </div> + </b-tab-item> </b-tabs> </div> - <div class="box"> - <Comments v-bind:comments="model.comments"/> - </div> </div> <b-loading :is-full-page="false" :active.sync="isLoading"/> </div> diff --git a/src/views/ModelAdd.vue b/src/views/ModelAdd.vue index 851b125e77c945292ff987162435967f6383c406..9acae99427ec4c358de2cffbb7787c0d84b47863 100644 --- a/src/views/ModelAdd.vue +++ b/src/views/ModelAdd.vue @@ -13,6 +13,17 @@ <b-field label="Long description"> <markdownEditor v-bind:input="model.longDescription" v-on:update-description="model.longDescription = $event"/> </b-field> + + <b-field label="Performance"> + <b-field> + <b-input type="number" placeholder="98" step="0.01" v-model="model.performance"/> + <b-autocomplete open-on-focus placeholder="accuracy" :data="performanceTypes" v-model="model.performanceUnit"/> + </b-field> + </b-field> + + <b-field label="Number of parameters"> + <b-input type="number" min="0" placeholder="0" v-model="model.parameterCount"/> + </b-field> </b-step-item> <b-step-item step="2" label="Tags" clickable> @@ -69,7 +80,12 @@ export default { return { model: {}, activeStep: 0, - isUploadModalActive: false + isUploadModalActive: false, + performanceTypes: [ + 'accuracy', + 'error rate', + 'MSE' + ] } }, methods: { diff --git a/src/views/ModelEdit.vue b/src/views/ModelEdit.vue index f15565d94009b36cbbede21e70447d1d6a1705b1..b047404dd4c8c0463c53ffa2cbe1d747a03fda4f 100644 --- a/src/views/ModelEdit.vue +++ b/src/views/ModelEdit.vue @@ -16,6 +16,17 @@ <markdownEditor v-bind:input="model.longDescription" v-on:update-description="model.longDescription = $event"/> </b-field> + <b-field label="Performance"> + <b-field> + <b-input type="number" placeholder="98" step="0.01" v-model="model.performance"/> + <b-autocomplete open-on-focus placeholder="accuracy" :data="performanceTypes" v-model="model.performanceUnit"/> + </b-field> + </b-field> + + <b-field label="Number of parameters"> + <b-input type="number" min="0" placeholder="0" v-model="model.parameterCount"/> + </b-field> + <hr> <h1 class="title">Tags</h1> <tagEditor v-bind:modelTags="model.tags" v-on:update-tags="model.tags = $event"/> diff --git a/src/views/Search.vue b/src/views/Search.vue index f1a46d012973e64aafb3f51499398c7482ed7746..192d24e0527a5ea2c00fda99db0da8f1cb725922 100644 --- a/src/views/Search.vue +++ b/src/views/Search.vue @@ -18,6 +18,8 @@ <b-select placeholder="Order by" icon="filter" @input="setOrder"> <option value="votes">Most vote</option> <option value="lastModified">Most recent</option> + <option value="performance">Best performance</option> + <option value="parameterCount">Less parameters</option> </b-select> </b-field> <h1 class="title is-6">{{result.totalResult}} results - page {{result.page}} of {{result.totalPage}}</h1>