Skip to content

Commit

Permalink
Merge pull request #11 from mbaraa/dev
Browse files Browse the repository at this point in the history
Dev branch
  • Loading branch information
mbaraa authored May 15, 2024
2 parents b874334 + f54d92c commit aa69d17
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 4 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/rex-deploy-beta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: rex-deploy

on:
push:
branches:
- dev
pull_request:
branches:
- non-existent
paths-ignore:
- "**.md"

jobs:
rex-deploy:
runs-on: ubuntu-latest
steps:
- name: rex-7567-e27
uses: mbaraa/[email protected]
with:
server-url: ${{ secrets.REX_SERVER }}
token: ${{ secrets.REX_KEY }}
repo-name: dankmuzikk-beta
31 changes: 31 additions & 0 deletions docker-compose-beta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: "3.8"

services:
app-beta:
container_name: "dankmuzikk-beta"
build:
context: .
image: "dankmuzikk-app-beta"
restart: "always"
ports:
- "20251:3000"
stdin_open: true
env_file:
- .env.docker
volumes:
- ./google-service-account.json:/app/google-service-account.json
- dankuploads-dir:/app/_serve
networks:
- danknetwork

networks:
danknetwork:
external: true

volumes:
dankuploads-dir:
driver: local
driver_opts:
type: none
o: bind
device: /mnt/vault/blobs/dankmuzikk/muzikk/
2 changes: 1 addition & 1 deletion views/components/navlink/navlink.templ
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ templ NavLink(title, imageUrl, path string) {
<a
href={ templ.SafeURL(path) }
title={ title }
class={ "cursor-pointer" }
class={ "cursor-pointer", "underline", "hover:no-underline" , "inline-block" }
hx-get={ path + "?no_reload=true" }
hx-target="#main-contents"
hx-swap="innerHTML"
Expand Down
31 changes: 28 additions & 3 deletions views/pages/index.templ
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package pages

import "dankmuzikk/views/layouts"
import (
"dankmuzikk/views/layouts"
"dankmuzikk/views/components/navlink"
)

templ Index(isMobile bool, themeName string) {
@layouts.Default(isMobile, themeName, main())
Expand All @@ -11,7 +14,29 @@ templ IndexNoReload() {
}

templ main() {
<main class="w-full">
yooo hooo
<main class={ "w-full", "h-full", "flex", "flex-col", "justify-center", "items-center" }>
<div class={ "flex", "justify-center" }>
<section
class={
"w-full", "md:w-2/3", "bg-black-trans-100", "rounded-xl",
"rounded-[10px]", "m-[10px]", "md:m-[20px]", "p-[20px]", "md:p-[40px]", "flex", "flex-col", "gap-y-6",
"", "text-white",
}
>
<h2 class={ "text-xl" }>What should you expect?</h2>
<p>
DankMuzikk is music player that plays music from YouTube but without actually using YouTube, start by typing a song's name into the search bar.
<br/>
More details&nbsp;
@navlink.NavLink("here", "", "/about")
<br/>
<br/>
And you can check the beta features <a class={ "cursor-pointer", "underline", "hover:no-underline" } href="https://beta.dankmuzikk.com">here</a>
<br/>
<br/>
Happy danking 🎉✨
</p>
</section>
</div>
</main>
}

0 comments on commit aa69d17

Please sign in to comment.