Test commit

README.md

@@ -35,7 +35,12 @@ To get started with DeguApp, follow these steps:
 2. Install dependencies:
 
    ```bash
-   cd deguapp
+   # frontend
+   cd deguapp/frontend
+   npm install
+
+   # backend
+   cd deguapp/api
    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!
 
-## 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
 ### Android
 
@@ -74,12 +74,24 @@ bundletool build-apks --bundle=./frontend/android/app/build/outputs/bundle/relea
 bundletool install-apks --apks=./deguapp.apks
 ```
 
-
-### Resources:
+#### Resources:
 
 - https://github.com/expo/eas-cli/issues/1300
 - 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
 
 This project is licensed under the GNU GPLv3 License - see the [LICENSE](LICENSE) file for details.

api/.gitea/workflows/build.yaml

@@ -0,0 +1,23 @@
+name: Build DeguApp backend
+
+on: pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js and TypeScript
+        uses: actions/setup-node@v1
+        with:
+          node-version: "20.14.0"
+
+      - name: npm install, build and test
+        run: |
+          npm install
+          npm run build --if-present
+          npm run test
+

api/src/app.ts

@@ -41,3 +41,5 @@ app.use(cookieParser());
 
 // Routes
 app.use(routes);
+
+//test

api/src/routes/index.ts

@@ -5,9 +5,9 @@ export const router = Router();
 
 router.use("/api/v1", api_v1);
 
-//router.get("*", (req: Request, res: Response) => {
-//  res.sendFile(path.join(__dirname, "../views/index.html"));
-//});
+router.get("*", (req: Request, res: Response) => {
+  res.sendFile(path.join(__dirname, "../public/index.html"));
+});
 
 // 404
 router.use((req: Request, res: Response) => {

frontend/app.json

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

frontend/app/signup.js

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

frontend/biome.json

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

frontend/package.json

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