Changes in text

Reviewed-on: #39

.gitea/workflows/build.yaml

@@ -5,9 +5,6 @@ on: pull_request
 jobs:
   build:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./api
 
     steps:
       - name: Checkout Repository
@@ -18,11 +15,18 @@ jobs:
         with:
           node-version: "20.14.0"
 
-      - name: change directory to api/
+      - name: npm install
-
+        working-directory: api/
-      - name: npm install, build and test
         run: |
           npm install
+
+      - name: npm run build
+        working-directory: api/
+        run: |
           npm run build --if-present
+
+      - name: npm run test
+        working-directory: api/
+        run: |
           npm run test
 

api/.gitea/workflows/build.yaml

@@ -1,23 +0,0 @@
-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,5 +41,3 @@ app.use(cookieParser());
 
 // Routes
 app.use(routes);
-
-//test

frontend/app/(app)/(tabs)/beer/add.js

@@ -18,7 +18,7 @@ export default function BeerAdd() {
 	const [open, setOpen] = useState(false);
 	const [items, setItems] = useState([
 		{ label: "Tank beer", value: "tank" },
-		{ label: "Cask beer", value: "cask" },
+		{ label: "Keg beer", value: "keg" },
 		{ label: "Glass bottle", value: "glass" },
 		{ label: "Can", value: "can" },
 		{ label: "PET bottle", value: "pet" },

frontend/app/(app)/(tabs)/review/add/[beer_id].js

@@ -19,7 +19,7 @@ export default function reviewAdd() {
 	const [openSourness, setOpenSourness] = useState(false);
 	const [openAgain, setOpenAgain] = useState(false);
 
-	// pěna
+	// foam
 	const [itemFoam, setFoamValue] = useState(null);
 	const [foam, setFoam] = useState([
 		{
@@ -54,11 +54,11 @@ export default function reviewAdd() {
 		},
 	]);
 
-	// hořkost / sladkost
+	// bitter / sweetness
 	const [itemBitter_sweetness, setBitter_sweetnessValue] = useState(null);
 	const [bitter_sweetness, setBitter_sweetness] = useState([
 		{
-			label: "Bad",
+			label: "Bitter",
 			value: "1",
 			icon: () => (
 				<Image
@@ -78,7 +78,7 @@ export default function reviewAdd() {
 			),
 		},
 		{
-			label: "Excellent",
+			label: "Sweet",
 			value: "3",
 			icon: () => (
 				<Image
@@ -89,7 +89,7 @@ export default function reviewAdd() {
 		},
 	]);
 
-	//chuť
+	// taste
 	const [itemTaste, setTasteValue] = useState(null);
 	const [taste, setTaste] = useState([
 		{
@@ -199,7 +199,7 @@ export default function reviewAdd() {
 		},
 	]);
 
-	//kyselost
+	// sourness
 	const [itemSourness, setSournessValue] = useState(null);
 	const [sourness, setSourness] = useState([
 		{
@@ -224,7 +224,7 @@ export default function reviewAdd() {
 		},
 	]);
 
-	//dal bych si znovu?
+	// would again
 	const [itemAgain, setAgainValue] = useState(null);
 	const [again, setAgain] = useState([
 		{

frontend/app/context/AuthContext.js

@@ -90,7 +90,7 @@ export function AuthProvider({ children }) {
 			});
 
 			if (resUser.status != 200) {
-				throw Error("user does not have user data");
+				throw Error("Username or password is incorrect!");
 			}
 
 			const userData = await resUser.json();
@@ -104,7 +104,7 @@ export function AuthProvider({ children }) {
 			await storageUtil.setItem(TOKEN_KEY, loginData.data.jwt);
 		} catch (err) {
 			console.error("Failed to log in", err);
-			return { error: true, msg: err.res };
+			return { error: true, msg: err };
 		}
 	}
 

frontend/app/login.js

@@ -20,8 +20,12 @@ function LoginPage() {
 		}
 	}, [authState.authenticated]);
 
-	function login() {
+	async function login() {
-		onLogin(email, pass);
+		const res = await onLogin(email, pass);
+		if (res !== undefined && res.error === true) {
+			alert(res.msg);
+			return;
+		}
 	}
 
 	return (