Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ContentNode: Create new responsive layout #4071

Merged
merged 42 commits into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c6591bc
Create new default layout
manuelmeister Nov 10, 2023
943f6a4
Update snapshots
manuelmeister Nov 12, 2023
52c32d3
Update snapshots
manuelmeister Nov 12, 2023
b71541b
Update snapshots
manuelmeister Nov 12, 2023
06d7698
Update dev data
manuelmeister Nov 12, 2023
3c86cc7
Replace magic numbers
manuelmeister Nov 12, 2023
c3c4ce5
Implement DefaultLayout in nuxt print
manuelmeister Nov 12, 2023
c59b9a9
Fix missing default layout in dev data
manuelmeister Nov 12, 2023
2df7282
Implement DefaultLayout in vue3 pdf service
manuelmeister Nov 12, 2023
72a3669
Fix snapshots & tests
manuelmeister Nov 12, 2023
b1ae791
Merge remote-tracking branch 'upstream/devel' into feature/new-flexla…
manuelmeister Nov 12, 2023
73bcd2e
Use valid pdf-style unit
manuelmeister Nov 25, 2023
0bcef6c
Implement default layout for vue3 pdf print
manuelmeister Nov 25, 2023
71a875e
Fix defaultLayout tests
manuelmeister Nov 25, 2023
a82316f
Merge remote-tracking branch 'upstream/devel' into feature/new-flexla…
manuelmeister Nov 25, 2023
c180834
Lint changes
manuelmeister Nov 25, 2023
2e14383
Fix number of content nodes
manuelmeister Nov 25, 2023
e779db3
Adjust query count of storyboards
manuelmeister Nov 25, 2023
2bc3f02
Fix rendering artifacts in nuxt print
manuelmeister Nov 26, 2023
4ab76e7
Fix rendering artifacts in vue3 print
manuelmeister Nov 26, 2023
b911d3a
Adjust vue3 print styling to match nuxt print
manuelmeister Nov 26, 2023
e3f9af6
Prevent non-root-attached DefaultLayout
manuelmeister Nov 26, 2023
9d47a81
Fix query count for ContentNodes
manuelmeister Nov 26, 2023
2c19caf
Keep overflowed border hidden in vue3 print
manuelmeister Nov 26, 2023
002b857
Make schema statement more readable
manuelmeister Dec 2, 2023
e63d78e
Review: Remove unnecessary check
manuelmeister Dec 2, 2023
525dc29
Review: Rename variable
manuelmeister Dec 2, 2023
543b549
Review: Fix translation key
manuelmeister Dec 2, 2023
4ef38d4
Review: Fix missing rename
manuelmeister Dec 2, 2023
33738b2
Merge remote-tracking branch 'upstream/devel' into feature/new-flexla…
manuelmeister Dec 2, 2023
9908ae9
Update query count snapshots
manuelmeister Dec 3, 2023
ed1fa9e
Rename DefaultLayout to ResponsiveLayout
manuelmeister Dec 3, 2023
e75e7cf
Fix flaky query count test
manuelmeister Dec 3, 2023
af02c01
Lint: Fix comment style
manuelmeister Dec 3, 2023
2903e89
Remove obsolete snapshot test
manuelmeister Dec 3, 2023
f833e16
Flaky test
manuelmeister Dec 3, 2023
2fb7e9d
Fix dev data responsive layout
manuelmeister Dec 3, 2023
e2d2c14
Rename fixture comment
manuelmeister Dec 4, 2023
3916453
EndpointQueryCountTest: allow a range for the number of queries on co…
BacLuc Dec 10, 2023
f409bee
Merge pull request #5 from BacLuc/separate-contentnode-querycount-tests
manuelmeister Dec 13, 2023
082c128
Merge remote-tracking branch 'upstream/devel' into feature/new-flexla…
manuelmeister Dec 17, 2023
4240876
Merge remote-tracking branch 'origin/feature/new-flexlayout' into fea…
manuelmeister Dec 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
App\Entity\ContentNode\MultiSelect:
multiSelect1:
root: '@columnLayout1'
parent: '@columnLayout1'
slot: '1'
parent: '@responsiveLayout1'
slot: 'aside-top'
position: 0
instanceName: 'multiSelect1'
contentType: '@contentTypeMultiSelect'
Expand All @@ -12,25 +12,25 @@ App\Entity\ContentNode\MultiSelect:
App\Entity\ContentNode\MaterialNode:
materialNode1:
root: '@columnLayout1'
parent: '@columnLayout1'
slot: '1'
parent: '@responsiveLayout1'
slot: 'aside-top'
position: 1
instanceName: 'materialNode1'
contentType: '@contentTypeMaterial'

App\Entity\ContentNode\SingleText:
singleText1:
root: '@columnLayout1'
parent: '@columnLayout1'
slot: '1'
parent: '@responsiveLayout1'
slot: 'aside-top'
position: 2
instanceName: 'singleText1'
contentType: '@contentTypeNotes'
data: { html: <word()> }
safetyConcept1:
root: '@columnLayout1'
parent: '@columnLayout1'
slot: '1'
parent: '@responsiveLayout1'
slot: 'aside-top'
position: 3
instanceName: 'safetyConcept1'
contentType: '@contentTypeSafetyConcept'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
App\Entity\ContentNode\Storyboard:
storyboard1:
root: '@columnLayout1'
parent: '@columnLayout1'
slot: '2'
parent: '@responsiveLayout1'
slot: 'main'
position: 0
instanceName: 'storyboard1'
contentType: '@contentTypeStoryboard'
Expand Down Expand Up @@ -31,8 +31,8 @@ App\Entity\ContentNode\Storyboard:
App\Entity\ContentNode\ColumnLayout:
columnLayoutChild1:
root: '@columnLayout1'
parent: '@columnLayout1'
slot: '2'
parent: '@responsiveLayout1'
slot: 'main'
position: 1
data: { columns: [{ slot: '1', width: 7 }, { slot: '2', width: 5 }] }
instanceName: 'columnLayoutChild1'
Expand Down
15 changes: 13 additions & 2 deletions api/fixtures/activity1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@ App\Entity\ContentNode\ColumnLayout:
parent: null
slot: null
position: 0
data: { columns: [{ slot: '1', width: 6 }, { slot: '2', width: 6 }] }
instanceName: 'columnLayout1'
data: { columns: [{ slot: '1', width: 12 }] }
instanceName: 'columnLayout1Root'
contentType: '@contentTypeColumnLayout'

# Default layout
App\Entity\ContentNode\ResponsiveLayout:
responsiveLayout1:
root: '@columnLayout1'
parent: '@columnLayout1'
slot: '1'
position: 0
data: { items: [{ slot: 'main' }, { slot: 'aside-top' }, { slot: 'aside-bottom' }] }
instanceName: 'responsiveLayout1'
contentType: '@contentTypeResponsiveLayout'
8 changes: 8 additions & 0 deletions api/fixtures/columnLayouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,11 @@ App\Entity\ContentNode\ColumnLayout:
data: { columns: [{ slot: '1', width: 12 }] }
instanceName: <word()>
contentType: '@contentTypeColumnLayout'
columnLayoutWithResponsiveLayout:
root: '@self'
parent: null
slot: null
position: 0
data: { columns: [{ slot: '1', width: 12 }] }
instanceName: <word()>
contentType: '@contentTypeColumnLayout'
6 changes: 5 additions & 1 deletion api/fixtures/contentTypes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ App\Entity\ContentType:
name: 'ColumnLayout'
active: true
entityClass: 'App\Entity\ContentNode\ColumnLayout'
contentTypeResponsiveLayout:
name: 'ResponsiveLayout'
active: true
entityClass: 'App\Entity\ContentNode\ResponsiveLayout'
contentTypeStoryboard:
name: 'Storyboard'
active: true
Expand All @@ -27,4 +31,4 @@ App\Entity\ContentType:
name: 'LAThematicArea'
active: true
entityClass: 'App\Entity\ContentNode\MultiSelect'
jsonConfig: { items: [ 'outdoorTechnique', 'security', 'natureAndEnvironment', 'pioneeringTechnique', 'campsiteAndSurroundings', 'preventionAndIntegration' ] }
jsonConfig: { items: [ 'outdoorTechnique', 'security', 'natureAndEnvironment', 'pioneeringTechnique', 'campsiteAndSurroundings', 'preventionAndIntegration' ] }
9 changes: 9 additions & 0 deletions api/fixtures/responsiveLayouts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
App\Entity\ContentNode\ResponsiveLayout:
responsiveLayoutCampUnrelated:
root: '@columnLayout1campUnrelated'
parent: '@columnLayout1campUnrelated'
slot: '1'
position: 0
data: { items: [{ slot: 'main' }, {slot: 'aside-top' }, {slot: 'aside-bottom'}] }
instanceName: 'responsiveLayoutCampUnrelated'
contentType: '@contentTypeResponsiveLayout'
8 changes: 0 additions & 8 deletions api/migrations/dev-data/Version202309300329.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ public function getDescription(): string {

public function up(Schema $schema): void {
// START PHP CODE
$this->addSql(createTruncateDatabaseCommand());

$statements = getStatementsForMigrationFile();
foreach ($statements as $statement) {
if (trim($statement)) {
$this->addSql($statement);
}
}
// END PHP CODE
}

Expand Down
23 changes: 23 additions & 0 deletions api/migrations/dev-data/Version202311121726.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types=1);

namespace DataMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

require_once __DIR__.'/helpers.php';

final class Version202311121726 extends AbstractMigration {
public function getDescription(): string {
return '';
}

public function up(Schema $schema): void {
// START PHP CODE
// END PHP CODE
}

public function down(Schema $schema): void {}
}
23 changes: 23 additions & 0 deletions api/migrations/dev-data/Version202311121824.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types=1);

namespace DataMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

require_once __DIR__.'/helpers.php';

final class Version202311121824 extends AbstractMigration {
public function getDescription(): string {
return '';
}

public function up(Schema $schema): void {
// START PHP CODE
// END PHP CODE
}

public function down(Schema $schema): void {}
}
31 changes: 31 additions & 0 deletions api/migrations/dev-data/Version202311261457.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

declare(strict_types=1);

namespace DataMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

require_once __DIR__.'/helpers.php';

final class Version202311261457 extends AbstractMigration {
public function getDescription(): string {
return '';
}

public function up(Schema $schema): void {
// START PHP CODE
$this->addSql(createTruncateDatabaseCommand());

$statements = getStatementsForMigrationFile();
foreach ($statements as $statement) {
if (trim($statement)) {
$this->addSql($statement);
}
}
// END PHP CODE
}

public function down(Schema $schema): void {}
}