Merge feature/nightly into main (UI/UX Verbesserungen, Nightly Badge, Layout & Tabs)

This commit is contained in:
vibe-bot 2025-08-09 10:45:57 +02:00
commit d9a9ffaca3
9 changed files with 501 additions and 7 deletions

View file

@ -0,0 +1,324 @@
SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS
Commands marked with * may be preceded by a number, _N.
Notes in parentheses indicate the behavior if _N is given.
A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K.
h H Display this help.
q :q Q :Q ZZ Exit.
---------------------------------------------------------------------------
MMOOVVIINNGG
e ^E j ^N CR * Forward one line (or _N lines).
y ^Y k ^K ^P * Backward one line (or _N lines).
ESC-j * Forward one file line (or _N file lines).
ESC-k * Backward one file line (or _N file lines).
f ^F ^V SPACE * Forward one window (or _N lines).
b ^B ESC-v * Backward one window (or _N lines).
z * Forward one window (and set window to _N).
w * Backward one window (and set window to _N).
ESC-SPACE * Forward one window, but don't stop at end-of-file.
ESC-b * Backward one window, but don't stop at beginning-of-file.
d ^D * Forward one half-window (and set half-window to _N).
u ^U * Backward one half-window (and set half-window to _N).
ESC-) RightArrow * Right one half screen width (or _N positions).
ESC-( LeftArrow * Left one half screen width (or _N positions).
ESC-} ^RightArrow Right to last column displayed.
ESC-{ ^LeftArrow Left to first column.
F Forward forever; like "tail -f".
ESC-F Like F but stop when search pattern is found.
r ^R ^L Repaint screen.
R Repaint screen, discarding buffered input.
---------------------------------------------------
Default "window" is the screen height.
Default "half-window" is half of the screen height.
---------------------------------------------------------------------------
SSEEAARRCCHHIINNGG
/_p_a_t_t_e_r_n * Search forward for (_N-th) matching line.
?_p_a_t_t_e_r_n * Search backward for (_N-th) matching line.
n * Repeat previous search (for _N-th occurrence).
N * Repeat previous search in reverse direction.
ESC-n * Repeat previous search, spanning files.
ESC-N * Repeat previous search, reverse dir. & spanning files.
^O^N ^On * Search forward for (_N-th) OSC8 hyperlink.
^O^P ^Op * Search backward for (_N-th) OSC8 hyperlink.
^O^L ^Ol Jump to the currently selected OSC8 hyperlink.
ESC-u Undo (toggle) search highlighting.
ESC-U Clear search highlighting.
&_p_a_t_t_e_r_n * Display only matching lines.
---------------------------------------------------
Search is case-sensitive unless changed with -i or -I.
A search pattern may begin with one or more of:
^N or ! Search for NON-matching lines.
^E or * Search multiple files (pass thru END OF FILE).
^F or @ Start search at FIRST file (for /) or last file (for ?).
^K Highlight matches, but don't move (KEEP position).
^R Don't use REGULAR EXPRESSIONS.
^S _n Search for match in _n-th parenthesized subpattern.
^W WRAP search if no match found.
^L Enter next character literally into pattern.
---------------------------------------------------------------------------
JJUUMMPPIINNGG
g < ESC-< * Go to first line in file (or line _N).
G > ESC-> * Go to last line in file (or line _N).
p % * Go to beginning of file (or _N percent into file).
t * Go to the (_N-th) next tag.
T * Go to the (_N-th) previous tag.
{ ( [ * Find close bracket } ) ].
} ) ] * Find open bracket { ( [.
ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>.
ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_>.
---------------------------------------------------
Each "find close bracket" command goes forward to the close bracket
matching the (_N-th) open bracket in the top line.
Each "find open bracket" command goes backward to the open bracket
matching the (_N-th) close bracket in the bottom line.
m_<_l_e_t_t_e_r_> Mark the current top line with <letter>.
M_<_l_e_t_t_e_r_> Mark the current bottom line with <letter>.
'_<_l_e_t_t_e_r_> Go to a previously marked position.
'' Go to the previous position.
^X^X Same as '.
ESC-m_<_l_e_t_t_e_r_> Clear a mark.
---------------------------------------------------
A mark is any upper-case or lower-case letter.
Certain marks are predefined:
^ means beginning of the file
$ means end of the file
---------------------------------------------------------------------------
CCHHAANNGGIINNGG FFIILLEESS
:e [_f_i_l_e] Examine a new file.
^X^V Same as :e.
:n * Examine the (_N-th) next file from the command line.
:p * Examine the (_N-th) previous file from the command line.
:x * Examine the first (or _N-th) file from the command line.
^O^O Open the currently selected OSC8 hyperlink.
:d Delete the current file from the command line list.
= ^G :f Print current file name.
---------------------------------------------------------------------------
MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS
-_<_f_l_a_g_> Toggle a command line option [see OPTIONS below].
--_<_n_a_m_e_> Toggle a command line option, by name.
__<_f_l_a_g_> Display the setting of a command line option.
___<_n_a_m_e_> Display the setting of an option, by name.
+_c_m_d Execute the less cmd each time a new file is examined.
!_c_o_m_m_a_n_d Execute the shell command with $SHELL.
#_c_o_m_m_a_n_d Execute the shell command, expanded like a prompt.
|XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command.
s _f_i_l_e Save input to a file.
v Edit the current file with $VISUAL or $EDITOR.
V Print version number of "less".
---------------------------------------------------------------------------
OOPPTTIIOONNSS
Most options may be changed either on the command line,
or from within less by using the - or -- command.
Options may be given in one of two forms: either a single
character preceded by a -, or a name preceded by --.
-? ........ --help
Display help (from command line).
-a ........ --search-skip-screen
Search skips current screen.
-A ........ --SEARCH-SKIP-SCREEN
Search starts just after target line.
-b [_N] .... --buffers=[_N]
Number of buffers.
-B ........ --auto-buffers
Don't automatically allocate buffers for pipes.
-c ........ --clear-screen
Repaint by clearing rather than scrolling.
-d ........ --dumb
Dumb terminal.
-D xx_c_o_l_o_r . --color=xx_c_o_l_o_r
Set screen colors.
-e -E .... --quit-at-eof --QUIT-AT-EOF
Quit at end of file.
-f ........ --force
Force open non-regular files.
-F ........ --quit-if-one-screen
Quit if entire file fits on first screen.
-g ........ --hilite-search
Highlight only last match for searches.
-G ........ --HILITE-SEARCH
Don't highlight any matches for searches.
-h [_N] .... --max-back-scroll=[_N]
Backward scroll limit.
-i ........ --ignore-case
Ignore case in searches that do not contain uppercase.
-I ........ --IGNORE-CASE
Ignore case in all searches.
-j [_N] .... --jump-target=[_N]
Screen position of target lines.
-J ........ --status-column
Display a status column at left edge of screen.
-k _f_i_l_e ... --lesskey-file=_f_i_l_e
Use a compiled lesskey file.
-K ........ --quit-on-intr
Exit less in response to ctrl-C.
-L ........ --no-lessopen
Ignore the LESSOPEN environment variable.
-m -M .... --long-prompt --LONG-PROMPT
Set prompt style.
-n ......... --line-numbers
Suppress line numbers in prompts and messages.
-N ......... --LINE-NUMBERS
Display line number at start of each line.
-o [_f_i_l_e] .. --log-file=[_f_i_l_e]
Copy to log file (standard input only).
-O [_f_i_l_e] .. --LOG-FILE=[_f_i_l_e]
Copy to log file (unconditionally overwrite).
-p _p_a_t_t_e_r_n . --pattern=[_p_a_t_t_e_r_n]
Start at pattern (from command line).
-P [_p_r_o_m_p_t] --prompt=[_p_r_o_m_p_t]
Define new prompt.
-q -Q .... --quiet --QUIET --silent --SILENT
Quiet the terminal bell.
-r -R .... --raw-control-chars --RAW-CONTROL-CHARS
Output "raw" control characters.
-s ........ --squeeze-blank-lines
Squeeze multiple blank lines.
-S ........ --chop-long-lines
Chop (truncate) long lines rather than wrapping.
-t _t_a_g .... --tag=[_t_a_g]
Find a tag.
-T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e]
Use an alternate tags file.
-u -U .... --underline-special --UNDERLINE-SPECIAL
Change handling of backspaces, tabs and carriage returns.
-V ........ --version
Display the version number of "less".
-w ........ --hilite-unread
Highlight first new line after forward-screen.
-W ........ --HILITE-UNREAD
Highlight first new line after any forward movement.
-x [_N[,...]] --tabs=[_N[,...]]
Set tab stops.
-X ........ --no-init
Don't use termcap init/deinit strings.
-y [_N] .... --max-forw-scroll=[_N]
Forward scroll limit.
-z [_N] .... --window=[_N]
Set size of window.
-" [_c[_c]] . --quotes=[_c[_c]]
Set shell quote characters.
-~ ........ --tilde
Don't display tildes after end of file.
-# [_N] .... --shift=[_N]
Set horizontal scroll amount (0 = one half screen width).
--exit-follow-on-close
Exit F command on a pipe when writer closes pipe.
--file-size
Automatically determine the size of the input file.
--follow-name
The F command changes files if the input file is renamed.
--form-feed
Stop scrolling when a form feed character is reached.
--header=[_L[,_C[,_N]]]
Use _L lines (starting at line _N) and _C columns as headers.
--incsearch
Search file as each pattern character is typed in.
--intr=[_C]
Use _C instead of ^X to interrupt a read.
--lesskey-context=_t_e_x_t
Use lesskey source file contents.
--lesskey-src=_f_i_l_e
Use a lesskey source file.
--line-num-width=[_N]
Set the width of the -N line number field to _N characters.
--match-shift=[_N]
Show at least _N characters to the left of a search match.
--modelines=[_N]
Read _N lines from the input file and look for vim modelines.
--mouse
Enable mouse input.
--no-edit-warn
Don't warn when using v command on a file opened via LESSOPEN.
--no-keypad
Don't send termcap keypad init/deinit strings.
--no-histdups
Remove duplicates from command history.
--no-number-headers
Don't give line numbers to header lines.
--no-paste
Ignore pasted input.
--no-search-header-lines
Searches do not include header lines.
--no-search-header-columns
Searches do not include header columns.
--no-search-headers
Searches do not include header lines or columns.
--no-vbell
Disable the terminal's visual bell.
--redraw-on-quit
Redraw final screen when quitting.
--rscroll=[_C]
Set the character used to mark truncated lines.
--save-marks
Retain marks across invocations of less.
--search-options=[EFKNRW-]
Set default options for every search.
--show-preproc-errors
Display a message if preprocessor exits with an error status.
--proc-backspace
Process backspaces for bold/underline.
--PROC-BACKSPACE
Treat backspaces as control characters.
--proc-return
Delete carriage returns before newline.
--PROC-RETURN
Treat carriage returns as control characters.
--proc-tab
Expand tabs to spaces.
--PROC-TAB
Treat tabs as control characters.
--status-col-width=[_N]
Set the width of the -J status column to _N characters.
--status-line
Highlight or color the entire line containing a mark.
--use-backslash
Subsequent options use backslash as escape char.
--use-color
Enables colored text.
--wheel-lines=[_N]
Each click of the mouse wheel moves _N lines.
--wordwrap
Wrap lines at spaces.
---------------------------------------------------------------------------
LLIINNEE EEDDIITTIINNGG
These keys can be used to edit text being entered
on the "command line" at the bottom of the screen.
RightArrow ..................... ESC-l ... Move cursor right one character.
LeftArrow ...................... ESC-h ... Move cursor left one character.
ctrl-RightArrow ESC-RightArrow ESC-w ... Move cursor right one word.
ctrl-LeftArrow ESC-LeftArrow ESC-b ... Move cursor left one word.
HOME ........................... ESC-0 ... Move cursor to start of line.
END ............................ ESC-$ ... Move cursor to end of line.
BACKSPACE ................................ Delete char to left of cursor.
DELETE ......................... ESC-x ... Delete char under cursor.
ctrl-BACKSPACE ESC-BACKSPACE ........... Delete word to left of cursor.
ctrl-DELETE .... ESC-DELETE .... ESC-X ... Delete word under cursor.
ctrl-U ......... ESC (MS-DOS only) ....... Delete entire line.
UpArrow ........................ ESC-k ... Retrieve previous command line.
DownArrow ...................... ESC-j ... Retrieve next command line.
TAB ...................................... Complete filename & cycle.
SHIFT-TAB ...................... ESC-TAB Complete filename & reverse cycle.
ctrl-L ................................... Complete filename, list all.

View file

@ -2,7 +2,7 @@
on: on:
push: push:
branches: [ "main" ] branches: [ "main", "feature/*" ]
workflow_dispatch: workflow_dispatch:
env: env:
@ -24,12 +24,26 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Generate Docker tag
id: docker_tag
run: |
if [[ "${{ github.ref_name }}" == "main" ]]; then
echo "tag=main" >> $GITHUB_OUTPUT
else
# Ersetze Slashes durch Bindestriche für gültige Docker Tags
CLEAN_TAG=$(echo "${{ github.ref_name }}" | sed 's/\//-/g')
echo "tag=$CLEAN_TAG" >> $GITHUB_OUTPUT
fi
- name: Build and push - name: Build and push
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: . context: .
push: true push: true
build-args: |
VITE_BUILD_CHANNEL=${{ steps.docker_tag.outputs.tag == 'main' && 'stable' || 'nightly' }}
tags: | tags: |
${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:latest
${{ env.IMAGE_NAME }}:${{ github.sha }} ${{ env.IMAGE_NAME }}:${{ github.sha }}
${{ env.IMAGE_NAME }}:${{ steps.docker_tag.outputs.tag }}
platforms: linux/amd64 platforms: linux/amd64

View file

@ -6,6 +6,9 @@ WORKDIR /app/web
COPY web/package*.json ./ COPY web/package*.json ./
RUN npm install --no-audit --no-fund RUN npm install --no-audit --no-fund
COPY web/ . COPY web/ .
# Umgebungsvariable für React Build verfügbar machen (Vite liest nur VITE_*)
ARG VITE_BUILD_CHANNEL=stable
ENV VITE_BUILD_CHANNEL=$VITE_BUILD_CHANNEL
RUN npm run build RUN npm run build
# --- Build server (npm) --- # --- Build server (npm) ---

48
FEATURE_BRANCH.md Normal file
View file

@ -0,0 +1,48 @@
# Feature Branch Development
## Workflow für Experimente
### 1. Feature Branch erstellen
```bash
git checkout -b feature/mein-experiment
git push -u origin feature/mein-experiment
```
### 2. Entwickeln und Testen
- Änderungen im Feature Branch machen
- Commits und Pushes wie gewohnt
- GitHub Actions baut automatisch das Feature Image
### 3. Feature Version testen
```bash
# Feature Version starten (ersetzt Stable Version)
docker-compose -f docker-compose.feature.yml up -d
# Beide Versionen verwenden Port 8199
# Nightly Version zeigt "Nightly" Badge im Header
```
### 4. In Portainer
- **Stable Version:** `flex420/discordsoundbot-vib:latest` (Port 8199)
- **Nightly Version:** `flex420/discordsoundbot-vib:feature-nightly` (Port 8199)
### 5. Mergen wenn bereit
```bash
git checkout main
git merge feature/mein-experiment
git push origin main
# Feature Branch löschen
git branch -d feature/mein-experiment
```
## Docker Images
- `:latest` - Hauptversion (main branch)
- `:feature-nightly` - Feature Version
- `:main` - Explizit main branch
- `:sha-abc123` - Spezifischer Commit
## Portainer Setup
1. **Stable Container:** Port 8199, Image `:latest`
2. **Nightly Container:** Port 8199, Image `:feature-nightly`
3. **Testing:** Nightly Version zeigt "Nightly" Badge im Header
4. **Deployment:** Wenn gut, Feature in main mergen

View file

@ -0,0 +1,24 @@
version: '3.8'
services:
app-feature:
image: flex420/discordsoundbot-vib:feature-nightly
container_name: jukebox-feature
restart: unless-stopped
ports:
- "8199:8080" # Gleicher Port wie Stable
environment:
- DISCORD_TOKEN=${DISCORD_TOKEN}
- CLIENT_ID=${CLIENT_ID}
- GUILD_ID=${GUILD_ID}
- ADMIN_PWD=${ADMIN_PWD}
- REACT_APP_VERSION=nightly
volumes:
- ./data/sounds:/data/sounds
- ./data/uploads:/data/uploads
networks:
- jukebox-network
networks:
jukebox-network:
driver: bridge

View file

@ -6,6 +6,8 @@ services:
- "8199:8080" - "8199:8080"
env_file: env_file:
- .env - .env
environment:
- REACT_APP_VERSION=stable
volumes: volumes:
- ./data/sounds:/data/sounds - ./data/sounds:/data/sounds
restart: unless-stopped restart: unless-stopped

3
tatus Normal file
View file

@ -0,0 +1,3 @@
664af11 (HEAD -> main, origin/main, origin/HEAD) Header: Neues Google Stitch Design implementiert - horizontales Layout mit Zählern und Buttons
bf9d6d6 Persistenz: state.json ins Sounds-Volume verschoben (Migration vom alten Pfad). totalPlays bleibt über Deployments erhalten
f6a5be4 UI: Entfernt Plus-Icon auf Sound-Karten; Favoriten-Icon bleibt (Hover-Action)

View file

@ -177,7 +177,12 @@ export default function App() {
<header className="flex items-center justify-between p-6"> <header className="flex items-center justify-between p-6">
<div className="flex items-center"> <div className="flex items-center">
<div> <div>
<h1 className="text-4xl font-bold">Jukebox 420</h1> <h1 className="text-4xl font-bold">
Jukebox 420
{import.meta.env.VITE_BUILD_CHANNEL === 'nightly' && (
<span className="text-sm font-semibold ml-2" style={{ color: '#ff4d4f' }}>Nightly Build</span>
)}
</h1>
<p className="text-7xl font-bold mt-2">{clock}</p> <p className="text-7xl font-bold mt-2">{clock}</p>
</div> </div>
</div> </div>
@ -314,16 +319,29 @@ export default function App() {
<div className="bg-transparent mb-8"> <div className="bg-transparent mb-8">
<div className="flex flex-wrap gap-3 text-sm"> <div className="flex flex-wrap gap-3 text-sm">
<button className={`tag-btn ${activeFolder==='__favs__'?'active':''}`} onClick={()=>setActiveFolder('__favs__')}>Favoriten ({favCount})</button> <button className={`tag-btn ${activeFolder==='__favs__'?'active':''}`} onClick={()=>setActiveFolder('__favs__')}>Favoriten ({favCount})</button>
{folders.map(f=> ( {folders.map(f=> {
<button key={f.key} className={`tag-btn ${activeFolder===f.key?'active':''}`} onClick={async ()=>{ setActiveFolder(f.key); const resp=await fetchSounds(undefined, f.key); setSounds(resp.items); setTotal(resp.total); setFolders(resp.folders); }}>{f.name} ({f.count})</button> const displayName = f.name.replace(/\s*\(\d+\)\s*$/, '');
))} return (
<button
key={f.key}
className={`tag-btn ${activeFolder===f.key?'active':''}`}
onClick={async ()=>{
setActiveFolder(f.key);
const resp=await fetchSounds(undefined, f.key);
setSounds(resp.items); setTotal(resp.total); setFolders(resp.folders);
}}
>
{displayName} ({f.count})
</button>
);
})}
</div> </div>
</div> </div>
{error && <div className="error">{error}</div>} {error && <div className="error">{error}</div>}
{info && <div className="badge" style={{ background:'rgba(34,197,94,.18)', borderColor:'rgba(34,197,94,.35)' }}>{info}</div>} {info && <div className="badge" style={{ background:'rgba(34,197,94,.18)', borderColor:'rgba(34,197,94,.35)' }}>{info}</div>}
<main className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6 gap-4"> <main className="sounds-flow">
{(activeFolder === '__favs__' ? filtered.filter((s) => !!favs[s.relativePath ?? s.fileName]) : filtered).map((s) => { {(activeFolder === '__favs__' ? filtered.filter((s) => !!favs[s.relativePath ?? s.fileName]) : filtered).map((s) => {
const key = `${s.relativePath ?? s.fileName}`; const key = `${s.relativePath ?? s.fileName}`;
const isFav = !!favs[key]; const isFav = !!favs[key];

View file

@ -339,6 +339,9 @@ header h1 {
color: inherit; color: inherit;
} }
/* Nightly Badge Farbe (Fallback) */
.nightly-badge { color: #ff4d4f; }
header p { header p {
margin: 0; margin: 0;
opacity: .9; opacity: .9;
@ -532,7 +535,28 @@ header p {
.error { background: rgba(255, 99, 99, .12); color: #ffd1d1; border: 1px solid rgba(255, 99, 99, .3); padding: 10px 12px; border-radius: 10px; margin-bottom: 12px; } .error { background: rgba(255, 99, 99, .12); color: #ffd1d1; border: 1px solid rgba(255, 99, 99, .3); padding: 10px 12px; border-radius: 10px; margin-bottom: 12px; }
.grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(220px, 1fr)); gap: 14px; } .grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(220px, 1fr)); gap: 14px; }
.sound-wrap { position: relative; display: grid; grid-template-columns: auto 1fr auto; align-items: center; gap: 8px; }
/* Lineares, responsives Flow-Layout für Sounds */
.sounds-flow {
display: flex;
flex-wrap: wrap;
align-items: flex-start;
gap: 12px;
}
.sounds-flow .sound-wrap {
position: relative;
flex: 0 0 auto;
}
/* Kartenbreite an Tabs angelehnt */
.sounds-flow .sound-btn {
display: inline-flex;
width: auto;
max-width: 260px; /* verhindert überlange Buttons, mehr Cards pro Zeile */
white-space: nowrap; /* einzeilig */
padding: 12px 16px; /* gleichmäßiges Padding links/rechts */
justify-content: center; /* Text zentrieren */
}
.sound-wrap { position: relative; display: block; }
.sound-wrap.row .sound { width: 100%; } .sound-wrap.row .sound { width: 100%; }
.row-check { width: 18px; height: 18px; accent-color: #60a5fa; } .row-check { width: 18px; height: 18px; accent-color: #60a5fa; }
.select-check { .select-check {
@ -609,3 +633,37 @@ header p {
/* Tabs/Filter wie der Random-Button im Header (einheitlicher Stil über alle Themes) */
[data-theme] .tag-btn {
padding: 12px 24px;
border-radius: 0.5rem;
background: #374151; /* bg-gray-700 */
color: #ffffff;
font-size: .875rem; /* einheitliche Schriftgröße wie andere Themes */
font-weight: 700;
border: none;
transition: background-color .2s ease, transform .2s ease;
}
[data-theme] .tag-btn:hover { background: #4b5563; /* bg-gray-600 */ }
[data-theme] .tag-btn.active {
background: #4b5563;
box-shadow: 0 0 0 2px rgba(255,255,255,.08) inset;
}
/* Aktives Tab farbig je nach Theme */
[data-theme="dark"] .tag-btn.active {
background: #0a84ff !important;
color: #ffffff !important;
}
[data-theme="rainbow"] .tag-btn.active {
background: linear-gradient(90deg, #ff6384, #36a2eb, #ffce56, #4bc0c0, #9966ff) !important;
color: #ffffff !important;
border: 1px solid transparent !important;
}
[data-theme="420"] .tag-btn.active {
background: #22c55e !important;
color: #ffffff !important;
border-color: #22c55e !important;
box-shadow: 0 0 15px rgba(34, 197, 94, 0.5);
}