Skip to content

Commit

Permalink
nicer comment headers
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew committed May 31, 2016
1 parent 8c7118b commit 289dad9
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 20 deletions.
12 changes: 10 additions & 2 deletions src/cljs/ulysses/pages/builder.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@
[clojure.string :as string]
[cljs.pprint :as pprint]))

; helpers -----------
;; ----------------------------------------------------------------------------
; helpers
;; ----------------------------------------------------------------------------

(defn- get-grant-op-id [page-with-args]
(-> page-with-args second :grant-op-id str->int))

; components --------
;; ----------------------------------------------------------------------------
; components
;; ----------------------------------------------------------------------------

(defn faculty-years-uconn
[{:keys [faculty-years-uconn]}]
Expand Down Expand Up @@ -142,6 +146,10 @@
[:div.inner
[:h3 "Word Cloud"]]]]])

;; ----------------------------------------------------------------------------
;; main
;; ----------------------------------------------------------------------------

(defn main []
(let [page-with-args (subscribe [:page-with-args])
builder-filters (subscribe [:builder-filters])
Expand Down
12 changes: 9 additions & 3 deletions src/cljs/ulysses/pages/home.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
[ulysses.lib.moment :as m]
[ulysses.routes :as routes]))

;; helper sub-components ---------------------------
;; ----------------------------------------------------------------------------
;; helper sub-components
;; ----------------------------------------------------------------------------

; grant-op-box ----------

Expand Down Expand Up @@ -75,7 +77,9 @@
(name mechanism)
[:div.inside]])

;; primary sub-components --------------------------
;; ----------------------------------------------------------------------------
;; primary sub-components
;; ----------------------------------------------------------------------------

(defn grant-op-box [grant]
(let [{:keys [id title purpose due-date funding-mechanism initial-team]} grant
Expand Down Expand Up @@ -128,7 +132,9 @@
[:div.pagination-info
"page " current-n " / " n])

;; main --------------------------------------------
;; ----------------------------------------------------------------------------
;; main
;; ----------------------------------------------------------------------------

(defn main []
(let [grant-ops (subscribe [:grant-ops])
Expand Down
12 changes: 9 additions & 3 deletions src/cljs/ulysses/pages/profile.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
[ulysses.components.word-cloud :refer [word-cloud]]
[reagent.core :as r]))

;; helpers -----------------------------------------
;; ----------------------------------------------------------------------------
;; helpers
;; ----------------------------------------------------------------------------

(defn get-person-id [page-with-args]
(-> page-with-args second :person-id str->int))

;; helper sub-components ---------------------------
;; ----------------------------------------------------------------------------
;; helper sub-components
;; ----------------------------------------------------------------------------

(defn profile [{:keys [name title department year_hired keywords] :as faculty}]
[:div.container
Expand All @@ -26,7 +30,9 @@
[label :default "hired in " year_hired]]
[word-cloud 50 keywords]]]])

;; main --------------------------------------------
;; ----------------------------------------------------------------------------
;; main
;; ----------------------------------------------------------------------------

(defn main []
(let [page-with-args (subscribe [:page-with-args])
Expand Down
2 changes: 0 additions & 2 deletions src/cljs/ulysses/views.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
[ulysses.pages.profile :as page-profile]
[ulysses.pages.not-found :as page-not-found]))

;; main

(defmulti pages identity)
(defmethod pages :home [] [page-home/main])
(defmethod pages :builder [] [page-builder/main])
Expand Down
47 changes: 37 additions & 10 deletions src/sass/app.scss
Original file line number Diff line number Diff line change
@@ -1,30 +1,57 @@
// Sass root file
// sass root file

// ----------------------------------------------------------------------------
// fonts
// ----------------------------------------------------------------------------

// Fonts
@import 'fonts';

// Variables
// ----------------------------------------------------------------------------
// variables
// ----------------------------------------------------------------------------

@import 'variables';

// Bootstrap
// ----------------------------------------------------------------------------
// bootstrap
// ----------------------------------------------------------------------------

@import '../../node_modules/bootstrap/scss/bootstrap';

// Font Awesome
// ----------------------------------------------------------------------------
// font awesome
// ----------------------------------------------------------------------------

@import '../../node_modules/font-awesome/scss/font-awesome';

// Mixins
// ----------------------------------------------------------------------------
// mixins
// ----------------------------------------------------------------------------

@import 'mixins';

// Bootstrap Overrides
// ----------------------------------------------------------------------------
// bootstrap overrides
// ----------------------------------------------------------------------------

@import 'bootstrap-overrides';

// Common
// ----------------------------------------------------------------------------
// common
// ----------------------------------------------------------------------------

@import 'common';

// Layout
// ----------------------------------------------------------------------------
// layout
// ----------------------------------------------------------------------------

@import 'layout';

// Components
// ----------------------------------------------------------------------------
// components
// ----------------------------------------------------------------------------

@import 'components/builder-panel';
@import 'components/faculties-pool';
@import 'components/footer';
Expand Down

0 comments on commit 289dad9

Please sign in to comment.