Prechádzať zdrojové kódy

upgraded bootstrap and and reagent, and added nav menu

Harlan Iverson 6 rokov pred
rodič
commit
91844a2b1f

+ 11 - 6
uspooge-app/project.clj

@@ -7,16 +7,21 @@
   
   
   :min-lein-version "2.7.1"
-  :jvm-opts ["-Xmx512M"]
+  :jvm-opts ["-Xmx512M"
+             "--add-modules" "java.xml.bind"]
 
   :dependencies [[org.clojure/clojure "1.9.0"]
-                 [org.clojure/clojurescript "1.9.946"]
+                 [org.clojure/clojurescript "1.10.439"]
                  [org.clojure/core.async  "0.4.474"]
-                 [reagent "0.7.0"]
-                 
-                 
 
-                 [cljsjs/react-router-dom "4.2.2-0" :exclusions [cljsjs/react]]
+[baking-soda "0.2.0"]
+[reagent "0.8.1" :exclusions [cljsjs/react
+                              cljsjs/react-dom]]
+[cljsjs/react "16.3.2-0"]
+[cljsjs/react-dom "16.3.2-0"]
+[cljsjs/react-transition-group "2.3.1-0"]
+[cljsjs/react-popper "0.10.4-0"]
+
                  [cljs-http "0.1.44"]
                  ]
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 5 - 0
uspooge-app/resources/public/css/bootstrap4.css


+ 2 - 0
uspooge-app/resources/public/index.html

@@ -4,6 +4,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="css/style.css" rel="stylesheet" type="text/css">
+    <link href="css/bootstrap4.css" rel="stylesheet" type="text/css">
+    <script src="js/bootstrap4.js" type="text/javascript"></script>
   </head>
   <body>
     <div id="app">

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 5 - 0
uspooge-app/resources/public/js/bootstrap4.js


+ 24 - 7
uspooge-app/src/uspooge_app/core.cljs

@@ -4,14 +4,15 @@
     (:require [clojure.string :as str]
               [reagent.core :as r]
               [cljs-http.client :as http]
-              [cljs.core.async :as async :refer [<!]]))
+              [cljs.core.async :as async :refer [<!]]
+              [baking-soda.core :as b]))
 
 (enable-console-print!)
 
 
 (defonce feeds (r/atom []))
 (defonce active-user (r/atom {:name "Anonymous CoW"}))
-(defonce app-state (r/atom {:text "Hello clojure world!" :__figwheel_counter 0 :active-user active-user}))
+(defonce app-state (r/atom {:text "Hello clojure world!" :nav-open? true :__figwheel_counter 0 :active-user active-user}))
  
 
 
@@ -61,18 +62,34 @@
   (when (= (-> item :media :content-type) "text/html")
     (iframe-video-item item)))
 
+(defn feeds-as-list [feeds]
+  [:ul
+    (for [feed feeds]
+      [:li (:title feed) (-> (:items feed) video-items feed-items)])])
+
+(defn toggle-nav [app-state]
+  (swap! app-state update :nav-open? (fn [nav-open?] (not nav-open?))))
+
 (defn hello-world [app-state]
   (fn []
     [:div
+     [b/Navbar
+            
+              [b/NavbarBrand "HolaB"]
+              [b/NavbarToggler {:on-click #(toggle-nav app-state)} [:span "menu"]]
+              
+              [b/Collapse {:is-open (get @app-state :nav-open?) :navbar "navbar"}
+            [b/Nav {:pills true} [b/NavItem [b/NavLink {:href "/"} "Hola"]] [b/NavItem [b/NavLink {:href "#"} "Hola 2"]]]
+            ]
+            ]
      [:h1 (:text @app-state)]
      [:h2 "You are " (get @(:active-user @app-state) :name "Anonymous cow")]
      [:h3 "Edit This and watch it change!"]
      [:p "We've reloaded " [:strong (:__figwheel_counter @app-state)] " times (not counting errorz)."]
-     (when true
-       [:ul
-         (for [feed @feeds]
-           [:li (:title feed) (-> (:items feed) video-items feed-items)])]
-       )]))
+     [b/Button {:color    "danger"
+                :on-click #(js/alert "HOLA")}
+      "Say Hola"]
+     (feeds-as-list @feeds)]))
 
 
 

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov