Compare commits

..

No commits in common. "8a06f5a57ce3d4ac13d3cd432a144ed847c55548" and "2c79ab64ade080892e26fed111aa7e96ebe76b15" have entirely different histories.

20 changed files with 0 additions and 148 deletions

View file

@ -47,7 +47,6 @@ class ElementController
'title' => $element->getTitle(),
'description' => $element->getDescription(),
'richText' => $element->getRichText(),
'pdfPath' => $element->getPdfPath(),
],
], 200);
}

View file

@ -11,7 +11,6 @@ class CreateElementDto
public string $title,
public string $description,
public string $richText,
public ?string $pdfPath,
public ?Element $parentElement,
) {
}

View file

@ -11,7 +11,6 @@ class Element
private string $title,
private string $description,
private string $richText,
private ?string $pdfPath,
private Set $set,
private ?Element $parentElement,
) {
@ -37,11 +36,6 @@ class Element
return $this->richText;
}
public function getPdfPath(): ?string
{
return $this->pdfPath;
}
public function getSet(): Set
{
return $this->set;

View file

@ -11,7 +11,6 @@ use Illuminate\Database\Eloquent\Model;
* @property string $title
* @property string $description
* @property string $rich_text
* @property string|null $pdf_path
* @property int|null $parent_element_id
*
* @method static Builder<static>|ElementModel newModelQuery()
@ -23,7 +22,6 @@ use Illuminate\Database\Eloquent\Model;
* @method static Builder<static>|ElementModel whereTitle($value)
* @method static Builder<static>|ElementModel whereDescription($value)
* @method static Builder<static>|ElementModel whereRichText($value)
* @method static Builder<static>|ElementModel wherePdfPath($value)
*
* @mixin \Eloquent
*/
@ -38,7 +36,6 @@ class ElementModel extends Model
'title',
'description',
'rich_text',
'pdf_path',
'parent_element_id',
];

View file

@ -19,7 +19,6 @@ class EloquentElementRepository implements ElementRepository
'title' => $dto->title,
'description' => $dto->description,
'rich_text' => $dto->richText,
'pdf_path' => $dto->pdfPath,
'parent_element_id' => $dto->parentElement?->getId(),
]);
@ -28,7 +27,6 @@ class EloquentElementRepository implements ElementRepository
title: $dto->title,
description: $dto->description,
richText: $dto->richText,
pdfPath: $dto->pdfPath,
set: $dto->set,
parentElement: $dto->parentElement,
);
@ -110,7 +108,6 @@ class EloquentElementRepository implements ElementRepository
title: $model->title,
description: $model->description,
richText: $model->rich_text,
pdfPath: $model->pdf_path,
set: $set,
parentElement: $parentElement,
);

View file

@ -32,7 +32,6 @@ class CreateElement
}
$description = $request->description ?? '';
$richText = $request->richText ?? '';
$pdfPath = $request->pdfPath === '' ? null : $request->pdfPath;
$set = $this->setRepo->find($request->setId);
if ($set === null) {
@ -49,7 +48,6 @@ class CreateElement
title: $request->title,
description: $description,
richText: $richText,
pdfPath: $pdfPath,
parentElement: null,
));
}
@ -73,7 +71,6 @@ class CreateElement
title: $request->title,
description: $description,
richText: $richText,
pdfPath: $pdfPath,
parentElement: $parentElement,
));
}

View file

@ -9,7 +9,6 @@ class CreateElementRequest
public ?string $title,
public ?string $description,
public ?string $richText,
public ?string $pdfPath,
public ?int $parentElementId,
) {
}

View file

@ -14,7 +14,6 @@ return new class extends Migration
$table->string('title');
$table->text('description')->default('');
$table->text('rich_text')->default('');
$table->string('pdf_path')->nullable();
$table->foreignId('parent_element_id')
->nullable()
->constrained('elements');

View file

@ -21,7 +21,6 @@ class ElementSeeder extends Seeder
richText: '<p>Begin with a clear map for avodah growth.</p>'
. '<p><strong>Move steadily</strong> from awareness '
. 'to practice.</p>',
pdfPath: '/assets/pdfs/baderech.pdf',
parentElement: null,
));
$elementRepository->create(new CreateElementDto(
@ -31,7 +30,6 @@ class ElementSeeder extends Seeder
. 'avodah practice.',
richText: '<p>Avodah foundations begin with honest awareness '
. 'and small repeatable steps.</p>',
pdfPath: null,
parentElement: $rootElement,
));
$elementRepository->create(new CreateElementDto(
@ -40,7 +38,6 @@ class ElementSeeder extends Seeder
description: 'Practical steps for consistent daily growth.',
richText: '<p>Daily practice turns inspiration into a '
. 'dependable rhythm.</p>',
pdfPath: null,
parentElement: $rootElement,
));
}

View file

@ -22,7 +22,6 @@ class FakeElementRepository implements ElementRepository
title: $dto->title,
description: $dto->description,
richText: $dto->richText,
pdfPath: $dto->pdfPath,
set: $dto->set,
parentElement: $dto->parentElement,
);
@ -100,7 +99,6 @@ class FakeElementRepository implements ElementRepository
title: $element->getTitle(),
description: $element->getDescription(),
richText: $element->getRichText(),
pdfPath: $element->getPdfPath(),
set: $element->getSet(),
parentElement: $parentElement,
);

View file

@ -27,7 +27,6 @@ class ElementsEndpointTest extends TestCase
title: 'Baderech HaAvodah',
description: 'A structured path for growth',
richText: '<p>A structured path for growth</p>',
pdfPath: '/assets/pdfs/baderech.pdf',
parentElement: null,
));
$firstChildElement = $elementRepository->create(new CreateElementDto(
@ -35,7 +34,6 @@ class ElementsEndpointTest extends TestCase
title: 'Avodah Foundations',
description: 'Foundations for steady avodah',
richText: '<p>Foundations rich text</p>',
pdfPath: '/assets/pdfs/foundations.pdf',
parentElement: $element,
));
$secondChildElement = $elementRepository->create(new CreateElementDto(
@ -43,7 +41,6 @@ class ElementsEndpointTest extends TestCase
title: 'Daily Practice',
description: 'Daily practices for growth',
richText: '<p>Daily practice rich text</p>',
pdfPath: null,
parentElement: $element,
));
@ -68,7 +65,6 @@ class ElementsEndpointTest extends TestCase
'title' => 'Baderech HaAvodah',
'description' => 'A structured path for growth',
'richText' => '<p>A structured path for growth</p>',
'pdfPath' => '/assets/pdfs/baderech.pdf',
],
]);
}

View file

@ -33,7 +33,6 @@ class SetsEndpointTest extends TestCase
title: $baderechSet->getName(),
description: $baderechSet->getDescription(),
richText: '',
pdfPath: null,
parentElement: null,
)
);

View file

@ -31,7 +31,6 @@ class ElementControllerTest extends TestCase
'Baderech HaAvodah',
'A structured path for growth',
'<p>A structured path for growth</p>',
'/assets/pdfs/baderech.pdf',
null,
);
$firstChildElement = $this->createElement(
@ -39,7 +38,6 @@ class ElementControllerTest extends TestCase
'Avodah Foundations',
'Foundations for steady avodah',
'<p>Foundations rich text</p>',
'/assets/pdfs/foundations.pdf',
$element,
);
$secondChildElement = $this->createElement(
@ -47,7 +45,6 @@ class ElementControllerTest extends TestCase
'Daily Practice',
'Daily practices for growth',
'<p>Daily practice rich text</p>',
null,
$element,
);
@ -65,10 +62,6 @@ class ElementControllerTest extends TestCase
'<p>A structured path for growth</p>',
$body['element']['richText'],
);
$this->assertSame(
'/assets/pdfs/baderech.pdf',
$body['element']['pdfPath'],
);
$this->assertSame([
[
'id' => $firstChildElement->getId(),
@ -120,7 +113,6 @@ class ElementControllerTest extends TestCase
string $title,
string $description,
string $richText,
?string $pdfPath,
?Element $parentElement,
): Element {
return $this->elementRepo->create(new CreateElementDto(
@ -128,7 +120,6 @@ class ElementControllerTest extends TestCase
title: $title,
description: $description,
richText: $richText,
pdfPath: $pdfPath,
parentElement: $parentElement,
));
}

View file

@ -21,7 +21,6 @@ class ElementTest extends TestCase
title: 'Root',
description: 'Root description',
richText: '<p>Root rich text</p>',
pdfPath: null,
set: $set,
parentElement: null,
);
@ -30,7 +29,6 @@ class ElementTest extends TestCase
title: 'Child',
description: 'Child description',
richText: '<p>Child rich text</p>',
pdfPath: '/assets/pdfs/child.pdf',
set: $set,
parentElement: $rootElement,
);
@ -45,13 +43,8 @@ class ElementTest extends TestCase
'<p>Child rich text</p>',
$childElement->getRichText(),
);
$this->assertSame(
'/assets/pdfs/child.pdf',
$childElement->getPdfPath(),
);
$this->assertSame($set, $childElement->getSet());
$this->assertSame($rootElement, $childElement->getParentElement());
$this->assertNull($rootElement->getPdfPath());
$this->assertNull($rootElement->getParentElement());
}
}

View file

@ -49,7 +49,6 @@ class CreateElementTest extends TestCase
title: 'Root',
description: 'Root description',
richText: '<p>Root rich text</p>',
pdfPath: '/assets/pdfs/root.pdf',
parentElementId: null,
));
@ -57,7 +56,6 @@ class CreateElementTest extends TestCase
$this->assertSame('Root', $element->getTitle());
$this->assertSame('Root description', $element->getDescription());
$this->assertSame('<p>Root rich text</p>', $element->getRichText());
$this->assertSame('/assets/pdfs/root.pdf', $element->getPdfPath());
$this->assertSame($set->getId(), $element->getSet()->getId());
$this->assertNull($element->getParentElement());
}
@ -71,7 +69,6 @@ class CreateElementTest extends TestCase
title: 'Root',
description: 'Root description',
richText: '<p>Root rich text</p>',
pdfPath: null,
parentElementId: null,
)
);
@ -82,7 +79,6 @@ class CreateElementTest extends TestCase
title: 'Child',
description: 'Child description',
richText: '<p>Child rich text</p>',
pdfPath: '/assets/pdfs/child.pdf',
parentElementId: $rootElement->getId(),
)
);
@ -96,10 +92,6 @@ class CreateElementTest extends TestCase
'<p>Child rich text</p>',
$childElement->getRichText(),
);
$this->assertSame(
'/assets/pdfs/child.pdf',
$childElement->getPdfPath(),
);
$this->assertSame(
$rootElement->getId(),
$childElement->getParentElement()->getId(),
@ -115,29 +107,11 @@ class CreateElementTest extends TestCase
title: 'Root',
description: null,
richText: null,
pdfPath: null,
parentElementId: null,
));
$this->assertSame('', $element->getDescription());
$this->assertSame('', $element->getRichText());
$this->assertNull($element->getPdfPath());
}
public function testCreatesElementWithNullPdfPathWhenBlank(): void
{
$set = $this->createSet('Daily learning');
$element = $this->createElement->execute(new CreateElementRequest(
setId: $set->getId(),
title: 'Root',
description: 'Root description',
richText: '<p>Root rich text</p>',
pdfPath: '',
parentElementId: null,
));
$this->assertNull($element->getPdfPath());
}
public function testThrowsWhenSetIdMissing(): void
@ -150,7 +124,6 @@ class CreateElementTest extends TestCase
title: 'Root',
description: 'Root description',
richText: '<p>Root rich text</p>',
pdfPath: null,
parentElementId: null,
));
}
@ -165,7 +138,6 @@ class CreateElementTest extends TestCase
title: null,
description: 'Root description',
richText: '<p>Root rich text</p>',
pdfPath: null,
parentElementId: null,
));
}
@ -180,7 +152,6 @@ class CreateElementTest extends TestCase
title: 'Root',
description: 'Root description',
richText: '<p>Root rich text</p>',
pdfPath: null,
parentElementId: null,
));
}
@ -199,7 +170,6 @@ class CreateElementTest extends TestCase
title: 'Child',
description: 'Child description',
richText: '<p>Child rich text</p>',
pdfPath: null,
parentElementId: 99,
));
}
@ -212,7 +182,6 @@ class CreateElementTest extends TestCase
title: 'Root',
description: 'Root description',
richText: '<p>Root rich text</p>',
pdfPath: null,
parentElementId: null,
));
@ -226,7 +195,6 @@ class CreateElementTest extends TestCase
title: 'Another root',
description: 'Another root description',
richText: '<p>Another root rich text</p>',
pdfPath: null,
parentElementId: null,
));
}
@ -241,7 +209,6 @@ class CreateElementTest extends TestCase
title: 'Parent root',
description: 'Parent root description',
richText: '<p>Parent root rich text</p>',
pdfPath: null,
parentElementId: null,
)
);
@ -256,7 +223,6 @@ class CreateElementTest extends TestCase
title: 'Invalid child',
description: 'Invalid child description',
richText: '<p>Invalid child rich text</p>',
pdfPath: null,
parentElementId: $parentElement->getId(),
));
}

View file

@ -32,7 +32,6 @@ class GetElementTest extends TestCase
'Baderech HaAvodah',
'A structured path for growth',
'<p>A structured path for growth</p>',
'/assets/pdfs/baderech.pdf',
null,
);
@ -52,10 +51,6 @@ class GetElementTest extends TestCase
'<p>A structured path for growth</p>',
$foundElement->getRichText(),
);
$this->assertSame(
'/assets/pdfs/baderech.pdf',
$foundElement->getPdfPath(),
);
}
public function testReturnsDirectChildElements(): void
@ -66,7 +61,6 @@ class GetElementTest extends TestCase
'Baderech HaAvodah',
'A structured path for growth',
'<p>A structured path for growth</p>',
'/assets/pdfs/baderech.pdf',
null,
);
$firstChildElement = $this->createElement(
@ -74,7 +68,6 @@ class GetElementTest extends TestCase
'Avodah Foundations',
'Foundations for steady avodah',
'<p>Foundations rich text</p>',
'/assets/pdfs/foundations.pdf',
$parentElement,
);
$secondChildElement = $this->createElement(
@ -82,7 +75,6 @@ class GetElementTest extends TestCase
'Daily Practice',
'Daily practices for growth',
'<p>Daily practice rich text</p>',
null,
$parentElement,
);
$this->createElement(
@ -90,7 +82,6 @@ class GetElementTest extends TestCase
'Nested Practice',
'Nested description',
'<p>Nested rich text</p>',
null,
$firstChildElement,
);
$otherSet = $this->createSet(2, 'Daily Learning');
@ -100,14 +91,12 @@ class GetElementTest extends TestCase
'Other parent description',
'<p>Other parent rich text</p>',
null,
null,
);
$this->createElement(
$otherSet,
'Other Child',
'Other child description',
'<p>Other child rich text</p>',
null,
$otherParentElement,
);
@ -168,7 +157,6 @@ class GetElementTest extends TestCase
string $title,
string $description,
string $richText,
?string $pdfPath,
?Element $parentElement,
): Element {
return $this->elementRepo->create(new CreateElementDto(
@ -176,7 +164,6 @@ class GetElementTest extends TestCase
title: $title,
description: $description,
richText: $richText,
pdfPath: $pdfPath,
parentElement: $parentElement,
));
}

View file

@ -46,10 +46,6 @@ describe('media page sets', () => {
.should('be.visible')
cy.contains('strong', 'Move steadily').should('be.visible')
})
cy.contains('[data-cy="element-pdf-link"]', 'View PDF')
.should('be.visible')
.and('have.attr', 'href', '/assets/pdfs/baderech.pdf')
.and('have.attr', 'target', '_blank')
cy.get('[data-cy="child-element-list"]').should('be.visible')
cy.get('[data-cy="child-element-list"]')
.should(
@ -82,6 +78,5 @@ describe('media page sets', () => {
'contain.text',
'Avodah foundations begin with honest awareness',
)
cy.get('[data-cy="element-pdf-link"]').should('not.exist')
})
})

View file

@ -9,7 +9,6 @@ export interface ChildElement {
export interface Element extends ChildElement {
richText: string
pdfPath: string | null
}
interface ElementResponse {

View file

@ -56,18 +56,6 @@ watch(
v-html="element.richText"
/>
<div v-if="element.pdfPath !== null" class="element-page__actions">
<a
:href="element.pdfPath"
class="element-page__pdf-link"
data-cy="element-pdf-link"
target="_blank"
rel="noreferrer"
>
View PDF
</a>
</div>
<nav
v-if="childElements.length > 0"
class="element-page__children"
@ -149,44 +137,6 @@ watch(
font-weight: 700;
}
.element-page__actions {
display: flex;
justify-content: center;
margin-top: 1.75rem;
}
.element-page__pdf-link {
display: inline-flex;
align-items: center;
justify-content: center;
min-height: 2.75rem;
padding: 0.7rem 1.15rem;
color: var(--color-white);
background: var(--color-olive);
border-radius: 8px;
font-family: var(--font-sans);
font-size: 0.95rem;
font-weight: 700;
line-height: 1;
text-decoration: none;
transition:
background-color 180ms ease,
box-shadow 180ms ease,
transform 180ms ease;
}
.element-page__pdf-link:hover,
.element-page__pdf-link:focus-visible {
background: #4d5b3c;
box-shadow: 0 10px 24px rgb(44 44 44 / 12%);
transform: translateY(-1px);
}
.element-page__pdf-link:focus-visible {
outline: 3px solid rgb(94 107 76 / 38%);
outline-offset: 4px;
}
.element-page__children {
margin-top: 3rem;
}