Skip to content

Commit

Permalink
fix: move shared atoms to common namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Macroz committed Nov 4, 2024
1 parent 6c5a820 commit 73f410c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
3 changes: 2 additions & 1 deletion src/cljs/rems/administration/create_license.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
[re-frame.core :as rf]
[rems.administration.administration :as administration]
[rems.administration.components :refer [localized-text-field localized-textarea-autosize organization-field radio-button-group]]
[rems.atoms :as atoms :refer [document-title failure-symbol file-download nbsp]]
[rems.atoms :as atoms :refer [document-title failure-symbol file-download]]
[rems.collapsible :as collapsible]
[rems.common.atoms :refer [nbsp]]
[rems.common.attachment-util :as attachment-util]
[rems.config]
[rems.globals]
Expand Down
3 changes: 2 additions & 1 deletion src/cljs/rems/application.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
[rems.administration.duo :refer [duo-field duo-info-field]]
[rems.common.application-util :refer [accepted-licenses? can-see-everything? form-fields-editable? get-member-name is-handler? is-handling-user?]]
[rems.common.attachment-util :as attachment-util]
[rems.atoms :as atoms :refer [document-title external-link file-download info-field make-empty-symbol nbsp readonly-checkbox success-symbol]]
[rems.atoms :as atoms :refer [document-title external-link file-download info-field make-empty-symbol readonly-checkbox success-symbol]]
[rems.common.atoms :refer [nbsp]]
[rems.common.catalogue-util :refer [catalogue-item-more-info-url]]
[rems.collapsible :as collapsible]
[rems.common.form :as form]
Expand Down
4 changes: 0 additions & 4 deletions src/cljs/rems/atoms.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
[rems.text :refer [text text-format localized localize-attachment]]
[rems.util :refer [class-names]]))

(def nbsp "\u00A0") ; non breaking space
(def nbhy "\u2011") ; non breaking hyphen
(def hamburger "\u2630") ; the hamburger menu icon

(defn external-link []
[:i {:class "fa fa-external-link-alt"}
[:span.sr-only (text :t.link/opens-in-new-window)]])
Expand Down
3 changes: 2 additions & 1 deletion src/cljs/rems/navbar.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[re-frame.core :as rf]
[rems.ajax]
[rems.atoms :as atoms]
[rems.common.atoms :refer [hamburger]]
[rems.common.util :refer [getx]]
[rems.common.roles :as roles]
[rems.config]
Expand Down Expand Up @@ -105,7 +106,7 @@
[:div.navbar.navbar-expand-sm.flex-fill
[:button.navbar-toggler
{:type :button :data-toggle "collapse" :data-target "#small-navbar"}
atoms/hamburger]
hamburger]
(when (rems.theme/use-navbar-logo?)
[:div.navbar-brand.logo-menu
[:div.img]])
Expand Down
2 changes: 1 addition & 1 deletion src/cljs/rems/phase.cljs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns rems.phase
(:require [rems.atoms :refer [nbsp]]
(:require [rems.common.atoms :refer [nbsp]]
[rems.guide-util :refer [component-info example]]
[rems.text :refer [text]]))

Expand Down
2 changes: 1 addition & 1 deletion test/clj/rems/application/test_model.clj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[rems.api.schema :as schema]
[rems.application.events :as events]
[rems.application.model :as model]
[rems.atoms :refer [nbsp nbhy]]
[rems.common.atoms :refer [nbsp nbhy]]
[rems.common.application-util :as application-util]
[rems.common.util :refer [deep-merge]]
[rems.permissions :as permissions]
Expand Down

0 comments on commit 73f410c

Please sign in to comment.