First merge from develop to main (WIP) #7

Merged

sugar merged 199 commits from develop into main 2026-01-27 17:47:07 +00:00

Conversation 0 Commits 199 Files Changed 228 +21 -17

144 changed files with 21 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files Hide outdated comments

Showing only changes of commit b2c5f8de38 - Show all commits

0

client/.gitignore → client/cms/.gitignore vendored

0

client/components.json → client/cms/components.json

0

client/eslint.config.js → client/cms/eslint.config.js

0

client/index.html → client/cms/index.html

0

client/package.json → client/cms/package.json

0

client/pnpm-lock.yaml → client/cms/pnpm-lock.yaml generated

0

client/src/App.tsx → client/cms/src/App.tsx

0

client/src/assets/nixos.svg → client/cms/src/assets/nixos.svg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

0

client/src/components/checkin/qr-dialog.tsx → client/cms/src/components/checkin/qr-dialog.tsx

0

client/src/components/hoc/with-fallback.tsx → client/cms/src/components/hoc/with-fallback.tsx

0

client/src/components/login-form.tsx → client/cms/src/components/login-form.tsx

0

client/src/components/profile/edit-profile-dialog.tsx → client/cms/src/components/profile/edit-profile-dialog.tsx

0

client/src/components/profile/edit-profile-form.tsx → client/cms/src/components/profile/edit-profile-form.tsx

0

client/src/components/profile/main-profile.tsx → client/cms/src/components/profile/main-profile.tsx

0

client/src/components/sidebar/app-sidebar.tsx → client/cms/src/components/sidebar/app-sidebar.tsx

0

client/src/components/sidebar/nav-main.tsx → client/cms/src/components/sidebar/nav-main.tsx

0

client/src/components/sidebar/nav-secondary.tsx → client/cms/src/components/sidebar/nav-secondary.tsx

0

client/src/components/sidebar/nav-user.tsx → client/cms/src/components/sidebar/nav-user.tsx

0

client/src/components/site-header.tsx → client/cms/src/components/site-header.tsx

0

client/src/components/theme-provider.tsx → client/cms/src/components/theme-provider.tsx

0

client/src/components/ui/avatar.tsx → client/cms/src/components/ui/avatar.tsx

0

client/src/components/ui/badge.tsx → client/cms/src/components/ui/badge.tsx

0

client/src/components/ui/breadcrumb.tsx → client/cms/src/components/ui/breadcrumb.tsx

0

client/src/components/ui/button.tsx → client/cms/src/components/ui/button.tsx

0

client/src/components/ui/card.tsx → client/cms/src/components/ui/card.tsx

0

client/src/components/ui/chart.tsx → client/cms/src/components/ui/chart.tsx

0

client/src/components/ui/checkbox.tsx → client/cms/src/components/ui/checkbox.tsx

0

client/src/components/ui/dialog.tsx → client/cms/src/components/ui/dialog.tsx

0

client/src/components/ui/drawer.tsx → client/cms/src/components/ui/drawer.tsx

0

client/src/components/ui/dropdown-menu.tsx → client/cms/src/components/ui/dropdown-menu.tsx

0

client/src/components/ui/field.tsx → client/cms/src/components/ui/field.tsx

0

client/src/components/ui/input.tsx → client/cms/src/components/ui/input.tsx

0

client/src/components/ui/label.tsx → client/cms/src/components/ui/label.tsx

0

client/src/components/ui/select.tsx → client/cms/src/components/ui/select.tsx

0

client/src/components/ui/separator.tsx → client/cms/src/components/ui/separator.tsx

0

client/src/components/ui/shadcn-io/qr-code/index.tsx → client/cms/src/components/ui/shadcn-io/qr-code/index.tsx

0

client/src/components/ui/sheet.tsx → client/cms/src/components/ui/sheet.tsx

0

client/src/components/ui/sidebar.tsx → client/cms/src/components/ui/sidebar.tsx

0

client/src/components/ui/skeleton.tsx → client/cms/src/components/ui/skeleton.tsx

0

client/src/components/ui/sonner.tsx → client/cms/src/components/ui/sonner.tsx

0

client/src/components/ui/table.tsx → client/cms/src/components/ui/table.tsx

0

client/src/components/ui/tabs.tsx → client/cms/src/components/ui/tabs.tsx

0

client/src/components/ui/toggle-group.tsx → client/cms/src/components/ui/toggle-group.tsx

0

client/src/components/ui/toggle.tsx → client/cms/src/components/ui/toggle.tsx

0

client/src/components/ui/tooltip.tsx → client/cms/src/components/ui/tooltip.tsx

0

client/src/components/workbenchCards/card-skeleton.tsx → client/cms/src/components/workbenchCards/card-skeleton.tsx

0

client/src/hooks/data/useGetCheckInCode.ts → client/cms/src/hooks/data/useGetCheckInCode.ts

0

client/src/hooks/data/useGetMagicLink.ts → client/cms/src/hooks/data/useGetMagicLink.ts

0

client/src/hooks/data/useUserInfo.ts → client/cms/src/hooks/data/useUserInfo.ts

0

client/src/hooks/data/useValidateMagicLink.ts → client/cms/src/hooks/data/useValidateMagicLink.ts

0

client/src/hooks/use-mobile.ts → client/cms/src/hooks/use-mobile.ts

0

client/src/hooks/useLogout.ts → client/cms/src/hooks/useLogout.ts

0

client/src/hooks/useTheme.ts → client/cms/src/hooks/useTheme.ts

0

client/src/index.css → client/cms/src/index.css

0

client/src/lib/axios.ts → client/cms/src/lib/axios.ts

0

client/src/lib/navData.ts → client/cms/src/lib/navData.ts

0

client/src/lib/random.ts → client/cms/src/lib/random.ts

0

client/src/lib/router.ts → client/cms/src/lib/router.ts

0

client/src/lib/token.ts → client/cms/src/lib/token.ts

0

client/src/lib/utils.ts → client/cms/src/lib/utils.ts

0

client/src/main.tsx → client/cms/src/main.tsx

0

client/src/routeTree.gen.ts → client/cms/src/routeTree.gen.ts

0

client/src/routes/__root.tsx → client/cms/src/routes/__root.tsx

0

client/src/routes/_sidebarLayout.tsx → client/cms/src/routes/_sidebarLayout.tsx

0

client/src/routes/_sidebarLayout/index.tsx → client/cms/src/routes/_sidebarLayout/index.tsx

0

client/src/routes/_sidebarLayout/profile.tsx → client/cms/src/routes/_sidebarLayout/profile.tsx

0

client/src/routes/authorize.tsx → client/cms/src/routes/authorize.tsx

0

client/src/routes/magicLinkSent.tsx → client/cms/src/routes/magicLinkSent.tsx

0

client/src/routes/token.tsx → client/cms/src/routes/token.tsx

0

client/tsconfig.app.json → client/cms/tsconfig.app.json

0

client/tsconfig.json → client/cms/tsconfig.json

0

client/tsconfig.node.json → client/cms/tsconfig.node.json

0

client/vite.config.ts → client/cms/vite.config.ts

0

mobile/.envrc → client/mobile/.envrc

0

mobile/.fvmrc → client/mobile/.fvmrc

0

mobile/.gitignore → client/mobile/.gitignore vendored

0

mobile/.metadata → client/mobile/.metadata

0

mobile/README.md → client/mobile/README.md

0

mobile/analysis_options.yaml → client/mobile/analysis_options.yaml

0

mobile/android/.gitignore → client/mobile/android/.gitignore vendored

0

mobile/android/app/build.gradle.kts → client/mobile/android/app/build.gradle.kts

0

mobile/android/app/src/debug/AndroidManifest.xml → client/mobile/android/app/src/debug/AndroidManifest.xml

0

mobile/android/app/src/main/AndroidManifest.xml → client/mobile/android/app/src/main/AndroidManifest.xml

0

mobile/android/app/src/main/kotlin/io/asnk/applications/nixcn/MainActivity.kt → client/mobile/android/app/src/main/kotlin/io/asnk/applications/nixcn/MainActivity.kt

0

mobile/android/app/src/main/res/drawable-v21/launch_background.xml → client/mobile/android/app/src/main/res/drawable-v21/launch_background.xml

0

mobile/android/app/src/main/res/drawable/launch_background.xml → client/mobile/android/app/src/main/res/drawable/launch_background.xml

0

mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png → client/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 544 B After Width:  |  Height:  |  Size: 544 B

0

mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png → client/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 442 B After Width:  |  Height:  |  Size: 442 B

0

mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png → client/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 721 B After Width:  |  Height:  |  Size: 721 B

0

mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png → client/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

0

mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png → client/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

mobile/android/app/src/main/res/values-night/styles.xml → client/mobile/android/app/src/main/res/values-night/styles.xml

0

mobile/android/app/src/main/res/values/styles.xml → client/mobile/android/app/src/main/res/values/styles.xml

0

mobile/android/app/src/profile/AndroidManifest.xml → client/mobile/android/app/src/profile/AndroidManifest.xml

0

mobile/android/build.gradle.kts → client/mobile/android/build.gradle.kts

0

mobile/android/gradle.properties → client/mobile/android/gradle.properties

0

mobile/android/gradle/wrapper/gradle-wrapper.properties → client/mobile/android/gradle/wrapper/gradle-wrapper.properties vendored

0

mobile/android/settings.gradle.kts → client/mobile/android/settings.gradle.kts

0

mobile/ios/.gitignore → client/mobile/ios/.gitignore vendored

0

mobile/ios/Flutter/AppFrameworkInfo.plist → client/mobile/ios/Flutter/AppFrameworkInfo.plist

Some files were not shown because too many files have changed in this diff Show More