Loading src/theme.cpp +43 −38 Changes for src/theme.cpp: 43 added lines, 38 removed lines. Original line number Diff line number Diff line Loading @@ -885,51 +885,42 @@ json_object* blogi::Theme::SettingsTheme(const int tid, libhttppp::HttpRequest & } } struct ColorDef { const char *suffix; const char *label; const char *darkDef; const char *lightDef; }; std::string styleCss; for(const auto& file : _PublicFiles){ if(file.Path == "/theme/public/style.css"){ styleCss = file.Content; break; } } struct ColorDef { const char *suffix; const char *cssVar; const char *label; const char *darkDef; const char *lightDef; }; ColorDef colors[] = { {"BG", "Background", "#232627", "rgba(235,237,240,1)"}, {"SURFACE", "Surface", "#31363b", "rgba(245,246,248,1)"}, {"SURFACE_A", "Surface (alpha)", "rgba(49,54,59,0.7)", "rgba(245,246,248,0.88)"}, {"TEXT", "Text", "#eeeeee", "rgba(44,62,80,1)"}, {"TEXT_MUTED", "Text Muted", "#aaaaaa", "rgba(127,140,141,1)"}, {"ACCENT", "Accent / Links", "#3ad43a", "rgba(39,148,94,1)"}, {"ACCENT_DARK", "Accent Dark", "#2ea82e", "rgba(30,122,75,1)"}, {"BORDER", "Border", "#3a3f44", "rgba(220,225,230,1)"}, {"BG_ALT", "Background Alt", "#2a2e32", "rgba(232,236,240,1)"}, {"ERROR", "Error", "#F36947", "rgba(231,76,60,1)"}, {"ERROR_BG", "Error Background", "#3d1f1a", "rgba(253,236,234,1)"}, {"ERROR_TEXT", "Error Text", "#ff9a8a", "rgba(192,57,43,1)"}, {"SUCCESS_BG", "Success Background","#1a3d1f", "rgba(234,250,241,1)"}, {"SUCCESS_TEXT", "Success Text", "#8aff9a", "rgba(39,174,96,1)"}, {"NAV_ACTIVE", "Nav Active", "#3daee9", "rgba(41,128,185,1)"}, {"NAV_HOVER", "Nav Hover", "#232629", "rgba(232,236,240,1)"}, {"NAV_BORDER", "Nav Border", "#222529", "rgba(189,195,199,1)"}, {"BG", "--blogi-bg", "Background", "#232627", "rgba(235,237,240,1)"}, {"SURFACE", "--blogi-surface", "Surface", "#31363b", "rgba(245,246,248,1)"}, {"SURFACE_A", "--blogi-surface-a", "Surface (alpha)", "rgba(49,54,59,0.7)", "rgba(245,246,248,0.88)"}, {"TEXT", "--blogi-text", "Text", "#eeeeee", "rgba(44,62,80,1)"}, {"TEXT_MUTED", "--blogi-text-muted", "Text Muted", "#aaaaaa", "rgba(127,140,141,1)"}, {"ACCENT", "--blogi-accent", "Accent / Links", "#3ad43a", "rgba(39,148,94,1)"}, {"ACCENT_DARK", "--blogi-accent-dark", "Accent Dark", "#2ea82e", "rgba(30,122,75,1)"}, {"BORDER", "--blogi-border", "Border", "#3a3f44", "rgba(220,225,230,1)"}, {"BG_ALT", "--blogi-bg-alt", "Background Alt", "#2a2e32", "rgba(232,236,240,1)"}, {"ERROR", "--blogi-error", "Error", "#F36947", "rgba(231,76,60,1)"}, {"ERROR_BG", "--blogi-error-bg", "Error Background", "#3d1f1a", "rgba(253,236,234,1)"}, {"ERROR_TEXT", "--blogi-error-text", "Error Text", "#ff9a8a", "rgba(192,57,43,1)"}, {"SUCCESS_BG", "--blogi-success-bg", "Success Background","#1a3d1f", "rgba(234,250,241,1)"}, {"SUCCESS_TEXT", "--blogi-success-text", "Success Text", "#8aff9a", "rgba(39,174,96,1)"}, {"NAV_ACTIVE", "--blogi-nav-active", "Nav Active", "#3daee9", "rgba(41,128,185,1)"}, {"NAV_HOVER", "--blogi-nav-hover", "Nav Hover", "#232629", "rgba(232,236,240,1)"}, {"NAV_BORDER", "--blogi-nav-border", "Nav Border", "#222529", "rgba(189,195,199,1)"}, }; if(reset){ // Batch reset: delete all theme color keys and re-insert defaults in one SQL // Batch reset: delete all theme color keys (do NOT insert hardcoded defaults, let getThemeColors extract from style.css) dbpp::SQL rsql; dbpp::DBResult rres; std::vector<char> buf; const std::string keyColumn = dbpp::quoteIdentifier(*_Config.TDatabase[tid], "key"); rsql << "DELETE FROM options WHERE " << keyColumn << " LIKE 'THEME_DARK_%' OR " << keyColumn << " LIKE 'THEME_LIGHT_%';"; _Config.TDatabase[tid]->exec(rsql, rres); for(auto &c : colors){ for(int p = 0; p < 2; ++p){ rsql.clear(); rres.clear(); const char *prefix = p == 0 ? "THEME_DARK_" : "THEME_LIGHT_"; const char *val = p == 0 ? c.darkDef : c.lightDef; uuid::uuid id; id.generate(); rsql << "INSERT INTO options (id," << keyColumn << ",value) VALUES ('" << id.c_str() << "','" << dbpp::SQL::escaped(buf, (std::string(prefix) + c.suffix).c_str()) << "','" << dbpp::SQL::escaped(buf, val) << "');"; _Config.TDatabase[tid]->exec(rsql, rres); } } } else { for(auto &profile : profiles){ std::string pfx = std::string("THEME_") + (std::string(profile) == "light" ? "LIGHT" : "DARK") + "_"; Loading Loading @@ -1039,10 +1030,17 @@ json_object* blogi::Theme::SettingsTheme(const int tid, libhttppp::HttpRequest & json_object *jfields = json_object_new_array(); for(auto &c : colors){ std::string dynamicDef = extractCssVar(styleCss, c.cssVar); if(dynamicDef.empty() && std::string(c.cssVar).find("--blogi-") == 0) { std::string altVar = "--color-" + std::string(c.cssVar).substr(8); dynamicDef = extractCssVar(styleCss, altVar); } std::string ddef = dynamicDef.empty() ? c.darkDef : dynamicDef; std::string val; try { getConfig(*_Config.TDatabase[tid], std::string("THEME_DARK_") + c.suffix, val); } catch(...) {} normalizeColor(val); if(val.empty()) val = c.darkDef; if(val.empty()) val = ddef; json_object *jf = json_object_new_object(); std::string name = "theme_dark_"; Loading @@ -1067,10 +1065,17 @@ json_object* blogi::Theme::SettingsTheme(const int tid, libhttppp::HttpRequest & json_object *jfields = json_object_new_array(); for(auto &c : colors){ std::string dynamicDef = extractCssVar(styleCss, c.cssVar); if(dynamicDef.empty() && std::string(c.cssVar).find("--blogi-") == 0) { std::string altVar = "--color-" + std::string(c.cssVar).substr(8); dynamicDef = extractCssVar(styleCss, altVar); } std::string ldef = dynamicDef.empty() ? c.lightDef : dynamicDef; std::string val; try { getConfig(*_Config.TDatabase[tid], std::string("THEME_LIGHT_") + c.suffix, val); } catch(...) {} normalizeColor(val); if(val.empty()) val = c.lightDef; if(val.empty()) val = ldef; json_object *jf = json_object_new_object(); std::string name = "theme_light_"; Loading Loading
src/theme.cpp +43 −38 Changes for src/theme.cpp: 43 added lines, 38 removed lines. Original line number Diff line number Diff line Loading @@ -885,51 +885,42 @@ json_object* blogi::Theme::SettingsTheme(const int tid, libhttppp::HttpRequest & } } struct ColorDef { const char *suffix; const char *label; const char *darkDef; const char *lightDef; }; std::string styleCss; for(const auto& file : _PublicFiles){ if(file.Path == "/theme/public/style.css"){ styleCss = file.Content; break; } } struct ColorDef { const char *suffix; const char *cssVar; const char *label; const char *darkDef; const char *lightDef; }; ColorDef colors[] = { {"BG", "Background", "#232627", "rgba(235,237,240,1)"}, {"SURFACE", "Surface", "#31363b", "rgba(245,246,248,1)"}, {"SURFACE_A", "Surface (alpha)", "rgba(49,54,59,0.7)", "rgba(245,246,248,0.88)"}, {"TEXT", "Text", "#eeeeee", "rgba(44,62,80,1)"}, {"TEXT_MUTED", "Text Muted", "#aaaaaa", "rgba(127,140,141,1)"}, {"ACCENT", "Accent / Links", "#3ad43a", "rgba(39,148,94,1)"}, {"ACCENT_DARK", "Accent Dark", "#2ea82e", "rgba(30,122,75,1)"}, {"BORDER", "Border", "#3a3f44", "rgba(220,225,230,1)"}, {"BG_ALT", "Background Alt", "#2a2e32", "rgba(232,236,240,1)"}, {"ERROR", "Error", "#F36947", "rgba(231,76,60,1)"}, {"ERROR_BG", "Error Background", "#3d1f1a", "rgba(253,236,234,1)"}, {"ERROR_TEXT", "Error Text", "#ff9a8a", "rgba(192,57,43,1)"}, {"SUCCESS_BG", "Success Background","#1a3d1f", "rgba(234,250,241,1)"}, {"SUCCESS_TEXT", "Success Text", "#8aff9a", "rgba(39,174,96,1)"}, {"NAV_ACTIVE", "Nav Active", "#3daee9", "rgba(41,128,185,1)"}, {"NAV_HOVER", "Nav Hover", "#232629", "rgba(232,236,240,1)"}, {"NAV_BORDER", "Nav Border", "#222529", "rgba(189,195,199,1)"}, {"BG", "--blogi-bg", "Background", "#232627", "rgba(235,237,240,1)"}, {"SURFACE", "--blogi-surface", "Surface", "#31363b", "rgba(245,246,248,1)"}, {"SURFACE_A", "--blogi-surface-a", "Surface (alpha)", "rgba(49,54,59,0.7)", "rgba(245,246,248,0.88)"}, {"TEXT", "--blogi-text", "Text", "#eeeeee", "rgba(44,62,80,1)"}, {"TEXT_MUTED", "--blogi-text-muted", "Text Muted", "#aaaaaa", "rgba(127,140,141,1)"}, {"ACCENT", "--blogi-accent", "Accent / Links", "#3ad43a", "rgba(39,148,94,1)"}, {"ACCENT_DARK", "--blogi-accent-dark", "Accent Dark", "#2ea82e", "rgba(30,122,75,1)"}, {"BORDER", "--blogi-border", "Border", "#3a3f44", "rgba(220,225,230,1)"}, {"BG_ALT", "--blogi-bg-alt", "Background Alt", "#2a2e32", "rgba(232,236,240,1)"}, {"ERROR", "--blogi-error", "Error", "#F36947", "rgba(231,76,60,1)"}, {"ERROR_BG", "--blogi-error-bg", "Error Background", "#3d1f1a", "rgba(253,236,234,1)"}, {"ERROR_TEXT", "--blogi-error-text", "Error Text", "#ff9a8a", "rgba(192,57,43,1)"}, {"SUCCESS_BG", "--blogi-success-bg", "Success Background","#1a3d1f", "rgba(234,250,241,1)"}, {"SUCCESS_TEXT", "--blogi-success-text", "Success Text", "#8aff9a", "rgba(39,174,96,1)"}, {"NAV_ACTIVE", "--blogi-nav-active", "Nav Active", "#3daee9", "rgba(41,128,185,1)"}, {"NAV_HOVER", "--blogi-nav-hover", "Nav Hover", "#232629", "rgba(232,236,240,1)"}, {"NAV_BORDER", "--blogi-nav-border", "Nav Border", "#222529", "rgba(189,195,199,1)"}, }; if(reset){ // Batch reset: delete all theme color keys and re-insert defaults in one SQL // Batch reset: delete all theme color keys (do NOT insert hardcoded defaults, let getThemeColors extract from style.css) dbpp::SQL rsql; dbpp::DBResult rres; std::vector<char> buf; const std::string keyColumn = dbpp::quoteIdentifier(*_Config.TDatabase[tid], "key"); rsql << "DELETE FROM options WHERE " << keyColumn << " LIKE 'THEME_DARK_%' OR " << keyColumn << " LIKE 'THEME_LIGHT_%';"; _Config.TDatabase[tid]->exec(rsql, rres); for(auto &c : colors){ for(int p = 0; p < 2; ++p){ rsql.clear(); rres.clear(); const char *prefix = p == 0 ? "THEME_DARK_" : "THEME_LIGHT_"; const char *val = p == 0 ? c.darkDef : c.lightDef; uuid::uuid id; id.generate(); rsql << "INSERT INTO options (id," << keyColumn << ",value) VALUES ('" << id.c_str() << "','" << dbpp::SQL::escaped(buf, (std::string(prefix) + c.suffix).c_str()) << "','" << dbpp::SQL::escaped(buf, val) << "');"; _Config.TDatabase[tid]->exec(rsql, rres); } } } else { for(auto &profile : profiles){ std::string pfx = std::string("THEME_") + (std::string(profile) == "light" ? "LIGHT" : "DARK") + "_"; Loading Loading @@ -1039,10 +1030,17 @@ json_object* blogi::Theme::SettingsTheme(const int tid, libhttppp::HttpRequest & json_object *jfields = json_object_new_array(); for(auto &c : colors){ std::string dynamicDef = extractCssVar(styleCss, c.cssVar); if(dynamicDef.empty() && std::string(c.cssVar).find("--blogi-") == 0) { std::string altVar = "--color-" + std::string(c.cssVar).substr(8); dynamicDef = extractCssVar(styleCss, altVar); } std::string ddef = dynamicDef.empty() ? c.darkDef : dynamicDef; std::string val; try { getConfig(*_Config.TDatabase[tid], std::string("THEME_DARK_") + c.suffix, val); } catch(...) {} normalizeColor(val); if(val.empty()) val = c.darkDef; if(val.empty()) val = ddef; json_object *jf = json_object_new_object(); std::string name = "theme_dark_"; Loading @@ -1067,10 +1065,17 @@ json_object* blogi::Theme::SettingsTheme(const int tid, libhttppp::HttpRequest & json_object *jfields = json_object_new_array(); for(auto &c : colors){ std::string dynamicDef = extractCssVar(styleCss, c.cssVar); if(dynamicDef.empty() && std::string(c.cssVar).find("--blogi-") == 0) { std::string altVar = "--color-" + std::string(c.cssVar).substr(8); dynamicDef = extractCssVar(styleCss, altVar); } std::string ldef = dynamicDef.empty() ? c.lightDef : dynamicDef; std::string val; try { getConfig(*_Config.TDatabase[tid], std::string("THEME_LIGHT_") + c.suffix, val); } catch(...) {} normalizeColor(val); if(val.empty()) val = c.lightDef; if(val.empty()) val = ldef; json_object *jf = json_object_new_object(); std::string name = "theme_light_"; Loading