Compare commits

..

No commits in common. "6c2ebe7d7aa0720919b783f2c1f41d2cfb6050aa" and "c9b82462187b3e69cb30d3c868d55a50c90b71e8" have entirely different histories.

5 changed files with 103 additions and 119 deletions

View File

@ -35,12 +35,7 @@ To get started with DeguApp, follow these steps:
2. Install dependencies: 2. Install dependencies:
```bash ```bash
# frontend cd deguapp
cd deguapp/frontend
npm install
# backend
cd deguapp/api
npm install npm install
``` ```
@ -48,6 +43,11 @@ To get started with DeguApp, follow these steps:
5. Open the app in your browser or Android emulator and start exploring! 5. Open the app in your browser or Android emulator and start exploring!
## Contributing
Contributions are welcome! If you'd like to contribute to DeguApp, please fork the repository and submit a pull request with your changes.
Use the upstream of the project, which can be found at https:/git.filiprojek.cz/fr/deguapp. **GitHub repository is just a mirror!**
## Local builds ## Local builds
### Android ### Android
@ -74,24 +74,12 @@ bundletool build-apks --bundle=./frontend/android/app/build/outputs/bundle/relea
bundletool install-apks --apks=./deguapp.apks bundletool install-apks --apks=./deguapp.apks
``` ```
#### Resources:
### Resources:
- https://github.com/expo/eas-cli/issues/1300 - https://github.com/expo/eas-cli/issues/1300
- https://reactnative.dev/docs/signed-apk-android#generating-the-release-aab - https://reactnative.dev/docs/signed-apk-android#generating-the-release-aab
### Server
```bash
cd api/
npm i
npm run build
```
## Contributing
Contributions are welcome! If you'd like to contribute to DeguApp, please fork the repository and submit a pull request with your changes.
Use the upstream of the project, which can be found at https:/git.filiprojek.cz/fr/deguapp. **GitHub repository is just a mirror!**
## License ## License
This project is licensed under the GNU GPLv3 License - see the [LICENSE](LICENSE) file for details. This project is licensed under the GNU GPLv3 License - see the [LICENSE](LICENSE) file for details.

View File

@ -12,7 +12,9 @@
"resizeMode": "contain", "resizeMode": "contain",
"backgroundColor": "#ffffff" "backgroundColor": "#ffffff"
}, },
"assetBundlePatterns": ["**/*"], "assetBundlePatterns": [
"**/*"
],
"ios": { "ios": {
"supportsTablet": true "supportsTablet": true
}, },

View File

@ -16,28 +16,23 @@ function SignupPage() {
const { onSignin } = useAuth(); const { onSignin } = useAuth();
async function signin() { async function signin() {
if (pass1 != pass2) { if (pass1 == pass2) {
alert("Passwords are not same!");
return;
}
const res = await onSignin(username, email, pass1); const res = await onSignin(username, email, pass1);
const data = await res.json(); if (res.error) {
if (res.msg.message == "validation error") {
if (res.status == 400) { alert(res.msg.data.message);
if (data.message == "validation error") {
alert(data.data.message);
} else { } else {
alert("Something went wrong"); alert(res.msg.message);
} }
return;
} }
if (!res.error) {
if (res.status == 201) {
alert("You have been successfully registered. Please Log In"); alert("You have been successfully registered. Please Log In");
router.replace("/login"); router.replace("/login");
}
return; return;
} }
alert("Passwords are not same!");
} }
return ( return (

View File

@ -1,7 +1,7 @@
{ {
"$schema": "https://biomejs.dev/schemas/1.7.3/schema.json", "$schema": "https://biomejs.dev/schemas/1.7.3/schema.json",
"files": { "files": {
"ignore": [".expo/", ".vscode/", "node_modules/", "dist/"] "ignore": [".expo/", ".vscode/", "node_modules/"]
}, },
"organizeImports": { "organizeImports": {
"enabled": true "enabled": true

View File

@ -7,8 +7,7 @@
"android": "expo start --android", "android": "expo start --android",
"ios": "expo start --ios", "ios": "expo start --ios",
"web": "expo start --web", "web": "expo start --web",
"build:web": "npx expo export", "build:web": "npx expo export"
"format": "npx @biomejs/biome format --write ."
}, },
"dependencies": { "dependencies": {
"@expo/metro-runtime": "~3.2.1", "@expo/metro-runtime": "~3.2.1",