diff --git a/.env b/.env index 0d5bfb0f..3c931a1c 100644 --- a/.env +++ b/.env @@ -2,4 +2,5 @@ PORT=8037 FLASK_DEBUG=true SECRET_KEY=local_development_fake_key FLASK_SECRET_KEY=local_development_fake_key -DEVEL=True \ No newline at end of file +DEVEL=True +FLASK_GOOGLE_SEARCH_API_KEY=insecure_development_key diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fc3ad697..e1a2732d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,16 +6,20 @@ env: SECRET_KEY: insecure_test_key FLASK_GOOGLE_SEARCH_API_KEY: insecure_test_key jobs: + run-dotrun: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 + steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dotrun - uses: canonical/install-dotrun@main + run: sudo pip3 install dotrun requests==2.31.0 - name: Install dependencies - run: dotrun install + run: | + sudo chmod -R 777 . + dotrun install - name: Build assets run: dotrun build diff --git a/konf/site.yaml b/konf/site.yaml index 3a7981a6..a106f126 100644 --- a/konf/site.yaml +++ b/konf/site.yaml @@ -6,7 +6,7 @@ env: - name: SENTRY_DSN value: https://426397ba83be483a8a8d1ed92b0f0623@sentry.is.canonical.com//17 - - name: SEARCH_API_KEY + - name: FLASK_GOOGLE_SEARCH_API_KEY secretKeyRef: key: google-custom-search-key name: google-api @@ -15,7 +15,7 @@ env: secretKeyRef: key: dqlite-io name: secret-keys - + # Overrides for production production: replicas: 5 diff --git a/static/favicons/COF-favicon-48x48.png b/static/favicons/COF-favicon-48x48.png new file mode 100644 index 00000000..b1faf2ba Binary files /dev/null and b/static/favicons/COF-favicon-48x48.png differ diff --git a/static/files/site.webmanifest b/static/files/site.webmanifest new file mode 100644 index 00000000..0dc10311 --- /dev/null +++ b/static/files/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "dqlite.io", + "short_name": "", + "icons": [ + { + "src": "https://assets.ubuntu.com/v1/9c69b268-COF%20android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "https://assets.ubuntu.com/v1/c55060fd-COF%20android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} \ No newline at end of file diff --git a/templates/base_layout.html b/templates/base_layout.html index 9cfb8bda..006146ea 100644 --- a/templates/base_layout.html +++ b/templates/base_layout.html @@ -1,89 +1,109 @@ - - - - - - - - {% block title %}Canonical Dqlite{% endblock %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if self.title() %} - - - {% endif %} - - {% if self.meta_description() %} - - - {% endif %} - - - - - - - - - - {% block body%} - {% include "partial/_navigation.html" %} - -
- {% block content %}{% endblock content %} -
- - {% include "partial/_footer.html" %} - {% endblock body %} - - - + + + + + + + + + + + + + + + + + + + + + {% if self.title() %} + + + {% endif %} + {% if self.meta_description() %} + + + {% endif %} + + + + + + + {% block body %} + {% include "partial/_navigation.html" %} +
+ {% block content %} + {% endblock content %} +
+ {% include "partial/_footer.html" %} + {% endblock body %} + + + - - {% block page_scripts %}{% endblock page_scripts %} - - + + {% block page_scripts %} + {% endblock page_scripts %} +