Skip to content

Commit

Permalink
add comms / blog to navigation (#181)
Browse files Browse the repository at this point in the history
* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* Update to handle AoE for deadlines.

* Fakes and mocks are gremlins. (#131)

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* Comms (#112)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* remove richtext default from entry page

* Comms (#134)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* remove richtext default from entry page

* Adding Azure BLOB storage for media and static with CDN endpoint

* Comms (#135)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* remove richtext default from entry page

* Adding Azure BLOB storage for media and static with CDN endpoint

* fix misspelling in production storage

* Comms (#136)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* remove richtext default from entry page

* Adding Azure BLOB storage for media and static with CDN endpoint

* fix misspelling in production storage

* storages module (#138)

* fix misspelling in production storage

* remove CDN

* use CDN (#139)

* Comms (#140)

* use CDN

* storage key

* Comms (#141)

* storage account key

* Add django debug toolbar (#142)

* add django debug toolbar

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

* 117 create a page for sponsors and partners   community and financial (#144)

* add django-debug-toolbar to requirements

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

* body field in Page models in home can be null (#145)

* body can be null

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

* fixing general page by rolling back migrations 0016 and fixing 0017 (#147)

* migration rollback for home app and re-create 0017 to allow for null body fields in Page models

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

* remove home.migrations.0018

* remove and re-add puput (#148)

* re-add puput

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

* EntryAbstract change content panels may fix the missing markdown_body in puput (#150)

* Update to handle AoE for deadlines.

* Fakes and mocks are gremlins. (#131)

* use CDN

* storage key

* storage account key

* add django debug toolbar

* add django-debug-toolbar to requirements

* body can be null

* migration rollback for home app and re-create 0017 to allow for null body fields in Page models

* re-add puput

* fix for markdown_body absent in content_panel

* django-debug-toolbar to requirements.txt

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

* pinned versions to fix wonky puput issues (#151)


* fixed pinned requirements and should fix missing markdown from puput

* 117 create a page for sponsors and partners   community and financial (#152)

* fixed pinned requirements and should fix missing markdown from puput

* fixed pinned requirements and should fix missing markdown from puput

* push forward and fix new puput req markdown body (#153)

* push forward and fix new puput req markdown body

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

* add general page template (#154)


* add general page template

* 117 create a page for sponsors and partners   community and financial (#160)

* update package versions

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

* production environment for running tests (#161)

* production environment for running tests

* github action tests on develop as well

* add environment variables for testing on staging

* Improvements (#159)

* Change breadcrumbs to dynamic values

* review accessibility on social icons

* Add blog stylesheet

* Add style blog page and review block template

* add text with image heading template block

---------

Co-authored-by: dawnwages <dawn.wages@gmail.com>

* Revert test GitHub action changes (#168)

* Revert test GitHub action changes

Reverts some changes from PR #137

* Reconfigure database settings to use GH postgres service.

* Add remaining environment variables without default.

* Specify a fixed secret key for tests rather than our secret key for our staging/prod environments.

* Elevate secret key setting to base.

It's necessary everywhere, so it should exist in your .env file anyway.

* Set default dict for options.

* add richtextblock

* Clean up development requirements file.

The toolbar and django-extensions are already in requirements.txt
flake8 and black are managed by pre-commit and not required.

* Make manage.py executable.

This allows folks to do ./manage.py runserver

* Clean up settings files to load dotenv from base settings.

* Improvements (#173)

* Change breadcrumbs to dynamic values

* review accessibility on social icons

* Add blog stylesheet

* Add style blog page and review block template

* add text with image heading template block

* paragraph limit now 10000 and rich text.

* removed richtext field, add heading with dropdown for h size

* list styles for numerated, circle and none

* style image, text, header combination blocks

* add icons for blocks

* eddit padding for blog entry

* margin and block quote styles

* remove quote from richtext options now that it is a styled block

* alter block quote migration

* caption an dlist padding

* fix migrations for puput

---------

Co-authored-by: Sarah Abderemane <sarahabderemane@gmail.com>

* Add missing padding on events page (especially for mobile).

Fix AOE time left to apply and make clearer around time of deadline.

Update event to show in local timezone and have location as a link.

* Add Tailwind via django-tailwind 3.6.0

* Remove moving css files to theme app

* Upgrade tailwind to v3.4.0 and start theme config

* Update static directories

* Update base.html and rename styles.css => extra-styles.css

Commenting django-bootstrap and removing tailwind CDN to use django-tailwind for a production use and start recreate each style missing. The file styles.css has been changed to extra-styles.css to avoid confusion with the one generated by django-tailwind.

* Review blog style page and entry page

* Change table, breadcrumbs and footer style

* Change nav template and adding AlpineJs to replace Bootstrap Js

* Update gitignore

* Change class container-lg => section-container

* Move static files for rendering

* Change stylesheet and review landing page and navigation

* Remove bootstrap and unused files/lines and update requirements.txt

* Remove the django-boostrap tags everywhere

* Update Dockerfile for deployment and the README.md

* Update blog page list and entry page stylesheet

* Add tailwind reload to dev requirements and update readme.

* Re-style the session pages with tailwind.

This creates standard btn class usages and header texts. The
text sizes for the headers match the richtext block mapping.

* Restyle the events pages with tailwind.

This creates a standard class for the grids of cards.

* Fix the stream field blocks.

There are multiple rich text blocks and the text_with_heading was pointed
to the wrong block (had an image).

Move rich text block to a structblock

This allows a template to be specified to utilize the prose wrapper.

* Reduce vertical whitespace on blog posts.

* Use ds purple color on nav bar and make the navbar links larger.

* This should allow tailwind to be built.

This stops using collectstatic as a part of the oryx build system and
uses a custom post build script.

Since tailwind requires node to compile the final css file, we need
to add a package.json file and ENABLE_MULTIPLEPLATFORM_BUILD to get
Oryx to install both python and node. This allows the post build script
to run.

This also fixes the Azure media/static file storage issue by exposing
the environment variables to actually push content there.

This will need a few new secrets configured and we may potentially
need to change AZURE_CUSTOM_DOMAIN since I don't think that was ever
used/tested.

* Clean up the storage keys.

* Avoid using the same name for static files.

The build process keeps the original around which means
we don't utilize the tailwind compiled file.

* Remove duplicate tailwind css file.

* Fix the tailwind build to use the new input styles file.

* add node version and node set up github action

* add node-version-file to github action

* add node-version-file to github action package-lock

* add package-lock to root

* add empty test script to root package json

* Azure media container as static url

* remove STATIC URL changes

* fontawesome cdn

* fontawesome cdn

* fontawesome cdn

* fix azure account key conflict

* Styling of blog (#178) (#179)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* Update to handle AoE for deadlines.

* Fakes and mocks are gremlins. (#131)

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* Comms (#112)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* remove richtext default from entry page

* Comms (#134)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* remove richtext default from entry page

* Adding Azure BLOB storage for media and static with CDN endpoint

* Comms (#135)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* remove richtext default from entry page

* Adding Azure BLOB storage for media and static with CDN endpoint

* fix misspelling in production storage

* Comms (#136)

* work in progress - TODO: fix error in block imports

* fix name of blog entry abstract to remove error

* fix url structure for blog

* add general page, fix settings for puput entry page, add block elements, add empty block template names

* paragraph blog and puput migrations

* move puput migrations

* fix TableBlock issue and move blog StreamField to resuable StreamBlock

* fix migration. prematurely upgraded to 4.2. Not compatible with puput

* update entry page and add templates

* remove richtext default from entry page

* Adding Azure BLOB storage for media and static with CDN endpoint

* fix misspelling in production storage

* storages module (#138)

* fix misspelling in production storage

* remove CDN

* use CDN (#139)

* Comms (#140)

* use CDN

* storage key

* Comms (#141)

* storage account key

* Add django debug toolbar (#142)

* add django debug toolbar

---------



* 117 create a page for sponsors and partners   community and financial (#144)

* add django-debug-toolbar to requirements

---------



* body field in Page models in home can be null (#145)

* body can be null

---------



* fixing general page by rolling back migrations 0016 and fixing 0017 (#147)

* migration rollback for home app and re-create 0017 to allow for null body fields in Page models

---------



* remove home.migrations.0018

* remove and re-add puput (#148)

* re-add puput

---------



* EntryAbstract change content panels may fix the missing markdown_body in puput (#150)

* Update to handle AoE for deadlines.

* Fakes and mocks are gremlins. (#131)

* use CDN

* storage key

* storage account key

* add django debug toolbar

* add django-debug-toolbar to requirements

* body can be null

* migration rollback for home app and re-create 0017 to allow for null body fields in Page models

* re-add puput

* fix for markdown_body absent in content_panel

* django-debug-toolbar to requirements.txt

---------



* pinned versions to fix wonky puput issues (#151)


* fixed pinned requirements and should fix missing markdown from puput

* 117 create a page for sponsors and partners   community and financial (#152)

* fixed pinned requirements and should fix missing markdown from puput

* fixed pinned requirements and should fix missing markdown from puput

* push forward and fix new puput req markdown body (#153)

* push forward and fix new puput req markdown body

---------



* add general page template (#154)


* add general page template

* 117 create a page for sponsors and partners   community and financial (#160)

* update package versions

---------



* production environment for running tests (#161)

* production environment for running tests

* github action tests on develop as well

* add environment variables for testing on staging

* Improvements (#159)

* Change breadcrumbs to dynamic values

* review accessibility on social icons

* Add blog stylesheet

* Add style blog page and review block template

* add text with image heading template block

---------



* Revert test GitHub action changes (#168)

* Revert test GitHub action changes

Reverts some changes from PR #137

* Reconfigure database settings to use GH postgres service.

* Add remaining environment variables without default.

* Specify a fixed secret key for tests rather than our secret key for our staging/prod environments.

* Elevate secret key setting to base.

It's necessary everywhere, so it should exist in your .env file anyway.

* Set default dict for options.

* add richtextblock

* Clean up development requirements file.

The toolbar and django-extensions are already in requirements.txt
flake8 and black are managed by pre-commit and not required.

* Make manage.py executable.

This allows folks to do ./manage.py runserver

* Clean up settings files to load dotenv from base settings.

* Improvements (#173)

* Change breadcrumbs to dynamic values

* review accessibility on social icons

* Add blog stylesheet

* Add style blog page and review block template

* add text with image heading template block

* paragraph limit now 10000 and rich text.

* removed richtext field, add heading with dropdown for h size

* list styles for numerated, circle and none

* style image, text, header combination blocks

* add icons for blocks

* eddit padding for blog entry

* margin and block quote styles

* remove quote from richtext options now that it is a styled block

* alter block quote migration

* caption an dlist padding

* fix migrations for puput

---------



* Add missing padding on events page (especially for mobile).

Fix AOE time left to apply and make clearer around time of deadline.

Update event to show in local timezone and have location as a link.

* Add Tailwind via django-tailwind 3.6.0

* Remove moving css files to theme app

* Upgrade tailwind to v3.4.0 and start theme config

* Update static directories

* Update base.html and rename styles.css => extra-styles.css

Commenting django-bootstrap and removing tailwind CDN to use django-tailwind for a production use and start recreate each style missing. The file styles.css has been changed to extra-styles.css to avoid confusion with the one generated by django-tailwind.

* Review blog style page and entry page

* Change table, breadcrumbs and footer style

* Change nav template and adding AlpineJs to replace Bootstrap Js

* Update gitignore

* Change class container-lg => section-container

* Move static files for rendering

* Change stylesheet and review landing page and navigation

* Remove bootstrap and unused files/lines and update requirements.txt

* Remove the django-boostrap tags everywhere

* Update Dockerfile for deployment and the README.md

* Update blog page list and entry page stylesheet

* Add tailwind reload to dev requirements and update readme.

* Re-style the session pages with tailwind.

This creates standard btn class usages and header texts. The
text sizes for the headers match the richtext block mapping.

* Restyle the events pages with tailwind.

This creates a standard class for the grids of cards.

* Fix the stream field blocks.

There are multiple rich text blocks and the text_with_heading was pointed
to the wrong block (had an image).

Move rich text block to a structblock

This allows a template to be specified to utilize the prose wrapper.

* Reduce vertical whitespace on blog posts.

* Use ds purple color on nav bar and make the navbar links larger.

* This should allow tailwind to be built.

This stops using collectstatic as a part of the oryx build system and
uses a custom post build script.

Since tailwind requires node to compile the final css file, we need
to add a package.json file and ENABLE_MULTIPLEPLATFORM_BUILD to get
Oryx to install both python and node. This allows the post build script
to run.

This also fixes the Azure media/static file storage issue by exposing
the environment variables to actually push content there.

This will need a few new secrets configured and we may potentially
need to change AZURE_CUSTOM_DOMAIN since I don't think that was ever
used/tested.

* Clean up the storage keys.

* Avoid using the same name for static files.

The build process keeps the original around which means
we don't utilize the tailwind compiled file.

* Remove duplicate tailwind css file.

* Fix the tailwind build to use the new input styles file.

* add node version and node set up github action

* add node-version-file to github action

* add node-version-file to github action package-lock

* add package-lock to root

* add empty test script to root package json

* Azure media container as static url

* remove STATIC URL changes

* fontawesome cdn

* fontawesome cdn

* fontawesome cdn

* fix azure account key conflict

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
Co-authored-by: Sarah Abderemane <sarahabderemane@gmail.com>
Co-authored-by: Tim Schilling <schillingt@better-simple.com>
Co-authored-by: Rachell Calhoun <rachell.calhoun@gmail.com>

* Add blog link to the pages. (#176)

* Add blog link to the pages.

This means we're going to need a comms page in wagtail.

* use wagtail menu

---------

Co-authored-by: dawnwages <dawn.wages@gmail.com>

* Add blog link to the pages. (#180)

This means we're going to need a comms page in wagtail.

Co-authored-by: tschilling <schillingt@better-simple.com>

---------

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
Co-authored-by: Sarah Abderemane <sarahabderemane@gmail.com>
Co-authored-by: Tim Schilling <schillingt@better-simple.com>
Co-authored-by: Rachell Calhoun <rachell.calhoun@gmail.com>
  • Loading branch information
5 people authored Jan 10, 2024
1 parent 426fc87 commit 2781363
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion home/templates/home/home_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1 class="p-0 text-[10vw] leading-[10vw] font-fraunces font-bold text-center">W
<a class="button-secondary text-black bg-white hover:bg-purple hover:text-white" href="{% url "session_list" %}">Sessions</a>
<a class="button-secondary" href="{% url "event_list" %}">Events</a>
<a class="button-secondary" href="https://github.com/djangonaut-space/pilot-program/blob/main/README.md">Program</a>
</div>
<a class="button-secondary" href="{% slugurl "comms" %}">Blog</a>

{% comment %} <form class="d-flex form-row">
<input type="email" name="email" aria-label="email" class="mr-1" placeholder="example@email.com">
Expand Down
15 changes: 11 additions & 4 deletions indymeet/templates/includes/nav.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load i18n static %}
{% load i18n static wagtailcore_tags %}
<nav class="bg-white {% if 'Home' in page.title %}stars{% endif %}">
<div class="mx-2 flex h-16 max-w-screen-xl items-center gap-8 px-1 sm:px-4 lg:px-2">
<a class="block text-teal-600" href="/">
Expand All @@ -13,24 +13,26 @@
{% trans "Program Documentation" %}
</a>
</li>

<li>
<a class="outline-link text-gray-700 transition hover:text-ds-purple" target="_blank" href="https://forms.gle/4vNuqQwEK6o48WqHA">
{% trans "Join us!" %}
</a>
</li>

<li>
<a class="outline-link text-gray-700 transition hover:text-ds-purple" href="{% url 'event_list' %}">
{% trans "Events" %}
</a>
</li>

<li>
<a class="outline-link text-gray-700 transition hover:text-ds-purple" href="{% url 'session_list' %}">
{% trans "Sessions" %}
</a>
</li>
<li>
<a class="outline-link text-gray-700 transition hover:text-ds-purple" href="{% slugurl "comms" %}">
{% trans "Blog" %}
</a>
</li>
</ul>
</nav>

Expand Down Expand Up @@ -91,6 +93,11 @@
{% trans "Sessions" %}
</a>
</li>
<li class="p-2">
<a class="block outline-link text-gray-500 transition hover:text-ds-purple" href="{% slugurl "comms" %}">
{% trans "Blog" %}
</a>
</li>
</ul>
</div>
</div>
Expand Down

0 comments on commit 2781363

Please sign in to comment.