diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 67394e668..97b9b6f68 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -70,6 +70,12 @@ jobs: # chmod +x _scripts/thumbnail_sizes.sh # ./_scripts/thumbnail_sizes.sh + - name: Inject feedback token + run: | + echo "feedback_token: \"$FEEDBACK_TOKEN\"" >> _config.yml + env: + FEEDBACK_TOKEN: ${{ secrets.FEEDBACK_TOKEN }} + # Outputs to the './_site' directory by default - name: Build Jekyll site run: | diff --git a/.gitignore b/.gitignore index 244b75f1c..62d1eda29 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,7 @@ _site # Ruby vendor directory vendor/bundle -.bundle \ No newline at end of file +.bundle + +# Local config override (contains secrets) +_config.local.yml diff --git a/Makefile b/Makefile index 2c9a7b941..c11ce8e11 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,21 @@ all: serve install: bundle install -# Start Jekyll server +# Start Jekyll server (uses _config.local.yml if present) serve: - $(JEKYLL) serve + @if [ -f _config.local.yml ]; then \ + $(JEKYLL) serve --config _config.yml,_config.local.yml; \ + else \ + $(JEKYLL) serve; \ + fi # Start Jekyll server with incremental regeneration serve-incremental: - $(JEKYLL) serve --incremental + @if [ -f _config.local.yml ]; then \ + $(JEKYLL) serve --incremental --config _config.yml,_config.local.yml; \ + else \ + $(JEKYLL) serve --incremental; \ + fi # Generate category and tag data generate-data: diff --git a/_config.yml b/_config.yml index c58a10641..0d713f587 100644 --- a/_config.yml +++ b/_config.yml @@ -4,10 +4,12 @@ author: email: hi@civictech.ca description: >- - Civic Tech Toronto is a vibrant and diverse community of Torontonians engaged - in understanding and creating solutions for civic challenges through technology, + Civic Tech Toronto is a vibrant and diverse community of Torontonians engaged + in understanding and creating solutions for civic challenges through technology, design, and other innovative means. +feedback_token: "" + baseurl: "" github_username: civictechto diff --git a/_pages/feedback.md b/_pages/feedback.md new file mode 100644 index 000000000..56d275b1c --- /dev/null +++ b/_pages/feedback.md @@ -0,0 +1,812 @@ +--- +title: "Share Your Feedback" +layout: page +permalink: "/feedback/" +excerpt: "π Help us make Civic Tech Toronto better. Responses are anonymous β we never collect names or emails β and are stored openly in a public GitHub repository." +--- + + + +
Thanks β your feedback helps us improve every week.
+Something went wrong. You can try again or email hi@civictech.ca.
+