Paths

Table of Contentst

Differential D10407

Remove gulp and pug
ClosedPublic
Actions

Authored by Anna Sirota (railla) on Feb 12 2021, 7:17 PM.

Tags

Subscribers

None

Details

Reviewers

Francesco Siddi (fsiddi)

Maniphest Tasks

T85646: Decoupling looper

Summary

Same as was already done in Blender ID:

Removes pug templates, replacing them with HTML;
Sets up pypugjs for the remaining external pug templates coming from BWA;
Removes all of the gulp boilerplate, replacing it with libsasscompiler and django-pipeline;
Moves around static files to make it easier to setup django-pipeline;

The branch: html-templates-no-gulp

Tests pass
Image can be built
Things look okay as far as visual testing in local setup goes;
Deploying to production worked on this branch.

Diff Detail

Repository: rBDF Blender Dev Fund

Event Timeline

Anna Sirota (railla) requested review of this revision.Feb 12 2021, 7:17 PM

Anna Sirota (railla) created this revision.

Anna Sirota (railla) edited the summary of this revision. (Show Details)Feb 12 2021, 7:20 PM

Anna Sirota (railla) added reviewers: Sybren A. Stüvel (sybren), Francesco Siddi (fsiddi).Feb 15 2021, 10:32 AM

Anna Sirota (railla) mentioned this in T85646: Decoupling looper.Feb 15 2021, 11:23 AM

On a strategy level it looks ok. Go ahead!

This revision is now accepted and ready to land.Feb 15 2021, 12:29 PM

Anna Sirota (railla) edited the summary of this revision. (Show Details)Feb 15 2021, 12:41 PM

Anna Sirota (railla) removed a reviewer: Sybren A. Stüvel (sybren).

Anna Sirota (railla) mentioned this in rBDF9b5b03870c1e: Remove gulp and pug D10407.Feb 15 2021, 12:43 PM

Landed in 9b5b03870c1e6608ef762d1f741b21dee4cbbd1d

Anna Sirota (railla) added a task: T85646: Decoupling looper.Mar 9 2021, 2:25 PM

Large Diff

This large diff affects 162 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

Path

Size

1 line

4 lines

	assets_shared/
	websrc/


	blender-web-assets

blender_fund/

settings_common.py

64 lines

blender_fund_main/

static/

blender_fund_main/

fonts/

font-borg-webfont.eot

font-borg-webfont.svg

111 lines

font-borg-webfont.ttf

font-borg-webfont.woff

images/

	blender_fund_main/	images/
		images/

background_honeycomb_blue.png

badge_corporate.png

bf-logo-text.png

css/

vendor/

1 line

images/

background_honeycomb_blue.png

badge_corporate.png

bf-logo-text.png

js/

vendor/

clipboard.min.js

7 lines

2 lines

163 lines

2 lines

1 line

2 lines

	blender_fund_main/	static/	blender_fund_main/
			websrc/

scripts/

tutti/

00_ajax_csrf.js

01_braintree.js

styles/

_braintree.sass

_memberships.sass

_plugin_select2.sass

_progress_bar.sass

3 lines

blender_notes/

static/

blender_notes/

js/

	scripts/
	js/

	blender_notes/	static/	blender_notes/	styles/
			websrc/	styles/

blender_notes.sass

docker/

3 lines

prep_docker_img.sh

12 lines

looper/

2 lines

package-lock.json

95 lines

4 lines

templates/

admin/

auth/

user/

change_form.html

6 lines

47 lines

blender_fund_main/

membership/

change_form.html

29 lines

object_history.html

40 lines

blender_fund/

_navbar_secondary.html

16 lines

empty_page.html

5 lines

285 lines

77 lines

layout_simple_box.html

25 lines

tags/

membership_credit.html

1 line

4 lines

wagtail_page_simple.html

10 lines

blender_fund_main/

emails/

managed_memb_notif.html

13 lines

membership_activated.html

6 lines

membership_bankinfo.html

29 lines

membership_deactivated.html

6 lines

payment_failed.html

12 lines

payment_paid.html

10 lines

payment_soft-failed.html

20 lines

blender_id_oauth_client/

login_loop_detected.html

15 lines

blender_notes/

notes_in_admin.html

27 lines

checkout/

83 lines

checkout_anonymous.html

8 lines

checkout_base.html

16 lines

checkout_done_transactionless.html

74 lines

checkout_existing_order.html

31 lines

choose_plan_variation.html

22 lines

not_your_order.html

15 lines

email_layout.html

37 lines

errors/

24 lines

pdf_layout.html

56 lines

settings/

35 lines

billing_address.html

13 lines

extend_membership.html

86 lines

extend_membership_done.html

10 lines

extend_membership_not_possible.html

9 lines

27 lines

membership_base.html

19 lines

membership_cancel.html

15 lines

membership_edit.html

98 lines

payment_method_change.html

36 lines

payment_method_delete.html

10 lines

payment_method_not_used.html

5 lines

payment_method_replace.html

42 lines

payment_methods.html

36 lines

personal_info.html

12 lines

35 lines

receipt_pdf.html

63 lines

27 lines

		templates/	checkout/
	websrc/	templates/	checkout/

	checkout_done.html
	checkout_done.pug

119 lines

websrc/

blender-web-assets

scripts/

tutti/

00_ajax_csrf.js

01_braintree.js

styles/

_braintree.sass

_memberships.sass

_plugin_select2.sass

_progress_bar.sass

blender_notes.sass

templates/

admin/

auth/

user/

change_form.pug

blender_fund_main/

membership/

change_form.pug

object_history.pug

blender_fund/

_navbar_secondary.pug

layout_simple_box.pug

tags/

membership_credit.pug

wagtail_page_simple.pug

blender_fund_main/

emails/

managed_memb_notif.pug

membership_activated.pug

membership_bankinfo.pug

membership_deactivated.pug

payment_failed.pug

payment_paid.pug

payment_soft-failed.pug

blender_id_oauth_client/

login_loop_detected.pug

blender_notes/

notes_in_admin.pug

checkout/

checkout_anonymous.pug

checkout_base.pug

checkout_done.pug

checkout_done_transactionless.pug

checkout_existing_order.pug

choose_plan_variation.pug

not_your_order.pug

email_layout.pug

errors/

settings/

billing_address.pug

extend_membership.pug

extend_membership_done.pug

extend_membership_not_possible.pug

membership_base.pug

membership_cancel.pug

membership_edit.pug

payment_method_change.pug

payment_method_delete.pug

payment_method_not_used.pug

payment_method_replace.pug

payment_methods.pug

personal_info.pug

receipt_pdf.pug

Diff 33933

.gitignore

.gitmodules

assets_shared

blender_fund/settings_common.py

blender_fund_main/static/blender_fund_main/fonts/font-borg-webfont.eot

blender_fund_main/static/blender_fund_main/fonts/font-borg-webfont.svg

blender_fund_main/static/blender_fund_main/fonts/font-borg-webfont.ttf

blender_fund_main/static/blender_fund_main/fonts/font-borg-webfont.woff

blender_fund_main/static/blender_fund_main/images/background_honeycomb_blue.png

blender_fund_main/static/blender_fund_main/images/badge_corporate.png

blender_fund_main/static/blender_fund_main/images/bf-logo-text.png

blender_fund_main/static/blender_fund_main/images/favicon.ico

blender_fund_main/static/blender_fund_main/scripts/tutti/00_ajax_csrf.js

blender_fund_main/static/blender_fund_main/scripts/tutti/01_braintree.js

blender_fund_main/static/blender_fund_main/scripts/tutti/02_currency.js

blender_fund_main/static/blender_fund_main/styles/_braintree.sass

blender_fund_main/static/blender_fund_main/styles/_checkout.sass

blender_fund_main/static/blender_fund_main/styles/_form.sass

blender_fund_main/static/blender_fund_main/styles/_memberships.sass

blender_fund_main/static/blender_fund_main/styles/_plugin_select2.sass

blender_fund_main/static/blender_fund_main/styles/_progress_bar.sass

blender_fund_main/static/blender_fund_main/styles/_settings.sass

blender_fund_main/static/blender_fund_main/styles/_sidebar.sass

blender_fund_main/static/blender_fund_main/styles/_stats.sass

blender_fund_main/static/blender_fund_main/styles/main.sass

blender_fund_main/static/css/vendor/toastr.min.css

blender_fund_main/static/images/background_honeycomb_blue.png

blender_fund_main/static/images/badge_corporate.png

blender_fund_main/static/images/bf-logo-text.png

blender_fund_main/static/js/vendor/clipboard.min.js

blender_fund_main/static/js/vendor/jquery.min.js

blender_fund_main/static/js/vendor/js.cookie.js

blender_fund_main/static/js/vendor/select2.min.js

blender_fund_main/static/js/vendor/toastr.js.map

blender_fund_main/static/js/vendor/toastr.min.js

blender_notes/static/blender_notes/js/notes.js

blender_notes/static/blender_notes/scripts/notes.js

blender_notes/static/blender_notes/styles/blender_notes.sass

docker/Dockerfile

docker/prep_docker_img.sh

gulp

gulpfile.js

looper/urls.py

package-lock.json

package.json

poetry.lock

pyproject.toml

templates/admin/auth/user/change_form.html

templates/admin/base_site.html

templates/admin/blender_fund_main/membership/change_form.html

templates/admin/object_history.html

templates/blender_fund/_navbar_secondary.html

templates/blender_fund/empty_page.html

templates/blender_fund/landing.html

templates/blender_fund/layout.html

templates/blender_fund/layout_simple_box.html

templates/blender_fund/tags/membership_credit.html

templates/blender_fund/tags/top_menu.html

templates/blender_fund/wagtail_page_simple.html

templates/blender_fund_main/emails/managed_memb_notif.html

templates/blender_fund_main/emails/membership_activated.html

templates/blender_fund_main/emails/membership_bankinfo.html

templates/blender_fund_main/emails/membership_deactivated.html

templates/blender_fund_main/emails/payment_failed.html

templates/blender_fund_main/emails/payment_paid.html

templates/blender_fund_main/emails/payment_soft-failed.html

templates/blender_id_oauth_client/login_loop_detected.html

templates/blender_notes/notes_in_admin.html

templates/checkout/checkout.html

templates/checkout/checkout_anonymous.html

templates/checkout/checkout_base.html

templates/checkout/checkout_done.html

templates/checkout/checkout_done_transactionless.html

templates/checkout/checkout_existing_order.html

templates/checkout/choose_plan_variation.html

templates/checkout/not_your_order.html

templates/email_layout.html

templates/errors/error500.html

templates/pdf_layout.html

templates/settings/base.html

templates/settings/billing_address.html

templates/settings/extend_membership.html

templates/settings/extend_membership_done.html

templates/settings/extend_membership_not_possible.html

templates/settings/home.html

templates/settings/membership_base.html

templates/settings/membership_cancel.html

templates/settings/membership_edit.html

templates/settings/payment_method_change.html

templates/settings/payment_method_delete.html

templates/settings/payment_method_not_used.html

templates/settings/payment_method_replace.html

templates/settings/payment_methods.html

templates/settings/personal_info.html

templates/settings/receipt.html

templates/settings/receipt_pdf.html

templates/settings/receipts.html

websrc/blender-web-assets

websrc/scripts/tutti/00_ajax_csrf.js

websrc/scripts/tutti/01_braintree.js

websrc/scripts/tutti/02_currency.js

websrc/styles/_braintree.sass

websrc/styles/_checkout.sass

websrc/styles/_form.sass

websrc/styles/_memberships.sass

websrc/styles/_plugin_select2.sass

websrc/styles/_progress_bar.sass

websrc/styles/_settings.sass

websrc/styles/_sidebar.sass

websrc/styles/_stats.sass

websrc/styles/blender_notes.sass

websrc/styles/main.sass

websrc/templates/admin/auth/user/change_form.pug

websrc/templates/admin/base_site.pug

websrc/templates/admin/blender_fund_main/membership/change_form.pug

websrc/templates/admin/object_history.pug

websrc/templates/blender_fund/_navbar_secondary.pug

websrc/templates/blender_fund/empty_page.pug

websrc/templates/blender_fund/landing.pug

websrc/templates/blender_fund/layout.pug

websrc/templates/blender_fund/layout_simple_box.pug

websrc/templates/blender_fund/tags/membership_credit.pug

websrc/templates/blender_fund/tags/top_menu.pug

websrc/templates/blender_fund/wagtail_page_simple.pug

websrc/templates/blender_fund_main/emails/managed_memb_notif.pug

websrc/templates/blender_fund_main/emails/membership_activated.pug

websrc/templates/blender_fund_main/emails/membership_bankinfo.pug

websrc/templates/blender_fund_main/emails/membership_deactivated.pug

websrc/templates/blender_fund_main/emails/payment_failed.pug

websrc/templates/blender_fund_main/emails/payment_paid.pug

websrc/templates/blender_fund_main/emails/payment_soft-failed.pug

websrc/templates/blender_id_oauth_client/login_loop_detected.pug

websrc/templates/blender_notes/notes_in_admin.pug

websrc/templates/checkout/checkout.pug

websrc/templates/checkout/checkout_anonymous.pug

websrc/templates/checkout/checkout_base.pug

websrc/templates/checkout/checkout_done.pug

websrc/templates/checkout/checkout_done_transactionless.pug

websrc/templates/checkout/checkout_existing_order.pug

websrc/templates/checkout/choose_plan_variation.pug

websrc/templates/checkout/not_your_order.pug

websrc/templates/email_layout.pug

websrc/templates/errors/error500.pug

websrc/templates/pdf_layout.pug

websrc/templates/settings/base.pug

websrc/templates/settings/billing_address.pug

websrc/templates/settings/extend_membership.pug

websrc/templates/settings/extend_membership_done.pug

websrc/templates/settings/extend_membership_not_possible.pug

websrc/templates/settings/home.pug

websrc/templates/settings/membership_base.pug

websrc/templates/settings/membership_cancel.pug

websrc/templates/settings/membership_edit.pug

websrc/templates/settings/payment_method_change.pug

websrc/templates/settings/payment_method_delete.pug

websrc/templates/settings/payment_method_not_used.pug

websrc/templates/settings/payment_method_replace.pug

websrc/templates/settings/payment_methods.pug

websrc/templates/settings/personal_info.pug

websrc/templates/settings/receipt.pug

websrc/templates/settings/receipt_pdf.pug

websrc/templates/settings/receipts.pug