clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-05 11:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin2/master' into fix/priority-style-issues

Browse Source 
# Conflicts:
#	package.json
#	resources/css/common.css
#	src/main/frontend/components/block.cljs
#	src/main/frontend/components/page.cljs
#	src/main/frontend/components/sidebar.css
#	yarn.lock
This commit is contained in:
charlie
2020-12-07 10:14:16 +08:00
parent 0a979b7b2c 959aabecd2
commit e2949a5a2b
48 changed files with 1983 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/frontend/components/sidebar.cljs
View File

@@ -118,8 +118,6 @@
[:div.cp__sidebar-main-content
{:data-is-global-graph-pages global-graph-pages?
:data-is-full-width (or global-graph-pages?
(and (not logged?)
home?)
(contains? #{:all-files :all-pages} route-name))}
(cond
(not indexeddb-support?)
@@ -174,22 +172,22 @@
current-repo (state/sub :git/current-repo)
latest-journals (db/get-latest-journals (state/get-current-repo) journals-length)
preferred-format (state/sub [:me :preferred_format])
logged? (:name me)
token (state/sub :encrypt/token)
;; TODO: remove this
daily-migrating? (state/sub [:daily/migrating?])]
logged? (:name me)]
(rum/with-context [[t] i18n/*tongue-context*]
[:div.max-w-7xl.mx-auto
(cond
daily-migrating?
(ui/loading "Migrating to daily notes")
(and default-home
(= :home (state/get-current-route))
(not (state/route-has-p?)))
(route-handler/redirect! {:to :page
:path-params {:name (:page default-home)}})
importing-to-db?
(ui/loading (t :parsing-files))
loading-files?
(ui/loading (t :loading-files))
(and (not logged?) (seq latest-journals))
(journal/journals latest-journals)
@@ -206,12 +204,6 @@
(seq latest-journals)
(journal/journals latest-journals)
importing-to-db?
(ui/loading (t :parsing-files))
loading-files?
(ui/loading (t :loading-files))
(and logged? (empty? (:repos me)))
(widgets/add-repo)