Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps-dev): bump shelljs from 0.7.8 to 0.8.5 in /web-ui #22

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.org
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
* CHANGELOG

** v1.4.6

- Replace `cl-arrow` with `serapeum`.

** v1.4.5

- Fix cl-case error.
Expand Down
2 changes: 0 additions & 2 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

I have been using it for a year or so and have been re-thinking of this software for some time. I would like to re-design it and make it more useful for general purpose (and surely for myself).

1.4.4 is the last stable version of existing functionality.

Next release will be a re-implementation of whole software, versioned starting from 2.0.0.

** Overview
Expand Down
4 changes: 2 additions & 2 deletions backend/silver-brain.asd
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
:author "YUE Daian"
:license "MIT"
:depends-on (;; Utility.
#:alexandria #:iterate #:trivia #:cl-arrows #:str #:trivial-types
#:alexandria #:iterate #:trivia #:serapeum #:str #:trivial-types
#:uuid #:unix-opts
;; Logging.
#:log4cl
;; Web related.
#:chameleon #:find-port #:cl-json
#:ningle #:clack #:flexi-streams #:mito)
#:ningle #:clack #:flexi-streams #:mito #:dbd-sqlite3)
:components ((:module "src"
:serial t
:components
Expand Down
4 changes: 3 additions & 1 deletion backend/src/packages.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@

(defpackage silver-brain.server
(:nicknames server)
(:use #:cl #:alexandria #:core #:cl-arrows #:trivia
(:use #:cl #:alexandria #:core #:trivia
#:silver-brain.core)
(:import-from #:serapeum
#:~>>)
(:import-from #:ningle
#:*request*
#:*response*)
Expand Down
14 changes: 7 additions & 7 deletions backend/src/server/route.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

(defroute *app* GET "/api/concepts" (search)
(render-json-array
(-<>> (if search
(service:find-concept-by-name search)
(service:get-all-concepts))
(mapcar #'concept-summary))))
(~>> (if search
(service:find-concept-by-name search)
(service:get-all-concepts))
(mapcar #'concept-summary))))

(defroute *app* POST "/api/concepts" ()
(match (decode-request-json-alist '(:name :content :content-format))
Expand Down Expand Up @@ -56,7 +56,7 @@

(defroute *app* GET "/api/concepts/:uuid/parents" (uuid)
(let ((concept (get-concept-by-uuid-or-404 uuid)))
(->> (concept-parents concept)
(~>> (concept-parents concept)
(mapcar #'concept-summary)
(render-json-array))))

Expand All @@ -77,7 +77,7 @@

(defroute *app* GET "/api/concepts/:uuid/children" (uuid)
(let ((concept (get-concept-by-uuid-or-404 uuid)))
(->> (concept-children concept)
(~>> (concept-children concept)
(mapcar #'concept-summary)
(render-json-array))))

Expand All @@ -98,7 +98,7 @@

(defroute *app* GET "/api/concepts/:uuid/friends" (uuid)
(let ((concept (get-concept-by-uuid-or-404 uuid)))
(->> (concept-friends concept)
(~>> (concept-friends concept)
(mapcar #'concept-summary)
(render-json-array))))

Expand Down
6 changes: 3 additions & 3 deletions web-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"postcss-url": "^7.2.1",
"rimraf": "^2.6.0",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
"shelljs": "^0.8.5",
"uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.8",
"vue-loader": "^13.3.0",
Expand Down