mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-12-02 01:01:14 +00:00
try to get list of themes from server side
This commit is contained in:
parent
904d33e895
commit
8049ce6abf
5 changed files with 446 additions and 414 deletions
|
@ -19,6 +19,7 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@typescript-eslint/parser": "^5.6.0",
|
"@typescript-eslint/parser": "^5.6.0",
|
||||||
"autosize": "^5.0.1",
|
"autosize": "^5.0.1",
|
||||||
|
"buffer": "^6.0.3",
|
||||||
"check-password-strength": "^2.0.3",
|
"check-password-strength": "^2.0.3",
|
||||||
"choices.js": "^10.0.0",
|
"choices.js": "^10.0.0",
|
||||||
"classnames": "^2.3.1",
|
"classnames": "^2.3.1",
|
||||||
|
|
|
@ -66,18 +66,23 @@ server.get("/css/themes-list", async (req, res) => {
|
||||||
"litely",
|
"litely",
|
||||||
"nord",
|
"nord",
|
||||||
];
|
];
|
||||||
fs.readdir(extraThemesFolder, function (err, data) {
|
fs.readdir(extraThemesFolder, function (_, data) {
|
||||||
data = data
|
if (data != null) {
|
||||||
.filter(d => d.endsWith(".min.css"))
|
data = data
|
||||||
.map(d => d.replace(".min.css", ""));
|
.filter(d => d.endsWith(".min.css"))
|
||||||
data = builtinThemes.concat(data);
|
.map(d => d.replace(".min.css", ""));
|
||||||
// use set to remove duplicate values
|
data = builtinThemes.concat(data);
|
||||||
data = Array.from(new Set(data));
|
// use set to remove duplicate values
|
||||||
res.send(data);
|
data = Array.from(new Set(data));
|
||||||
|
res.send(data);
|
||||||
|
} else {
|
||||||
|
res.send(builtinThemes);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
server.get("/css/themes/:name", async (req, res) => {
|
server.get("/css/themes/:name", async (req, res) => {
|
||||||
|
res.contentType("text/css");
|
||||||
const theme = req.params.name;
|
const theme = req.params.name;
|
||||||
if (!theme.endsWith(".css")) {
|
if (!theme.endsWith(".css")) {
|
||||||
res.send("Theme must be a css file");
|
res.send("Theme must be a css file");
|
||||||
|
|
|
@ -29,6 +29,7 @@ import {
|
||||||
debounce,
|
debounce,
|
||||||
elementUrl,
|
elementUrl,
|
||||||
fetchCommunities,
|
fetchCommunities,
|
||||||
|
fetchThemes,
|
||||||
fetchUsers,
|
fetchUsers,
|
||||||
getLanguage,
|
getLanguage,
|
||||||
getNativeLanguageName,
|
getNativeLanguageName,
|
||||||
|
@ -40,7 +41,6 @@ import {
|
||||||
setTheme,
|
setTheme,
|
||||||
setupTippy,
|
setupTippy,
|
||||||
showLocal,
|
showLocal,
|
||||||
themes,
|
|
||||||
toast,
|
toast,
|
||||||
updateCommunityBlock,
|
updateCommunityBlock,
|
||||||
updatePersonBlock,
|
updatePersonBlock,
|
||||||
|
@ -548,7 +548,7 @@ export class Settings extends Component<any, SettingsState> {
|
||||||
{i18n.t("theme")}
|
{i18n.t("theme")}
|
||||||
</option>
|
</option>
|
||||||
<option value="browser">{i18n.t("browser_default")}</option>
|
<option value="browser">{i18n.t("browser_default")}</option>
|
||||||
{themes.map(theme => (
|
{fetchThemes().map(theme => (
|
||||||
<option value={theme}>{theme}</option>
|
<option value={theme}>{theme}</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -166,24 +166,22 @@ export const languages = [
|
||||||
{ code: "lt" },
|
{ code: "lt" },
|
||||||
];
|
];
|
||||||
|
|
||||||
export function themes() {
|
export function fetchThemes(): Promise<string[]> {
|
||||||
const builtinThemes = [
|
var promise = new Promise<string[]>((resolve, reject) => {
|
||||||
"litera",
|
if (isBrowser()) {
|
||||||
"materia",
|
const url = `${window.location.protocol}//${window.location.host}/css/themes-list`;
|
||||||
"minty",
|
console.log(url);
|
||||||
"solar",
|
fetch(url).then(res => {
|
||||||
"united",
|
res.json().then(json => {
|
||||||
"cyborg",
|
console.log(json);
|
||||||
"darkly",
|
resolve(json);
|
||||||
"journal",
|
});
|
||||||
"sketchy",
|
});
|
||||||
"vaporwave",
|
} else {
|
||||||
"vaporwave-dark",
|
listThemes().then(themes => resolve(themes));
|
||||||
"i386",
|
}
|
||||||
"litely",
|
});
|
||||||
"nord",
|
return promise;
|
||||||
];
|
|
||||||
return builtinThemes;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULT_ALPHABET =
|
const DEFAULT_ALPHABET =
|
||||||
|
|
Loading…
Reference in a new issue