Skip to content

Update develop to main #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matikepa merged 3 commits into from
Jun 17, 2026
Merged

Update develop to main #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40afc67
dependabot updates
Jun 16, 2026
76b66d1
Merge branch 'main' into develop
matikepa Jun 16, 2026
4d297ee
update makefile, update banner color
Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@ REQUIREMENTS = requirements.txt
# Help target
.PHONY: help
help: ## Show available commands
@echo " make all - Clean, build, format, and run"
@echo " make all - Clean, build, sync JS, format, and run"
@echo " make new-post - Create a new blog post"
@echo " make clean - Clean all (Hugo cache, public, resources, venv)"
@echo " make build - Setup environment and install dependencies"
@echo " make sync-js - Copy scripts/gtag.js to assets/js/custom.js (no minify)"
@echo " make run - Run Hugo server (requires build first)"
@echo " make format - Run pre-commit hooks"

# Standard targets
.PHONY: all
all: clean build format run ## Clean, build, format, and run
all: clean build sync-js format run ## Clean, build, sync JS, format, and run

# Create new blog post
.PHONY: new-post
Expand Down Expand Up @@ -77,9 +78,21 @@ build: ## Setup virtual environment and install dependencies
# @. $(VENV_ACTIVATE) && python ./scripts/minifier.py || { echo "❌ JavaScript minification failed"; exit 1; }
# @echo "✅ JavaScript minification complete."

# Sync custom JavaScript from source before running Hugo (no minification)
.PHONY: sync-js
sync-js: ## Copy scripts/gtag.js to assets/js/custom.js (no minify)
@echo "🔄 Syncing scripts/gtag.js to assets/js/custom.js (no minification)..."
@if [ ! -f "./scripts/gtag.js" ]; then \
echo "❌ Source file scripts/gtag.js not found."; \
exit 1; \
fi
@mkdir -p ./assets/js
@cp ./scripts/gtag.js ./assets/js/custom.js
@echo "✅ JavaScript sync complete."

# Run: pre-check environment and start Hugo server
.PHONY: run
run: ## Run Hugo server (requires environment setup)
run: sync-js ## Run Hugo server (requires environment setup)
@echo "🔍 Checking if environment is ready..."
@if [ ! -d "$(VENV_DIR)" ]; then \
echo "❌ Virtual environment not found. Please run 'make build' first."; \
Expand Down
97 changes: 60 additions & 37 deletions assets/js/custom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ function addPostHogTag(apiKey, options = {}) {
p = t.createElement('script');
p.type = 'text/javascript';
p.async = true;
p.src = s.api_host.replace('.i.posthog.com', '-assets.i.posthog.com') + '/static/array.js';
p.src =
s.api_host.replace('.i.posthog.com', '-assets.i.posthog.com') + '/static/array.js';
r = t.getElementsByTagName('script')[0];
r.parentNode.insertBefore(p, r);
let u = e;
Expand All @@ -43,7 +44,10 @@ function addPostHogTag(apiKey, options = {}) {
u.people.toString = function () {
return u.toString(1) + '.people (stub)';
};
o = 'init capture register register_once register_for_session unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group identify setPersonProperties setPersonPropertiesForFlags resetPersonPropertiesForFlags setGroupPropertiesForFlags resetGroupPropertiesForFlags resetGroups onFeatureFlags addFeatureFlagsHandler onSessionId getSurveys getActiveMatchingSurveys renderSurvey canRenderSurvey getNextSurveyStep'.split(' ');
o =
'init capture register register_once register_for_session unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group identify setPersonProperties setPersonPropertiesForFlags resetPersonPropertiesForFlags setGroupPropertiesForFlags resetGroupPropertiesForFlags resetGroups onFeatureFlags addFeatureFlagsHandler onSessionId getSurveys getActiveMatchingSurveys renderSurvey canRenderSurvey getNextSurveyStep'.split(
' '
);
for (n = 0; n < o.length; n += 1) {
g(u, o[n]);
}
Expand All @@ -63,9 +67,9 @@ function addPostHogTag(apiKey, options = {}) {

addPostHogTag('phc_VXNcrtI3vEl899qY4aKXoHcLxtt08qxMnWHLfnLjPCf');

/**
* Function to add Google Analytics tag dynamically
/** * Function to add Google Analytics tag dynamically
*/

function addGoogleAnalyticsTag(trackingId) {
// Load the gtag.js script asynchronously
const script = document.createElement('script');
Expand All @@ -87,25 +91,6 @@ function addGoogleAnalyticsTag(trackingId) {
// Call the function with your tracking ID
addGoogleAnalyticsTag('G-81E77KGMGF');

/**
* Function to add Cloudflare Web Analytics tag dynamically
*/
function addCloudflareAnalyticsTag(token) {
if (!token || typeof document === 'undefined') return;

// Avoid injecting the same script multiple times.
if (document.querySelector('script[data-cf-beacon]')) return;

const script = document.createElement('script');
script.defer = true;
script.src = 'https://static.cloudflareinsights.com/beacon.min.js';
script.setAttribute('data-cf-beacon', JSON.stringify({ token }));
document.head.appendChild(script);
}

addCloudflareAnalyticsTag('81f78840732445d79901d42f93257926');


/**
* Enhanced Cookie Consent Manager
* Handles cookie consent banner with modern Google Analytics 4 (gtag.js)
Expand Down Expand Up @@ -144,9 +129,8 @@ class CookieConsent {
.cookie-container {
position: fixed;
z-index: 10010;
background: var(--global-background-color, #fff);
color: var(--global-font-color, #161209);
border: 1px solid var(--global-border-color, #f0f0f0);
background: var(--cookie-bg, #262626);
color: var(--cookie-fg, #e2e8f0);
border-radius: 0.375rem;
box-shadow: 0 2px 8px rgba(0,0,0,0.10), 0 1.5px 4px rgba(0,0,0,0.08);
padding: 1rem 2rem 1rem 1rem;
Expand Down Expand Up @@ -178,15 +162,14 @@ class CookieConsent {
line-height: 1.5;
margin: 0;
word-break: break-word;
color: var(--global-font-color, #161209);
}
.cookie-message a {
color: var(--global-link-color, #161209);
color: #6366f1;
text-decoration: underline;
transition: color 0.2s;
}
.cookie-message a:hover {
color: var(--global-link-hover-color, #161209);
color: #4f46e5;
}
.cookie-buttons {
display: flex;
Expand All @@ -203,25 +186,65 @@ class CookieConsent {
transition: background 0.2s, color 0.2s;
}
.cookie-btn {
background: var(--global-font-color, #161209);
color: var(--global-background-color, #fff);
background: #6366f1;
color: #fff;
}
.cookie-btn:hover {
opacity: 0.85;
background: #4f46e5;
}
.nope-cookie-btn {
background: transparent;
color: var(--global-font-secondary-color, #a9a9b3);
border: 1px solid var(--global-border-color, #f0f0f0);
color: #64748b;
border: 1px solid #64748b;
}
.nope-cookie-btn:hover {
background: var(--global-border-color, #f0f0f0);
color: var(--global-font-color, #161209);
background: #e2e8f0;
color: #334155;
}
.cookie-btn:focus, .nope-cookie-btn:focus {
outline: 2px solid var(--global-link-color, #161209);
outline: 2px solid #6366f1;
outline-offset: 2px;
}
@media (prefers-color-scheme: dark) {
.cookie-container {
--cookie-bg: #f5f5f5;
--cookie-fg: #334155;
}
.cookie-btn {
background: #6366f1;
color: #fff;
}
.cookie-btn:hover {
background: #4f46e5;
}
.nope-cookie-btn {
color: #475569;
border-color: #cbd5e1;
}
.nope-cookie-btn:hover {
background: #f1f5f9;
color: #334155;
}
}
.dark .cookie-container {
--cookie-bg: #f5f5f5;
--cookie-fg: #334155;
}
.dark .cookie-btn {
background: #6366f1;
color: #fff;
}
.dark .cookie-btn:hover {
background: #4f46e5;
}
.dark .nope-cookie-btn {
color: #475569;
border-color: #cbd5e1;
}
.dark .nope-cookie-btn:hover {
background: #f1f5f9;
color: #334155;
}
`;

const styleElement = document.createElement('style');
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
cfgv==3.5.0
distlib==0.4.0
filelock==3.29.0
filelock==3.29.4
distlib==0.4.3
hugo==0.153.0
identify==2.6.19
jsmin==3.0.1
libsass==0.23.0
nodeenv==1.10.0
platformdirs==4.9.6
platformdirs==4.10.0
pre_commit==4.6.0
PyYAML==6.0.3
rcssmin==1.2.2
virtualenv==21.3.3
virtualenv==21.5.0