diff --git a/frontend/src/components/AuthenticatedImage.vue b/frontend/src/components/AuthenticatedImage.vue index 4c62beb..5f3f0f3 100644 --- a/frontend/src/components/AuthenticatedImage.vue +++ b/frontend/src/components/AuthenticatedImage.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue index 66b379e..b76e1c9 100644 --- a/frontend/src/components/Sidebar.vue +++ b/frontend/src/components/Sidebar.vue @@ -21,6 +21,12 @@ Friends +
  • + + + Files + +
  • diff --git a/frontend/src/components/WebcamFileSource.vue b/frontend/src/components/WebcamFileSource.vue new file mode 100644 index 0000000..a6686de --- /dev/null +++ b/frontend/src/components/WebcamFileSource.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/WebcamFileSourceLegacy.vue b/frontend/src/components/WebcamFileSourceLegacy.vue new file mode 100644 index 0000000..67fdeca --- /dev/null +++ b/frontend/src/components/WebcamFileSourceLegacy.vue @@ -0,0 +1,163 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/router.js b/frontend/src/router.js index 0d31dcf..761bac9 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -12,6 +12,7 @@ import InventoryNew from "@/views/InventoryNew.vue"; import InventoryEdit from "@/views/InventoryEdit.vue"; import InventoryDetail from "@/views/InventoryDetail.vue"; import Admin from "@/views/Admin.vue"; +import Files from "@/views/Files.vue"; const routes = [ @@ -23,6 +24,7 @@ const routes = [ {path: '/inventory/:id/edit', component: InventoryEdit, meta: {requiresAuth: true}, props: true}, {path: '/inventory/new', component: InventoryNew, meta: {requiresAuth: true}}, {path: '/friends', component: Friends, meta: {requiresAuth: true}}, + {path: '/files', component: Files, meta: {requiresAuth: true}}, {path: '/admin', component: Admin, meta: {requiresAuth: true}}, {path: '/search/:query', component: Search, meta: {requiresAuth: true}, props: true}, {path: '/login', component: Login, meta: {requiresAuth: false}}, diff --git a/frontend/src/store.js b/frontend/src/store.js index 79056cb..07609e0 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -27,6 +27,7 @@ export default createStore({ categories: [], availability_policies: [], domains: [], + storage_locations: [], }, mutations: { setUser(state, user) { @@ -80,6 +81,9 @@ export default createStore({ setDomains(state, domains) { state.domains = domains; }, + setStorageLocations(state, storage_locations) { + state.storage_locations = storage_locations; + }, setFiles(state, files) { state.files = files; }, @@ -187,11 +191,14 @@ export default createStore({ async createInventoryItem({state, dispatch, getters}, item) { const servers = await dispatch('getHomeServers') const data = {availability_policy: 'friends', ...item} - return await servers.post(getters.signAuth, '/api/inventory_items/', data) + const reply = await servers.post(getters.signAuth, '/api/inventory_items/', data) + state.last_load.files = 0 + return reply }, async updateInventoryItem({state, dispatch, getters}, item) { const servers = await dispatch('getHomeServers') const data = {availability_policy: 'friends', ...item} + data.files = data.files.map(file => file.id) return await servers.patch(getters.signAuth, '/api/inventory_items/' + item.id + '/', data) }, async deleteInventoryItem({state, dispatch, getters}, item) { @@ -249,9 +256,13 @@ export default createStore({ }) return true }, - async declineFriend({state, dispatch}, args) { - // TODO implement - console.log('declining friend ' + args) + async declineFriend({state, dispatch, getters}, {id}) { + const servers = await dispatch('getHomeServers') + return await servers.delete(getters.signAuth, '/api/friendrequests/' + id + '/') + }, + async dropFriend({state, dispatch, getters}, {id}) { + const servers = await dispatch('getHomeServers') + return await servers.delete(getters.signAuth, '/api/friends/' + id + '/') }, async fetchFiles({state, commit, dispatch, getters}) { if (state.last_load.files > Date.now() - 1000 * 60 * 60 * 24) { @@ -277,6 +288,16 @@ export default createStore({ return data } }, + async deleteFile({state, dispatch, getters}, {id}) { + const servers = await dispatch('getHomeServers') + await servers.delete(getters.signAuth, '/api/files/' + id + '/') + state.files = state.files.filter(file => file.id !== id) + }, + async deleteItemFile({state, dispatch, getters}, {item_id, file_id}) { + const servers = await dispatch('getHomeServers') + await servers.delete(getters.signAuth, '/api/item_files/' + item_id + '/' + file_id + '/') + state.files = state.files.filter(file => file.id !== file_id) + }, async fetchTags({state, commit, dispatch, getters}) { if (state.last_load.tags > Date.now() - 1000 * 60 * 60 * 24) { return state.tags @@ -317,6 +338,16 @@ export default createStore({ state.last_load.availability_policies = Date.now() return data }, + async fetchStorageLocations({state, commit, dispatch, getters}) { + if (state.last_load.storage_locations > Date.now() - 1000 * 60 * 60 * 24) { + return state.storage_locations + } + const servers = await dispatch('getHomeServers') + const data = await servers.get(getters.signAuth, '/api/storage_locations/') + commit('setStorageLocations', data) + state.last_load.storage_locations = Date.now() + return data + }, async fetchInfo({state, commit, dispatch, getters}) { const last_load_info = Math.min( state.last_load.tags, @@ -331,7 +362,7 @@ export default createStore({ commit('setTags', data.tags) commit('setProperties', data.properties) commit('setCategories', data.categories) - commit('setAvailabilityPolicies', data.policies) + commit('setAvailabilityPolicies', data.availability_policies) commit('setDomains', data.domains) state.last_load.tags = Date.now() state.last_load.properties = Date.now() diff --git a/frontend/src/views/Admin.vue b/frontend/src/views/Admin.vue index 338e4de..43020a2 100644 --- a/frontend/src/views/Admin.vue +++ b/frontend/src/views/Admin.vue @@ -67,6 +67,18 @@ +
    +
    +
    Storage Locations
    +
    +
    +
      +
    • + {{ location.path }} +
      • +
    +
    +
    @@ -86,13 +98,14 @@ export default { ...BIcons }, computed: { - ...mapState(["tags", "properties", "categories", "availability_policies", "domains"]), + ...mapState(["tags", "properties", "categories", "availability_policies", "domains", "storage_locations"]) }, methods: { - ...mapActions(["fetchInfo"]), + ...mapActions(["fetchInfo", "fetchStorageLocations"]) }, async mounted() { await this.fetchInfo(); + await this.fetchStorageLocations(); } } diff --git a/frontend/src/views/Files.vue b/frontend/src/views/Files.vue new file mode 100644 index 0000000..15a0e35 --- /dev/null +++ b/frontend/src/views/Files.vue @@ -0,0 +1,71 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/Friends.vue b/frontend/src/views/Friends.vue index 0075574..e584a36 100644 --- a/frontend/src/views/Friends.vue +++ b/frontend/src/views/Friends.vue @@ -39,13 +39,13 @@ {{ friend.username }} - {{ friend.server.join(', ') }} + {{ friend.server.join(', ')}} - + + Delete @@ -85,7 +85,7 @@ Accept   - @@ -129,7 +129,8 @@ export default { } }, methods: { - ...mapActions(['fetchFriends', "lookupServer", "requestFriend", "acceptFriend", "fetchFriendRequests", "declineFriend"]), + ...mapActions(['fetchFriends', "lookupServer", "requestFriend", "acceptFriend", "fetchFriendRequests", + "declineFriend", "dropFriend"]), fetchContent() { this.fetchFriends().then((friends) => { friends.map((friend) => { @@ -163,8 +164,16 @@ export default { }).catch(() => { }) }, - tryRejectFriend(friend) { - this.declineFriend({username: friend}).then((ok) => { + tryDropFriend(friend) { + this.dropFriend(friend).then((ok) => { + if (ok) { + delete this.friends[friend.username] + } + }).catch(() => { + }) + }, + tryDeclineFriend(request) { + this.declineFriend(request).then((ok) => { if (ok) { this.fetchContent() } diff --git a/frontend/src/views/InventoryEdit.vue b/frontend/src/views/InventoryEdit.vue index 30bcb5e..1091352 100644 --- a/frontend/src/views/InventoryEdit.vue +++ b/frontend/src/views/InventoryEdit.vue @@ -31,7 +31,7 @@
    - +
    @@ -85,7 +85,7 @@ export default { }, methods: { ...mapActions(["fetchInventoryItems", "updateInventoryItem"]), - addFiles(files) { + changeFiles(files) { this.inventory_items.find(item => item.id === parseInt(this.id)).files = files }, }, diff --git a/frontend/src/views/InventoryNew.vue b/frontend/src/views/InventoryNew.vue index e23d63e..271f04f 100644 --- a/frontend/src/views/InventoryNew.vue +++ b/frontend/src/views/InventoryNew.vue @@ -6,13 +6,6 @@
    Create New Item
    -
    -
      -
    • - {{ file.name }} ({{ file.hash }}) -
      • -
    -