Skip to content

Commit

Permalink
Merge pull request #49 from markstory/profile-pages
Browse files Browse the repository at this point in the history
Finish conversion to htmx
  • Loading branch information
markstory authored Dec 24, 2023
2 parents bd4a519 + 8eb8369 commit cd09b1b
Show file tree
Hide file tree
Showing 253 changed files with 6,688 additions and 10,241 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ indent_size = 2
[*.tsx]
indent_size = 2

[*.ts]
indent_size = 2

[*.scss]
indent_size = 2

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['7.4', '8.0']
php-version: ['8.1']
db-type: [sqlite, mysql, pgsql]

env:
Expand Down Expand Up @@ -45,9 +45,9 @@ jobs:
- name: composer install
run: |
if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
composer update --no-progress --prefer-lowest --prefer-stable
composer install --no-progress --prefer-lowest --prefer-stable --ignore-platform-req=php
else
composer update --no-progress
composer install --no-progress --ignore-platform-req=php
fi
cp ./tests/Fixture/google-auth.json ./config/google-auth.json
Expand Down Expand Up @@ -107,13 +107,13 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.1
extensions: mbstring, intl, pdo_mysql
coverage: pcov

- name: Install dependencies & build javascript
run: |
composer update --no-progress
composer install --no-progress --ignore-platform-req=php
yarn install
yarn build
Expand Down Expand Up @@ -165,13 +165,13 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
extensions: mbstring, intl
coverage: none
tools: phive

- name: composer install
run: composer update --no-progress
run: composer install --no-progress --ignore-platform-req=php

- name: Install PHP tools with phive.
run: phive install --trust-gpg-keys '12CE0F1D262429A5'
Expand Down
156 changes: 0 additions & 156 deletions assets/js/Pages/CalendarProviders/Index.tsx

This file was deleted.

138 changes: 0 additions & 138 deletions assets/js/Pages/CalendarProviders/calendarSources.tsx

This file was deleted.

Loading

0 comments on commit cd09b1b

Please sign in to comment.