Skip to content

Commit

Permalink
MFH
Browse files Browse the repository at this point in the history
  • Loading branch information
thekid committed Sep 29, 2024
2 parents bc018a4 + 6564d5e commit c6cb0ad
Show file tree
Hide file tree
Showing 21 changed files with 250 additions and 189 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
os: [ubuntu-latest, windows-latest]

steps:
Expand All @@ -24,12 +24,13 @@ jobs:
run: git config --system core.autocrlf false; git config --system core.eol lf

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up PHP ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: gd
ini-values: date.timezone=Europe/Berlin

- name: Validate composer.json and composer.lock
Expand All @@ -40,7 +41,7 @@ jobs:
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,29 @@ jobs:
- 27017/tcp
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up PHP 8.3
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
extensions: gd
ini-values: date.timezone=Europe/Berlin

- name: Get Composer Cache Directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
run: >
curl -sSL https://baltocdn.com/xp-framework/xp-runners/distribution/downloads/e/entrypoint/xp-run-8.6.2.sh > xp-run &&
curl -sSL https://baltocdn.com/xp-framework/xp-runners/distribution/downloads/e/entrypoint/xp-run-8.8.0.sh > xp-run &&
composer install --prefer-dist --no-scripts &&
echo "vendor/autoload.php" > composer.pth
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,18 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.3'
extensions: gd
ini-values: date.timezone=Europe/Berlin

- name: Install dependencies
run: >
curl -sSL https://baltocdn.com/xp-framework/xp-runners/distribution/downloads/e/entrypoint/xp-run-8.6.2.sh > xp-run &&
curl -sSL https://baltocdn.com/xp-framework/xp-runners/distribution/downloads/e/entrypoint/xp-run-8.8.0.sh > xp-run &&
composer install --prefer-dist --no-scripts &&
echo "vendor/autoload.php" > composer.pth
Expand Down
59 changes: 59 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,65 @@ Dialog change log

## ?.?.? / ????-??-??

## 2.4.0 / 2024-09-15

* Merged PR #61: Refactor to make use of asymmetric visibility
(@thekid)
* Updated the *OpenLayers* JavaScript library to version 10.1, see
https://github.com/openlayers/openlayers/releases
(@thekid)

## 2.3.0 / 2024-05-20

* Preload the cover image, increasing the LightHouse score on the
home page to 99. See #18
(@thekid)

## 2.2.0 / 2024-05-16

* Updated the *OpenLayers* JavaScript library to version 9.2, see
https://github.com/openlayers/openlayers/releases
(@thekid)

## 2.1.2 / 2024-05-12

* Fixed the `video` elements in having an unwanted bottom "margin".
Use *display: block* to prevent this, just like with images.
(@thekid)

## 2.1.1 / 2024-05-06

* Fixed [descenders](https://en.wikipedia.org/wiki/Descender) being
cut off on cards
(@thekid)

## 2.1.0 / 2024-04-28

* Added *LIVE* display inside feed, fixed query problem when images
are not set yet
(@thekid)
* Upgraded `xp-framework/imaging` and `xp-forge/web-auth` libraries,
removing dependency on the XML library
(@thekid)
* Upgraded `xp-framework/command` library, being able to adjust the
argument methods' prefixes to the much nicer *use*.
(@thekid)

## 2.0.0 / 2024-03-24

* Changed main font from *Overpass* to *Barlow* - its rounded edges
fit better with the rest of the design
(@thekid)
* Upgraded XP Compiler & Core - dropping support for PHP 7.0 - 7.3
(@thekid)
* Merged PR #59: Use `Collection::modify()` instead of invoking
"findAndModify"
(@thekid)

## 1.18.0 / 2024-03-02

* Upgraded `xp-forge/markdown` and `xp-forge/web-auth` libraries
(@thekid)
* Merged PR #58: Balance layout for odd number of preview images
(@thekid)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Build status on GitHub](https://github.com/thekid/dialog/workflows/Tests/badge.svg)](https://github.com/thekid/dialog/actions)
[![Uses XP Framework](https://raw.githubusercontent.com/xp-framework/web/master/static/xp-framework-badge.png)](https://github.com/xp-framework/core)
[![BSD Licence](https://raw.githubusercontent.com/xp-framework/web/master/static/licence-bsd.png)](https://github.com/xp-framework/core/blob/master/LICENCE.md)
[![Requires PHP 7.0+](https://raw.githubusercontent.com/xp-framework/web/master/static/php-7_0plus.svg)](http://php.net/)
[![Requires PHP 7.4+](https://raw.githubusercontent.com/xp-framework/web/master/static/php-7_4plus.svg)](http://php.net/)
[![Supports PHP 8.0+](https://raw.githubusercontent.com/xp-framework/web/master/static/php-8_0plus.svg)](http://php.net/)

See https://dialog.friebes.info/
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
"license": "bsd",

"require": {
"xp-framework/compiler": "^8.5",
"xp-framework/imaging": "^10.1",
"xp-framework/command": "^11.0",
"xp-framework/compiler": "^9.3",
"xp-framework/imaging": "^11.0",
"xp-framework/command": "^12.0",
"xp-framework/networking": "^10.4",
"xp-forge/web": "^4.0",
"xp-forge/web-auth": "^3.3",
"xp-forge/web-auth": "^5.0",
"xp-forge/frontend": "^6.0",
"xp-forge/rest-api": "^4.0",
"xp-forge/rest-client": "^5.3",
"xp-forge/handlebars-templates": "^3.0",
"xp-forge/markdown": "^7.0",
"xp-forge/markdown": "^8.0",
"xp-forge/yaml": "^8.0",
"xp-forge/hashing": "^2.1",
"xp-forge/inject": "^5.4",
"xp-forge/mongodb": "^2.0"
"xp-forge/inject": "^6.0",
"xp-forge/mongodb": "^2.2"
},

"require-dev": {
"xp-framework/test": "^1.0"
"xp-framework/test": "^2.0"
},

"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"dependencies": {
"ol": "^7.1"
"ol": "^10.1"
},
"bundles": {
"vendor": {
"ol": "ol.css | dist/ol.js",
"fonts://display=swap": "Overpass",
"fonts://display=swap": "Barlow",
".": "src/main/js/*.js"
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/handlebars/feed.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{{#with elements}}
{{#each .}}
<section>
<h2><a href="{{route this}}">{{title}}</a></h2>
<h2 class="{{range-rel is.from is.until}} date"><a href="{{route this}}">{{title}}</a></h2>

<div class="meta">
{{date ./date format="d.m.Y"}} @
Expand Down
5 changes: 4 additions & 1 deletion src/main/handlebars/home.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@
<meta property="og:image" content="{{request.uri.base}}/image/{{cover.slug}}/preview-{{.}}.jpg">
{{/with}}
{{/with}}
{{#with cover}}
<link rel="preload" href="/image/{{slug}}/full-{{images.0.name}}.webp" as="image">
{{/with}}
{{/inline}}
{{#*inline "main"}}

<!-- About me -->
{{#with cover}}
<div class="cover" style="background-image: url(/image/{{slug}}/full-{{#with images.0}}{{.}}{{/with}}.webp)">
<div class="cover" style="background-image: url(/image/{{slug}}/full-{{images.0.name}}.webp)">
<h1>{{title}}</h1>
</div>
<article class="intro">
Expand Down
2 changes: 1 addition & 1 deletion src/main/handlebars/journey.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ parent: feed
{{#with itinerary}}
{{#each .}}
<section id="{{scroll slug}}">
<h2>
<h2 class="scroll">
<a class="scroll" href="#{{scroll slug}}">{{title}}</a>
<a title="Nach oben" class="top" href="#">&#8593;</a>
</h2>
Expand Down
Loading

0 comments on commit c6cb0ad

Please sign in to comment.