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

Merging the experimental branch in main #174

Merged
merged 141 commits into from
Mar 2, 2023
Merged
Changes from 1 commit
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
fe19d2f
Add Flask as dependency
Bubobubobubobubo Jan 12, 2023
375c67b
Adding a local Flask webserver and a React Front
Bubobubobubobubo Jan 13, 2023
0098406
integrate basic web app
Bubobubobubobubo Jan 13, 2023
2b7e7a9
Cleaning up the mess
Bubobubobubobubo Jan 13, 2023
8d075b0
up up
Bubobubobubobubo Jan 13, 2023
7a04541
Ignore package-lock.json
thegamecracks Jan 13, 2023
526a2f0
Remove sardine/client/ artifacts from sdist and wheel
thegamecracks Jan 13, 2023
5b8d1f9
Adds support for remote code execution
JMPothelune Jan 13, 2023
5ea7128
Merge pull request #154 from JMPothelune/jm-sardine-gui
Bubobubobubobubo Jan 13, 2023
13b5f6d
Adds missing ignored lib
JMPothelune Jan 13, 2023
18d5cae
Merge pull request #155 from JMPothelune/148-sardine-gui
Bubobubobubobubo Jan 13, 2023
1dfa64f
Better styling
Bubobubobubobubo Jan 13, 2023
8449645
work commit
Bubobubobubobubo Jan 14, 2023
d59e691
fix(client): removed material search
Pipazoul Jan 17, 2023
075c1f4
fix(client): removed unused searchbar
Pipazoul Jan 17, 2023
6a8f947
chore(client): added Button and IconBtn components
Pipazoul Jan 17, 2023
33124a4
feat(client): simple navbar
Pipazoul Jan 17, 2023
c907f9f
chore(client): styling btn
Pipazoul Jan 17, 2023
8f4d7dc
chore(client): added console component
Pipazoul Jan 17, 2023
912d859
Migrates the webclient from sardine to fishery
JMPothelune Jan 21, 2023
35879fe
Logs sync
JMPothelune Jan 21, 2023
20da6c3
Replace rich by custom logger to write in log file
JMPothelune Jan 21, 2023
c4fd019
Fix react logs list
JMPothelune Jan 21, 2023
b1b9ea3
Console White
JMPothelune Jan 21, 2023
6c1ff45
Fix executing by adding new lines
JMPothelune Jan 21, 2023
b8744c9
Clean print
JMPothelune Jan 21, 2023
a3dcce6
Adds --no-browser option to "fishery web" command
JMPothelune Jan 21, 2023
50793d2
Merge pull request #157 from JMPothelune/148-sardine-gui
Bubobubobubobubo Jan 21, 2023
cbd1df7
chare(client): rewrite to sveltejs
Pipazoul Jan 22, 2023
025b837
fix(client): keep lib folder for sevlte
Pipazoul Jan 22, 2023
72d0136
style(client): styling fine-tuning
Pipazoul Jan 22, 2023
7f348ee
fix(client)/ preventEventDefault on keyDownhandler
Pipazoul Jan 22, 2023
df4c01f
Cosmetic changes with some docstrings
Bubobubobubobubo Jan 22, 2023
839122e
cosmetic
Bubobubobubobubo Jan 22, 2023
9b30579
Rewires the front and the back :)
JMPothelune Jan 23, 2023
8eabbc1
Merge pull request #158 from JMPothelune/148-sardine-gui
Bubobubobubobubo Jan 23, 2023
c165ecf
Allows static build
JMPothelune Jan 23, 2023
5d6cb21
Merge pull request #159 from JMPothelune/148-sardine-gui
Bubobubobubobubo Jan 23, 2023
7f24b38
add global style for the editor
Bubobubobubobubo Jan 23, 2023
b646c2b
add alternative keybinding for evaluation
Bubobubobubobubo Jan 23, 2023
bd9af0d
Switch to TypeScript in config and add new KeyEvent
Bubobubobubobubo Jan 23, 2023
65b6daf
Adding types when possible
Bubobubobubobubo Jan 23, 2023
596f1ec
adding logo and name to tab
Bubobubobubobubo Jan 23, 2023
09dca95
Fixing some weird warningsn
Bubobubobubobubo Jan 23, 2023
3bc1147
make buttons react
Bubobubobubobubo Jan 23, 2023
870d2e5
Button management
JMPothelune Jan 23, 2023
bd7cfd1
Merge pull request #160 from JMPothelune/148-sardine-gui
Bubobubobubobubo Jan 23, 2023
c24b4d2
Adding tabs to the editor
Bubobubobubobubo Jan 23, 2023
228be87
Introducing a local storage for the web server
Bubobubobubobubo Jan 23, 2023
001b4dc
Add file reading logic on the flask server
Bubobubobubobubo Jan 23, 2023
f714f94
adding a download command in flask server to download files from loca…
Bubobubobubobubo Jan 23, 2023
e917826
Cleaning code
Bubobubobubobubo Jan 23, 2023
84ed4df
make the tabs actually do something
Bubobubobubobubo Jan 23, 2023
b2ad5fe
add stupid tab switching method
Bubobubobubobubo Jan 23, 2023
c415b71
add yet another buffer
Bubobubobubobubo Jan 23, 2023
a31c7d2
add a dummy function to write to a file
Bubobubobubobubo Jan 23, 2023
e97b159
Try to load files from local directory
Bubobubobubobubo Jan 23, 2023
738eac0
Change default fishery web port to a MacOS safe default
Bubobubobubobubo Jan 23, 2023
1d0cb3a
load files in respective tabs
Bubobubobubobubo Jan 24, 2023
369d967
commit before implementing buffer persistence (saving / querying from…
Bubobubobubobubo Jan 24, 2023
c603d56
Move selectedTab value to store
Bubobubobubobubo Jan 24, 2023
2c459cf
Switch font to Hasklig
Bubobubobubobubo Jan 24, 2023
61b6394
The editor can now handle the tab key while in Vim mode
Bubobubobubobubo Jan 24, 2023
71e037e
auto save every second (1/2)
Bubobubobubobubo Jan 24, 2023
2783231
completely stuck on keeping state
Bubobubobubobubo Jan 24, 2023
d802e16
kinda works
Bubobubobubobubo Jan 24, 2023
2b2b384
clean
Bubobubobubobubo Jan 24, 2023
3bfe3b4
simplify due to lack of time
Bubobubobubobubo Jan 24, 2023
a3745f8
add todo list
Bubobubobubobubo Jan 24, 2023
fe03feb
Begin the transition to a cleaner system
Bubobubobubobubo Jan 25, 2023
f7d4317
Saving works
Bubobubobubobubo Jan 25, 2023
97adae9
Revert "Saving works"
Bubobubobubobubo Jan 26, 2023
e1861d3
Revert "Begin the transition to a cleaner system"
Bubobubobubobubo Jan 26, 2023
a62c3d8
create web editor buffers with the configuration folder
Bubobubobubobubo Jan 26, 2023
c8d48de
fix typo
Bubobubobubobubo Jan 27, 2023
a936742
Button is now fixed!
Bubobubobubobubo Jan 29, 2023
2fb2e86
Minor cosmetic fixes
Bubobubobubobubo Jan 29, 2023
6abdda4
Fine tune editor style and add round tutorial button
Bubobubobubobubo Jan 29, 2023
5613ab2
Add an option to open the Sardine Folder!
Bubobubobubobubo Jan 29, 2023
25ef168
Don't try to intercept the escape key
Bubobubobubobubo Jan 29, 2023
70681d8
Fix indentation of Python mode
Bubobubobubobubo Jan 29, 2023
3dadd03
Simplify web editor configuration
Bubobubobubobubo Jan 29, 2023
6700667
Add blinking animation!
Bubobubobubobubo Jan 30, 2023
c09753b
Delete sardine/client folder
Bubobubobubobubo Feb 2, 2023
e254c2e
redo formatting of the layout file
Bubobubobubobubo Feb 4, 2023
851a992
Remove the old client from fishery
Bubobubobubobubo Feb 5, 2023
9f80e9e
Remove yappi profiling
Bubobubobubobubo Feb 5, 2023
7d52176
Remove profiler.py and remove relative imports
Bubobubobubobubo Feb 5, 2023
849f32e
house cleaning
Bubobubobubobubo Feb 12, 2023
fdd0195
Remove some of the unnecessary logging
Bubobubobubobubo Feb 12, 2023
bcfd115
Fix buffer error
JMPothelune Feb 13, 2023
077c85c
Adds support for dev front (CORS independant)
JMPothelune Feb 13, 2023
ef3c4b1
Merge pull request #163 from JMPothelune/148-sardine-gui
Bubobubobubobubo Feb 13, 2023
522c592
Fixing Windows issues
amiika Feb 14, 2023
eea5d60
Merge pull request #165 from amiika/148-sardine-gui
Bubobubobubobubo Feb 14, 2023
e282947
changing editor font
Bubobubobubobubo Feb 15, 2023
b2d512a
Remove old Ziffers integration
Bubobubobubobubo Feb 16, 2023
8533cf0
refact(client): renamed js files in ts
Pipazoul Feb 16, 2023
677474e
refact(client): renamed js import
Pipazoul Feb 16, 2023
58a06fc
feat(client): doc section
Pipazoul Feb 16, 2023
afa9e4f
Merge branch '148-sardine-gui' of https://github.com/Bubobubobubobubo…
Pipazoul Feb 16, 2023
13a2c00
Fixing bug with creating files at init
Bubobubobubobubo Feb 16, 2023
62620cf
Add option not to sort OSC messages
Bubobubobubobubo Feb 16, 2023
ccde428
Add nudge attribute for SuperDirt
Bubobubobubobubo Feb 16, 2023
40e8ac9
Fix problem with sorted OSC messages
Bubobubobubobubo Feb 16, 2023
2011a70
Creating sardine.log if it doesn't exist!
Bubobubobubobubo Feb 16, 2023
e4ff2f6
Adding the "send_raw" function to the OSC handler.
Bubobubobubobubo Feb 16, 2023
9624862
Chasing the logging bug
Bubobubobubobubo Feb 17, 2023
a731e87
Remove Ziffers once again
Bubobubobubobubo Feb 17, 2023
87b9883
Fixing default MIDI on Windows
Bubobubobubobubo Feb 17, 2023
a6bbdd2
lmao
Bubobubobubobubo Feb 17, 2023
5469bc3
Reintroduce ListParser
Bubobubobubobubo Feb 17, 2023
46a5859
fix
Bubobubobubobubo Feb 17, 2023
45e7b2a
remove some ziffering
Bubobubobubobubo Feb 17, 2023
39ad4d5
test posix paths
Bubobubobubobubo Feb 17, 2023
3b97ab5
Fix invalid path name for Windows installation
Bubobubobubobubo Feb 17, 2023
82c8014
Better reporting of default MIDI port
Bubobubobubobubo Feb 17, 2023
141a055
Properly create buffer files when initialising
Bubobubobubobubo Feb 17, 2023
f53d609
Fix ordering when importing Flask
Bubobubobubobubo Feb 17, 2023
1819343
Better handling of file paths (Pathlib)
Bubobubobubobubo Feb 17, 2023
8d54979
Replace 'r' with new term 'rand' in documentation
Feb 17, 2023
fa6e91c
Remove CORS temporarily
Bubobubobubobubo Feb 17, 2023
607d174
Merge pull request #170 from bench/169-replace-r-by-rand-in-doc
Bubobubobubobubo Feb 18, 2023
8bd6b34
Make room for Ziffers once again
Bubobubobubobubo Feb 19, 2023
7870594
Merge branch '148-sardine-gui' of github.com:Bubobubobubobubo/sardine…
Bubobubobubobubo Feb 19, 2023
19fc285
wrong move
Bubobubobubobubo Feb 19, 2023
268f1d5
Ziffers midi
Bubobubobubobubo Feb 20, 2023
6c14a96
Adding scale and key parameters to Ziffers MIDI
Bubobubobubobubo Feb 20, 2023
1a18528
Adding Ziffers for the SuperDirt Handler
Bubobubobubobubo Feb 20, 2023
c169f45
Duration for ZD()
Bubobubobubobubo Feb 20, 2023
1921423
Adding surfboards for ZN and ZD
Bubobubobubobubo Feb 20, 2023
6d8b7d2
minor fixes
Bubobubobubobubo Feb 26, 2023
dffa748
Fixing silences with ZD
Bubobubobubobubo Feb 26, 2023
c8c08d3
remove ziffers from sardine-config (not needed)
Bubobubobubobubo Feb 26, 2023
30ae33e
remove the huge boxes used for printing
Bubobubobubobubo Feb 26, 2023
f55996c
add SC.info() method for tracking server state
Bubobubobubobubo Feb 26, 2023
3be1d8f
adding the SC() call function to pipe code to SC
Bubobubobubobubo Feb 26, 2023
5af9674
Support for shorthand parameter names
Bubobubobubobubo Feb 26, 2023
e0e7fef
simplify the exit condition in sardine.cli
Bubobubobubobubo Feb 27, 2023
6f35a82
add the flask-cors dependency to pyproject
Bubobubobubobubo Feb 27, 2023
bec9ad3
remove rogue print statement
Bubobubobubobubo Mar 1, 2023
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
Prev Previous commit
Next Next commit
fix typo
  • Loading branch information
Bubobubobubobubo committed Jan 27, 2023
commit c8d48de3929505271d6b78cb810e1312dfd7f60b
2 changes: 1 addition & 1 deletion fishery/server/flask_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
USER_DIR = Path(user_data_dir(APP_NAME, APP_AUTHOR))
LOG_FILE = USER_DIR / "sardine.log"
# We need to create it if it doesn't already exist
Path(LOG_FILE).touch(exist_ok=True))
Path(LOG_FILE).touch(exist_ok=True)

__all__ = ("WebServer",)

Expand Down