Merge branch 'dev' into brian/uc-33-kafka-optimizations

This commit is contained in:
Brian Cao 2022-08-25 22:43:33 -07:00
commit f1e0814f4b
5 changed files with 25 additions and 1 deletions

View File

@ -7,6 +7,7 @@ on: [push]
env:
DATABASE_TYPE: postgresql
SKIP_DB_CHECK: 1
jobs:
build:

View File

@ -48,5 +48,14 @@ export default function useLocale() {
}
}, [locale]);
useEffect(() => {
const url = new URL(window.location.href);
const locale = url.searchParams.get('locale');
if (locale) {
saveLocale(locale);
}
}, []);
return { locale, saveLocale, messages, dir, dateLocale };
}

View File

@ -23,5 +23,14 @@ export default function useTheme() {
document.body.setAttribute('data-theme', theme);
}, [theme]);
useEffect(() => {
const url = new URL(window.location.href);
const theme = url.searchParams.get('theme');
if (['light', 'dark'].includes(theme)) {
saveTheme(theme);
}
}, []);
return [theme, saveTheme];
}

View File

@ -1,6 +1,6 @@
{
"name": "umami",
"version": "1.37.0",
"version": "1.38.0-beta.1",
"description": "A simple, fast, privacy-focused alternative to Google Analytics.",
"author": "Mike Cao <mike@mikecao.com>",
"license": "MIT",

View File

@ -4,6 +4,11 @@ const chalk = require('chalk');
const spawn = require('cross-spawn');
const { execSync } = require('child_process');
if (process.env.SKIP_DB_CHECK) {
console.log('Skipping database check.');
process.exit(0);
}
const prisma = new PrismaClient();
function success(msg) {