Code

Issues/618 htl server#624

Code

Merged

cmrockwell merged 57 commits intodevelop-sling12headwirecom/peregrine-cms:develop-sling12from issues/618-htl-serverheadwirecom/peregrine-cms:issues/618-htl-serverCopy head branch name to clipboardApr 26, 2021

+3,295-442

Commits

Commits on Oct 21, 2020

• pagerenderer/server won't deploy to my develop-sling12. Has to do with common-lang dependency. Also frontend-maven-plugin (node) was failing, but not sure what it does for server/ui.apps. Commentin…

  Show description for 579b7eb
  cmrockwell

  committed
  579b7eb

  Copy full SHA for 579b7eb

• Add missing base template for /content/pagerenderserver/templates

  Show description for 2a2c757
  cmrockwell

  committed
  2a2c757

  Copy full SHA for 2a2c757

• flag pagerenderserver site as internal

  cmrockwell

  committed
  2df4737

  Copy full SHA for 2df4737

• added base template to /content/pagerenderserver/templates so the example vue site can have new page without errors. Added TODO comments about nav and footer for these sites

  cmrockwell

  committed
  3a12a67

  Copy full SHA for 3a12a67

• refactored by moving /apps/pagerenderserver/structure to /apps/pagerenderserver/components. Adjusted PageRenderServerConstants.java and /content/pagerenderserver/ paths accordingly

  cmrockwell

  committed
  df1049d

  Copy full SHA for df1049d

Commits on Oct 22, 2020

• finished moving page from structure to omponents by updating these references

  cmrockwell

  committed
  5e093fd

  Copy full SHA for 5e093fd

Commits on Oct 26, 2020

• To addtess issue #636, Sling JUnit Tests were added for resource adaption (AdaptTo) for per:Page and per:Asset types; and their ability to get the correct per:Site resource as implemented in PerBas…

  Show description for 2019764
  cmrockwell

  committed
  2019764

  Copy full SHA for 2019764

Commits on Oct 27, 2020

• #618 Moved Helper.java to core, and updated data-sly-use in page.html. Refactored Helper.java to allow siteCSS to exist under per:Site/jcr:content

  cmrockwell

  committed
  51469da

  Copy full SHA for 51469da

• Although the npm build scripts are not building vue components for the pagerenderer/server module, it may be useful to continue support the npm build processes. this commit updates a few deps to ke…

  Show description for 6c7f751
  cmrockwell

  committed
  6c7f751

  Copy full SHA for 6c7f751

• add pagerender/server to list of maven compile modules

  cmrockwell

  committed
  80cb826

  Copy full SHA for 80cb826

Commits on Oct 28, 2020

• #618 Updated PageMerge.java adding a method (getMergedResources) returning a list of resources coming either from the template or the page content.

  cmrockwell

  committed
  0a057d2

  Copy full SHA for 0a057d2

• #618 Updated page.html to use PageMerge.java for getting and iterating merged resources as htl

  cmrockwell

  committed
  750a23b

  Copy full SHA for 750a23b

• #618 updated predifned page and template content

  cmrockwell

  committed
  1befe34

  Copy full SHA for 1befe34

Commits on Oct 29, 2020

• Created BaseHelper Use, which can be extended by page and component helpers alike. Refactored PageHelper Use class to extend BaseHelper

  cmrockwell

  committed
  7b3c31f

  Copy full SHA for 7b3c31f

Commits on Oct 30, 2020

• #618 Added getters for all HTL Java Use binding for BaseHelper, updated PageHelper to use getters instead of direct access

  cmrockwell

  committed
  49e5a7d

  Copy full SHA for 49e5a7d

• #618 Added convenience method to PerBase for getting per:Site/jcr:content ValueMap

  cmrockwell

  committed
  5d4b073

  Copy full SHA for 5d4b073

Commits on Nov 6, 2020

• #618 refactored PageMerge to make it possible to test: If the slingScriptHelper is null, then it will try to get the modelFactory from the bindings, which is added by the Adaption Jtest adds it. Us…

  Show description for 5540d0d
  cmrockwell

  committed
  5540d0d

  Copy full SHA for 5540d0d

• organized slingjunit pom.xml deps

  cmrockwell

  committed
  3276e59

  Copy full SHA for 3276e59

• 618 to make testing easier and possible, NavModel Use pojo was updated to use resource from the bindings and not a reference through the request

  cmrockwell

  committed
  817c997

  Copy full SHA for 817c997

• 618 added ssrPageMergeScenario1 for PageMerge::getMergedResources. Test whether getMergedResources properly merges template content with page content for HTL rendering

  cmrockwell

  committed
  ccc3a5d

  Copy full SHA for ccc3a5d

• started example sub-template for PageMerge junit tests

  cmrockwell

  committed
  16d9457

  Copy full SHA for 16d9457

• removed unneeded files from slingjunit test content

  cmrockwell

  committed
  09fecfd

  Copy full SHA for 09fecfd

• #618 Added test content for SSR scenario 2: inheriting template content from a parent template

  cmrockwell

  committed
  c15d91c

  Copy full SHA for c15d91c

• refactored unit tests moving common binding to setup. added test for SSR scenario 2: sub-template inheritance

  cmrockwell

  committed
  b5e78c8

  Copy full SHA for b5e78c8

• #618 Updated getChildren method to resolve children resources from parent templates

  cmrockwell

  committed
  237b967

  Copy full SHA for 237b967

Commits on Nov 10, 2020

• Added content for JUnit SSR test scenarios

  cmrockwell

  committed
  60f9173

  Copy full SHA for 60f9173

• Added JUnit SSR scenario 3 which tests combining content within containers in template with page content containers

  cmrockwell

  committed
  55a569f

  Copy full SHA for 55a569f

• Added getCombinedResources to com.peregrine.pagerender.server.models.Container for SSR test 3

  cmrockwell

  committed
  76c1036

  Copy full SHA for 76c1036

• missed check for null

  cmrockwell

  committed
  f612ab0

  Copy full SHA for f612ab0

Commits on Nov 11, 2020

• moved css for drop zone to separate css file, server.css

  cmrockwell

  committed
  bf3a83c

  Copy full SHA for bf3a83c

Commits on Nov 13, 2020

• fix for adding and editing components

  reusr1

  committed
  69a5da1

  Copy full SHA for 69a5da1

• adding missing per:Component metadata for Page. fixes error that occured when creating new templates for pagerendervue tenant

  cmrockwell

  committed
  4891f36

  Copy full SHA for 4891f36

• Update pagerenderserver example site metadata. Moved siteCSS and siteJS to /content/pagerenderserver/.content.xml. in anticipation of issue #636. cleaned up base component

  cmrockwell

  committed
  582537f

  Copy full SHA for 582537f

Commits on Nov 17, 2020

• #620 added condition for serverSide to addComponentToPath state action such that refreshEditor is called and rendering is refreshed showing added components

  cmrockwell

  committed
  d29a323

  Copy full SHA for d29a323

Commits on Nov 18, 2020

• Similar change for getParentContent as done for pagerenderserver. Allows getting parent content from tenant root per:Site/jcr:content

  cmrockwell

  committed
  fcd1b17

  Copy full SHA for fcd1b17

• Related to Issue #620, Added ssrPageMergeScenario4 for newly created pages. Tests that new pages they have containers for authoring and resources inherited from the template

  cmrockwell

  committed
  9fdbf3a

  Copy full SHA for 9fdbf3a

• optimize imports

  cmrockwell

  committed
  349ca42

  Copy full SHA for 349ca42

Commits on Nov 19, 2020

• Setup for ssrPageMergeScenario5: adding content to empty containers on page

  cmrockwell

  committed
  dd66c3d

  Copy full SHA for dd66c3d

• #620 implemented html renderer for nt:unstructured as a Container that merges children and properties for template and page resources

  cmrockwell

  committed
  26954fa

  Copy full SHA for 26954fa

Commits on Nov 20, 2020

• #620 Update server.css to hide/show the container drop zone depending on author mode

  cmrockwell

  committed
  708d3dd

  Copy full SHA for 708d3dd

Commits on Apr 8, 2021

• refreshed branch merging develop-sling12 in

  cmrockwell

  committed
  1fa6a96

  Copy full SHA for 1fa6a96

• Refactored slingjunit tests such that remote tests are available when 'remote' runmode exists, local replication tests are available when 'local' runmode exists, and there is a common set of test a…

  Show description for 930068e
  cmrockwell

  committed
  930068e

  Copy full SHA for 930068e

• deny everyone read on /content for author instances

  cmrockwell

  committed
  fe3ae26

  Copy full SHA for fe3ae26

Commits on Apr 13, 2021

• When a site uses both server-side templates and vue templates, check the serverSide property. if it exists and is true, then load the page. Otherwise proceed with clientside rendering.

  cmrockwell

  committed
  fd8413d

  Copy full SHA for fd8413d

Commits on Apr 14, 2021

• updated Sling Junit Core to version 1.1.2, and removed unused deps slingjunit.core pom.xml files

  cmrockwell

  committed
  6024826

  Copy full SHA for 6024826

Commits on Apr 15, 2021

• getSiteResource should return null if there is no per:Site resource in the parents

  cmrockwell

  committed
  884ae81

  Copy full SHA for 884ae81

Commits on Apr 16, 2021

• started basic footer htl component; removed debug path output in page.html

  cmrockwell

  committed
  d95c8b3

  Copy full SHA for d95c8b3

Commits on Apr 19, 2021

• updated names in pom to match the vue page renderer

  reusr1

  committed
  3cf2125

  Copy full SHA for 3cf2125

• add server side rendering to docker build

  reusr1

  committed
  c243a26

  Copy full SHA for c243a26

• Merge branch 'develop-sling12' into issues/618-htl-server

  reusr1

  committed
  9c024f3

  Copy full SHA for 9c024f3

• updated bootstrap

  cmrockwell

  committed
  c540c78

  Copy full SHA for c540c78

• added nav component for server side rendering internal site

  cmrockwell

  committed
  3224334

  Copy full SHA for 3224334

• updated footer component adding model

  cmrockwell

  committed
  e3908a4

  Copy full SHA for e3908a4

• added basic footer nav template for pagerenderserver site, removed ui.apps rider Helper.java (replaced with models), added image logo, updated base.html

  cmrockwell

  committed
  386c069

  Copy full SHA for 386c069

• Merge branch 'issues/618-htl-server' of github.com:headwirecom/peregrine-cms into issues/618-htl-server

  cmrockwell

  committed
  8e118a4

  Copy full SHA for 8e118a4

Commits on Apr 24, 2021

• updates to resolve PR suggestions: add check for response object for data property in peregrineApp.js, remove commented and unused lines from NavModel.java, use the common pattern for public static…

  Show description for 6088a74
  cmrockwell

  committed
  6088a74

  Copy full SHA for 6088a74

• Merge branch 'develop-sling12' into issues/618-htl-server

  cmrockwell

  authored
  5901bee

  Copy full SHA for 5901bee