Batyka/soundcloak
1
0
Fork 0
mirror of https://git.maid.zone/stuff/soundcloak.git synced 2025-12-12 14:49:38 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix static files; drop normalize.css

Browse Source
This commit is contained in:
Laptop
2024-12-29 22:06:32 +02:00
parent ac0572294b
commit 5ee5805a62
7 changed files with 28 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.go
View File

@@ -78,13 +78,13 @@ func main() {
const AssetsMaxAge = 14400 // 4hrs
const ExternalMaxAge = 28800 // 8hrs
if cfg.EmbedFiles {
app.Use("/", filesystem.New(filesystem.Config{Root: http.FS(static.Instance), PathPrefix: "instance", MaxAge: InstanceMaxAge}))
app.Use("/", filesystem.New(filesystem.Config{Root: http.FS(static.Assets), PathPrefix: "assets", MaxAge: AssetsMaxAge}))
app.Use("/js/", filesystem.New(filesystem.Config{Root: http.FS(static.External), PathPrefix: "external", MaxAge: ExternalMaxAge}))
app.Use("/_/static/", filesystem.New(filesystem.Config{Root: http.FS(static.Instance), PathPrefix: "instance", MaxAge: InstanceMaxAge}))
app.Use("/_/static/", filesystem.New(filesystem.Config{Root: http.FS(static.Assets), PathPrefix: "assets", MaxAge: AssetsMaxAge}))
app.Use("/_/static/js/", filesystem.New(filesystem.Config{Root: http.FS(static.External), PathPrefix: "external", MaxAge: ExternalMaxAge}))
} else {
app.Static("/", "static/instance", fiber.Static{Compress: true, MaxAge: InstanceMaxAge})
app.Static("/", "static/assets", fiber.Static{Compress: true, MaxAge: AssetsMaxAge})
app.Static("/js/", "static/external", fiber.Static{Compress: true, MaxAge: ExternalMaxAge})
app.Static("/_/static/", "static/instance", fiber.Static{Compress: true, MaxAge: InstanceMaxAge})
app.Static("/_/static/", "static/assets", fiber.Static{Compress: true, MaxAge: AssetsMaxAge})
app.Static("/_/static/js/", "static/external", fiber.Static{Compress: true, MaxAge: ExternalMaxAge})
}
app.Get("/search", func(c *fiber.Ctx) error {

11
static/assets/global.css
View File

@@ -1,8 +1,6 @@
@import url(normalize.css);
@font-face {
font-family: "fixed";
src: url("/fixed.ttf");
src: url("/_/static/fixed.ttf");
}
:root {
@@ -26,6 +24,13 @@ body {
color: var(--accent);
}
input, select {
font-family: inherit;
font-size: 100%;
line-height: 1.15;
margin: 0;
}
h1,
h2,
h3,

351
static/assets/normalize.css vendored
View File

@@ -1,351 +0,0 @@
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* Document
========================================================================== */
/**
* 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in iOS.
*/
html {
line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/* Sections
========================================================================== */
/**
* Remove the margin in all browsers.
*/
body {
margin: 0;
}
/**
* Render the `main` element consistently in IE.
*/
main {
display: block;
}
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/* Grouping content
========================================================================== */
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
hr {
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
pre {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/* Text-level semantics
========================================================================== */
/**
* Remove the gray background on active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
}
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
font-weight: bolder;
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/**
* Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/* Embedded content
========================================================================== */
/**
* Remove the border on images inside links in IE 10.
*/
img {
border-style: none;
}
/* Forms
========================================================================== */
/**
* 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
}
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
button,
input {
/* 1 */
overflow: visible;
}
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
button,
select {
/* 1 */
text-transform: none;
}
/**
* Correct the inability to style clickable types in iOS and Safari.
*/
button,
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
/**
* Remove the inner border and padding in Firefox.
*/
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
}
/**
* Restore the focus styles unset by the previous rule.
*/
button:-moz-focusring,
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
}
/**
* Correct the padding in Firefox.
*/
fieldset {
padding: 0.35em 0.75em 0.625em;
}
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
legend {
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
}
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
progress {
vertical-align: baseline;
}
/**
* Remove the default vertical scrollbar in IE 10+.
*/
textarea {
overflow: auto;
}
/**
* 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
}
/**
* Remove the inner padding in Chrome and Safari on macOS.
*/
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
}
/* Interactive
========================================================================== */
/*
* Add the correct display in Edge, IE 10+, and Firefox.
*/
details {
display: block;
}
/*
* Add the correct display in all browsers.
*/
summary {
display: list-item;
}
/* Misc
========================================================================== */
/**
* Add the correct display in IE 10+.
*/
template {
display: none;
}
/**
* Add the correct display in IE 10.
*/
[hidden] {
display: none;
}

10
templates/base.templ
View File

@@ -8,8 +8,8 @@ templ Base(title string, content templ.Component, head templ.Component) {
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link rel="stylesheet" href="/global.css"/>
<link rel="stylesheet" href="/instance.css"/>
<link rel="stylesheet" href="/_/static/global.css"/>
<link rel="stylesheet" href="/_/static/instance.css"/>
if title != "" {
<title>{ title } ~ soundcloak</title>
} else {
@@ -30,7 +30,7 @@ templ Base(title string, content templ.Component, head templ.Component) {
}
templ MainPageHead() {
<link rel="stylesheet" href="/index.css"/>
<link rel="stylesheet" href="/_/static/index.css"/>
}
templ MainPage(p cfg.Preferences) {
@@ -46,7 +46,7 @@ templ MainPage(p cfg.Preferences) {
</div>
if *p.SearchSuggestions {
<ul id="search-suggestions" style="display: none;"></ul>
<script async src="/index.js"></script>
<script async src="/_/static/index.js"></script>
}
</div>
<input type="submit" value="Search" class="btn" style="width: 100%; margin-top: .5rem;"/>
@@ -58,6 +58,6 @@ templ MainPage(p cfg.Preferences) {
<a class="btn" href="/_/preferences">Preferences</a>
<a class="btn" href="https://git.maid.zone/stuff/soundcloak">Source code</a>
<a class="btn" href="/notice.txt">Legal notice</a>
<a class="btn" href="/_/static/notice.txt">Legal notice</a>
</footer>
}

2
templates/playlist.templ
View File

@@ -25,7 +25,7 @@ templ PlaylistItem(playlist *sc.Playlist, showUsername bool) {
if playlist.Artwork != "" {
<img src={ playlist.Artwork }/>
} else {
<img src="/placeholder.jpg"/>
<img src="/_/static/placeholder.jpg"/>
}
<div class="meta">
<h3>{ playlist.Title }</h3>

14
templates/track.templ
View File

@@ -48,7 +48,7 @@ templ TrackHeader(prefs cfg.Preferences, t sc.Track, needPlayer bool) {
<meta name="og:image" content={ t.Artwork }/>
<link rel="icon" type="image/x-icon" href={ t.Artwork }/>
if needPlayer && *prefs.Player == cfg.HLSPlayer {
<script src="/js/hls.light.min.js"></script>
<script src="/_/static/js/hls.light.min.js"></script>
}
}
@@ -76,7 +76,7 @@ templ TrackPlayer(prefs cfg.Preferences, track sc.Track, stream string, displayE
{{ audioPref = *prefs.RestreamAudio }}
if nextTrack != nil {
<audio id="track" src={ "/_/restream" + track.Href() } controls autoplay?={ autoplay } data-next={ next(nextTrack, playlist, true, mode, "") } volume={ volume }></audio>
<script async src="/restream.js"></script>
<script async src="/_/static/restream.js"></script>
} else {
<audio src={ "/_/restream" + track.Href() } controls autoplay?={ autoplay }></audio>
}
@@ -88,9 +88,9 @@ templ TrackPlayer(prefs cfg.Preferences, track sc.Track, stream string, displayE
<audio id="track" src={ stream } controls autoplay?={ autoplay }></audio>
}
if *prefs.FullyPreloadTrack {
<script async src="/player_preload.js"></script>
<script async src="/_/static/player_preload.js"></script>
} else {
<script async src="/player.js"></script>
<script async src="/_/static/player.js"></script>
}
<noscript>
<br/>
@@ -133,7 +133,7 @@ templ TrackItem(track *sc.Track, showUsername bool, overrideHref string) {
if track.Artwork != "" {
<img src={ track.Artwork }/>
} else {
<img src="/placeholder.jpg"/>
<img src="/_/static/placeholder.jpg"/>
}
<div class="meta">
<h3>{ track.Title }</h3>
@@ -205,10 +205,10 @@ templ TrackEmbed(prefs cfg.Preferences, t sc.Track, stream string, displayErr st
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link rel="stylesheet" href="/global.css"/>
<link rel="stylesheet" href="/_/static/global.css"/>
<title>soundcloak</title>
if *prefs.Player == cfg.HLSPlayer {
<script src="/js/hls.js/hls.light.js"></script>
<script src="/_/static/js/hls.light.js"></script>
}
</head>
<body>

2
templates/user.templ
View File

@@ -21,7 +21,7 @@ templ UserItem(user *sc.User) {
if user.Avatar != "" {
<img src={ user.Avatar }/>
} else {
<img src="/placeholder.jpg"/>
<img src="/_/static/placeholder.jpg"/>
}
<div class="meta">
<h3>{ user.Username }</h3>