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

PHP rewrite #851

Draft
wants to merge 114 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
340d1f3
Update dependency @eslint/js to v9.1.1
renovate[bot] Apr 19, 2024
d411530
Update dependency eslint to v9.1.0
renovate[bot] Apr 20, 2024
2db8ab1
Update renovate.json
Zoey2936 Apr 20, 2024
7035202
remove global/frintend and backend folder
Zoey2936 Apr 20, 2024
7a6a9b8
init PHP rewrite
Zoey2936 Apr 20, 2024
b6db58f
Update zoeyvid/nginx-quic Docker tag to v273
renovate[bot] Apr 21, 2024
69a0967
Update zoeyvid/nginx-quic Docker tag to v273
renovate[bot] Apr 21, 2024
1e0777f
Update Dockerfile
Zoey2936 Apr 21, 2024
f358867
Merge branch 'develop' into php
Zoey2936 Apr 21, 2024
6a4dd7e
Merge branch 'develop' into php
Zoey2936 Apr 27, 2024
f7ca07a
Update dependency globals to v15.1.0
renovate[bot] Apr 28, 2024
6230132
Update dependency liquidjs to v10.12.0
renovate[bot] Apr 28, 2024
a642a8d
Update Dockerfile
Zoey2936 Apr 29, 2024
e789ccf
Update dependency @babel/core to v7.24.5
renovate[bot] Apr 29, 2024
9da7bfb
use lts nodejs
Zoey2936 May 2, 2024
b5f4e82
Merge branch 'develop' into php
Zoey2936 May 2, 2024
6c16829
Merge branch 'develop' into php
Zoey2936 May 3, 2024
eef25d8
Update composer.json
Zoey2936 May 10, 2024
3c312a4
add totp function
Zoey2936 May 11, 2024
bdde839
merge upstream
Zoey2936 May 12, 2024
e09df00
Merge branch 'develop' into php
Zoey2936 May 12, 2024
a6e0a3d
merge upstream
Zoey2936 May 12, 2024
57b927d
Merge branch 'develop' into php
Zoey2936 May 12, 2024
b31f606
update nginx-quic
Zoey2936 May 12, 2024
4299e78
configure session with valkey
Zoey2936 May 12, 2024
87501e9
Merge branch 'develop' into php
Zoey2936 May 12, 2024
3e5f727
change name of php session
Zoey2936 May 12, 2024
8000087
fix launch
Zoey2936 May 12, 2024
121d761
add login page
Zoey2936 May 13, 2024
243e9fb
dep updates/small changes
renovate[bot] May 14, 2024
56e7472
remove PHP81
Zoey2936 May 23, 2024
8c18961
Merge branch 'develop' into php
Zoey2936 May 23, 2024
2c4df9c
Update start.sh
Zoey2936 May 23, 2024
bffca9c
Merge branch 'develop' into php
Zoey2936 May 23, 2024
6aed6d6
add some todo notes
Zoey2936 May 23, 2024
2221295
improve login.php
Zoey2936 May 23, 2024
906edd9
Update zoeyvid/valkey-static Docker tag to v13
renovate[bot] May 24, 2024
6ee1514
use strong instead of b
Zoey2936 May 24, 2024
e52f38e
Update zoeyvid/valkey-static Docker tag to v14
renovate[bot] May 24, 2024
599bebb
Enable protected-mode
Zoey2936 May 24, 2024
6041cbf
add auth.php
Zoey2936 May 27, 2024
ec5327f
move files
Zoey2936 May 27, 2024
ef83fe9
Merge branch 'develop' into php
Zoey2936 May 31, 2024
bf68860
add bootstrap icons/tailwind/lint/prettier workflows/remove php qr code
Zoey2936 Jun 1, 2024
e258b72
Merge branch 'develop' into php
Zoey2936 Jun 2, 2024
d82787d
add default/dead host pages by @DavidCraftDev
DavidCraftDev Jun 4, 2024
22ab2db
Merge branch 'develop' into php
Zoey2936 Jun 4, 2024
396596d
new design for fancyindex by @DavidCraftDev
Zoey2936 Jun 8, 2024
3c585bc
Merge branch 'develop' into php
Zoey2936 Jun 9, 2024
26a7616
merge develop
Zoey2936 Jun 9, 2024
5708c55
enable human readable sizes again
Zoey2936 Jun 9, 2024
383aa71
Merge branch 'develop' into php
Zoey2936 Jun 9, 2024
fd4acf2
Fix design on mobile and add ascending sorting arrow by @DavidCraftDev
DavidCraftDev Jun 10, 2024
57613b1
Merge branch 'develop' into php
Zoey2936 Jun 10, 2024
c400610
update alpine to 3.20.1
renovate[bot] Jun 13, 2024
586e64c
dep updates/alpine 3.20.1
Zoey2936 Jun 11, 2024
c9d7e5b
Merge branch 'develop' into php
Zoey2936 Jun 20, 2024
9cafbd1
dep updates/alpine 3.20.1
Zoey2936 Jun 11, 2024
143456c
Merge branch 'develop' into php
Zoey2936 Jun 21, 2024
e34fcf5
Merge branch 'develop' into php
Zoey2936 Jun 21, 2024
cb7077d
Update zoeyvid/nginx-quic Docker tag to v296
Zoey2936 Jun 21, 2024
9a62476
Merge branch 'develop' into php
Zoey2936 Jun 28, 2024
ab33b30
Merge branch 'develop' into php
Zoey2936 Jun 29, 2024
38f6999
chore(deps): update zoeyvid/curl-quic docker tag to v399
renovate[bot] Jul 9, 2024
a2d7b02
chore(deps): update zoeyvid/nginx-quic docker tag to v297
renovate[bot] Jul 9, 2024
6678d23
Merge branch 'develop' into php
Zoey2936 Jul 11, 2024
2983ec7
Delete 20240711144745_change_incoming_port_to_string.js
Zoey2936 Jul 11, 2024
c6220b8
dep updates
renovate[bot] Jul 23, 2024
6d3cd5d
Merge branch 'develop' into php
Zoey2936 Aug 3, 2024
80881b1
make file executeable again
Zoey2936 Aug 3, 2024
3995d2b
chore(deps): update zoeyvid/curl-quic docker tag to v408
renovate[bot] Aug 7, 2024
d659db7
tailwindcss-update
web-flow Aug 7, 2024
312fa94
chore(deps): update zoeyvid/nginx-quic docker tag to v305
renovate[bot] Aug 8, 2024
f869a69
tailwindcss-update
web-flow Aug 8, 2024
7369b02
chore(deps): update zoeyvid/nginx-quic docker tag to v306
renovate[bot] Aug 13, 2024
8e407d4
tailwindcss-update
web-flow Aug 15, 2024
41b14e1
Update zoeyvid/nginx-quic Docker tag to v307
renovate[bot] Aug 16, 2024
51ffd37
chore(deps): update zoeyvid/curl-quic docker tag to v410
renovate[bot] Aug 24, 2024
5ee1e89
chore(deps): update zoeyvid/nginx-quic docker tag to v310
renovate[bot] Aug 30, 2024
1ffbe65
chore(deps): update peter-evans/create-pull-request action to v7
renovate[bot] Sep 3, 2024
4ebd0a2
chore(deps): update zoeyvid/nginx-quic docker tag to v312
renovate[bot] Sep 3, 2024
615ba3f
chore(deps): update alpine docker tag to v3.20.3
renovate[bot] Sep 7, 2024
c7e4cb2
chore(deps): update zoeyvid/curl-quic docker tag to v413
renovate[bot] Sep 7, 2024
6c22424
chore(deps): update zoeyvid/nginx-quic docker tag to v314
renovate[bot] Sep 7, 2024
0ee10da
chore(deps): update zoeyvid/valkey-static docker tag to v29
renovate[bot] Sep 8, 2024
3c6624e
chore(deps): update zoeyvid/curl-quic docker tag to v414
renovate[bot] Sep 11, 2024
cb0f304
chore(deps): update zoeyvid/valkey-static docker tag to v30
renovate[bot] Sep 16, 2024
1f48072
tailwindcss-update
web-flow Sep 16, 2024
1ab9d59
chore(deps): update zoeyvid/curl-quic docker tag to v415
renovate[bot] Sep 16, 2024
d5acc8c
chore(deps): update zoeyvid/nginx-quic docker tag to v335
renovate[bot] Sep 17, 2024
921719b
tailwindcss-update
web-flow Sep 17, 2024
b844824
Update Dockerfile
Zoey2936 Sep 18, 2024
e97c39b
chore(deps): update zoeyvid/curl-quic docker tag to v416
renovate[bot] Sep 18, 2024
df25492
chore(deps): update zoeyvid/nginx-quic docker tag to v337
renovate[bot] Sep 18, 2024
d761f8c
Update Dockerfile
Zoey2936 Oct 2, 2024
8ded426
tailwindcss-update
web-flow Oct 2, 2024
211f43c
Update Dockerfile
Zoey2936 Oct 2, 2024
73a9b79
Merge branch 'develop' into php
Zoey2936 Oct 2, 2024
792a02a
Delete 20240921100301_regenerate_default_host.js
Zoey2936 Oct 2, 2024
71abcad
chore(deps): update zoeyvid/curl-quic docker tag to v419
renovate[bot] Oct 6, 2024
c8ac0ec
chore(deps): update zoeyvid/nginx-quic docker tag to v345
renovate[bot] Oct 8, 2024
07720a2
chore(deps): update zoeyvid/nginx-quic docker tag to v346
renovate[bot] Oct 9, 2024
73210a7
fix(deps): update dependency phpmailer/phpmailer to v6.9.2
renovate[bot] Oct 9, 2024
ec574f3
chore(deps): update zoeyvid/nginx-quic docker tag to v347
renovate[bot] Oct 10, 2024
2f0d646
chore(deps): update zoeyvid/curl-quic docker tag to v420
renovate[bot] Oct 17, 2024
ebe3d09
tailwindcss-update
web-flow Oct 17, 2024
8bd3b81
Update zoeyvid/nginx-quic Docker tag to v349
renovate[bot] Oct 20, 2024
15ee498
Update zoeyvid/nginx-quic Docker tag to v350
renovate[bot] Oct 22, 2024
cbef03d
Update zoeyvid/curl-quic Docker tag to v423
renovate[bot] Oct 26, 2024
b37a3b0
chore(deps): update zoeyvid/nginx-quic docker tag to v351
renovate[bot] Nov 2, 2024
10b83b3
chore(deps): update zoeyvid/curl-quic docker tag to v425
renovate[bot] Nov 6, 2024
74da93f
chore(deps): update zoeyvid/nginx-quic docker tag to v352
renovate[bot] Nov 16, 2024
e8cbcea
tailwindcss-update
web-flow Nov 16, 2024
d7f59a7
chore(deps): update zoeyvid/curl-quic docker tag to v426
renovate[bot] Nov 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/delete-merged-branch-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ exclude:
- main
- stable
- develop
delete_closed_pr: true
delete_closed_pr: true
30 changes: 30 additions & 0 deletions .github/workflows/bootstrap-icons.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: bootstrap-icons
on:
push:
paths:
- src/bootstrap-icons.json
- .github/workflows/bootstrap-icons.yml
schedule:
- cron: "0 */6 * * *"
workflow_dispatch:
jobs:
bootstrap-icons:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: update bootstrap-icons
run: |
curl -sL $(curl -sL https://api.github.com/repos/twbs/icons/releases/latest --header "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" | jq -r .assets[].browser_download_url) -o bootstrap-icons.zip
unzip bootstrap-icons.zip
rm -rf src/public/bootstrap-icons bootstrap-icons.zip
mv bootstrap-icons-* bootstrap-icons
mkdir src/public/bootstrap-icons
for icon in $(jq -r .[] src/bootstrap-icons.json); do mv bootstrap-icons/"$icon".svg src/public/bootstrap-icons/"$icon".svg; done
- name: push changes
run: |
git add src/public/bootstrap-icons
git config user.name "GitHub"
git config user.email "noreply@github.com"
git diff-index --quiet HEAD || git commit -sm "bootstrap-icons"
git push
11 changes: 2 additions & 9 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,12 @@ on:
paths:
- .github/workflows/docker.yml
- Dockerfile
- frontend/**
- backend/**
- global/**
- rootfs/**
- src/**
pull_request:
paths:
- .github/workflows/docker.yml
- Dockerfile
- frontend/**
- backend/**
- global/**
- rootfs/**
- src/**
workflow_dispatch:
Expand Down Expand Up @@ -56,9 +50,8 @@ jobs:
- name: version
run: |
version="$(cat .version)+$(git rev-parse --short HEAD)"
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/messages.json
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/package.json
sed -i "s|\"0.0.0\"|\"$version\"|g" backend/package.json
# todo: embed version somewhere
#sed -i "s|\"0.0.0\"|\"$version\"|g" src/
- name: Build
uses: docker/build-push-action@v6
if: ${{ github.event_name != 'pull_request' }}
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: lint
on:
push:
schedule:
- cron: "0 */6 * * *"
workflow_dispatch:
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: lint
run: |
cd src
cp -v config.php.example config.php
find . -name "*.php" -exec php -l {} \;
curl -sSfL https://github.com/wapmorgan/PhpDeprecationDetector/releases/download/"$(git ls-remote --tags https://github.com/wapmorgan/PhpDeprecationDetector | cut -d/ -f3 | grep -v v1 | sort -V | tail -1)"/phpdd-"$(git ls-remote --tags https://github.com/wapmorgan/PhpDeprecationDetector | cut -d/ -f3 | grep -v v1 | sort -V | tail -1)".phar -o phpdd.phar
chmod +x phpdd.phar
find . -name "*.php" -exec ./phpdd.phar -n {} \;
curl -sSfL https://github.com/vimeo/psalm/releases/latest/download/psalm.phar -o psalm.phar
chmod +x psalm.phar
./psalm.phar --no-cache
25 changes: 25 additions & 0 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: prettier
on:
push:
schedule:
- cron: "0 */6 * * *"
workflow_dispatch:
jobs:
prettier:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: prettier
run: |
yarn global add prettier @prettier/plugin-php prettier-plugin-tailwindcss
sed -i "s|doctype|DOCTYPE|g" /home/runner/.config/yarn/global/node_modules/prettier/plugins/html.js
sed -i "s|doctype|DOCTYPE|g" /home/runner/.config/yarn/global/node_modules/prettier/plugins/html.mjs
prettier . -w --end-of-line crlf --print-width 10000 --plugin /home/runner/.config/yarn/global/node_modules/@prettier/plugin-php/standalone.js --plugin /home/runner/.config/yarn/global/node_modules/prettier-plugin-tailwindcss/dist/index.mjs
- name: push
run: |
git add -A
git config user.name "GitHub"
git config user.email "noreply@github.com"
git diff-index --quiet HEAD || git commit -sm "prettier"
git push
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
- name: Run Shellcheck
uses: ludeeus/action-shellcheck@master
with:
check_together: 'yes'
check_together: "yes"
env:
SHELLCHECK_OPTS: --shell sh -e SC1091 -e SC2153 -e SC2154
2 changes: 1 addition & 1 deletion .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
with:
check_filenames: true
check_hidden: true
skip: .git,.gitignore,showdown.min.js,jquery.min.js,xregexp-all.js
skip: .git,.gitignore,./rootfs/app/nftd,./src/vendor
26 changes: 26 additions & 0 deletions .github/workflows/tailwindcss-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: tailwindcss-update
on:
push:
schedule:
- cron: "0 */6 * * *"
workflow_dispatch:
jobs:
tailwindcss-update:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- run: cp -v src/tailwind.config.js tailwind.config.js
- name: update tailwindcss (minify)
uses: ZoeyVid/tailwindcss-update@main
with:
input: src/tailwind-input.css
output: src/public/tailwind.css
params: "--minify"
- name: push changes
run: |
git add --force src/public/tailwind.css
git config user.name "GitHub"
git config user.email "noreply@github.com"
git diff-index --quiet HEAD || git commit -sm "tailwindcss-update"
git push
10 changes: 1 addition & 9 deletions .github/workflows/update-and-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,16 @@ on:
push:
branches:
- develop
- php
schedule:
- cron: "0 */6 * * *"
workflow_dispatch:
jobs:
update-and-lint:
runs-on: ubuntu-latest
if: ${{ github.ref_name == 'develop' }}
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 21
- name: eslint
run: |
cd backend
yarn install --no-lockfile
yarn eslint . --fix
- name: nginxbeautifier
run: |
yarn global add nginxbeautifier
Expand Down
8 changes: 4 additions & 4 deletions .imgbotconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"schedule": "daily",
"aggressiveCompression": "true",
"compressWiki": "true",
"minKBReduced": 0
"schedule": "daily",
"aggressiveCompression": "true",
"compressWiki": "true",
"minKBReduced": 0
}
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
src/public/tailwind.css
src/composer.lock
src/vendor

rootfs/app/fancyindex
1 change: 0 additions & 1 deletion .version

This file was deleted.

Loading