merge conflict
Showing
- .env.example 1 addition, 0 deletions.env.example
- .env.production.example 1 addition, 0 deletions.env.production.example
- Dockerfile 2 additions, 0 deletionsDockerfile
- nginx.conf 21 additions, 0 deletionsnginx.conf
- src/App.css 37 additions, 37 deletionssrc/App.css
- src/TonalityApp.tsx 10 additions, 11 deletionssrc/TonalityApp.tsx
- src/assets/images/logo.svg 3 additions, 11 deletionssrc/assets/images/logo.svg
- src/components/ui/button.tsx 6 additions, 6 deletionssrc/components/ui/button.tsx
- src/components/ui/form.tsx 2 additions, 2 deletionssrc/components/ui/form.tsx
- src/components/ui/input.tsx 1 addition, 1 deletionsrc/components/ui/input.tsx
- src/components/ui/toast.tsx 127 additions, 0 deletionssrc/components/ui/toast.tsx
- src/components/ui/toaster.tsx 33 additions, 0 deletionssrc/components/ui/toaster.tsx
- src/components/ui/use-toast.ts 192 additions, 0 deletionssrc/components/ui/use-toast.ts
- src/index.css 8 additions, 0 deletionssrc/index.css
- src/layouts/AnonymousLayout.tsx 24 additions, 3 deletionssrc/layouts/AnonymousLayout.tsx
- src/layouts/MainLayout.tsx 4 additions, 4 deletionssrc/layouts/MainLayout.tsx
- src/layouts/NotMatchLayout.tsx 6 additions, 6 deletionssrc/layouts/NotMatchLayout.tsx
- src/pages/LoginPage.tsx 135 additions, 3 deletionssrc/pages/LoginPage.tsx
- src/pages/NotMatch.tsx 2 additions, 6 deletionssrc/pages/NotMatch.tsx
- src/pages/SignUpPage.tsx 132 additions, 0 deletionssrc/pages/SignUpPage.tsx
Please register or sign in to comment