Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion govscape/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "govscape"
version = "0.1.0"
description = ""
authors = ["kylebd99 <kdeeds@cs.washington.edu>"]
authors = []
readme = "README.md"


Expand Down
31 changes: 15 additions & 16 deletions govscape_conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
server {
server_name govscape.net www.govscape.net;
server_name govscape-anonymized.net www.govscape-anonymized.net;

root /home/ubuntu/govscape/interface/build;
index index.html;

# Redirect all www requests to non-www requests
if ($host = www.govscape.net) {
return 301 https://govscape.net$request_uri;
if ($host = www.govscape-anonymized.net) {
return 301 https://govscape-anonymized.net$request_uri;
}

# Serve static frontend files
Expand All @@ -30,26 +30,25 @@ server {

listen 443 ssl; # HTTPS port

# SSL configuration (managed by Certbot)
ssl_certificate /etc/letsencrypt/live/govscape.net/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/govscape.net/privkey.pem;
include /etc/letsencrypt/options-ssl-nginx.conf;
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
ssl_certificate /etc/letsencrypt/live/govscape-anonymized.net/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/govscape-anonymized.net/privkey.pem; # managed by Certbot
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
}

# HTTP server block: redirect to HTTPS
server {
listen 80;
server_name govscape.net www.govscape.net;
server_name govscape-anonymized.net www.govscape-anonymized.net;

# Redirect all HTTP requests to HTTPS
if ($host = www.govscape.net) {
return 301 https://govscape.net$request_uri;
}
if ($host = www.govscape-anonymized.net) {
return 301 https://$host$request_uri;
} # managed by Certbot

if ($host = govscape.net) {
return 301 https://$host$request_uri;
}

if ($host = govscape-anonymized.net) {
return 301 https://$host$request_uri;
} # managed by Certbot

return 404; # fallback
}
173 changes: 0 additions & 173 deletions interface/src/lib/components/CookieConsent.svelte

This file was deleted.

2 changes: 1 addition & 1 deletion interface/src/lib/utils/fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const ENDPOINTS = {
S3: 'http://localhost:8080/img'
},
PROD: {
API: 'https://govscape.net/api',
API: 'https://govscape-anonymized.net/api',
S3: 'https://bcgl-public-bucket.s3.amazonaws.com/prod-serving/img'
}
};
Expand Down
28 changes: 0 additions & 28 deletions interface/src/routes/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,44 +1,16 @@
<script>
import { onMount } from 'svelte';
import { page } from '$app/stores';
import CookieConsent from '$lib/components/CookieConsent.svelte';
import { userTracker } from '$lib/utils/userTracking.js';

let showCookieConsent = false;

function handleCookieConsent(event) {
const { accepted } = event.detail;

userTracker.updateConsent(accepted);
showCookieConsent = false;
}

onMount(() => {
showCookieConsent = userTracker.needsConsent();
});
</script>

<div class="app">
<header>
<a href="/" class="logo">
<img draggable="false" src="/logo.png" alt="GovScape Logo" class="logo-image" />
</a>
<nav>
<a href="/faq">FAQ</a>
</nav>
</header>
{#key $page.url.pathname}
<slot />
{/key}
<footer>
<div class="footer-content">
GovScape is a project by the University of Washington
</div>
</footer>
<CookieConsent
show={showCookieConsent}
on:consent={handleCookieConsent}
/>
</div>

<style>
Expand Down
Loading