Compare commits

..

5 Commits

Author SHA1 Message Date
6c2ebe7d7a Added: dist/ to biome ignore 2024-06-02 23:06:58 +02:00
1dd7952976 Code formatted 2024-06-02 23:06:32 +02:00
922a11b23b Added: package.json format script 2024-06-02 23:05:57 +02:00
5a2a2db5e2 Fixes: error handling on signup page #13 2024-06-02 23:04:42 +02:00
61449caef1 Updated README.md 2024-06-02 22:34:07 +02:00
5 changed files with 119 additions and 103 deletions

View File

@ -35,7 +35,12 @@ To get started with DeguApp, follow these steps:
2. Install dependencies: 2. Install dependencies:
```bash ```bash
cd deguapp # frontend
cd deguapp/frontend
npm install
# backend
cd deguapp/api
npm install npm install
``` ```
@ -43,11 +48,6 @@ 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,12 +74,24 @@ 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

@ -1,43 +1,41 @@
{ {
"expo": { "expo": {
"name": "deguapp", "name": "deguapp",
"slug": "deguapp", "slug": "deguapp",
"scheme": "deguapp", "scheme": "deguapp",
"version": "1.0.0", "version": "1.0.0",
"orientation": "portrait", "orientation": "portrait",
"icon": "./assets/icon.png", "icon": "./assets/icon.png",
"userInterfaceStyle": "light", "userInterfaceStyle": "light",
"splash": { "splash": {
"image": "./assets/splash.png", "image": "./assets/splash.png",
"resizeMode": "contain", "resizeMode": "contain",
"backgroundColor": "#ffffff" "backgroundColor": "#ffffff"
}, },
"assetBundlePatterns": [ "assetBundlePatterns": ["**/*"],
"**/*" "ios": {
], "supportsTablet": true
"ios": { },
"supportsTablet": true "android": {
}, "adaptiveIcon": {
"android": { "foregroundImage": "./assets/adaptive-icon.png",
"adaptiveIcon": { "backgroundColor": "#ffffff"
"foregroundImage": "./assets/adaptive-icon.png", }
"backgroundColor": "#ffffff" },
} "web": {
}, "favicon": "./assets/favicon.png"
"web": { },
"favicon": "./assets/favicon.png" "plugins": [
}, "expo-router",
"plugins": [ [
"expo-router", "expo-image-picker",
[ {
"expo-image-picker", "photosPermission": "The app accesses your photos to let you share them with your friends.",
{ "cameraPermission": "The app accesses your camera to let you take photos of your beer and share them with your friends.",
"photosPermission": "The app accesses your photos to let you share them with your friends.", "microphonePermission": "The app accesses your microphone to let you record audio and share it with your friends."
"cameraPermission": "The app accesses your camera to let you take photos of your beer and share them with your friends.", }
"microphonePermission": "The app accesses your microphone to let you record audio and share it with your friends." ],
} "expo-secure-store"
], ]
"expo-secure-store" }
]
}
} }

View File

@ -16,23 +16,28 @@ function SignupPage() {
const { onSignin } = useAuth(); const { onSignin } = useAuth();
async function signin() { async function signin() {
if (pass1 == pass2) { if (pass1 != pass2) {
const res = await onSignin(username, email, pass1); alert("Passwords are not same!");
if (res.error) { return;
if (res.msg.message == "validation error") { }
alert(res.msg.data.message);
} else { const res = await onSignin(username, email, pass1);
alert(res.msg.message); const data = await res.json();
}
} if (res.status == 400) {
if (!res.error) { if (data.message == "validation error") {
alert("You have been successfully registered. Please Log In"); alert(data.data.message);
router.replace("/login"); } else {
alert("Something went wrong");
} }
return; return;
} }
alert("Passwords are not same!"); if (res.status == 201) {
alert("You have been successfully registered. Please Log In");
router.replace("/login");
return;
}
} }
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/"] "ignore": [".expo/", ".vscode/", "node_modules/", "dist/"]
}, },
"organizeImports": { "organizeImports": {
"enabled": true "enabled": true

View File

@ -1,42 +1,43 @@
{ {
"name": "deguapp", "name": "deguapp",
"version": "1.0.0", "version": "1.0.0",
"main": "expo-router/entry", "main": "expo-router/entry",
"scripts": { "scripts": {
"start": "expo start", "start": "expo start",
"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": { },
"@expo/metro-runtime": "~3.2.1", "dependencies": {
"@react-native-async-storage/async-storage": "^1.23.1", "@expo/metro-runtime": "~3.2.1",
"@types/react": "~18.2.45", "@react-native-async-storage/async-storage": "^1.23.1",
"axios": "^1.6.8", "@types/react": "~18.2.45",
"expo": "^51.0.2", "axios": "^1.6.8",
"expo-constants": "~16.0.1", "expo": "^51.0.2",
"expo-image-picker": "~15.0.4", "expo-constants": "~16.0.1",
"expo-linear-gradient": "~13.0.2", "expo-image-picker": "~15.0.4",
"expo-linking": "~6.3.1", "expo-linear-gradient": "~13.0.2",
"expo-router": "~3.5.11", "expo-linking": "~6.3.1",
"expo-secure-store": "~13.0.1", "expo-router": "~3.5.11",
"expo-status-bar": "~1.12.1", "expo-secure-store": "~13.0.1",
"expo-system-ui": "~3.0.4", "expo-status-bar": "~1.12.1",
"react": "18.2.0", "expo-system-ui": "~3.0.4",
"react-dom": "18.2.0", "react": "18.2.0",
"react-native": "0.74.1", "react-dom": "18.2.0",
"react-native-dropdown-picker": "^5.4.6", "react-native": "0.74.1",
"react-native-range-slider-expo": "^1.4.3", "react-native-dropdown-picker": "^5.4.6",
"react-native-safe-area-context": "4.10.1", "react-native-range-slider-expo": "^1.4.3",
"react-native-screens": "3.31.1", "react-native-safe-area-context": "4.10.1",
"react-native-web": "~0.19.6", "react-native-screens": "3.31.1",
"@shopify/flash-list": "1.6.4" "react-native-web": "~0.19.6",
}, "@shopify/flash-list": "1.6.4"
"devDependencies": { },
"@babel/core": "^7.20.0", "devDependencies": {
"@biomejs/biome": "1.7.3", "@babel/core": "^7.20.0",
"babel-plugin-module-resolver": "^5.0.2" "@biomejs/biome": "1.7.3",
}, "babel-plugin-module-resolver": "^5.0.2"
"private": true },
"private": true
} }