Compare commits
No commits in common. "main" and "kevin/reviews-page" have entirely different histories.
main
...
kevin/revi
@ -1,32 +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
|
|
||||||
working-directory: api/
|
|
||||||
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
|
|
||||||
|
|
||||||
28
README.md
28
README.md
@ -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.
|
||||||
|
|||||||
@ -5,9 +5,9 @@ export const router = Router();
|
|||||||
|
|
||||||
router.use("/api/v1", api_v1);
|
router.use("/api/v1", api_v1);
|
||||||
|
|
||||||
router.get("*", (req: Request, res: Response) => {
|
//router.get("*", (req: Request, res: Response) => {
|
||||||
res.sendFile(path.join(__dirname, "../public/index.html"));
|
// res.sendFile(path.join(__dirname, "../views/index.html"));
|
||||||
});
|
//});
|
||||||
|
|
||||||
// 404
|
// 404
|
||||||
router.use((req: Request, res: Response) => {
|
router.use((req: Request, res: Response) => {
|
||||||
|
|||||||
@ -1,41 +1,43 @@
|
|||||||
{
|
{
|
||||||
"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": {
|
||||||
"android": {
|
"supportsTablet": true
|
||||||
"adaptiveIcon": {
|
},
|
||||||
"foregroundImage": "./assets/adaptive-icon.png",
|
"android": {
|
||||||
"backgroundColor": "#ffffff"
|
"adaptiveIcon": {
|
||||||
}
|
"foregroundImage": "./assets/adaptive-icon.png",
|
||||||
},
|
"backgroundColor": "#ffffff"
|
||||||
"web": {
|
}
|
||||||
"favicon": "./assets/favicon.png"
|
},
|
||||||
},
|
"web": {
|
||||||
"plugins": [
|
"favicon": "./assets/favicon.png"
|
||||||
"expo-router",
|
},
|
||||||
[
|
"plugins": [
|
||||||
"expo-image-picker",
|
"expo-router",
|
||||||
{
|
[
|
||||||
"photosPermission": "The app accesses your photos to let you share them with your friends.",
|
"expo-image-picker",
|
||||||
"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."
|
"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.",
|
||||||
],
|
"microphonePermission": "The app accesses your microphone to let you record audio and share it with your friends."
|
||||||
"expo-secure-store"
|
}
|
||||||
]
|
],
|
||||||
}
|
"expo-secure-store"
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,7 +18,7 @@ export default function BeerAdd() {
|
|||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [items, setItems] = useState([
|
const [items, setItems] = useState([
|
||||||
{ label: "Tank beer", value: "tank" },
|
{ label: "Tank beer", value: "tank" },
|
||||||
{ label: "Keg beer", value: "keg" },
|
{ label: "Cask beer", value: "cask" },
|
||||||
{ label: "Glass bottle", value: "glass" },
|
{ label: "Glass bottle", value: "glass" },
|
||||||
{ label: "Can", value: "can" },
|
{ label: "Can", value: "can" },
|
||||||
{ label: "PET bottle", value: "pet" },
|
{ label: "PET bottle", value: "pet" },
|
||||||
|
|||||||
@ -19,7 +19,7 @@ export default function reviewAdd() {
|
|||||||
const [openSourness, setOpenSourness] = useState(false);
|
const [openSourness, setOpenSourness] = useState(false);
|
||||||
const [openAgain, setOpenAgain] = useState(false);
|
const [openAgain, setOpenAgain] = useState(false);
|
||||||
|
|
||||||
// foam
|
// pěna
|
||||||
const [itemFoam, setFoamValue] = useState(null);
|
const [itemFoam, setFoamValue] = useState(null);
|
||||||
const [foam, setFoam] = useState([
|
const [foam, setFoam] = useState([
|
||||||
{
|
{
|
||||||
@ -54,11 +54,11 @@ export default function reviewAdd() {
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// bitter / sweetness
|
// hořkost / sladkost
|
||||||
const [itemBitter_sweetness, setBitter_sweetnessValue] = useState(null);
|
const [itemBitter_sweetness, setBitter_sweetnessValue] = useState(null);
|
||||||
const [bitter_sweetness, setBitter_sweetness] = useState([
|
const [bitter_sweetness, setBitter_sweetness] = useState([
|
||||||
{
|
{
|
||||||
label: "Bitter",
|
label: "Bad",
|
||||||
value: "1",
|
value: "1",
|
||||||
icon: () => (
|
icon: () => (
|
||||||
<Image
|
<Image
|
||||||
@ -78,7 +78,7 @@ export default function reviewAdd() {
|
|||||||
),
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Sweet",
|
label: "Excellent",
|
||||||
value: "3",
|
value: "3",
|
||||||
icon: () => (
|
icon: () => (
|
||||||
<Image
|
<Image
|
||||||
@ -89,7 +89,7 @@ export default function reviewAdd() {
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// taste
|
//chuť
|
||||||
const [itemTaste, setTasteValue] = useState(null);
|
const [itemTaste, setTasteValue] = useState(null);
|
||||||
const [taste, setTaste] = useState([
|
const [taste, setTaste] = useState([
|
||||||
{
|
{
|
||||||
@ -199,7 +199,7 @@ export default function reviewAdd() {
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// sourness
|
//kyselost
|
||||||
const [itemSourness, setSournessValue] = useState(null);
|
const [itemSourness, setSournessValue] = useState(null);
|
||||||
const [sourness, setSourness] = useState([
|
const [sourness, setSourness] = useState([
|
||||||
{
|
{
|
||||||
@ -224,7 +224,7 @@ export default function reviewAdd() {
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// would again
|
//dal bych si znovu?
|
||||||
const [itemAgain, setAgainValue] = useState(null);
|
const [itemAgain, setAgainValue] = useState(null);
|
||||||
const [again, setAgain] = useState([
|
const [again, setAgain] = useState([
|
||||||
{
|
{
|
||||||
|
|||||||
@ -90,7 +90,7 @@ export function AuthProvider({ children }) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (resUser.status != 200) {
|
if (resUser.status != 200) {
|
||||||
throw Error("Username or password is incorrect!");
|
throw Error("user does not have user data");
|
||||||
}
|
}
|
||||||
|
|
||||||
const userData = await resUser.json();
|
const userData = await resUser.json();
|
||||||
@ -104,7 +104,7 @@ export function AuthProvider({ children }) {
|
|||||||
await storageUtil.setItem(TOKEN_KEY, loginData.data.jwt);
|
await storageUtil.setItem(TOKEN_KEY, loginData.data.jwt);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Failed to log in", err);
|
console.error("Failed to log in", err);
|
||||||
return { error: true, msg: err };
|
return { error: true, msg: err.res };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -20,12 +20,8 @@ function LoginPage() {
|
|||||||
}
|
}
|
||||||
}, [authState.authenticated]);
|
}, [authState.authenticated]);
|
||||||
|
|
||||||
async function login() {
|
function login() {
|
||||||
const res = await onLogin(email, pass);
|
onLogin(email, pass);
|
||||||
if (res !== undefined && res.error === true) {
|
|
||||||
alert(res.msg);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -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!");
|
const res = await onSignin(username, email, pass1);
|
||||||
return;
|
if (res.error) {
|
||||||
}
|
if (res.msg.message == "validation error") {
|
||||||
|
alert(res.msg.data.message);
|
||||||
const res = await onSignin(username, email, pass1);
|
} else {
|
||||||
const data = await res.json();
|
alert(res.msg.message);
|
||||||
|
}
|
||||||
if (res.status == 400) {
|
}
|
||||||
if (data.message == "validation error") {
|
if (!res.error) {
|
||||||
alert(data.data.message);
|
alert("You have been successfully registered. Please Log In");
|
||||||
} else {
|
router.replace("/login");
|
||||||
alert("Something went wrong");
|
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (res.status == 201) {
|
alert("Passwords are not same!");
|
||||||
alert("You have been successfully registered. Please Log In");
|
|
||||||
router.replace("/login");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
@ -1,43 +1,41 @@
|
|||||||
{
|
{
|
||||||
"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",
|
},
|
||||||
"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
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user