Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-08 07:50:43 -05:00
Code Issues Activity

fix(frontend): fix image uploading

Browse source
This commit is contained in:
Andrey Antukh 2019-07-05 09:41:20 +02:00
parent b6b6fdf115
commit 820edba113
3 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/uxbox/main.cljs
View file

@ -49,7 +49,7 @@
(and (:status error)
(or (= (:status error) 403)
(= (:status error) 419)))
(ts/schedule 100 #(st/emit! (logout)))
(ts/schedule 0 #(st/emit! (rt/nav :auth-login)))
;; Conflict
(= status 412)

6
frontend/src/uxbox/main/repo/images.cljs
View file

@ -55,12 +55,14 @@
[_ {:keys [collection id file width height mimetype] :as body}]
(let [body (doto (js/FormData.)
(.append "mimetype" mimetype)
(.append "collection" (str collection))
(.append "file" file)
(.append "width" width)
(.append "height" height)
(.append "id" id))
params {:url (str url "/library/images/")
_ (when collection
(.append body "collection" (str collection)))
params {:url (str url "/library/images")
:method :post
:body body}]
(send! params)))

49
frontend/src/uxbox/main/ui.cljs
View file

@ -2,33 +2,34 @@
;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
;; Copyright (c) 2015-2017 Andrey Antukh <niwi@niwi.nz>
;; Copyright (c) 2015-2017 Juan de la Cruz <delacruzgarciajuan@gmail.com>
;; Copyright (c) 2015-2019 Andrey Antukh <niwi@niwi.nz>
(ns uxbox.main.ui
(:require [beicon.core :as rx]
[lentes.core :as l]
[cuerdas.core :as str]
[potok.core :as ptk]
[uxbox.builtins.icons :as i]
[uxbox.main.store :as st]
[uxbox.main.data.projects :as dp]
[uxbox.main.data.auth :refer [logout]]
[uxbox.main.ui.loader :refer [loader]]
[uxbox.main.ui.lightbox :refer [lightbox]]
[uxbox.main.ui.auth :as auth]
[uxbox.main.ui.dashboard :as dashboard]
[uxbox.main.ui.settings :as settings]
[uxbox.main.ui.workspace :refer [workspace]]
[uxbox.main.ui.shapes]
[uxbox.util.messages :as uum]
[uxbox.util.html-history :as html-history]
[uxbox.util.router :as rt]
[uxbox.util.timers :as ts]
[uxbox.util.i18n :refer [tr]]
[uxbox.util.data :refer [parse-int uuid-str?]]
[uxbox.util.dom :as dom]
[rumext.core :as mx :include-macros true]))
(:require
[beicon.core :as rx]
[cuerdas.core :as str]
[lentes.core :as l]
[potok.core :as ptk]
[rumext.core :as mx :include-macros true]
[uxbox.builtins.icons :as i]
[uxbox.main.data.auth :refer [logout]]
[uxbox.main.data.projects :as dp]
[uxbox.main.store :as st]
[uxbox.main.ui.auth :as auth]
[uxbox.main.ui.dashboard :as dashboard]
[uxbox.main.ui.lightbox :refer [lightbox]]
[uxbox.main.ui.loader :refer [loader]]
[uxbox.main.ui.settings :as settings]
[uxbox.main.ui.shapes]
[uxbox.main.ui.workspace :refer [workspace]]
[uxbox.util.data :refer [parse-int uuid-str?]]
[uxbox.util.dom :as dom]
[uxbox.util.html-history :as html-history]
[uxbox.util.i18n :refer [tr]]
[uxbox.util.messages :as uum]
[uxbox.util.router :as rt]
[uxbox.util.timers :as ts]))
;; --- Refs