diff --git a/cat.iml b/cat.iml index c1a11cd..a62ddbc 100644 --- a/cat.iml +++ b/cat.iml @@ -185,11 +185,8 @@ - - + - - diff --git a/project.clj b/project.clj index c96be70..ac1df3f 100644 --- a/project.clj +++ b/project.clj @@ -26,8 +26,8 @@ [org.clojure/tools.cli "0.4.1"] [org.clojure/tools.logging "0.4.1"] [org.postgresql/postgresql "42.2.5"] - [org.webjars.bower/tether "1.4.4"] - [org.webjars/bootstrap "4.2.1"] + ;https://www.webjars.org/ + [org.webjars.npm/bulma "0.7.2"] [org.webjars/font-awesome "5.6.1"] [org.webjars/webjars-locator "0.34"] [ring-webjars "0.2.0"] diff --git a/resources/html/home.html b/resources/html/home.html index 9053726..a752744 100644 --- a/resources/html/home.html +++ b/resources/html/home.html @@ -4,14 +4,75 @@ Welcome to cat - - - +
-
+
+
+
@@ -116,46 +177,51 @@
-
-
-
-

Welcome to cat

-

If you're seeing this message, that means you haven't yet compiled your ClojureScript!

-

Please run lein figwheel to start the ClojureScript compiler and reload the page. -

-

For better ClojureScript development experience in Chrome follow these steps:

-
    -
  • Open DevTools -
  • Go to Settings ("three dots" icon in the upper right corner of DevTools > Menu > Settings F1 - > - General > Console) -
  • Check-in "Enable custom formatters" -
  • Close DevTools -
  • Open DevTools -
-

See ClojureScript documentation for - further details.

-
-
+
+

Welcome to cat

+

If you're seeing this message, that means you haven't yet compiled your ClojureScript!

+

Please run lein figwheel to start the ClojureScript compiler and reload the page. +

+

For better ClojureScript development experience in Chrome follow these steps:

+
    +
  • Open DevTools +
  • Go to Settings ("three dots" icon in the upper right corner of DevTools > Menu > Settings F1 + > + General > Console) +
  • Check-in "Enable custom formatters" +
  • Close DevTools +
  • Open DevTools +
+

See ClojureScript documentation for + further details.

+ -{% style "/assets/bootstrap/css/bootstrap.min.css" %} +{% style "/assets/bulma/css/bulma.css" %} {% style "/assets/font-awesome/css/all.css" %} {% style "/css/screen.css" %} -{% script "/assets/jquery/jquery.min.js" %} +{% script "/js/home.js" %} {% script "/assets/font-awesome/js/all.js" %} -{% script "/assets/tether/dist/js/tether.min.js" %} -{% script "/assets/bootstrap/js/bootstrap.min.js" %} - +{% script "/js/app.js" %} -{% script "/js/graphing.js" %} +{% script "/js/graphing.js" %} diff --git a/resources/public/favicon.ico b/resources/public/favicon.ico index 0e50cb2..d207ad1 100644 Binary files a/resources/public/favicon.ico and b/resources/public/favicon.ico differ diff --git a/resources/public/img/cat.png b/resources/public/img/cat.png new file mode 100644 index 0000000..47b0654 Binary files /dev/null and b/resources/public/img/cat.png differ diff --git a/resources/public/img/cat_hollow_pink.png b/resources/public/img/cat_hollow_pink.png new file mode 100644 index 0000000..028115d Binary files /dev/null and b/resources/public/img/cat_hollow_pink.png differ diff --git a/resources/public/img/cat_hollow_purple.png b/resources/public/img/cat_hollow_purple.png new file mode 100644 index 0000000..19176d6 Binary files /dev/null and b/resources/public/img/cat_hollow_purple.png differ diff --git a/resources/public/img/cat_noedge.png b/resources/public/img/cat_noedge.png new file mode 100644 index 0000000..2bf8818 Binary files /dev/null and b/resources/public/img/cat_noedge.png differ diff --git a/resources/public/img/halloween-black-cat.png b/resources/public/img/halloween-black-cat.png new file mode 100644 index 0000000..9805988 Binary files /dev/null and b/resources/public/img/halloween-black-cat.png differ diff --git a/resources/public/img/ico/cat_hollow_pink.ico b/resources/public/img/ico/cat_hollow_pink.ico new file mode 100644 index 0000000..de64e7f Binary files /dev/null and b/resources/public/img/ico/cat_hollow_pink.ico differ diff --git a/resources/public/img/ico/cat_hollow_purple.ico b/resources/public/img/ico/cat_hollow_purple.ico new file mode 100644 index 0000000..d207ad1 Binary files /dev/null and b/resources/public/img/ico/cat_hollow_purple.ico differ diff --git a/resources/public/js/home.js b/resources/public/js/home.js new file mode 100644 index 0000000..c25459a --- /dev/null +++ b/resources/public/js/home.js @@ -0,0 +1,25 @@ +document.addEventListener('DOMContentLoaded', () => { + + // Get all "navbar-burger" elements + const $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0); + +// Check if there are any navbar burgers + if ($navbarBurgers.length > 0) { + + // Add a click event on each of them + $navbarBurgers.forEach(el => { + el.addEventListener('click', () => { + + // Get the target from the "data-target" attribute + const target = el.dataset.target; + const $target = document.getElementById(target); + + // Toggle the "is-active" class on both the "navbar-burger" and the "navbar-menu" + el.classList.toggle('is-active'); + $target.classList.toggle('is-active'); + + }); + }); + } + +}); \ No newline at end of file diff --git a/resources/public/js/spec.json b/resources/public/js/spec.json index 33864e0..1f8c5be 100644 --- a/resources/public/js/spec.json +++ b/resources/public/js/spec.json @@ -49,7 +49,7 @@ }, { "name": "nodeCharge", - "value": -30, + "value": -70, "bind": { "input": "range", "min": -100, @@ -69,7 +69,7 @@ }, { "name": "static", - "value": true, + "value": false, "bind": { "input": "checkbox" }