From f01f6d50b51dc41d701f137662eb338f84c06c6c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 8 Jan 2024 15:49:49 +0530 Subject: [PATCH] fix!(portal): remove Homepage --- .../v12_0/set_default_homepage_type.py | 5 - erpnext/portal/doctype/homepage/__init__.py | 0 erpnext/portal/doctype/homepage/homepage.js | 13 - erpnext/portal/doctype/homepage/homepage.json | 122 ------- erpnext/portal/doctype/homepage/homepage.py | 32 -- .../portal/doctype/homepage/test_homepage.py | 19 - .../doctype/homepage_section/__init__.py | 0 .../homepage_section/homepage_section.js | 6 - .../homepage_section/homepage_section.json | 336 ------------------ .../homepage_section/homepage_section.py | 31 -- .../homepage_section/test_homepage_section.py | 38 -- .../doctype/homepage_section_card/__init__.py | 0 .../homepage_section_card.json | 203 ----------- .../homepage_section_card.py | 27 -- erpnext/templates/includes/macros.html | 32 -- erpnext/templates/pages/home.css | 8 - erpnext/templates/pages/home.html | 76 ---- erpnext/templates/pages/home.py | 49 --- 18 files changed, 997 deletions(-) delete mode 100644 erpnext/patches/v12_0/set_default_homepage_type.py delete mode 100644 erpnext/portal/doctype/homepage/__init__.py delete mode 100644 erpnext/portal/doctype/homepage/homepage.js delete mode 100644 erpnext/portal/doctype/homepage/homepage.json delete mode 100644 erpnext/portal/doctype/homepage/homepage.py delete mode 100644 erpnext/portal/doctype/homepage/test_homepage.py delete mode 100644 erpnext/portal/doctype/homepage_section/__init__.py delete mode 100644 erpnext/portal/doctype/homepage_section/homepage_section.js delete mode 100644 erpnext/portal/doctype/homepage_section/homepage_section.json delete mode 100644 erpnext/portal/doctype/homepage_section/homepage_section.py delete mode 100644 erpnext/portal/doctype/homepage_section/test_homepage_section.py delete mode 100644 erpnext/portal/doctype/homepage_section_card/__init__.py delete mode 100644 erpnext/portal/doctype/homepage_section_card/homepage_section_card.json delete mode 100644 erpnext/portal/doctype/homepage_section_card/homepage_section_card.py delete mode 100644 erpnext/templates/pages/home.css delete mode 100644 erpnext/templates/pages/home.html delete mode 100644 erpnext/templates/pages/home.py diff --git a/erpnext/patches/v12_0/set_default_homepage_type.py b/erpnext/patches/v12_0/set_default_homepage_type.py deleted file mode 100644 index d91fe33a3f..0000000000 --- a/erpnext/patches/v12_0/set_default_homepage_type.py +++ /dev/null @@ -1,5 +0,0 @@ -import frappe - - -def execute(): - frappe.db.set_single_value("Homepage", "hero_section_based_on", "Default") diff --git a/erpnext/portal/doctype/homepage/__init__.py b/erpnext/portal/doctype/homepage/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/portal/doctype/homepage/homepage.js b/erpnext/portal/doctype/homepage/homepage.js deleted file mode 100644 index 6739979b98..0000000000 --- a/erpnext/portal/doctype/homepage/homepage.js +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Homepage', { - refresh: function(frm) { - frm.add_custom_button(__('Set Meta Tags'), () => { - frappe.utils.set_meta_tag('home'); - }); - frm.add_custom_button(__('Customize Homepage Sections'), () => { - frappe.set_route('List', 'Homepage Section', 'List'); - }); - }, -}); diff --git a/erpnext/portal/doctype/homepage/homepage.json b/erpnext/portal/doctype/homepage/homepage.json deleted file mode 100644 index 2b891f7268..0000000000 --- a/erpnext/portal/doctype/homepage/homepage.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "actions": [], - "beta": 1, - "creation": "2016-04-22 05:27:52.109319", - "doctype": "DocType", - "document_type": "Setup", - "engine": "InnoDB", - "field_order": [ - "company", - "hero_section_based_on", - "column_break_2", - "title", - "section_break_4", - "tag_line", - "description", - "hero_image", - "slideshow", - "hero_section" - ], - "fields": [ - { - "fieldname": "company", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Company", - "options": "Company", - "reqd": 1 - }, - { - "fieldname": "hero_section_based_on", - "fieldtype": "Select", - "label": "Hero Section Based On", - "options": "Default\nSlideshow\nHomepage Section" - }, - { - "fieldname": "column_break_2", - "fieldtype": "Column Break" - }, - { - "fieldname": "title", - "fieldtype": "Data", - "label": "Title" - }, - { - "fieldname": "section_break_4", - "fieldtype": "Section Break", - "label": "Hero Section" - }, - { - "depends_on": "eval:doc.hero_section_based_on === 'Default'", - "description": "Company Tagline for website homepage", - "fieldname": "tag_line", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Tag Line", - "reqd": 1 - }, - { - "depends_on": "eval:doc.hero_section_based_on === 'Default'", - "description": "Company Description for website homepage", - "fieldname": "description", - "fieldtype": "Text", - "in_list_view": 1, - "label": "Description", - "reqd": 1 - }, - { - "depends_on": "eval:doc.hero_section_based_on === 'Default'", - "fieldname": "hero_image", - "fieldtype": "Attach Image", - "label": "Hero Image" - }, - { - "depends_on": "eval:doc.hero_section_based_on === 'Slideshow'", - "fieldname": "slideshow", - "fieldtype": "Link", - "label": "Homepage Slideshow", - "options": "Website Slideshow" - }, - { - "depends_on": "eval:doc.hero_section_based_on === 'Homepage Section'", - "fieldname": "hero_section", - "fieldtype": "Link", - "label": "Homepage Section", - "options": "Homepage Section" - } - ], - "issingle": 1, - "links": [], - "modified": "2022-12-19 21:10:29.127277", - "modified_by": "Administrator", - "module": "Portal", - "name": "Homepage", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "role": "System Manager", - "share": 1, - "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "role": "Administrator", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "states": [], - "title_field": "company", - "track_changes": 1 -} \ No newline at end of file diff --git a/erpnext/portal/doctype/homepage/homepage.py b/erpnext/portal/doctype/homepage/homepage.py deleted file mode 100644 index 3539b280ca..0000000000 --- a/erpnext/portal/doctype/homepage/homepage.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - - -import frappe -from frappe.model.document import Document -from frappe.website.utils import delete_page_cache - - -class Homepage(Document): - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - company: DF.Link - description: DF.Text - hero_image: DF.AttachImage | None - hero_section: DF.Link | None - hero_section_based_on: DF.Literal["Default", "Slideshow", "Homepage Section"] - slideshow: DF.Link | None - tag_line: DF.Data - title: DF.Data | None - # end: auto-generated types - - def validate(self): - if not self.description: - self.description = frappe._("This is an example website auto-generated from ERPNext") - delete_page_cache("home") diff --git a/erpnext/portal/doctype/homepage/test_homepage.py b/erpnext/portal/doctype/homepage/test_homepage.py deleted file mode 100644 index e1532239c3..0000000000 --- a/erpnext/portal/doctype/homepage/test_homepage.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors -# See license.txt - -import unittest - -import frappe -from frappe.utils import set_request -from frappe.website.serve import get_response - - -class TestHomepage(unittest.TestCase): - def test_homepage_load(self): - set_request(method="GET", path="home") - response = get_response() - - self.assertEqual(response.status_code, 200) - - html = frappe.safe_decode(response.get_data()) - self.assertTrue('
My custom html', - } - ).insert() - - set_request(method="GET", path="home") - response = get_response() - - self.assertEqual(response.status_code, 200) - - html = frappe.safe_decode(response.get_data()) - - soup = BeautifulSoup(html, "html.parser") - sections = soup.find("main").find_all(class_="custom-section") - self.assertEqual(len(sections), 1) - - homepage_section = sections[0] - self.assertEqual(homepage_section.text, "My custom html") - - # cleanup - frappe.db.rollback() diff --git a/erpnext/portal/doctype/homepage_section_card/__init__.py b/erpnext/portal/doctype/homepage_section_card/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/portal/doctype/homepage_section_card/homepage_section_card.json b/erpnext/portal/doctype/homepage_section_card/homepage_section_card.json deleted file mode 100644 index 9092b268c5..0000000000 --- a/erpnext/portal/doctype/homepage_section_card/homepage_section_card.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2019-02-10 19:39:02.734686", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "title", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Title", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "subtitle", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Subtitle", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "image", - "fieldtype": "Attach Image", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Image", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "content", - "fieldtype": "Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Content", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "route", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Route", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2019-02-10 20:11:41.040716", - "modified_by": "Administrator", - "module": "Portal", - "name": "Homepage Section Card", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 -} \ No newline at end of file diff --git a/erpnext/portal/doctype/homepage_section_card/homepage_section_card.py b/erpnext/portal/doctype/homepage_section_card/homepage_section_card.py deleted file mode 100644 index ce2fe31a98..0000000000 --- a/erpnext/portal/doctype/homepage_section_card/homepage_section_card.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - - -from frappe.model.document import Document - - -class HomepageSectionCard(Document): - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - content: DF.Text | None - image: DF.AttachImage | None - parent: DF.Data - parentfield: DF.Data - parenttype: DF.Data - route: DF.Data | None - subtitle: DF.Data | None - title: DF.Data - # end: auto-generated types - - pass diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html index dc9ee234d9..5c8714db8f 100644 --- a/erpnext/templates/includes/macros.html +++ b/erpnext/templates/includes/macros.html @@ -33,38 +33,6 @@ {% endmacro %} -{% macro render_homepage_section(section) %} - -{% if section.section_based_on == 'Custom HTML' and section.section_html %} - {{ section.section_html }} -{% elif section.section_based_on == 'Cards' %} -
-

{{ section.name }}

- -
- {% for card in section.section_cards %} -
-
- {% if card.image %} - {{ card.title }} - {% endif %} -
-
{{ card.title }}
-

{{ card.subtitle or '' }}

-

{{ card.content or '' | truncate(140, True) }}

-
-
- {{ _('More details') }} -
-
-
- {% endfor %} -
-
-{% endif %} - -{% endmacro %} - {%- macro item_card(item, is_featured=False, is_full_width=False, align="Left") -%} {%- set align_items_class = resolve_class({ 'align-items-end': align == 'Right', diff --git a/erpnext/templates/pages/home.css b/erpnext/templates/pages/home.css deleted file mode 100644 index f2661491ce..0000000000 --- a/erpnext/templates/pages/home.css +++ /dev/null @@ -1,8 +0,0 @@ -/* csslint ignore:start */ -{% if homepage.hero_image %} -.hero-image { - background-size: cover; - padding: 10rem 0; -} -{% endif %} -/* csslint ignore:end */ diff --git a/erpnext/templates/pages/home.html b/erpnext/templates/pages/home.html deleted file mode 100644 index b9b435c7c3..0000000000 --- a/erpnext/templates/pages/home.html +++ /dev/null @@ -1,76 +0,0 @@ -{% extends "templates/web.html" %} - -{% from "erpnext/templates/includes/macros.html" import render_homepage_section %} - -{% block content %} -
- {% if homepage.hero_section_based_on == 'Default' %} -
-
-

{{ homepage.tag_line }}

-

{{ homepage.tag_line }}

-

{{ homepage.description }}

-

{{ homepage.description }}

-
- -
- {% elif homepage.hero_section_based_on == 'Slideshow' and slideshow %} -
- {% include "templates/includes/slideshow.html" %} -
- {% elif homepage.hero_section_based_on == 'Homepage Section' %} - {{ render_homepage_section(homepage.hero_section_doc) }} - {% endif %} - - {% if homepage.products %} -
-

{{ _('Products') }}

- -
- {% for item in homepage.products %} -
-
- {{ item.item_name }} -
-
{{ item.item_name }}
- {{ _('More details') }} -
-
-
- {% endfor %} -
-
- {% endif %} - - {% if blogs %} -
-

{{ _('Publications') }}

- -
- {% for blog in blogs %} -
-
-
-
{{ blog.title }}
-

{{ _('By {0}').format(blog.blogger) }}

-

{{ blog.blog_intro }}

-
-
- {{ _('Read blog') }} -
-
-
- {% endfor %} -
-
- {% endif %} - - {% for section in homepage_sections %} - {{ render_homepage_section(section) }} - {% endfor %} -
-{% endblock %} diff --git a/erpnext/templates/pages/home.py b/erpnext/templates/pages/home.py deleted file mode 100644 index 751a5b0b50..0000000000 --- a/erpnext/templates/pages/home.py +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - - -import frappe - -no_cache = 1 - - -def get_context(context): - homepage = frappe.get_cached_doc("Homepage") - - homepage.title = homepage.title or homepage.company - context.title = homepage.title - context.homepage = homepage - - if homepage.hero_section_based_on == "Homepage Section" and homepage.hero_section: - homepage.hero_section_doc = frappe.get_cached_doc("Homepage Section", homepage.hero_section) - - if homepage.slideshow: - doc = frappe.get_cached_doc("Website Slideshow", homepage.slideshow) - context.slideshow = homepage.slideshow - context.slideshow_header = doc.header - context.slides = doc.slideshow_items - - context.blogs = frappe.get_all( - "Blog Post", - fields=["title", "blogger", "blog_intro", "route"], - filters={"published": 1}, - order_by="modified desc", - limit=3, - ) - - # filter out homepage section which is used as hero section - homepage_hero_section = ( - homepage.hero_section_based_on == "Homepage Section" and homepage.hero_section - ) - homepage_sections = frappe.get_all( - "Homepage Section", - filters=[["name", "!=", homepage_hero_section]] if homepage_hero_section else None, - order_by="section_order asc", - ) - context.homepage_sections = [ - frappe.get_cached_doc("Homepage Section", name) for name in homepage_sections - ] - - context.metatags = context.metatags or frappe._dict({}) - context.metatags.image = homepage.hero_image or None - context.metatags.description = homepage.description or None