Techsoup dc website customizations

.devcontainer/devcontainer.json

@@ -0,0 +1,29 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+	"name": "Python 3",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": { "version": "18.4.0" },
+		"ghcr.io/devcontainers-contrib/features/protoc:1": {},
+		"ghcr.io/dhoeric/features/google-cloud-cli:1": {}
+
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "pip3 install --user -r requirements.txt",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
+

deploy/git/mixer_hash.txt

@@ -0,0 +1 @@
+5af6f16

deploy/git/website_hash.txt

@@ -0,0 +1 @@
+c7ac2a1

deploy/gke/techsoup.yaml

@@ -0,0 +1,25 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This is a yaml template to create gcp/gke configuration.
+# Copy this file to `config.yaml` and use that.
+project: techsoup-data-commons
+ip: 34.111.225.45
+domain: datacommons.techsoup.org
+region:
+  primary: us-central1
+  others:
+nodes: 1
+

deploy/helm_charts/envs/techsoup.yaml

@@ -22,7 +22,7 @@ namespace:
 website:
   image:
     project: techsoup-data-commons
-    tag: f5bad76
+    tag: 1aa51df 
   flaskEnv: custom
   replicas: 1
 
@@ -56,9 +56,12 @@ kgStoreConfig:
     project: techsoup-data-commons
     instance: dc-graph
     tables:
-      - freemeals_2023_04_11_14_09_49
-      - mealsites_2023_05_25_20_51_17
+      - mealsites_places_exp_2023_06_02_18_41_11
       - usda_grocery_access_2023_05_22_11_28_04
+      - fea_grocery_access_2023_06_01_18_49_10
+      - fea_store_availabili_2023_06_06_12_25_22
+      - irs_registered_nonpr_2023_06_07_11_02_15
+      - techsoup_served_nonp_2023_06_07_13_27_15
 
 svg:
   blocklistFile: ["dc/g/Uncategorized", "oecd/g/OECD"]

server/__init__.py

@@ -102,7 +102,8 @@ def register_routes_base_dc(app):
 
 def register_routes_custom_dc(app):
   ## apply the blueprints for custom dc instances
-  pass
+  from server.routes import ts_issue_landing
+  app.register_blueprint(ts_issue_landing.bp)
 
 
 def register_routes_disasters(app):

server/app_env/custom.py

@@ -18,23 +18,23 @@
 
 class Config(_base.Config):
   CUSTOM = True
-  NAME = "Custom Data Commons"
+  NAME = "Data Commons for Civil Society"
   OVERRIDE_CSS_PATH = '/custom_dc/custom/overrides.css'
-  LOGO_PATH = "/custom_dc/custom/logo.png"
+  LOGO_PATH = "/custom_dc/custom/techsoup-logo.svg"
   SHOW_DISASTER = False
 
 
 class LocalConfig(Config, local.Config):
-  LITE = True
+  #LITE = True
   API_ROOT = 'https://api.datacommons.org'
   # NEED TO DO THE FOLLOWING CHANGES:
   # 1. Send an email to <[email protected]> to get an API key
   #    for Data Commons API.
   # 2. In the custom GCP project, store the API key in secret manager
   #    `printf "<API_KEY>" | gcloud secrets create mixer-api-key --data-file=-`
   # 3. Update SECRET_PROJECT to be the custom GCP project id.
-  SECRET_PROJECT = ''
+  SECRET_PROJECT = 'techsoup-data-commons'
 
 
 class ComposeConfig(Config, local.Config):
-  pass
+  pass