diff options
Diffstat (limited to 'src/frontend')
-rw-r--r-- | src/frontend/tubo/api.cljs (renamed from src/frontend/tau/api.cljs) | 2 | ||||
-rw-r--r-- | src/frontend/tubo/components/comments.cljs (renamed from src/frontend/tau/components/comments.cljs) | 12 | ||||
-rw-r--r-- | src/frontend/tubo/components/items.cljs (renamed from src/frontend/tau/components/items.cljs) | 20 | ||||
-rw-r--r-- | src/frontend/tubo/components/loading.cljs (renamed from src/frontend/tau/components/loading.cljs) | 2 | ||||
-rw-r--r-- | src/frontend/tubo/components/navigation.cljs (renamed from src/frontend/tau/components/navigation.cljs) | 4 | ||||
-rw-r--r-- | src/frontend/tubo/components/player.cljs (renamed from src/frontend/tau/components/player.cljs) | 8 | ||||
-rw-r--r-- | src/frontend/tubo/core.cljs (renamed from src/frontend/tau/core.cljs) | 10 | ||||
-rw-r--r-- | src/frontend/tubo/events.cljs (renamed from src/frontend/tau/events.cljs) | 6 | ||||
-rw-r--r-- | src/frontend/tubo/routes.cljs (renamed from src/frontend/tau/routes.cljs) | 14 | ||||
-rw-r--r-- | src/frontend/tubo/subs.cljs (renamed from src/frontend/tau/subs.cljs) | 2 | ||||
-rw-r--r-- | src/frontend/tubo/util.cljs (renamed from src/frontend/tau/util.cljs) | 2 | ||||
-rw-r--r-- | src/frontend/tubo/views.cljs (renamed from src/frontend/tau/views.cljs) | 27 | ||||
-rw-r--r-- | src/frontend/tubo/views/channel.cljs (renamed from src/frontend/tau/views/channel.cljs) | 10 | ||||
-rw-r--r-- | src/frontend/tubo/views/kiosk.cljs (renamed from src/frontend/tau/views/kiosk.cljs) | 10 | ||||
-rw-r--r-- | src/frontend/tubo/views/playlist.cljs (renamed from src/frontend/tau/views/playlist.cljs) | 12 | ||||
-rw-r--r-- | src/frontend/tubo/views/search.cljs (renamed from src/frontend/tau/views/search.cljs) | 8 | ||||
-rw-r--r-- | src/frontend/tubo/views/stream.cljs (renamed from src/frontend/tau/views/stream.cljs) | 20 |
17 files changed, 85 insertions, 84 deletions
diff --git a/src/frontend/tau/api.cljs b/src/frontend/tubo/api.cljs index e69bc9c..2ca442f 100644 --- a/src/frontend/tau/api.cljs +++ b/src/frontend/tubo/api.cljs @@ -1,4 +1,4 @@ -(ns tau.api +(ns tubo.api (:require [ajax.core :as ajax])) diff --git a/src/frontend/tau/components/comments.cljs b/src/frontend/tubo/components/comments.cljs index bfbf822..a65b6d8 100644 --- a/src/frontend/tau/components/comments.cljs +++ b/src/frontend/tubo/components/comments.cljs @@ -1,10 +1,10 @@ -(ns tau.components.comments +(ns tubo.components.comments (:require [re-frame.core :as rf] [reitit.frontend.easy :as rfe] - [tau.components.loading :as loading] - [tau.events :as events] - [tau.util :as util])) + [tubo.components.loading :as loading] + [tubo.events :as events] + [tubo.util :as util])) (defn comment-item [{:keys [id text uploader-name uploader-avatar uploader-url stream-position @@ -15,7 +15,7 @@ [:div.flex.items-center.py-3.box-border.h-12 (when uploader-url [:div.w-12 - [:a {:href (rfe/href :tau.routes/channel nil {:url uploader-url}) :title uploader-name} + [:a {:href (rfe/href :tubo.routes/channel nil {:url uploader-url}) :title uploader-name} [:img.rounded-full.object-cover.min-w-full.min-h-full {:src uploader-avatar}]]])]) [:div.ml-4 [:div.flex.items-center @@ -23,7 +23,7 @@ [:i.fa-solid.fa-thumbtack.mr-2.text-xs]) (when uploader-name [:div.flex.items-center - [:a {:href (rfe/href :tau.routes/channel nil {:url uploader-url}) :title uploader-name} + [:a {:href (rfe/href :tubo.routes/channel nil {:url uploader-url}) :title uploader-name} [:h1.text-gray-300.font-bold uploader-name]] (when stream-position [:p.mx-1.text-xs (str "at " (util/format-duration stream-position))])]) diff --git a/src/frontend/tau/components/items.cljs b/src/frontend/tubo/components/items.cljs index dccd43f..95e2251 100644 --- a/src/frontend/tau/components/items.cljs +++ b/src/frontend/tubo/components/items.cljs @@ -1,9 +1,9 @@ -(ns tau.components.items +(ns tubo.components.items (:require [re-frame.core :as rf] [reitit.frontend.easy :as rfe] - [tau.components.loading :as loading] - [tau.util :as util])) + [tubo.components.loading :as loading] + [tubo.util :as util])) (defn thumbnail [thumbnail-url route url name duration] @@ -30,7 +30,7 @@ (when-not (empty? uploader-name) [:div.flex.items-center.my-2 (if uploader-url - [:a {:href (rfe/href :tau.routes/channel nil {:url uploader-url}) :title uploader-name} + [:a {:href (rfe/href :tubo.routes/channel nil {:url uploader-url}) :title uploader-name} [:h1.line-clamp-1.text-gray-300.font-bold.pr-2 uploader-name]] [:h1.line-clamp-1.text-gray-300.font-bold.pr-2 uploader-name]) (when verified? @@ -53,20 +53,20 @@ (defn stream-item [{:keys [url name thumbnail-url duration] :as item}] [:<> - [thumbnail thumbnail-url (rfe/href :tau.routes/stream nil {:url url}) url name duration] - [item-content item (rfe/href :tau.routes/stream nil {:url url})]]) + [thumbnail thumbnail-url (rfe/href :tubo.routes/stream nil {:url url}) url name duration] + [item-content item (rfe/href :tubo.routes/stream nil {:url url})]]) (defn channel-item [{:keys [url name thumbnail-url] :as item}] [:<> - [thumbnail thumbnail-url (rfe/href :tau.routes/channel nil {:url url}) url name nil] - [item-content item (rfe/href :tau.routes/channel nil {:url url})]]) + [thumbnail thumbnail-url (rfe/href :tubo.routes/channel nil {:url url}) url name nil] + [item-content item (rfe/href :tubo.routes/channel nil {:url url})]]) (defn playlist-item [{:keys [url name thumbnail-url] :as item}] [:<> - [thumbnail thumbnail-url (rfe/href :tau.routes/playlist nil {:url url}) url name nil] - [item-content item (rfe/href :tau.routes/playlist nil {:url url})]]) + [thumbnail thumbnail-url (rfe/href :tubo.routes/playlist nil {:url url}) url name nil] + [item-content item (rfe/href :tubo.routes/playlist nil {:url url})]]) (defn generic-item [item] diff --git a/src/frontend/tau/components/loading.cljs b/src/frontend/tubo/components/loading.cljs index 40f6db3..08c37de 100644 --- a/src/frontend/tau/components/loading.cljs +++ b/src/frontend/tubo/components/loading.cljs @@ -1,4 +1,4 @@ -(ns tau.components.loading) +(ns tubo.components.loading) (defn loading-icon [service-color & styles] diff --git a/src/frontend/tau/components/navigation.cljs b/src/frontend/tubo/components/navigation.cljs index 87e6dc5..a48854c 100644 --- a/src/frontend/tau/components/navigation.cljs +++ b/src/frontend/tubo/components/navigation.cljs @@ -1,7 +1,7 @@ -(ns tau.components.navigation +(ns tubo.components.navigation (:require [re-frame.core :as rf] - [tau.events :as events])) + [tubo.events :as events])) (defn back-button [service-color] [:div.flex.items-center diff --git a/src/frontend/tau/components/player.cljs b/src/frontend/tubo/components/player.cljs index 11cc9c5..c4b5df7 100644 --- a/src/frontend/tau/components/player.cljs +++ b/src/frontend/tubo/components/player.cljs @@ -1,10 +1,10 @@ -(ns tau.components.player +(ns tubo.components.player (:require [reagent.core :as r] [reagent.dom :as rdom] [re-frame.core :as rf] [reitit.frontend.easy :as rfe] - [tau.events :as events] + [tubo.events :as events] ["video.js" :as videojs])) (defn global-player @@ -21,9 +21,9 @@ [:div.flex.flex-wrap.items-center [:div.flex.flex-col [:a.text-xs - {:href (rfe/href :tau.router/stream nil {:url url})} name] + {:href (rfe/href :tubo.router/stream nil {:url url})} name] [:a.text-xs.text-gray-300 - {:href (rfe/href :tau.router/channel nil {:url uploader-url})} uploader-name]] + {:href (rfe/href :tubo.router/channel nil {:url uploader-url})} uploader-name]] [:div.px-2.py-0.md:pt-4 [:audio {:src stream :ref #(reset! !player %) :loop @!loop?}]] [:div.mx-2 diff --git a/src/frontend/tau/core.cljs b/src/frontend/tubo/core.cljs index 7665a20..4834dc2 100644 --- a/src/frontend/tau/core.cljs +++ b/src/frontend/tubo/core.cljs @@ -1,12 +1,12 @@ -(ns tau.core +(ns tubo.core (:require ["react-dom/client" :as rdom] [reagent.core :as r] [re-frame.core :as rf] - [tau.events :as events] - [tau.routes :as routes] - [tau.subs] - [tau.views :as views])) + [tubo.events :as events] + [tubo.routes :as routes] + [tubo.subs] + [tubo.views :as views])) (defonce root (rdom/createRoot (.querySelector js/document "#app"))) diff --git a/src/frontend/tau/events.cljs b/src/frontend/tubo/events.cljs index d854b0e..d919e31 100644 --- a/src/frontend/tau/events.cljs +++ b/src/frontend/tubo/events.cljs @@ -1,10 +1,10 @@ -(ns tau.events +(ns tubo.events (:require [day8.re-frame.http-fx] [re-frame.core :as rf] [reitit.frontend.easy :as rfe] [reitit.frontend.controllers :as rfc] - [tau.api :as api])) + [tubo.api :as api])) (rf/reg-event-db ::initialize-db @@ -283,7 +283,7 @@ ::change-service (fn [{:keys [db]} [_ service-id]] {:fx [[:dispatch - [::navigate {:name :tau.routes/kiosk + [::navigate {:name :tubo.routes/kiosk :params {} :query {:serviceId service-id}}]]]})) diff --git a/src/frontend/tau/routes.cljs b/src/frontend/tubo/routes.cljs index a5fb579..eb40ac7 100644 --- a/src/frontend/tau/routes.cljs +++ b/src/frontend/tubo/routes.cljs @@ -1,14 +1,14 @@ -(ns tau.routes +(ns tubo.routes (:require [reitit.frontend :as ref] [reitit.frontend.easy :as rfe] [re-frame.core :as rf] - [tau.events :as events] - [tau.views.channel :as channel] - [tau.views.kiosk :as kiosk] - [tau.views.playlist :as playlist] - [tau.views.search :as search] - [tau.views.stream :as stream])) + [tubo.events :as events] + [tubo.views.channel :as channel] + [tubo.views.kiosk :as kiosk] + [tubo.views.playlist :as playlist] + [tubo.views.search :as search] + [tubo.views.stream :as stream])) (def routes (ref/router diff --git a/src/frontend/tau/subs.cljs b/src/frontend/tubo/subs.cljs index 41bbb67..88291ca 100644 --- a/src/frontend/tau/subs.cljs +++ b/src/frontend/tubo/subs.cljs @@ -1,4 +1,4 @@ -(ns tau.subs +(ns tubo.subs (:require [re-frame.core :as rf])) diff --git a/src/frontend/tau/util.cljs b/src/frontend/tubo/util.cljs index d23ef9a..8e03f85 100644 --- a/src/frontend/tau/util.cljs +++ b/src/frontend/tubo/util.cljs @@ -1,4 +1,4 @@ -(ns tau.util +(ns tubo.util (:require ["timeago.js" :as timeago])) diff --git a/src/frontend/tau/views.cljs b/src/frontend/tubo/views.cljs index 6a4789f..4fe2202 100644 --- a/src/frontend/tau/views.cljs +++ b/src/frontend/tubo/views.cljs @@ -1,12 +1,12 @@ -(ns tau.views +(ns tubo.views (:require [reitit.frontend.easy :as rfe] [re-frame.core :as rf] [reagent.ratom :as ratom] - [tau.components.navigation :as navigation] - [tau.components.player :as player] - [tau.events :as events] - [tau.routes :as routes])) + [tubo.components.navigation :as navigation] + [tubo.components.player :as player] + [tubo.events :as events] + [tubo.routes :as routes])) (defonce scroll-hook (.addEventListener js/window "scroll" #(rf/dispatch [::events/page-scroll]))) (defonce mobile-touch-hook (.addEventListener js/document.body "touchmove" #(rf/dispatch [::events/page-scroll]))) @@ -26,8 +26,9 @@ {:style {:background service-color}} [:div.flex.items-center.justify-between.flex-auto [:div.py-2 - [:a.px-5.text-white.font-bold.font-nunito - {:href (rfe/href ::routes/home) :dangerouslySetInnerHTML {:__html "τ"}}]] + [:a.px-5.text-white.font-bold + {:href (rfe/href ::routes/home)} + "tubo"]] [:form.flex.items-center.relative {:on-submit (fn [e] (.preventDefault e) @@ -79,12 +80,12 @@ [] [:footer [:div.bg-black.text-gray-300.p-5.text-center.w-full - [:div.flex.flex-col.justify-center - [:div - [:p.px-2 (str "Tau " (.getFullYear (js/Date.)))]] - [:div.pt-4 - [:a {:href "https://sr.ht/~conses/tau"} - [:i.fa-solid.fa-code]]]]]]) + [:div.flex.flex-col.justify-center.items-center + [:div.flex.items-center.justify-center + [:div.items-center + [:a.font-bold {:href "https://sr.ht/~conses/tubo"} "tubo"]] + [:div + [:p.px-2 (str "2022-" (.getFullYear (js/Date.)))]]]]]]) (defn app [] diff --git a/src/frontend/tau/views/channel.cljs b/src/frontend/tubo/views/channel.cljs index 205474d..ee5459f 100644 --- a/src/frontend/tau/views/channel.cljs +++ b/src/frontend/tubo/views/channel.cljs @@ -1,10 +1,10 @@ -(ns tau.views.channel +(ns tubo.views.channel (:require [re-frame.core :as rf] - [tau.components.items :as items] - [tau.components.loading :as loading] - [tau.components.navigation :as navigation] - [tau.events :as events])) + [tubo.components.items :as items] + [tubo.components.loading :as loading] + [tubo.components.navigation :as navigation] + [tubo.events :as events])) (defn channel [{{:keys [url]} :query-params}] diff --git a/src/frontend/tau/views/kiosk.cljs b/src/frontend/tubo/views/kiosk.cljs index 824d85b..1c072af 100644 --- a/src/frontend/tau/views/kiosk.cljs +++ b/src/frontend/tubo/views/kiosk.cljs @@ -1,10 +1,10 @@ -(ns tau.views.kiosk +(ns tubo.views.kiosk (:require [re-frame.core :as rf] - [tau.components.items :as items] - [tau.components.loading :as loading] - [tau.components.navigation :as navigation] - [tau.events :as events])) + [tubo.components.items :as items] + [tubo.components.loading :as loading] + [tubo.components.navigation :as navigation] + [tubo.events :as events])) (defn kiosk [{{:keys [serviceId kioskId]} :query-params}] diff --git a/src/frontend/tau/views/playlist.cljs b/src/frontend/tubo/views/playlist.cljs index 756846c..ed4f90f 100644 --- a/src/frontend/tau/views/playlist.cljs +++ b/src/frontend/tubo/views/playlist.cljs @@ -1,11 +1,11 @@ -(ns tau.views.playlist +(ns tubo.views.playlist (:require [re-frame.core :as rf] [reitit.frontend.easy :as rfe] - [tau.components.items :as items] - [tau.components.loading :as loading] - [tau.components.navigation :as navigation] - [tau.events :as events])) + [tubo.components.items :as items] + [tubo.components.loading :as loading] + [tubo.components.navigation :as navigation] + [tubo.events :as events])) (defn playlist [{{:keys [url]} :query-params}] @@ -34,7 +34,7 @@ [:span.mr-2 "By"] [:div.flex.items-center.py-3.box-border.h-12 [:div.w-12 - [:a {:href (rfe/href :tau.routes/channel nil {:url uploader-url}) :title uploader-name} + [:a {:href (rfe/href :tubo.routes/channel nil {:url uploader-url}) :title uploader-name} [:img.rounded-full.object-cover.min-h-full.min-w-full {:src uploader-avatar :alt uploader-name}]]]]] [:p.pt-4 (str stream-count " streams")]]] [items/related-streams related-streams next-page-url]])])) diff --git a/src/frontend/tau/views/search.cljs b/src/frontend/tubo/views/search.cljs index bfb0b20..9938f53 100644 --- a/src/frontend/tau/views/search.cljs +++ b/src/frontend/tubo/views/search.cljs @@ -1,10 +1,10 @@ -(ns tau.views.search +(ns tubo.views.search (:require [re-frame.core :as rf] [reitit.frontend.easy :as rfe] - [tau.components.items :as items] - [tau.components.loading :as loading] - [tau.events :as events])) + [tubo.components.items :as items] + [tubo.components.loading :as loading] + [tubo.events :as events])) (defn search [{{:keys [q serviceId]} :query-params}] diff --git a/src/frontend/tau/views/stream.cljs b/src/frontend/tubo/views/stream.cljs index 3363d6a..a380b5e 100644 --- a/src/frontend/tau/views/stream.cljs +++ b/src/frontend/tubo/views/stream.cljs @@ -1,14 +1,14 @@ -(ns tau.views.stream +(ns tubo.views.stream (:require [re-frame.core :as rf] [reitit.frontend.easy :as rfe] - [tau.events :as events] - [tau.components.items :as items] - [tau.components.loading :as loading] - [tau.components.navigation :as navigation] - [tau.components.comments :as comments] - [tau.components.player :as player] - [tau.util :as util])) + [tubo.events :as events] + [tubo.components.items :as items] + [tubo.components.loading :as loading] + [tubo.components.navigation :as navigation] + [tubo.components.comments :as comments] + [tubo.components.player :as player] + [tubo.util :as util])) (defn stream [match] @@ -65,10 +65,10 @@ [:div.flex.items-center.flex-auto (when uploader-avatar [:div.relative.w-16.h-16 - [:a {:href (rfe/href :tau.routes/channel nil {:url uploader-url}) :title uploader-name} + [:a {:href (rfe/href :tubo.routes/channel nil {:url uploader-url}) :title uploader-name} [:img.rounded-full.object-cover.max-w-full.min-h-full {:src uploader-avatar :alt uploader-name}]]]) [:div.mx-2 - [:a {:href (rfe/href :tau.routes/channel nil {:url uploader-url})} uploader-name] + [:a {:href (rfe/href :tubo.routes/channel nil {:url uploader-url})} uploader-name] (when subscriber-count [:div.flex.my-2.items-center [:i.fa-solid.fa-users.text-xs] |