diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c451f2e1a80..fdd73bbc489 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -80,4 +80,4 @@ jobs: chmod 600 sftp_key echo "$SFTP_KNOWN_HOSTS" > known_hosts chmod 600 known_hosts - rsync -avz --delete -e "ssh -i sftp_key -o UserKnownHostsFile=known_hosts" build/web/ $SFTP_USERNAME@$SFTP_HOST:/var/www/$WEB_DIR.butterfly.linwood + rsync -avz --delete -e "ssh -i sftp_key -o UserKnownHostsFile=known_hosts" build/web/ $SFTP_USERNAME@$SFTP_HOST:/var/www/$WEB_DIR.flow.linwood diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e06b06ceee6..c5a609b8903 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,21 +6,21 @@ If you have any questions, please contact me at [contact@linwood.dev](mailto:con There is a matrix server for this project [here](https://linwood.dev/matrix) and a discord server [here](https://discord.linwood.dev). -Please follow the [Code of Conduct](https://docs.butterfly.linwood.dev/code-of-conduct). +Please follow the [Code of Conduct](https://flow.linwood.dev/code-of-conduct). ## Give feedback The best way to give feedback is to open an issue on GitHub. -Please report any bug you find [here](https://github.com/LinwoodDev/Butterfly/issues/new?assignees=CodeDoctorDE&labels=bug%2Ctriage&template=bug_report.yml&title=%5BBug%5D%3A+). +Please report any bug you find [here](https://github.com/LinwoodDev/Flow/issues/new?assignees=CodeDoctorDE&labels=bug%2Ctriage&template=bug_report.yml&title=%5BBug%5D%3A+). -If you have a feature that you would like to see added, please open an issue [here](https://github.com/LinwoodDev/Butterfly/issues/new?assignees=CodeDoctorDE&labels=enhancement%2Ctriage&template=feature_request.yml&title=%5BFeature+request%5D%3A+). +If you have a feature that you would like to see added, please open an issue [here](https://github.com/LinwoodDev/Flow/issues/new?assignees=CodeDoctorDE&labels=enhancement%2Ctriage&template=feature_request.yml&title=%5BFeature+request%5D%3A+). ## Test nightly builds Nightly builds are not production ready and need to be tested. Please report any bugs in the github issues section. -Read more about it [here](https://docs.butterfly.linwood.dev/nightly). +Read more about it [here](https://flow.linwood.dev/nightly). ## Write documentation @@ -44,7 +44,7 @@ Fork the project and create a pull request to add your documentation to the `dev ## Translate Crowdin is a service that allows you to translate the documentation and the app. -Click [here](https://translate.linwood.dev/butterfly) to see the project and start translating. +Click [here](https://translate.linwood.dev/flow) to see the project and start translating. If you have a new language to add, please contact me. ## Code diff --git a/app/build.sh b/app/build.sh deleted file mode 100644 index 7d51ae284b8..00000000000 --- a/app/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -FLUTTER_VERSION=$(cat ../FLUTTER_VERSION) -if [ "$FLOW_NIGHTLY" = "true" ]; -then - cp -r web_nightly/** web -fi -if cd flutter -then - git pull - cd .. -else - git clone https://github.com/flutter/flutter.git -b $FLUTTER_VERSION -fi -flutter/bin/flutter config --enable-web -if [ "$FLOW_NIGHTLY" = "true" ] -then - flutter/bin/flutter build web --release --dart-define=FLUTTER_WEB_CANVASKIT_URL=/canvaskit/ --dart-define=flavor=nightly -else - flutter/bin/flutter build web --release --dart-define=FLUTTER_WEB_CANVASKIT_URL=/canvaskit/ --dart-define=flavor=production -fi diff --git a/app/screenshot.bat b/app/screenshot.bat deleted file mode 100644 index fd5cb886c11..00000000000 --- a/app/screenshot.bat +++ /dev/null @@ -1,4 +0,0 @@ -flutter build apk --flavor production --debug -cd android -./gradlew app:assembleAndroidTest -bundle exec fastlane screengrab \ No newline at end of file diff --git a/app/screenshot.sh b/app/screenshot.sh deleted file mode 100644 index fd5cb886c11..00000000000 --- a/app/screenshot.sh +++ /dev/null @@ -1,4 +0,0 @@ -flutter build apk --flavor production --debug -cd android -./gradlew app:assembleAndroidTest -bundle exec fastlane screengrab \ No newline at end of file diff --git a/app/vercel.json b/app/vercel.json deleted file mode 100644 index 3400bf215f5..00000000000 --- a/app/vercel.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://openapi.vercel.sh/vercel.json", - "rewrites": [ - { - "source": "/(.*)", - "destination": "/" - } - ] -} diff --git a/crowdin.yml b/crowdin.yml index 0b75ce01ee0..933fc3073b8 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,15 +1,11 @@ -commit_message: '[ci skip]' +commit_message: "[ci skip]" files: - source: /app/lib/l10n/app_en.arb translation: /app/lib/l10n/app_%osx_locale%.arb - - source: /docs/i18n/en/**/* - translation: /docs/i18n/%two_letters_code%/**/%original_file_name% - - source: /docs/docs/**/* - translation: /docs/i18n/%two_letters_code%/docusaurus-plugin-content-docs/current/**/%original_file_name% - - source: /docs/community/**/* + - source: /docs/src/translations/en.json + translation: /docs/src/translations/%two_letters_code%.json + - source: /docs/src/content/docs/**/* + ignore_settings: 1 ignore: - - CHANGELOG.md - - versions.md - translation: /docs/i18n/%two_letters_code%/docusaurus-plugin-content-docs-community/current/**/%original_file_name% - - source: /docs/versioned_docs/**/* - translation: /docs/i18n/%two_letters_code%/docusaurus-plugin-content-docs/**/%original_file_name% + - "%two_letters_code%/**/*" + translation: /docs/src/content/docs/%two_letters_code%/**/%original_file_name% diff --git a/docs/src/assets/img/smart-screen-more-info.png b/docs/src/assets/img/smart-screen-more-info.png new file mode 100644 index 00000000000..267641a08ec Binary files /dev/null and b/docs/src/assets/img/smart-screen-more-info.png differ diff --git a/docs/src/assets/img/smart-screen.png b/docs/src/assets/img/smart-screen.png new file mode 100644 index 00000000000..169b605b74d Binary files /dev/null and b/docs/src/assets/img/smart-screen.png differ diff --git a/docs/src/content/docs/community/branding.md b/docs/src/content/docs/community/branding.md new file mode 100644 index 00000000000..491f507b487 --- /dev/null +++ b/docs/src/content/docs/community/branding.md @@ -0,0 +1,41 @@ +--- +title: Branding +--- + +These assets are licensed under the [CC-BY-SA-4.0](https://github.com/LinwoodDev/Flow/blob/develop/BRANDING_LICENSE). + +## Logo + +![Logo](/img/logo.svg) + +[SVG](/img/logo.svg) [PNG](/img/logo.png) + +## Banner + +![Banner](/img/banner.svg) + +[SVG](/img/banner.svg) [PNG](/img/banner.png) + +## Documentation + +![Documentation](/img/docs.svg) + +[SVG](/img/docs.svg) [PNG](/img/docs.png) + +## Colors + +* Primary: `#c4840d` +* Accent: `#7b8f96` + +## Fonts + +* Website: `Barlow` +* App: `Comfortaa` + +## Screenshots + +> Used in the firefox responsive design mode + +* Phone: Galaxy S20 Ultra +* 7-inch tablet: Nexus 7 +* 10-inch tablet: Nexus 10 diff --git a/docs/src/content/docs/community/code-of-conduct.mdx b/docs/src/content/docs/community/code-of-conduct.mdx new file mode 100644 index 00000000000..6c77978b280 --- /dev/null +++ b/docs/src/content/docs/community/code-of-conduct.mdx @@ -0,0 +1,11 @@ +--- +title: "" +head: + - tag: title + content: Code of Conduct | Linwood Flow +tableOfContents: false +--- + +import CodeOfConduct from "/../CODE_OF_CONDUCT.md" + + diff --git a/docs/src/content/docs/community/contributing.mdx b/docs/src/content/docs/community/contributing.mdx new file mode 100644 index 00000000000..f6d2ea74154 --- /dev/null +++ b/docs/src/content/docs/community/contributing.mdx @@ -0,0 +1,11 @@ +--- +title: "" +head: + - tag: title + content: Contributing | Linwood Flow +tableOfContents: false +--- + +import Contributing from "/../CONTRIBUTING.md" + + diff --git a/docs/src/content/docs/community/faq.md b/docs/src/content/docs/community/faq.md new file mode 100644 index 00000000000..048e69e2873 --- /dev/null +++ b/docs/src/content/docs/community/faq.md @@ -0,0 +1,26 @@ +--- +title: Frequently Asked Questions +--- + +Here are some frequently asked questions. + +## Web + +### How do I install the web version? + +You can install the web version by clicking on the install button in the title bar. +After that you can use this app offline. + +### Flow does not load on Brave + +Brave Users who have set the 'Block Fingerprinting' Shield setting to Aggressive, need to change it to 'Standard' or just plain 'Block Fingerprinting'. +Click on the shield icon in the address bar to change the setting. +Try updating your browser to the latest version. + +## Mobile + +### iOS support + +> [#244](https://github.com/LinwoodDev/Butterfly/issues/244) + +Flow is available on iOS as preview. Click [here](https://flow.linwood.dev/downloads/ios) to download it. See [here](https://github.com/LinwoodDev/Flow/issues/244#issuecomment-1935460878) why it's not available on the App Store. diff --git a/docs/src/content/docs/community/index.md b/docs/src/content/docs/community/index.md new file mode 100644 index 00000000000..ab70723a9dc --- /dev/null +++ b/docs/src/content/docs/community/index.md @@ -0,0 +1,22 @@ +--- +title: Community +--- + +Welcome to the community section. + +## Acknowledgements + +A special thanks goes to: + +* [Flutter](https://github.com/flutter/flutter) for providing this useful crossplatform ui framework +* [window_manager](https://github.com/leanflutter/window_manager) for all this useful desktop window features +* [Starlight](https://github.com/withastro/starlight) for an easy-to-use static react documentation framework +* [Phosphor Icons](https://phosphoricons.com/) for the beautiful icons + +All other licenses can you found in the settings. + +## Useful links + +* [GitHub](https://github.com/LinwoodDev/Flow) +* [Discord](https://go.linwood.dev/discord) +* [Matrix](https://go.linwood.dev/matrix) diff --git a/docs/src/content/docs/community/nightly.md b/docs/src/content/docs/community/nightly.md new file mode 100644 index 00000000000..b3531171624 --- /dev/null +++ b/docs/src/content/docs/community/nightly.md @@ -0,0 +1,23 @@ +--- +title: Nightly Builds +--- + +:::warning + +Do not use the nightly version of Flow for production. + +::: + +Nightly builds are designed to give you the option to test the latest version and get the newest features +and give feedback. + +## Get the builds + +Go to the download pages of your platform. +All nightly builds get also published as pre-release on github. + +## Experiments + +Experiments are features that are not ready for production yet. +Default they are disabled. You can enable them in the settings under `Experiments`. +This tab is only visible in the nightly version. diff --git a/docs/src/content/docs/community/versions.mdx b/docs/src/content/docs/community/versions.mdx new file mode 100644 index 00000000000..8d7cfe01806 --- /dev/null +++ b/docs/src/content/docs/community/versions.mdx @@ -0,0 +1,11 @@ +--- +title: "" +head: + - tag: title + content: Versions | Linwood Flow +tableOfContents: false +--- + +import Security from "/../SECURITY.md" + + diff --git a/docs/src/content/docs/index.mdx b/docs/src/content/docs/docs/index.mdx similarity index 100% rename from docs/src/content/docs/index.mdx rename to docs/src/content/docs/docs/index.mdx diff --git a/docs/src/content/docs/intro.md b/docs/src/content/docs/docs/intro.md similarity index 100% rename from docs/src/content/docs/intro.md rename to docs/src/content/docs/docs/intro.md diff --git a/docs/src/content/docs/server/errors.md b/docs/src/content/docs/docs/server/errors.md similarity index 100% rename from docs/src/content/docs/server/errors.md rename to docs/src/content/docs/docs/server/errors.md diff --git a/metadata/en-US/changelogs/7.txt b/metadata/en-US/changelogs/7.txt index c1820ba4837..cb667a99d71 100644 --- a/metadata/en-US/changelogs/7.txt +++ b/metadata/en-US/changelogs/7.txt @@ -3,7 +3,6 @@ * Add high contrast mode * Add classic theme * Add notebooks -* Add right click menus * Allow changing group and place in event creation dialog * Make dashboard the back page * Improve icon style for different calendar item types @@ -17,7 +16,6 @@ * Fix week system in calendar week view * Fix switching from moment to appointment doesn't update the dialog * Fix list view has duplicated items -* Upgrade project layout * Upgrade to flutter 3.19 and 3.22 Read more here: https://linwood.dev/flow/0.3 \ No newline at end of file diff --git a/metadata/en-US/changelogs/8.txt b/metadata/en-US/changelogs/8.txt new file mode 100644 index 00000000000..207cd38f735 --- /dev/null +++ b/metadata/en-US/changelogs/8.txt @@ -0,0 +1,6 @@ +* Add right click menus +* Fix month view start of the week +* Upgrade project layout +* Upgrade to flutter 3.24 + +Read more here: https://linwood.dev/flow/0.3.1 \ No newline at end of file