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

Vite Migration #379

Draft
wants to merge 170 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
d47588e
Initializing Vite_Migration for empty Pull Request
V13Axel Jul 2, 2024
f7835dc
Convert clock to es module
V13Axel Jul 2, 2024
6e36484
Move to export defaults
V13Axel Jul 2, 2024
b9c3f2d
wip
V13Axel Jul 2, 2024
01aec12
wip
V13Axel Jul 2, 2024
8adb936
Initial vite installation
V13Axel Jul 2, 2024
195f3e1
Progress babyyeeee
V13Axel Jul 3, 2024
2b72421
Add built assets to gitignore
V13Axel Jul 3, 2024
5eb295c
Update configs to allow access to vite via docker
V13Axel Jul 4, 2024
4587f38
Get non-app pages loading properly via vite
V13Axel Jul 4, 2024
ee7ca8c
wip
V13Axel Jul 5, 2024
674dc3e
wip
V13Axel Jul 5, 2024
d868f46
error_message
V13Axel Jul 5, 2024
2c3171d
wip
V13Axel Jul 7, 2024
af59e56
... And calendar_functions is done.
V13Axel Jul 7, 2024
3b85200
variables, weather layout, day data layout, season generator
V13Axel Jul 7, 2024
3ddcc63
inputs_view migrated
V13Axel Jul 7, 2024
9e12e55
calendar_inputs_edit done
V13Axel Jul 7, 2024
4194297
wip
V13Axel Jul 7, 2024
7ee0ee0
Fix import
V13Axel Jul 7, 2024
7a8fe87
SO much closer
V13Axel Jul 7, 2024
8f8f3d1
Hoist all previously-global uses of `static_data` to `window.static_d…
V13Axel Jul 7, 2024
75ed4e3
wip
V13Axel Jul 7, 2024
bac75e2
Further wip
V13Axel Jul 7, 2024
022f676
further wip
V13Axel Jul 7, 2024
72bda16
Fix fontawesome 404s
V13Axel Jul 7, 2024
75cdc54
Pre-emptively update dynamic_data to window...
V13Axel Jul 7, 2024
010294e
Move `hash` to window
V13Axel Jul 7, 2024
2dd42f2
Windowize calendar_name
V13Axel Jul 7, 2024
5b29914
here also
V13Axel Jul 7, 2024
dff8351
wip
V13Axel Jul 10, 2024
309b1bf
... Progress! A rendered calendar (mostly)
V13Axel Jul 10, 2024
2b36ace
Away with thee, loading_bar
V13Axel Jul 11, 2024
a0f0967
Fix popper
V13Axel Jul 11, 2024
78dfe02
working moon tooltip
V13Axel Jul 11, 2024
b4d3649
Start working on a context menu
V13Axel Jul 12, 2024
e7dff4a
Initial porting of day context menu
V13Axel Jul 12, 2024
21339ba
Functional copy_link
V13Axel Jul 12, 2024
8f3d332
Functional "Set current date" menu item
V13Axel Jul 12, 2024
3f6a1e7
And even place it at the event x/y
V13Axel Jul 12, 2024
7ef4276
not needed
V13Axel Jul 12, 2024
37d1b85
Remove old contextMenu stuff
V13Axel Jul 12, 2024
d612dd7
Implement new context-menu for events
V13Axel Jul 12, 2024
9eecb79
yeet
V13Axel Jul 12, 2024
48352ac
Get them working here
V13Axel Jul 13, 2024
ecbf2cd
This will need attention later
V13Axel Jul 13, 2024
2aaa7d6
Remove unnecessary comment
V13Axel Jul 13, 2024
b291629
Copy context menu over to vertical view events
V13Axel Jul 13, 2024
413a8ee
Fix changing layouts
V13Axel Jul 13, 2024
a7e638c
More context menu fixes
V13Axel Jul 13, 2024
534b1d4
Fix notify function
V13Axel Jul 13, 2024
ad64883
Fix setting preview date
V13Axel Jul 14, 2024
b253b80
Fix changing to guest or climate view
V13Axel Jul 14, 2024
0b59fa7
Windowify this
V13Axel Jul 14, 2024
04132b0
Bind this in event viewer comment loading
V13Axel Jul 18, 2024
6218ca9
Working Quill editor
V13Axel Jul 19, 2024
29220bc
wip
V13Axel Jul 19, 2024
fde860c
Fully working comment editor
V13Axel Jul 19, 2024
f0eb63a
And then we make it look nice
V13Axel Jul 19, 2024
858b9bf
Simplify opening
V13Axel Jul 19, 2024
22cab62
wip edit UI
V13Axel Jul 19, 2024
b685a05
What do you mean "tailwind just works"??
V13Axel Jul 19, 2024
b928982
Fix sidebar heading via tailwind
V13Axel Jul 19, 2024
7ea4edf
Niceties
V13Axel Jul 19, 2024
3d99f18
Support tw dark theme on calendar pages
V13Axel Jul 19, 2024
da6600f
Convert the print menu to alpine
V13Axel Jul 19, 2024
f7c2e4e
More windowifying
V13Axel Jul 19, 2024
c45d65c
Start swapping out bootstrap icons
V13Axel Jul 19, 2024
59b37f3
Fix clock and current date inputs
V13Axel Jul 19, 2024
e36badf
Moar fixes!
V13Axel Jul 19, 2024
cca6497
Keep a notification around by mouseover
V13Axel Jul 19, 2024
4903104
Separate the rich editor and make it properly modelable
V13Axel Jul 20, 2024
aa23f85
Commenting fixes
V13Axel Jul 20, 2024
ead3fe3
Fix preview date when crossing years, fix description editing
V13Axel Jul 20, 2024
e09b653
Start towards global week via alpine
V13Axel Jul 20, 2024
7bfafc1
Fix prompt on switching to edit
V13Axel Jul 21, 2024
ebd5ef1
Use $dispatch
V13Axel Jul 21, 2024
79fa61f
Formatting
V13Axel Jul 21, 2024
9960c3d
Break weekdays out into its own component
V13Axel Aug 2, 2024
ebc28da
Start making the weekday inputs look good
V13Axel Aug 2, 2024
7d41444
Still needs sorting, uh... sorted. But it's looking good!
V13Axel Aug 2, 2024
87c6c20
Get the day adding/removing working
V13Axel Oct 8, 2024
29e7ec6
Remove console.log
V13Axel Oct 8, 2024
b6b6f70
Quickfix for now
V13Axel Oct 16, 2024
d0e9e21
Fixed random fract import
Haxxer Oct 16, 2024
f6d6887
Weather tooltip is a go, kinda
Haxxer Oct 16, 2024
9cfaf68
Added WIP sticky weather tooltip
Haxxer Oct 20, 2024
cc0d793
yeet the sticky behavior
V13Axel Oct 24, 2024
5f70124
Consistency is key!
V13Axel Oct 29, 2024
9527f74
Consistency is key!
V13Axel Oct 29, 2024
56ece35
Break out months collapsible properly
V13Axel Oct 29, 2024
95c0322
Move weekdays collapsible to new dynamic wrapper
V13Axel Oct 29, 2024
4c4e798
Moar
V13Axel Oct 29, 2024
9738cb8
Consistency is key!
V13Axel Oct 29, 2024
a8578cf
Componentized all collapsibles
Haxxer Oct 31, 2024
4b13e30
Edit page shenanigans
Haxxer Nov 6, 2024
69d6770
Update icons
V13Axel Nov 12, 2024
735c72c
Formatting
V13Axel Nov 12, 2024
1f97bac
wip
V13Axel Nov 12, 2024
8abbd19
Abstractification!
V13Axel Nov 12, 2024
178a2f9
wip it
V13Axel Nov 12, 2024
7c96b15
'changes' => 'watchers', 'retreives' => 'loads'
V13Axel Nov 12, 2024
ac68b08
wip
V13Axel Nov 13, 2024
25b8d39
Weather, settings, and nicer collapsible behavior
Haxxer Nov 16, 2024
47466cf
Fixed weather inputs being visible even if disabled
Haxxer Nov 17, 2024
2837765
Moon collapsible
Haxxer Nov 17, 2024
73e1908
Fixed deleting moons
Haxxer Nov 17, 2024
090b7c8
Statistics collapsible
Haxxer Nov 17, 2024
4d60c9f
Added temporary done icon to track completed collapsibles
Haxxer Nov 17, 2024
c811153
Cycles collapsible
Haxxer Nov 17, 2024
12f61e4
Leap day collapsible
Haxxer Nov 17, 2024
ecac7b6
WIP everything is on fire but cool
Haxxer Nov 17, 2024
6e5bc62
Break watcher setup down a bit further
V13Axel Nov 17, 2024
01b14fe
Gotta bind the changeHandlers on declaration if we do it like this. Huh.
V13Axel Nov 17, 2024
1954fe2
Bind changeHandler in weekdays collapsible, fix adding new weekday
V13Axel Nov 17, 2024
8aae17f
Formatting
V13Axel Nov 17, 2024
0fe6c52
Initial poke at validation for leap days. Might need a rethink.
V13Axel Nov 17, 2024
f8b3848
Added error modal
Haxxer Nov 19, 2024
6152cbb
wip
V13Axel Nov 19, 2024
ccdf9a8
This is simpler
V13Axel Dec 5, 2024
1005e4c
Temp fix for year header
V13Axel Dec 5, 2024
ace99cd
IT WAS THE LEGACY CODE ALL ALOOOONNNGGG
V13Axel Dec 5, 2024
f97d01f
Get rid of those console.logs
V13Axel Dec 5, 2024
5893398
Prevent clicking through errors modal
V13Axel Dec 6, 2024
7261abd
An attempt at selective error highlighting
V13Axel Dec 6, 2024
a05a980
Errors n shiz
Haxxer Dec 12, 2024
231b747
Comments
Haxxer Dec 12, 2024
fb690c8
Categories stub
Haxxer Dec 12, 2024
ed97446
Calendar class stub
Haxxer Dec 12, 2024
7b4cb57
Wire up things
V13Axel Dec 19, 2024
79ba85c
Yeet the init function in favor of setupWatchers, running after first…
V13Axel Dec 19, 2024
a7aaeb1
Initial event categories collapsible wiring-up
V13Axel Dec 19, 2024
b77100e
Initial creation of new categories
V13Axel Dec 20, 2024
f6220df
Event categories collapsible 98% of the way there
V13Axel Dec 20, 2024
18325c1
...And even closer!
V13Axel Dec 20, 2024
3419ae4
Most of the way to a functional real-time advancement collapsible
V13Axel Dec 20, 2024
f487fe9
Fixed leap day interval text not showing up
Haxxer Jan 1, 2025
08d8c64
Removed console log in real-time advancement
Haxxer Jan 1, 2025
796e7a5
Added location selection support
Haxxer Jan 1, 2025
e7aea24
Finalized locations
Haxxer Jan 1, 2025
d5e647b
Events done
Haxxer Jan 1, 2025
e2a7a37
Seasons work, WIP
Haxxer Jan 1, 2025
7bf4381
Seasons continued WIP, season colors and preset seasons operational
Haxxer Jan 2, 2025
593a59d
Don't need those
V13Axel Jan 2, 2025
7811e59
wip
V13Axel Jan 2, 2025
b768fee
Fix real-time advancement clock interactions
V13Axel Jan 3, 2025
f403506
Fixed wrong event on collapsible component
Haxxer Jan 4, 2025
e4079ce
Eras WIP
Haxxer Jan 4, 2025
676b1d8
Minor fixes to era epoch and sorting
Haxxer Jan 4, 2025
8fc0c63
Slightly better month appearance handler in eras
Haxxer Jan 4, 2025
aaf4897
Formatting
V13Axel Jan 15, 2025
49685ef
Initial stages of alpinized user management
V13Axel Jan 16, 2025
238e17a
Working user removal
V13Axel Jan 16, 2025
c7537fd
huge strides towards the user management component
V13Axel Jan 16, 2025
c8b0a60
Fix color drop-down
V13Axel Jan 16, 2025
4fdf235
Event category update propagation
V13Axel Jan 16, 2025
3409ca7
Category collapsible fixes
V13Axel Jan 16, 2025
171865b
Default event category selection fixes
V13Axel Jan 16, 2025
a6b3ac4
Remove debugging
V13Axel Jan 16, 2025
0477e3b
Era timespan length fix
V13Axel Jan 16, 2025
4904f2e
Fix event category selection
V13Axel Jan 17, 2025
30cb582
Fixes to eras collapsible
V13Axel Jan 17, 2025
66d63b1
Re-render calendar when eras change
V13Axel Jan 17, 2025
98d2c6a
Genericize the draggable/sortable bits
V13Axel Jan 23, 2025
fdf61df
wip
V13Axel Jan 23, 2025
c234774
Functional drag and drop reordering on event categories
V13Axel Jan 24, 2025
dd0800f
Add reordering toggle
V13Axel Jan 24, 2025
fb12023
Mark it done
V13Axel Jan 24, 2025
caa8d85
Remove sorting handle from eras and seasons as they auto-sort
Haxxer Feb 2, 2025
c156140
Fixed season and location seasons inter-functionality
Haxxer Feb 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/node_modules/
/public/build
/public/hot
/public/storage
/public/js
Expand Down
8 changes: 3 additions & 5 deletions aliases.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
alias npm='docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/app" -w /app node:20 npm'
alias npm='docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/app" -w /app node:20 npm --legacy-peer-deps'
alias npx='docker run -it -e AWS_PROFILE=fc -u $(id -u):$(id -g) -v "${PWD}/:/app" -v ~/.aws/:/home/node/.aws -w /app node:20 npx'
alias node='docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/app" -w /app node:20'
alias artisan='docker compose exec php php artisan'
alias fc_up='FC_WEB_PORT=9987 FC_BROWSERSYNC_PORT=9980 FC_BROWSERSYNC=true docker compose up'
alias fc_nohot='docker compose up'
alias fc_upd='FC_WEB_PORT=9987 FC_BROWSERSYNC_PORT=9980 FC_BROWSERSYNC=true docker compose up -d'
alias fc_nohotd='docker compose up -d'
alias fc_up='docker compose up'
alias fc_upd='docker compose up -d'
alias docker-clean='docker compose down && docker stop $(docker ps -a -q) && docker system prune -a -f && composer install && docker compose build'

function composer() {
Expand Down
26 changes: 26 additions & 0 deletions app/View/Components/ContextMenu.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace App\View\Components;

use Closure;
use Illuminate\Contracts\View\View;
use Illuminate\View\Component;

class ContextMenu extends Component
{
/**
* Create a new component instance.
*/
public function __construct()
{
//
}

/**
* Get the view / contents that represent the component.
*/
public function render(): View|Closure|string
{
return view('components.context-menu');
}
}
26 changes: 26 additions & 0 deletions app/View/Components/NotificationArea.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace App\View\Components;

use Closure;
use Illuminate\Contracts\View\View;
use Illuminate\View\Component;

class NotificationArea extends Component
{
/**
* Create a new component instance.
*/
public function __construct()
{
//
}

/**
* Get the view / contents that represent the component.
*/
public function render(): View|Closure|string
{
return view('components.notification-area');
}
}
5 changes: 2 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,11 @@ services:
user: "${FC_USER_ID:-1000}:${FC_GROUP_ID:-1000}"
mem_limit: 2048m
ports:
- ${FC_BROWSERSYNC_PORT:-9987}:9980
- "9988:3001"
- ${FORWARD_VITE_PORT:-5173}:5173
working_dir: "/fantasy-calendar"
volumes:
- ./:/fantasy-calendar
command: ["npm", "run", "watch"]
command: ["npm", "run", "dev"]
environment:
- BROWSERSYNC=${FC_BROWSERSYNC:-false}
- "MIXVERSION=true"
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ quick_deploy_prod:
install_dev:
cp ./setup/docker.example.env .env || true # Copy env file, don't overwrite
docker-compose build # Gotta build our images before we can use them
docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/app" -w /app node:20 npm install # NPM install inside docker container to avoid installing on host
docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/var/task" -v ${COMPOSER_HOME:-$HOME/.composer}:/tmp -e COMPOSER_CACHE_DIR=/tmp/composer-cache -w /var/task fc-bref-composer composer install # Composer install inside docker container (it has all our required PHP modules)
docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/app" -w /app node:20 npm install --legacy-peer-deps # NPM install inside docker container to avoid installing on host
docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/var/task" -e COMPOSER_CACHE_DIR=/tmp/composer-cache -w /var/task fc-bref-composer composer install # Composer install inside docker container (it has all our required PHP modules)
docker-compose up -d # Start up our docker containers
until docker-compose exec php php artisan migrate:status; do sleep 1; done # Wait for mysql to be ready
docker-compose exec php php artisan migrate:fresh --seed # Run migrations
Expand Down
Loading