Added dataset tabs

backend/database/datasets.py

@@ -7,6 +7,7 @@
 
 import os
 
+
 class DatasetModel(DynamicDocument):
 
     id = SequenceField(primary_key=True)
@@ -40,36 +41,14 @@ def save(self, *args, **kwargs):
             self.owner = 'system'
 
         return super(DatasetModel, self).save(*args, **kwargs)
+
+    def get_users(self):
+        from .users import UserModel
 
-    # def download_images(self, keywords, limit=100):
-
-    #     task = TaskModel(
-    #         name="Downloading {} images to {} with keywords {}".format(limit, self.name, keywords),
-    #         dataset_id=self.id,
-    #         group="Downloading Images"
-    #     )
-
-    #     def download_images(task, dataset, keywords, limit):
-    #         def custom_print(string):
-    #             __builtins__.print("%f -- %s" % (time.time(), string))
-
-    #             print = dprint
-    #             task.log()
-    #         for keyword in args['keywords']:
-    #             response = gid.googleimagesdownload()
-    #             response.download({
-    #                 "keywords": keyword,
-    #                 "limit": args['limit'],
-    #                 "output_directory": output_dir,
-    #                 "no_numbering": True,
-    #                 "format": "jpg",
-    #                 "type": "photo",
-    #                 "print_urls": False,
-    #                 "print_paths": False,
-    #                 "print_size": False
-    #             })
-
-    #     return task
+        members = self.users
+        members.append(self.owner)
+
+        return UserModel.objects(username__in=members).exclude('password', 'id', 'preferences')
 
     def import_coco(self, coco_json):
 

backend/database/users.py

@@ -89,7 +89,8 @@ def can_edit(self, model):
         return model.can_edit(self)
 
     def _update_last_seen(self):
-        self.update(last_seen=datetime.datetime.now())
+        self.update(last_seen=datetime.datetime.utcnow())
+
 
 
 __all__ = ["UserModel"]

backend/webserver/api/annotations.py

@@ -37,7 +37,6 @@ def post(self):
         metadata = args.get('metadata', {})
         segmentation = args.get('segmentation', [])
         keypoints = args.get('keypoints', [])
-        color = args.get('color')
 
         logger.info(f'{current_user.username} has created an annotation for image {image_id}')
 

backend/webserver/api/annotator.py

@@ -9,7 +9,6 @@
 from config import Config
 from database import (
     ImageModel,
-    DatasetModel,
     CategoryModel,
     AnnotationModel,
     SessionEvent

backend/webserver/api/datasets.py

@@ -118,6 +118,22 @@ def post(self, dataset_id):
         return {"success": True}
 
 
+@api.route('/<int:dataset_id>/users')
+class DatasetMembers(Resource):
+
+    @login_required
+    def get(self, dataset_id):
+        """ All users in the dataset """
+        args = dataset_generate.parse_args()
+
+        dataset = current_user.datasets.filter(id=dataset_id, deleted=False).first()
+        if dataset is None:
+            return {"message": "Invalid dataset id"}, 400
+
+        users = dataset.get_users()
+        return query_util.fix_ids(users)
+
+
 @api.route('/<int:dataset_id>')
 class DatasetId(Resource):
     @login_required

backend/webserver/api/images.py

@@ -7,7 +7,6 @@
 from database import (
     ImageModel,
     DatasetModel,
-    CategoryModel,
     AnnotationModel
 )
 

backend/webserver/api/undo.py

@@ -1,5 +1,5 @@
 from flask_restplus import Namespace, Resource, reqparse
-from flask_login import login_required, current_user
+from flask_login import login_required
 
 import os
 import shutil

backend/webserver/sockets.py

@@ -34,7 +34,6 @@ def wrapped(*args, **kwargs):
 @socketio.on('annotation')
 @authenticated_only
 def annotation(data):
-    image_id = data.get('image_id')
     emit('annotation', data, broadcast=True)
 
 

backend/webserver/watcher.py

@@ -5,8 +5,6 @@
 from database import ImageModel
 
 import re
-import time
-import threading
 
 
 class ImageFolderHandler(FileSystemEventHandler):

client/src/components/Pagination.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="row justify-content-md-center bg-light">
+  <div class="row align-items-center justify-content-center bg-light">
     <ul class="pagination text-center">
       <li class="page-item" @click="previousPage">
         <a class="page-link" aria-label="Previous">
@@ -92,3 +92,10 @@ export default {
   }
 };
 </script>
+
+<style>
+.page {
+    display:block;
+    margin:0 auto;
+}
+</style>

client/src/components/cards/ImageCard.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="col-md-3">
     <div
-      class="card mb-4 box-shadow"
+      class="card mb-4 shadow-sm"
       :class="{'border': annotated, 'border-danger': annotated}"
       @mouseover="hover = true"
       @mouseleave="hover = false"

client/src/components/tasks/TaskGroup.vue

@@ -2,7 +2,7 @@
   <div style="margin: 10px">
     <div class="card">
 
-     <div class="card-header text-left" @click="showTasks = !showTasks">
+      <div class="card-header text-left" @click="showTasks = !showTasks">
         {{ name }}
 
         <span style="float: right; color: light-gray">

client/src/models/datasets.js

@@ -1,52 +1,55 @@
 import axios from "axios";
 
-const baseURL = "/api/dataset/";
+const baseURL = "/api/dataset";
 
 export default {
   allData(params) {
-    return axios.get(baseURL + "data", {
+    return axios.get(`${baseURL}/data`, {
       params: {
         ...params
       }
     });
   },
   getData(id, params) {
-    return axios.get(baseURL + `${id}/data`, {
+    return axios.get(`${baseURL}/${id}/data`, {
       params: {
         ...params
       }
     });
   },
   create(name, categories) {
-    return axios.post(baseURL + `?name=${name}`, {
+    return axios.post(`${baseURL}/?name=${name}`, {
       categories: categories
     });
   },
   generate(id, body) {
-    return axios.post(baseURL + `${id}/generate`, {
+    return axios.post(`${baseURL}/${id}/generate`, {
       ...body
     });
   },
   scan(id) {
-    return axios.get(baseURL + `${id}/scan`);
+    return axios.get(`${baseURL}/${id}/scan`);
   },
   exportingCOCO(id) {
-    return axios.get(baseURL + `${id}/export`);
+    return axios.get(`${baseURL}/${id}/export`);
   },
   getCoco(id) {
-    return axios.get(baseURL + `${id}/coco`);
+    return axios.get(`${baseURL}/${id}/coco`);
   },
   uploadCoco(id, file) {
     let form = new FormData();
     form.append("coco", file);
 
-    return axios.post(baseURL + `${id}/coco`, form, {
+    return axios.post(`${baseURL}/${id}/coco`, form, {
       headers: {
         "Content-Type": "multipart/form-data"
       }
     });
   },
   export(id, format) {
-    return axios.get(baseURL + `${id}/${format}`);
+    return axios.get(`${baseURL}/${id}/${format}`);
+  },
+  getUsers(id) {
+    return axios.get(`${baseURL}/${id}/users`);
   }
 };