Compare commits
No commits in common. "master" and "main" have entirely different histories.
0
backend/.gitattributes → .gitattributes
vendored
0
backend/.gitattributes → .gitattributes
vendored
0
backend/.gitignore → .gitignore
vendored
0
backend/.gitignore → .gitignore
vendored
8
.idea/.gitignore
generated
vendored
8
.idea/.gitignore
generated
vendored
@ -1,8 +0,0 @@
|
|||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
# Editor-based HTTP Client requests
|
|
||||||
/httpRequests/
|
|
||||||
# Datasource local storage ignored files
|
|
||||||
/dataSources/
|
|
||||||
/dataSources.local.xml
|
|
||||||
6
.idea/misc.xml
generated
6
.idea/misc.xml
generated
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_23" project-jdk-name="17" project-jdk-type="JavaSDK">
|
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
8
.idea/modules.xml
generated
8
.idea/modules.xml
generated
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ProjectModuleManager">
|
|
||||||
<modules>
|
|
||||||
<module fileurl="file://$PROJECT_DIR$/Hangry_Fullstack.iml" filepath="$PROJECT_DIR$/Hangry_Fullstack.iml" />
|
|
||||||
</modules>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
4
.idea/vcs.xml
generated
4
.idea/vcs.xml
generated
@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings" defaultProject="true" />
|
|
||||||
</project>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module type="GENERAL_MODULE" version="4">
|
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
||||||
<exclude-output />
|
|
||||||
<content url="file://$MODULE_DIR$">
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/backend/src/main/java" isTestSource="false" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="jdk" jdkName="17" jdkType="JavaSDK" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package com.example.backend;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
public class BackendApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(BackendApplication.class, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
package com.example.backend;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
public class Recipe {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
private String name;
|
|
||||||
private String description;
|
|
||||||
private String category;
|
|
||||||
private String imageUrl;
|
|
||||||
|
|
||||||
@OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true)
|
|
||||||
private List<RecipeIngredient> recipeIngredients;
|
|
||||||
|
|
||||||
@ManyToOne
|
|
||||||
@JoinColumn(name = "user_id", nullable = false) // Hier verbinden wir Recipe mit User
|
|
||||||
private User user;
|
|
||||||
|
|
||||||
public Recipe() {}
|
|
||||||
|
|
||||||
public Recipe(String name, String description, String category, String imageUrl, User user) {
|
|
||||||
this.name = name;
|
|
||||||
this.description = description;
|
|
||||||
this.category = category;
|
|
||||||
this.imageUrl = imageUrl;
|
|
||||||
this.user = user;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Getter und Setter
|
|
||||||
public Long getId() { return id; }
|
|
||||||
public void setId(Long id) { this.id = id; }
|
|
||||||
|
|
||||||
public String getName() { return name; }
|
|
||||||
public void setName(String name) { this.name = name; }
|
|
||||||
|
|
||||||
public String getDescription() { return description; }
|
|
||||||
public void setDescription(String description) { this.description = description; }
|
|
||||||
|
|
||||||
public String getCategory() { return category; }
|
|
||||||
public void setCategory(String category) { this.category = category; }
|
|
||||||
|
|
||||||
public String getImageUrl() { return imageUrl; }
|
|
||||||
public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; }
|
|
||||||
|
|
||||||
public List<RecipeIngredient> getRecipeIngredients() { return recipeIngredients; }
|
|
||||||
public void setRecipeIngredients(List<RecipeIngredient> recipeIngredients) { this.recipeIngredients = recipeIngredients; }
|
|
||||||
|
|
||||||
public User getUser() { return user; }
|
|
||||||
public void setUser(User user) { this.user = user; }
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
package com.example.backend.exceptions;
|
|
||||||
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
|
||||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@RestControllerAdvice
|
|
||||||
public class GlobalExceptionHandler {
|
|
||||||
|
|
||||||
@ExceptionHandler(UserNotFoundException.class)
|
|
||||||
public ResponseEntity<Map<String, String>> handleUserNotFoundException(UserNotFoundException ex) {
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("error", ex.getMessage());
|
|
||||||
return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ExceptionHandler(Exception.class)
|
|
||||||
public ResponseEntity<Map<String, String>> handleGeneralException(Exception ex) {
|
|
||||||
Map<String, String> response = new HashMap<>();
|
|
||||||
response.put("error", "Ein unerwarteter Fehler ist aufgetreten.");
|
|
||||||
return new ResponseEntity<>(response, HttpStatus.INTERNAL_SERVER_ERROR);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
package com.example.backend.exceptions;
|
|
||||||
|
|
||||||
public class UserNotFoundException extends RuntimeException {
|
|
||||||
public UserNotFoundException(String message) {
|
|
||||||
super(message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
24
frontend/.gitignore
vendored
24
frontend/.gitignore
vendored
@ -1,24 +0,0 @@
|
|||||||
# Logs
|
|
||||||
logs
|
|
||||||
*.log
|
|
||||||
npm-debug.log*
|
|
||||||
yarn-debug.log*
|
|
||||||
yarn-error.log*
|
|
||||||
pnpm-debug.log*
|
|
||||||
lerna-debug.log*
|
|
||||||
|
|
||||||
node_modules
|
|
||||||
dist
|
|
||||||
dist-ssr
|
|
||||||
*.local
|
|
||||||
|
|
||||||
# Editor directories and files
|
|
||||||
.vscode/*
|
|
||||||
!.vscode/extensions.json
|
|
||||||
.idea
|
|
||||||
.DS_Store
|
|
||||||
*.suo
|
|
||||||
*.ntvs*
|
|
||||||
*.njsproj
|
|
||||||
*.sln
|
|
||||||
*.sw?
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
# React + TypeScript + Vite
|
|
||||||
|
|
||||||
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
|
||||||
|
|
||||||
Currently, two official plugins are available:
|
|
||||||
|
|
||||||
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) for Fast Refresh
|
|
||||||
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
|
||||||
|
|
||||||
## Expanding the ESLint configuration
|
|
||||||
|
|
||||||
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
|
|
||||||
|
|
||||||
```js
|
|
||||||
export default tseslint.config({
|
|
||||||
extends: [
|
|
||||||
// Remove ...tseslint.configs.recommended and replace with this
|
|
||||||
...tseslint.configs.recommendedTypeChecked,
|
|
||||||
// Alternatively, use this for stricter rules
|
|
||||||
...tseslint.configs.strictTypeChecked,
|
|
||||||
// Optionally, add this for stylistic rules
|
|
||||||
...tseslint.configs.stylisticTypeChecked,
|
|
||||||
],
|
|
||||||
languageOptions: {
|
|
||||||
// other options...
|
|
||||||
parserOptions: {
|
|
||||||
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
|
||||||
tsconfigRootDir: import.meta.dirname,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
|
|
||||||
|
|
||||||
```js
|
|
||||||
// eslint.config.js
|
|
||||||
import reactX from 'eslint-plugin-react-x'
|
|
||||||
import reactDom from 'eslint-plugin-react-dom'
|
|
||||||
|
|
||||||
export default tseslint.config({
|
|
||||||
plugins: {
|
|
||||||
// Add the react-x and react-dom plugins
|
|
||||||
'react-x': reactX,
|
|
||||||
'react-dom': reactDom,
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
// other rules...
|
|
||||||
// Enable its recommended typescript rules
|
|
||||||
...reactX.configs['recommended-typescript'].rules,
|
|
||||||
...reactDom.configs.recommended.rules,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
```
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
import js from '@eslint/js'
|
|
||||||
import globals from 'globals'
|
|
||||||
import reactHooks from 'eslint-plugin-react-hooks'
|
|
||||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
|
||||||
import tseslint from 'typescript-eslint'
|
|
||||||
|
|
||||||
export default tseslint.config(
|
|
||||||
{ ignores: ['dist'] },
|
|
||||||
{
|
|
||||||
extends: [js.configs.recommended, ...tseslint.configs.recommended],
|
|
||||||
files: ['**/*.{ts,tsx}'],
|
|
||||||
languageOptions: {
|
|
||||||
ecmaVersion: 2020,
|
|
||||||
globals: globals.browser,
|
|
||||||
},
|
|
||||||
plugins: {
|
|
||||||
'react-hooks': reactHooks,
|
|
||||||
'react-refresh': reactRefresh,
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
...reactHooks.configs.recommended.rules,
|
|
||||||
'react-refresh/only-export-components': [
|
|
||||||
'warn',
|
|
||||||
{ allowConstantExport: true },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<title>Vite + React + TS</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="root"></div>
|
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
4468
frontend/package-lock.json
generated
4468
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,33 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "frontend",
|
|
||||||
"private": true,
|
|
||||||
"version": "0.0.0",
|
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "vite",
|
|
||||||
"build": "tsc -b && vite build",
|
|
||||||
"lint": "eslint .",
|
|
||||||
"preview": "vite preview"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"axios": "^1.9.0",
|
|
||||||
"jwt-decode": "^4.0.0",
|
|
||||||
"react": "^19.1.0",
|
|
||||||
"react-dom": "^19.1.0",
|
|
||||||
"react-icons": "^5.5.0",
|
|
||||||
"react-router-dom": "^7.6.0"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@eslint/js": "^9.25.0",
|
|
||||||
"@types/react": "^19.1.2",
|
|
||||||
"@types/react-dom": "^19.1.2",
|
|
||||||
"@vitejs/plugin-react": "^4.4.1",
|
|
||||||
"eslint": "^9.25.0",
|
|
||||||
"eslint-plugin-react-hooks": "^5.2.0",
|
|
||||||
"eslint-plugin-react-refresh": "^0.4.19",
|
|
||||||
"globals": "^16.0.0",
|
|
||||||
"typescript": "~5.8.3",
|
|
||||||
"typescript-eslint": "^8.30.1",
|
|
||||||
"vite": "^6.3.5"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB |
@ -1,42 +0,0 @@
|
|||||||
#root {
|
|
||||||
max-width: 1280px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 2rem;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.logo {
|
|
||||||
height: 6em;
|
|
||||||
padding: 1.5em;
|
|
||||||
will-change: filter;
|
|
||||||
transition: filter 300ms;
|
|
||||||
}
|
|
||||||
.logo:hover {
|
|
||||||
filter: drop-shadow(0 0 2em #646cffaa);
|
|
||||||
}
|
|
||||||
.logo.react:hover {
|
|
||||||
filter: drop-shadow(0 0 2em #61dafbaa);
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes logo-spin {
|
|
||||||
from {
|
|
||||||
transform: rotate(0deg);
|
|
||||||
}
|
|
||||||
to {
|
|
||||||
transform: rotate(360deg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-reduced-motion: no-preference) {
|
|
||||||
a:nth-of-type(2) .logo {
|
|
||||||
animation: logo-spin infinite 20s linear;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.card {
|
|
||||||
padding: 2em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.read-the-docs {
|
|
||||||
color: #888;
|
|
||||||
}
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
import {BrowserRouter as Router, Routes, Route, Navigate} from "react-router-dom";
|
|
||||||
|
|
||||||
// Screens (du musst diese entsprechend importieren)
|
|
||||||
import ProfileScreen from "./screens/Profile";
|
|
||||||
import EditProfileScreen from "./screens/EditProfileScreen";
|
|
||||||
import LibraryScreen from "./screens/LibraryScreen";
|
|
||||||
import RegistrationScreen from "./screens/RegisterScreen";
|
|
||||||
import LoginScreen from "./screens/LoginScreen";
|
|
||||||
import HomeScreen from "./screens/Home.tsx";
|
|
||||||
import type {JSX} from "react";
|
|
||||||
|
|
||||||
// Optional: Auth-Gateway (z. B. ProtectedRoute)
|
|
||||||
const isAuthenticated = () => {
|
|
||||||
return localStorage.getItem("authToken") !== null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const ProtectedRoute = ({children}: { children: JSX.Element }) => {
|
|
||||||
return isAuthenticated() ? children : <Navigate to="/login"/>;
|
|
||||||
};
|
|
||||||
|
|
||||||
const App = () => {
|
|
||||||
return (
|
|
||||||
<Router>
|
|
||||||
<Routes>
|
|
||||||
{/* Öffentliche Seiten */}
|
|
||||||
<Route path="/login" element={<LoginScreen/>}/>
|
|
||||||
<Route path="/register" element={<RegistrationScreen/>}/>
|
|
||||||
|
|
||||||
{/* Geschützte Seiten */}
|
|
||||||
<Route
|
|
||||||
path="/profile"
|
|
||||||
element={
|
|
||||||
<ProtectedRoute>
|
|
||||||
<ProfileScreen/>
|
|
||||||
</ProtectedRoute>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<Route
|
|
||||||
path="/edit-profile"
|
|
||||||
element={
|
|
||||||
<ProtectedRoute>
|
|
||||||
<EditProfileScreen/>
|
|
||||||
</ProtectedRoute>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<Route
|
|
||||||
path="/library/:userId"
|
|
||||||
element={
|
|
||||||
<ProtectedRoute>
|
|
||||||
<LibraryScreen/>
|
|
||||||
</ProtectedRoute>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<Route
|
|
||||||
path="/recipes/:id"
|
|
||||||
element={
|
|
||||||
<ProtectedRoute>
|
|
||||||
<HomeScreen/>
|
|
||||||
</ProtectedRoute>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* Fallback/Redirect */}
|
|
||||||
<Route path="*" element={<Navigate to="/profile"/>}/>
|
|
||||||
</Routes>
|
|
||||||
</Router>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default App;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
|
||||||
|
Before Width: | Height: | Size: 4.0 KiB |
@ -1,68 +0,0 @@
|
|||||||
:root {
|
|
||||||
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
|
|
||||||
line-height: 1.5;
|
|
||||||
font-weight: 400;
|
|
||||||
|
|
||||||
color-scheme: light dark;
|
|
||||||
color: rgba(255, 255, 255, 0.87);
|
|
||||||
background-color: #242424;
|
|
||||||
|
|
||||||
font-synthesis: none;
|
|
||||||
text-rendering: optimizeLegibility;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
-moz-osx-font-smoothing: grayscale;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
font-weight: 500;
|
|
||||||
color: #646cff;
|
|
||||||
text-decoration: inherit;
|
|
||||||
}
|
|
||||||
a:hover {
|
|
||||||
color: #535bf2;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
display: flex;
|
|
||||||
place-items: center;
|
|
||||||
min-width: 320px;
|
|
||||||
min-height: 100vh;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 3.2em;
|
|
||||||
line-height: 1.1;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
border-radius: 8px;
|
|
||||||
border: 1px solid transparent;
|
|
||||||
padding: 0.6em 1.2em;
|
|
||||||
font-size: 1em;
|
|
||||||
font-weight: 500;
|
|
||||||
font-family: inherit;
|
|
||||||
background-color: #1a1a1a;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: border-color 0.25s;
|
|
||||||
}
|
|
||||||
button:hover {
|
|
||||||
border-color: #646cff;
|
|
||||||
}
|
|
||||||
button:focus,
|
|
||||||
button:focus-visible {
|
|
||||||
outline: 4px auto -webkit-focus-ring-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-color-scheme: light) {
|
|
||||||
:root {
|
|
||||||
color: #213547;
|
|
||||||
background-color: #ffffff;
|
|
||||||
}
|
|
||||||
a:hover {
|
|
||||||
color: #747bff;
|
|
||||||
}
|
|
||||||
button {
|
|
||||||
background-color: #f9f9f9;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
import { StrictMode } from 'react'
|
|
||||||
import { createRoot } from 'react-dom/client'
|
|
||||||
import './index.css'
|
|
||||||
import App from './App.tsx'
|
|
||||||
|
|
||||||
createRoot(document.getElementById('root')!).render(
|
|
||||||
<StrictMode>
|
|
||||||
<App />
|
|
||||||
</StrictMode>,
|
|
||||||
)
|
|
||||||
@ -1,132 +0,0 @@
|
|||||||
import React, { useState, useEffect } from "react";
|
|
||||||
import { jwtDecode } from "jwt-decode";
|
|
||||||
import { useNavigate } from "react-router-dom";
|
|
||||||
|
|
||||||
const API_URL = "http://localhost:8080/users"; // localhost für Web (kein 10.0.2.2)
|
|
||||||
|
|
||||||
const EditProfileScreen = () => {
|
|
||||||
const [username, setUsername] = useState("");
|
|
||||||
const [email, setEmail] = useState("");
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
const navigate = useNavigate();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const fetchUserProfile = async () => {
|
|
||||||
try {
|
|
||||||
const token = localStorage.getItem("authToken");
|
|
||||||
if (!token) return;
|
|
||||||
|
|
||||||
const decoded: any = jwtDecode(token);
|
|
||||||
const userEmail = decoded.sub;
|
|
||||||
|
|
||||||
const response = await fetch(`${API_URL}/email/${userEmail}`, {
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${token}`,
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) throw new Error("Fehler beim Laden");
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
setUsername(data.username);
|
|
||||||
setEmail(data.email);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Fehler beim Laden:", error);
|
|
||||||
alert("Profil konnte nicht geladen werden.");
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
fetchUserProfile();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleSave = async () => {
|
|
||||||
if (!email) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const token = localStorage.getItem("authToken");
|
|
||||||
|
|
||||||
const response = await fetch(`${API_URL}/update/email/${email}`, {
|
|
||||||
method: "PUT",
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${token}`,
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ username, email }),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) throw new Error("Fehler beim Speichern");
|
|
||||||
|
|
||||||
alert("Änderungen gespeichert.");
|
|
||||||
navigate(-1); // Zurück
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Fehler beim Speichern:", error);
|
|
||||||
alert("Profil konnte nicht gespeichert werden.");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (loading) return <p>Lade Profil...</p>;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div style={styles.container}>
|
|
||||||
<label style={styles.label}>Benutzername</label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={username}
|
|
||||||
onChange={(e) => setUsername(e.target.value)}
|
|
||||||
style={styles.input}
|
|
||||||
placeholder="Benutzername"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<label style={styles.label}>E-Mail</label>
|
|
||||||
<input
|
|
||||||
type="email"
|
|
||||||
value={email}
|
|
||||||
readOnly
|
|
||||||
style={{ ...styles.input, backgroundColor: "#f0f0f0" }}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<button onClick={handleSave} style={styles.button}>
|
|
||||||
Speichern
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const styles: { [key: string]: React.CSSProperties } = {
|
|
||||||
container: {
|
|
||||||
maxWidth: "400px",
|
|
||||||
margin: "50px auto",
|
|
||||||
padding: "20px",
|
|
||||||
border: "1px solid #ccc",
|
|
||||||
borderRadius: "8px",
|
|
||||||
backgroundColor: "#fff",
|
|
||||||
boxShadow: "0 0 10px rgba(0,0,0,0.1)",
|
|
||||||
},
|
|
||||||
label: {
|
|
||||||
display: "block",
|
|
||||||
fontSize: "16px",
|
|
||||||
marginBottom: "5px",
|
|
||||||
},
|
|
||||||
input: {
|
|
||||||
width: "100%",
|
|
||||||
padding: "10px",
|
|
||||||
marginBottom: "15px",
|
|
||||||
border: "1px solid #ccc",
|
|
||||||
borderRadius: "5px",
|
|
||||||
},
|
|
||||||
button: {
|
|
||||||
width: "100%",
|
|
||||||
padding: "12px",
|
|
||||||
backgroundColor: "#007bff",
|
|
||||||
color: "#fff",
|
|
||||||
border: "none",
|
|
||||||
borderRadius: "5px",
|
|
||||||
fontSize: "16px",
|
|
||||||
cursor: "pointer",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export default EditProfileScreen;
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
|
|
||||||
// Dummy HomeScreen – Beispielkomponente
|
|
||||||
const HomeScreen = () => {
|
|
||||||
return (
|
|
||||||
<div style={{ display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }}>
|
|
||||||
<p>Home Screen</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default HomeScreen;
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
|
||||||
import { useNavigate, useParams } from "react-router-dom";
|
|
||||||
import axios from "axios";
|
|
||||||
|
|
||||||
interface Recipe {
|
|
||||||
id: number;
|
|
||||||
name: string;
|
|
||||||
category: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
const LibraryScreen = () => {
|
|
||||||
const [favorites, setFavorites] = useState<Recipe[]>([]);
|
|
||||||
const [ownRecipes, setOwnRecipes] = useState<Recipe[]>([]);
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { userId } = useParams<{ userId: string }>(); // expects userId from route like /library/:userId
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
fetchRecipes();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const fetchRecipes = async () => {
|
|
||||||
try {
|
|
||||||
const favoriteResponse = await axios.get(`http://localhost:8080/api/recipes/favorites/${userId}`);
|
|
||||||
const ownResponse = await axios.get(`http://localhost:8080/api/recipes/user/${userId}`);
|
|
||||||
|
|
||||||
setFavorites(favoriteResponse.data);
|
|
||||||
setOwnRecipes(ownResponse.data);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Fehler beim Laden der Rezepte:", error);
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderRecipe = (recipe: Recipe) => (
|
|
||||||
<div
|
|
||||||
key={recipe.id}
|
|
||||||
onClick={() => navigate(`/recipes/${recipe.id}`)}
|
|
||||||
style={styles.recipeCard}
|
|
||||||
>
|
|
||||||
<h4 style={{ margin: 0 }}>{recipe.name}</h4>
|
|
||||||
<p style={{ margin: 0, color: "#555" }}>{recipe.category}</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
if (loading) {
|
|
||||||
return <div style={styles.loading}>Lade Rezepte...</div>;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div style={styles.container}>
|
|
||||||
<h2>Favorisierte Rezepte</h2>
|
|
||||||
{favorites.length === 0 ? (
|
|
||||||
<p>Keine Favoriten gefunden.</p>
|
|
||||||
) : (
|
|
||||||
favorites.map(renderRecipe)
|
|
||||||
)}
|
|
||||||
|
|
||||||
<h2 style={{ marginTop: 30 }}>Eigene Rezepte</h2>
|
|
||||||
{ownRecipes.length === 0 ? (
|
|
||||||
<p>Du hast noch keine eigenen Rezepte.</p>
|
|
||||||
) : (
|
|
||||||
ownRecipes.map(renderRecipe)
|
|
||||||
)}
|
|
||||||
|
|
||||||
<button style={styles.createButton} onClick={() => navigate("/create-recipe")}>
|
|
||||||
Neues Rezept erstellen
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const styles: { [key: string]: React.CSSProperties } = {
|
|
||||||
container: {
|
|
||||||
maxWidth: 800,
|
|
||||||
margin: "40px auto",
|
|
||||||
padding: 20,
|
|
||||||
fontFamily: "Arial, sans-serif",
|
|
||||||
},
|
|
||||||
loading: {
|
|
||||||
textAlign: "center",
|
|
||||||
padding: 40,
|
|
||||||
fontSize: 18,
|
|
||||||
},
|
|
||||||
recipeCard: {
|
|
||||||
borderBottom: "1px solid #ddd",
|
|
||||||
padding: "10px 0",
|
|
||||||
cursor: "pointer",
|
|
||||||
},
|
|
||||||
createButton: {
|
|
||||||
marginTop: 30,
|
|
||||||
padding: "12px 20px",
|
|
||||||
backgroundColor: "#007bff",
|
|
||||||
color: "white",
|
|
||||||
border: "none",
|
|
||||||
borderRadius: 5,
|
|
||||||
fontSize: 16,
|
|
||||||
cursor: "pointer",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export default LibraryScreen;
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
import { useState } from "react";
|
|
||||||
import { useNavigate } from "react-router-dom";
|
|
||||||
import { loginUser } from "../services/authService";
|
|
||||||
import { colors, spacing, radii, fontSizes } from "../theme";
|
|
||||||
|
|
||||||
const LoginScreen = () => {
|
|
||||||
const [email, setEmail] = useState("");
|
|
||||||
const [password, setPassword] = useState("");
|
|
||||||
const navigate = useNavigate();
|
|
||||||
|
|
||||||
const handleLogin = async () => {
|
|
||||||
try {
|
|
||||||
const token = await loginUser(email, password);
|
|
||||||
if (token) {
|
|
||||||
console.log("Login erfolgreich!", token);
|
|
||||||
|
|
||||||
// Token im localStorage speichern (Web)
|
|
||||||
localStorage.setItem("authToken", token);
|
|
||||||
|
|
||||||
// Navigation zur Home-Seite
|
|
||||||
navigate("/home");
|
|
||||||
} else {
|
|
||||||
console.log("Login fehlgeschlagen");
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Fehler beim Login:", error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div style={styles.wrapper}>
|
|
||||||
<div style={styles.container}>
|
|
||||||
<h2 style={styles.title}>Login</h2>
|
|
||||||
|
|
||||||
<input
|
|
||||||
type="email"
|
|
||||||
placeholder="E-Mail"
|
|
||||||
value={email}
|
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
|
||||||
style={styles.input}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
placeholder="Passwort"
|
|
||||||
value={password}
|
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
|
||||||
style={styles.input}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<button onClick={handleLogin} style={styles.button}>
|
|
||||||
Einloggen
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<p style={styles.linkText} onClick={() => navigate("/register")}>
|
|
||||||
Noch kein Konto? Registrieren
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const styles: { [key: string]: React.CSSProperties } = {
|
|
||||||
wrapper: {
|
|
||||||
display: "flex",
|
|
||||||
alignItems: "center",
|
|
||||||
justifyContent: "center",
|
|
||||||
height: "100vh", // ganzer Viewport
|
|
||||||
width: "100vw",
|
|
||||||
backgroundColor: colors.background, // optional für Theme-Kontrast
|
|
||||||
},
|
|
||||||
container: {
|
|
||||||
display: "flex",
|
|
||||||
flexDirection: "column",
|
|
||||||
justifyContent: "center",
|
|
||||||
maxWidth: "400px",
|
|
||||||
width: "90%",
|
|
||||||
margin: "10vh auto",
|
|
||||||
padding: spacing.lg,
|
|
||||||
backgroundColor: colors.surface,
|
|
||||||
border: `1px solid ${colors.border}`,
|
|
||||||
borderRadius: radii.lg,
|
|
||||||
boxShadow: "0 4px 12px rgba(0,0,0,0.05)",
|
|
||||||
},
|
|
||||||
title: {
|
|
||||||
fontSize: fontSizes.xl,
|
|
||||||
marginBottom: spacing.md,
|
|
||||||
textAlign: "center",
|
|
||||||
color: colors.text,
|
|
||||||
},
|
|
||||||
input: {
|
|
||||||
padding: spacing.md,
|
|
||||||
marginBottom: spacing.sm,
|
|
||||||
borderRadius: radii.md,
|
|
||||||
border: `1px solid ${colors.border}`,
|
|
||||||
fontSize: fontSizes.md,
|
|
||||||
},
|
|
||||||
button: {
|
|
||||||
padding: spacing.md,
|
|
||||||
backgroundColor: colors.primary,
|
|
||||||
color: "#fff",
|
|
||||||
border: "none",
|
|
||||||
borderRadius: radii.md,
|
|
||||||
cursor: "pointer",
|
|
||||||
fontSize: fontSizes.md,
|
|
||||||
marginTop: spacing.sm,
|
|
||||||
},
|
|
||||||
linkText: {
|
|
||||||
marginTop: spacing.sm,
|
|
||||||
color: colors.primary,
|
|
||||||
textAlign: "center",
|
|
||||||
cursor: "pointer",
|
|
||||||
fontSize: fontSizes.sm,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export default LoginScreen;
|
|
||||||
@ -1,120 +0,0 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
|
||||||
import { jwtDecode } from "jwt-decode";
|
|
||||||
import { useNavigate } from "react-router-dom";
|
|
||||||
|
|
||||||
const API_URL = "http://localhost:8080/users"; // Web: localhost statt 10.0.2.2
|
|
||||||
|
|
||||||
const ProfileScreen = () => {
|
|
||||||
const [user, setUser] = useState<{ username: string; email: string } | null>(null);
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
const navigate = useNavigate();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const fetchUserProfile = async () => {
|
|
||||||
const token = localStorage.getItem("authToken");
|
|
||||||
if (!token) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const decoded: any = jwtDecode(token);
|
|
||||||
const email = decoded.sub;
|
|
||||||
|
|
||||||
const response = await fetch(`${API_URL}/email/${email}`, {
|
|
||||||
method: "GET",
|
|
||||||
headers: {
|
|
||||||
Authorization: `Bearer ${token}`,
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) throw new Error("Fehler beim Laden");
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
setUser(data);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Fehler beim Laden:", error);
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
fetchUserProfile();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
if (loading) return <div style={styles.loader}>Lade Profil...</div>;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div style={styles.container}>
|
|
||||||
{/* Header */}
|
|
||||||
<div style={styles.headerRow}>
|
|
||||||
<h2 style={styles.welcomeText}>Hi, {user?.username || "User"}!</h2>
|
|
||||||
<button
|
|
||||||
style={styles.settingsButton}
|
|
||||||
onClick={() => alert("Settings-Funktion folgt")}
|
|
||||||
>
|
|
||||||
⚙️
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Bearbeiten */}
|
|
||||||
<div style={{ marginTop: 30 }}>
|
|
||||||
<button style={styles.editButton} onClick={() => navigate("/edit-profile")}>
|
|
||||||
Profil bearbeiten
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Placeholder für Inhalte */}
|
|
||||||
<div style={styles.placeholder}>
|
|
||||||
<p>Hier kommen später Rezepte.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const styles: { [key: string]: React.CSSProperties } = {
|
|
||||||
container: {
|
|
||||||
maxWidth: "600px",
|
|
||||||
margin: "50px auto",
|
|
||||||
padding: "20px",
|
|
||||||
border: "1px solid #ddd",
|
|
||||||
borderRadius: "10px",
|
|
||||||
backgroundColor: "#f9f9f9",
|
|
||||||
},
|
|
||||||
loader: {
|
|
||||||
display: "flex",
|
|
||||||
justifyContent: "center",
|
|
||||||
alignItems: "center",
|
|
||||||
height: "100vh",
|
|
||||||
fontSize: "20px",
|
|
||||||
},
|
|
||||||
headerRow: {
|
|
||||||
display: "flex",
|
|
||||||
justifyContent: "space-between",
|
|
||||||
alignItems: "center",
|
|
||||||
},
|
|
||||||
welcomeText: {
|
|
||||||
fontSize: "24px",
|
|
||||||
fontWeight: "bold",
|
|
||||||
},
|
|
||||||
settingsButton: {
|
|
||||||
fontSize: "20px",
|
|
||||||
background: "none",
|
|
||||||
border: "none",
|
|
||||||
cursor: "pointer",
|
|
||||||
},
|
|
||||||
editButton: {
|
|
||||||
padding: "10px 20px",
|
|
||||||
fontSize: "16px",
|
|
||||||
backgroundColor: "#007bff",
|
|
||||||
color: "#fff",
|
|
||||||
border: "none",
|
|
||||||
borderRadius: "5px",
|
|
||||||
cursor: "pointer",
|
|
||||||
},
|
|
||||||
placeholder: {
|
|
||||||
marginTop: 40,
|
|
||||||
textAlign: "center",
|
|
||||||
color: "#555",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ProfileScreen;
|
|
||||||
@ -1,124 +0,0 @@
|
|||||||
import { useState } from "react";
|
|
||||||
import { useNavigate } from "react-router-dom";
|
|
||||||
import { registerUser } from "../services/authService";
|
|
||||||
|
|
||||||
const RegistrationScreen = () => {
|
|
||||||
const [username, setUsername] = useState("");
|
|
||||||
const [email, setEmail] = useState("");
|
|
||||||
const [password, setPassword] = useState("");
|
|
||||||
const [confirmPassword, setConfirmPassword] = useState("");
|
|
||||||
const [errorMessage, setErrorMessage] = useState("");
|
|
||||||
const navigate = useNavigate();
|
|
||||||
|
|
||||||
const handleRegister = async () => {
|
|
||||||
if (password !== confirmPassword) {
|
|
||||||
setErrorMessage("Passwörter stimmen nicht überein.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const result = await registerUser(email, password, username);
|
|
||||||
if (result) {
|
|
||||||
console.log("Registrierung erfolgreich!");
|
|
||||||
navigate("/login");
|
|
||||||
} else {
|
|
||||||
setErrorMessage("Registrierung fehlgeschlagen.");
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Fehler bei der Registrierung:", error);
|
|
||||||
setErrorMessage("Es gab ein Problem bei der Registrierung.");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div style={styles.container}>
|
|
||||||
<h2 style={styles.title}>Registrierung</h2>
|
|
||||||
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
placeholder="Username"
|
|
||||||
value={username}
|
|
||||||
onChange={(e) => setUsername(e.target.value)}
|
|
||||||
style={styles.input}
|
|
||||||
/>
|
|
||||||
<input
|
|
||||||
type="email"
|
|
||||||
placeholder="E-Mail"
|
|
||||||
value={email}
|
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
|
||||||
style={styles.input}
|
|
||||||
/>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
placeholder="Passwort"
|
|
||||||
value={password}
|
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
|
||||||
style={styles.input}
|
|
||||||
/>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
placeholder="Passwort bestätigen"
|
|
||||||
value={confirmPassword}
|
|
||||||
onChange={(e) => setConfirmPassword(e.target.value)}
|
|
||||||
style={styles.input}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errorMessage && <p style={styles.errorText}>{errorMessage}</p>}
|
|
||||||
|
|
||||||
<button onClick={handleRegister} style={styles.button}>
|
|
||||||
Registrieren
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<p onClick={() => navigate("/login")} style={styles.linkText}>
|
|
||||||
Schon ein Konto? Einloggen
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const styles: { [key: string]: React.CSSProperties } = {
|
|
||||||
container: {
|
|
||||||
display: "flex",
|
|
||||||
flexDirection: "column",
|
|
||||||
maxWidth: "400px",
|
|
||||||
margin: "100px auto",
|
|
||||||
padding: "20px",
|
|
||||||
border: "1px solid #ccc",
|
|
||||||
borderRadius: "8px",
|
|
||||||
boxShadow: "0 0 10px rgba(0, 0, 0, 0.1)",
|
|
||||||
},
|
|
||||||
title: {
|
|
||||||
fontSize: "24px",
|
|
||||||
marginBottom: "20px",
|
|
||||||
textAlign: "center",
|
|
||||||
},
|
|
||||||
input: {
|
|
||||||
padding: "10px",
|
|
||||||
marginBottom: "10px",
|
|
||||||
borderRadius: "5px",
|
|
||||||
border: "1px solid #ccc",
|
|
||||||
fontSize: "16px",
|
|
||||||
},
|
|
||||||
button: {
|
|
||||||
padding: "10px",
|
|
||||||
backgroundColor: "#007bff",
|
|
||||||
color: "#fff",
|
|
||||||
border: "none",
|
|
||||||
borderRadius: "5px",
|
|
||||||
cursor: "pointer",
|
|
||||||
fontSize: "16px",
|
|
||||||
},
|
|
||||||
linkText: {
|
|
||||||
marginTop: "10px",
|
|
||||||
color: "#007bff",
|
|
||||||
textAlign: "center",
|
|
||||||
cursor: "pointer",
|
|
||||||
},
|
|
||||||
errorText: {
|
|
||||||
color: "red",
|
|
||||||
textAlign: "center",
|
|
||||||
marginBottom: "10px",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export default RegistrationScreen;
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
import {useEffect, useState} from "react";
|
|
||||||
import {Routes, Route, Navigate, Link} from "react-router-dom";
|
|
||||||
import {jwtDecode} from "jwt-decode";
|
|
||||||
|
|
||||||
import Home from "../screens/Home";
|
|
||||||
import LoginScreen from "../screens/LoginScreen";
|
|
||||||
import RegisterScreen from "../screens/RegisterScreen";
|
|
||||||
import Profile from "../screens/Profile";
|
|
||||||
import EditProfileScreen from "../screens/EditProfileScreen";
|
|
||||||
import LibraryScreen from "../screens/LibraryScreen";
|
|
||||||
|
|
||||||
import {MdHome, MdList, MdPerson} from "react-icons/md"; // Web Icons
|
|
||||||
|
|
||||||
// Token validieren mit localStorage
|
|
||||||
const isTokenValid = () => {
|
|
||||||
const token = localStorage.getItem("authToken");
|
|
||||||
if (!token) return false;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const decoded: any = jwtDecode(token);
|
|
||||||
return decoded.exp && decoded.exp > Math.floor(Date.now() / 1000);
|
|
||||||
} catch (error) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Web-basierte BottomTabs
|
|
||||||
const BottomTabs = () => (
|
|
||||||
<nav style={{display: "flex", gap: 20, justifyContent: "center", marginBottom: 20}}>
|
|
||||||
<Link to="/"><MdHome size={24}/> Home</Link>
|
|
||||||
<Link to="/library"><MdList size={24}/> Library</Link>
|
|
||||||
<Link to="/profile"><MdPerson size={24}/> Profile</Link>
|
|
||||||
</nav>
|
|
||||||
);
|
|
||||||
|
|
||||||
const AppNavigator = () => {
|
|
||||||
const [isLoggedIn, setIsLoggedIn] = useState<boolean | null>(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setIsLoggedIn(isTokenValid());
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
if (isLoggedIn === null) {
|
|
||||||
return (
|
|
||||||
<div style={{textAlign: "center", marginTop: "2rem"}}>
|
|
||||||
<p>Loading...</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isLoggedIn) {
|
|
||||||
return (
|
|
||||||
<Routes>
|
|
||||||
<Route path="/login" element={<LoginScreen/>}/>
|
|
||||||
<Route path="/register" element={<RegisterScreen/>}/>
|
|
||||||
<Route path="*" element={<Navigate to="/login"/>}/>
|
|
||||||
</Routes>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<BottomTabs/>
|
|
||||||
<Routes>
|
|
||||||
<Route path="/" element={<Home/>}/>
|
|
||||||
<Route path="/library" element={<LibraryScreen/>}/>
|
|
||||||
<Route path="/profile" element={<Profile/>}/>
|
|
||||||
<Route path="/edit-profile" element={<EditProfileScreen/>}/>
|
|
||||||
<Route path="*" element={<Navigate to="/"/>}/>
|
|
||||||
</Routes>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default AppNavigator;
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
const API_URL = "http://localhost:8080/api/auth";
|
|
||||||
export const loginUser = async (email: string, password: string) => {
|
|
||||||
try {
|
|
||||||
const response = await fetch(`${API_URL}/login`, {
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json"
|
|
||||||
},
|
|
||||||
body: JSON.stringify({email, password})
|
|
||||||
});
|
|
||||||
const data = await response.json();
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error("Login fehlgeschlagen");
|
|
||||||
}
|
|
||||||
|
|
||||||
return data.token; // Token zurückgeben
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Fehler beim Login:", error);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
export const registerUser = async (email: string, password: string, username: string) => {
|
|
||||||
try {
|
|
||||||
// Die Daten, die an das Backend gesendet werden
|
|
||||||
const userData = {email, password, username};
|
|
||||||
|
|
||||||
// Anfrage an das Backend
|
|
||||||
const response = await fetch(`${API_URL}/register`, {
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
body: JSON.stringify(userData),
|
|
||||||
});
|
|
||||||
|
|
||||||
// Überprüfen, ob die Antwort erfolgreich war
|
|
||||||
if (!response.ok) {
|
|
||||||
const errorMessage = await response.text();
|
|
||||||
throw new Error(errorMessage); // Beispiel für Fehlermeldung, falls E-Mail oder Username bereits vergeben
|
|
||||||
}
|
|
||||||
|
|
||||||
return userData // Erfolgreiche Antwort, z.B. der neue User
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Fehler bei der Registrierung:", error);
|
|
||||||
throw error; // Fehler weitergeben, damit der Benutzer entsprechend reagieren kann
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
// theme.ts
|
|
||||||
|
|
||||||
export const colors = {
|
|
||||||
primary: "#007bff",
|
|
||||||
primaryDark: "#0056b3",
|
|
||||||
background: "#f5f5f5",
|
|
||||||
surface: "#ffffff",
|
|
||||||
text: "#333333",
|
|
||||||
muted: "#666666",
|
|
||||||
border: "#cccccc",
|
|
||||||
error: "#ff4d4f",
|
|
||||||
};
|
|
||||||
|
|
||||||
export const spacing = {
|
|
||||||
xs: 4,
|
|
||||||
sm: 8,
|
|
||||||
md: 16,
|
|
||||||
lg: 24,
|
|
||||||
xl: 32,
|
|
||||||
};
|
|
||||||
|
|
||||||
export const radii = {
|
|
||||||
sm: 4,
|
|
||||||
md: 8,
|
|
||||||
lg: 12,
|
|
||||||
xl: 20,
|
|
||||||
};
|
|
||||||
|
|
||||||
export const fontSizes = {
|
|
||||||
sm: 14,
|
|
||||||
md: 16,
|
|
||||||
lg: 20,
|
|
||||||
xl: 28,
|
|
||||||
};
|
|
||||||
1
frontend/src/vite-env.d.ts
vendored
1
frontend/src/vite-env.d.ts
vendored
@ -1 +0,0 @@
|
|||||||
/// <reference types="vite/client" />
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
|
||||||
"target": "ES2020",
|
|
||||||
"useDefineForClassFields": true,
|
|
||||||
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
|
||||||
"module": "ESNext",
|
|
||||||
"skipLibCheck": true,
|
|
||||||
|
|
||||||
/* Bundler mode */
|
|
||||||
"moduleResolution": "bundler",
|
|
||||||
"allowImportingTsExtensions": true,
|
|
||||||
"verbatimModuleSyntax": true,
|
|
||||||
"moduleDetection": "force",
|
|
||||||
"noEmit": true,
|
|
||||||
"jsx": "react-jsx",
|
|
||||||
|
|
||||||
/* Linting */
|
|
||||||
"strict": true,
|
|
||||||
"noUnusedLocals": true,
|
|
||||||
"noUnusedParameters": true,
|
|
||||||
"erasableSyntaxOnly": true,
|
|
||||||
"noFallthroughCasesInSwitch": true,
|
|
||||||
"noUncheckedSideEffectImports": true
|
|
||||||
},
|
|
||||||
"include": ["src"]
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"files": [],
|
|
||||||
"references": [
|
|
||||||
{ "path": "./tsconfig.app.json" },
|
|
||||||
{ "path": "./tsconfig.node.json" }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
|
||||||
"target": "ES2022",
|
|
||||||
"lib": ["ES2023"],
|
|
||||||
"module": "ESNext",
|
|
||||||
"skipLibCheck": true,
|
|
||||||
|
|
||||||
/* Bundler mode */
|
|
||||||
"moduleResolution": "bundler",
|
|
||||||
"allowImportingTsExtensions": true,
|
|
||||||
"verbatimModuleSyntax": true,
|
|
||||||
"moduleDetection": "force",
|
|
||||||
"noEmit": true,
|
|
||||||
|
|
||||||
/* Linting */
|
|
||||||
"strict": true,
|
|
||||||
"noUnusedLocals": true,
|
|
||||||
"noUnusedParameters": true,
|
|
||||||
"erasableSyntaxOnly": true,
|
|
||||||
"noFallthroughCasesInSwitch": true,
|
|
||||||
"noUncheckedSideEffectImports": true
|
|
||||||
},
|
|
||||||
"include": ["vite.config.ts"]
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
import { defineConfig } from 'vite'
|
|
||||||
import react from '@vitejs/plugin-react'
|
|
||||||
|
|
||||||
// https://vite.dev/config/
|
|
||||||
export default defineConfig({
|
|
||||||
plugins: [react()],
|
|
||||||
server: {
|
|
||||||
proxy: {
|
|
||||||
'/api': {
|
|
||||||
target: 'http://localhost:8080',
|
|
||||||
secure: false,
|
|
||||||
changeOrigin: true,
|
|
||||||
ws: true,
|
|
||||||
/*configure: (proxy) => {
|
|
||||||
proxy.on('error', (err, _req, _res) => {
|
|
||||||
console.error(err);
|
|
||||||
})
|
|
||||||
proxy.on('proxyReq', (_proxyReq, req, _res) => {
|
|
||||||
console.log("Anfrage an Proxy: ", req.method, req.url);
|
|
||||||
})
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
0
backend/mvnw → mvnw
vendored
0
backend/mvnw → mvnw
vendored
0
backend/mvnw.cmd → mvnw.cmd
vendored
0
backend/mvnw.cmd → mvnw.cmd
vendored
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
@ -1,7 +1,6 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
@ -1,4 +1,5 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
13
src/main/java/com/example/hangry/HangryApplication.java
Normal file
13
src/main/java/com/example/hangry/HangryApplication.java
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
package com.example.hangry;
|
||||||
|
|
||||||
|
import org.springframework.boot.SpringApplication;
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
public class HangryApplication {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
SpringApplication.run(HangryApplication.class, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
@ -1,7 +1,5 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
public interface LikeRepository extends JpaRepository<Like, Long> {
|
public interface LikeRepository extends JpaRepository<Like, Long> {
|
||||||
boolean existsByUserAndRecipe(User user, Recipe recipe);
|
boolean existsByUserAndRecipe(User user, Recipe recipe);
|
||||||
81
src/main/java/com/example/hangry/Recipe.java
Normal file
81
src/main/java/com/example/hangry/Recipe.java
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
package com.example.hangry;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
public class Recipe {
|
||||||
|
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
private String description;
|
||||||
|
private String category;
|
||||||
|
private String imageUrl;
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
private List<RecipeIngredient> recipeIngredients;
|
||||||
|
|
||||||
|
public Recipe() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Recipe(String name, String description, String category, String imageUrl) {
|
||||||
|
this.name = name;
|
||||||
|
this.description = description;
|
||||||
|
this.category = category;
|
||||||
|
this.imageUrl = imageUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Getter und Setter
|
||||||
|
public Long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDescription(String description) {
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCategory() {
|
||||||
|
return category;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCategory(String category) {
|
||||||
|
this.category = category;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getImageUrl() {
|
||||||
|
return imageUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setImageUrl(String imageUrl) {
|
||||||
|
this.imageUrl = imageUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<RecipeIngredient> getRecipeIngredients() {
|
||||||
|
return recipeIngredients;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRecipeIngredients(List<RecipeIngredient> recipeIngredients) {
|
||||||
|
this.recipeIngredients = recipeIngredients;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
@ -6,15 +6,10 @@ import org.springframework.data.jpa.repository.JpaRepository;
|
|||||||
import org.springframework.data.jpa.repository.Query;
|
import org.springframework.data.jpa.repository.Query;
|
||||||
import org.springframework.data.repository.query.Param;
|
import org.springframework.data.repository.query.Param;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public interface RecipeRepository extends JpaRepository<Recipe, Long> {
|
public interface RecipeRepository extends JpaRepository<Recipe, Long> {
|
||||||
// Filtert Rezepte nach Kategorie (z. B. vegan, vegetarisch, einfach)
|
// Filtert Rezepte nach Kategorie (z. B. vegan, vegetarisch, einfach)
|
||||||
Page<Recipe> findByCategoryIgnoreCase(String category, Pageable pageable);
|
Page<Recipe> findByCategoryIgnoreCase(String category, Pageable pageable);
|
||||||
|
|
||||||
Page<Recipe> findByUser_Id(long userID, Pageable pageable);
|
|
||||||
List<Recipe> findByUser_Id(long userID);
|
|
||||||
|
|
||||||
// Sucht nach Rezepten, die eine bestimmte Zutat enthalten
|
// Sucht nach Rezepten, die eine bestimmte Zutat enthalten
|
||||||
@Query("SELECT r FROM Recipe r JOIN r.recipeIngredients i WHERE LOWER(i.ingredient.name) LIKE LOWER(CONCAT('%', :ingredient, '%'))")
|
@Query("SELECT r FROM Recipe r JOIN r.recipeIngredients i WHERE LOWER(i.ingredient.name) LIKE LOWER(CONCAT('%', :ingredient, '%'))")
|
||||||
Page<Recipe> findByIngredient(@Param("ingredient") String ingredient, Pageable pageable);
|
Page<Recipe> findByIngredient(@Param("ingredient") String ingredient, Pageable pageable);
|
||||||
@ -1,7 +1,6 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -1,17 +1,15 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface UserRepository extends JpaRepository<User, Long> {
|
public interface UserRepository extends JpaRepository<User, Long> {
|
||||||
|
|
||||||
// Benutzerdefinierte Abfrage: Benutzer nach Benutzernamen finden
|
// Benutzerdefinierte Abfrage: Benutzer nach Benutzernamen finden
|
||||||
Optional<User> findByUsername(String username);
|
User findByUsername(String username);
|
||||||
|
|
||||||
// Benutzerdefinierte Abfrage: Benutzer nach E-Mail finden
|
// Benutzerdefinierte Abfrage: Benutzer nach E-Mail finden
|
||||||
Optional<User> findByEmail(String email);
|
User findByEmail(String email);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1,11 +1,10 @@
|
|||||||
package com.example.backend.controller;
|
package com.example.hangry.controller;
|
||||||
|
|
||||||
import com.example.backend.User;
|
import com.example.hangry.User;
|
||||||
import com.example.backend.services.JwtService;
|
import com.example.hangry.services.UserService;
|
||||||
import com.example.backend.services.UserService;
|
import com.example.hangry.services.JwtService;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
|
|
||||||
@ -1,12 +1,10 @@
|
|||||||
package com.example.backend.controller;
|
package com.example.hangry.controller;
|
||||||
|
|
||||||
import com.example.backend.Group;
|
|
||||||
import com.example.backend.User;
|
|
||||||
import com.example.backend.services.GroupService;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import com.example.hangry.*;
|
||||||
|
import com.example.hangry.services.GroupService;
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/groups")
|
@RequestMapping("/api/groups")
|
||||||
@CrossOrigin(origins = "*")
|
@CrossOrigin(origins = "*")
|
||||||
@ -1,13 +1,15 @@
|
|||||||
package com.example.backend.controller;
|
package com.example.hangry.controller;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import com.example.backend.Recipe;
|
|
||||||
import com.example.backend.services.GroupRecipeService;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import com.example.hangry.services.GroupRecipeService;
|
||||||
|
import com.example.hangry.*;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/group-recipes")
|
@RequestMapping("/api/group-recipes")
|
||||||
@CrossOrigin(origins = "*")
|
@CrossOrigin(origins = "*")
|
||||||
@ -1,13 +1,12 @@
|
|||||||
package com.example.backend.controller;
|
package com.example.hangry.controller;
|
||||||
|
|
||||||
import com.example.backend.Ingredient;
|
|
||||||
import com.example.backend.services.IngredientService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import java.util.*;
|
||||||
import java.util.List;
|
import com.example.hangry.*;
|
||||||
|
import com.example.hangry.services.IngredientService;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/ingredients")
|
@RequestMapping("/api/ingredients")
|
||||||
@ -1,11 +1,10 @@
|
|||||||
package com.example.backend.controller;
|
package com.example.hangry.controller;
|
||||||
|
|
||||||
import com.example.backend.Recipe;
|
|
||||||
import com.example.backend.services.LikeService;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import com.example.hangry.*;
|
||||||
|
import com.example.hangry.services.LikeService;
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/likes")
|
@RequestMapping("/api/likes")
|
||||||
@CrossOrigin(origins = "*")
|
@CrossOrigin(origins = "*")
|
||||||
@ -1,14 +1,14 @@
|
|||||||
package com.example.backend.controller;
|
package com.example.hangry.controller;
|
||||||
|
|
||||||
import com.example.backend.Recipe;
|
|
||||||
import com.example.backend.services.RecipeService;
|
|
||||||
import org.springframework.data.domain.Page;
|
|
||||||
import org.springframework.data.domain.Pageable;
|
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import com.example.hangry.*;
|
||||||
|
import com.example.hangry.services.RecipeService;
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/api/recipes")
|
@RequestMapping("/api/recipes")
|
||||||
@CrossOrigin(origins = "*") // Erlaubt CORS für alle Domains, kann angepasst werden
|
@CrossOrigin(origins = "*") // Erlaubt CORS für alle Domains, kann angepasst werden
|
||||||
@ -32,12 +32,6 @@ public class RecipeController {
|
|||||||
Optional<Recipe> recipe = recipeService.getRecipeById(id);
|
Optional<Recipe> recipe = recipeService.getRecipeById(id);
|
||||||
return recipe.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
|
return recipe.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
|
||||||
}
|
}
|
||||||
// Endpunkt: Eigene Rezepte abrufen
|
|
||||||
@GetMapping("/user/{userId}")
|
|
||||||
public Page<Recipe> getRecipesByUser(@PathVariable Long userId, Pageable pageable) {
|
|
||||||
return recipeService.getRecipesByUser(userId, pageable);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Neues Rezept erstellen
|
// Neues Rezept erstellen
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@ -1,9 +1,9 @@
|
|||||||
package com.example.backend.controller;
|
package com.example.hangry.controller;
|
||||||
|
|
||||||
import com.example.backend.User;
|
|
||||||
import com.example.backend.services.UserService;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import com.example.hangry.*;
|
||||||
|
import com.example.hangry.services.UserService;
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/users")
|
@RequestMapping("/users")
|
||||||
public class UserController {
|
public class UserController {
|
||||||
@ -31,12 +31,4 @@ public class UserController {
|
|||||||
public User getUserByEmail(@PathVariable String email) {
|
public User getUserByEmail(@PathVariable String email) {
|
||||||
return userService.getUserByEmail(email);
|
return userService.getUserByEmail(email);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Endpunkt: Benutzer aktualisieren
|
|
||||||
@PutMapping("/update/email/{email}")
|
|
||||||
public User updateUser(@PathVariable String email, @RequestBody User updatedUser) {
|
|
||||||
return userService.updateUser(email, updatedUser);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1,15 +1,17 @@
|
|||||||
package com.example.backend.security;
|
package com.example.hangry.security;
|
||||||
|
|
||||||
import com.example.backend.User;
|
import com.example.hangry.User;
|
||||||
import com.example.backend.UserRepository;
|
import com.example.hangry.UserRepository;
|
||||||
import com.example.backend.exceptions.UserNotFoundException;
|
import com.example.hangry.services.JwtService;
|
||||||
import com.example.backend.services.JwtService;
|
|
||||||
import jakarta.servlet.FilterChain;
|
import jakarta.servlet.FilterChain;
|
||||||
import jakarta.servlet.ServletException;
|
import jakarta.servlet.ServletException;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
|
import org.springframework.security.core.userdetails.UserDetails;
|
||||||
|
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||||
|
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.web.filter.OncePerRequestFilter;
|
import org.springframework.web.filter.OncePerRequestFilter;
|
||||||
|
|
||||||
@ -37,7 +39,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
|
|||||||
String token = authHeader.substring(7);
|
String token = authHeader.substring(7);
|
||||||
String email = jwtService.extractEmail(token);
|
String email = jwtService.extractEmail(token);
|
||||||
if (email != null && SecurityContextHolder.getContext().getAuthentication() == null) {
|
if (email != null && SecurityContextHolder.getContext().getAuthentication() == null) {
|
||||||
User user = userRepository.findByEmail(email).orElseThrow(() -> new UserNotFoundException("User not found"));
|
User user = userRepository.findByEmail(email);
|
||||||
if (user != null && jwtService.validateToken(token, user)) {
|
if (user != null && jwtService.validateToken(token, user)) {
|
||||||
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(user, null, new ArrayList<>());
|
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(user, null, new ArrayList<>());
|
||||||
SecurityContextHolder.getContext().setAuthentication(authentication);
|
SecurityContextHolder.getContext().setAuthentication(authentication);
|
||||||
@ -1,12 +1,12 @@
|
|||||||
package com.example.backend.security;
|
package com.example.hangry.security;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
||||||
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
|
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
|
||||||
import org.springframework.security.config.http.SessionCreationPolicy;
|
|
||||||
import org.springframework.security.web.SecurityFilterChain;
|
import org.springframework.security.web.SecurityFilterChain;
|
||||||
|
import org.springframework.security.config.http.SessionCreationPolicy;
|
||||||
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
|
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@ -1,10 +1,9 @@
|
|||||||
package com.example.backend.services;
|
package com.example.hangry.services;
|
||||||
|
|
||||||
import com.example.backend.*;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import com.example.hangry.*;
|
||||||
@Service
|
@Service
|
||||||
public class GroupRecipeService {
|
public class GroupRecipeService {
|
||||||
|
|
||||||
@ -1,12 +1,8 @@
|
|||||||
package com.example.backend.services;
|
package com.example.hangry.services;
|
||||||
|
|
||||||
import com.example.backend.Group;
|
|
||||||
import com.example.backend.GroupRepository;
|
|
||||||
import com.example.backend.User;
|
|
||||||
import com.example.backend.UserRepository;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import com.example.hangry.*;
|
||||||
@Service
|
@Service
|
||||||
public class GroupService {
|
public class GroupService {
|
||||||
|
|
||||||
@ -1,14 +1,9 @@
|
|||||||
package com.example.backend.services;
|
package com.example.hangry.services;
|
||||||
|
|
||||||
import com.example.backend.Ingredient;
|
|
||||||
import com.example.backend.IngredientRepository;
|
|
||||||
import com.example.backend.User;
|
|
||||||
import com.example.backend.UserRepository;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import java.util.*;
|
||||||
import java.util.List;
|
import com.example.hangry.*;
|
||||||
import java.util.Optional;
|
|
||||||
@Service
|
@Service
|
||||||
public class IngredientService {
|
public class IngredientService {
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.example.backend.services;
|
package com.example.hangry.services;
|
||||||
|
|
||||||
import com.example.backend.User;
|
import com.example.hangry.User;
|
||||||
import io.jsonwebtoken.Claims;
|
import io.jsonwebtoken.Claims;
|
||||||
import io.jsonwebtoken.Jwts;
|
import io.jsonwebtoken.Jwts;
|
||||||
import io.jsonwebtoken.SignatureAlgorithm;
|
import io.jsonwebtoken.SignatureAlgorithm;
|
||||||
@ -1,10 +1,9 @@
|
|||||||
package com.example.backend.services;
|
package com.example.hangry.services;
|
||||||
|
|
||||||
import com.example.backend.*;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import com.example.hangry.*;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class LikeService {
|
public class LikeService {
|
||||||
@ -1,13 +1,11 @@
|
|||||||
package com.example.backend.services;
|
package com.example.hangry.services;
|
||||||
|
|
||||||
import com.example.backend.Recipe;
|
|
||||||
import com.example.backend.RecipeRepository;
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import com.example.hangry.*;
|
||||||
@Service
|
@Service
|
||||||
public class RecipeService {
|
public class RecipeService {
|
||||||
|
|
||||||
@ -63,9 +61,4 @@ public class RecipeService {
|
|||||||
return recipeRepository.findByIngredient(ingredient, pageable);
|
return recipeRepository.findByIngredient(ingredient, pageable);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Eigene Rezepte abrufen
|
|
||||||
public Page<Recipe> getRecipesByUser(Long userId, Pageable pageable) {
|
|
||||||
return recipeRepository.findByUser_Id(userId, pageable);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,11 +1,9 @@
|
|||||||
package com.example.backend.services;
|
package com.example.hangry.services;
|
||||||
|
|
||||||
import com.example.backend.User;
|
|
||||||
import com.example.backend.UserRepository;
|
|
||||||
import com.example.backend.exceptions.UserNotFoundException;
|
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import com.example.hangry.*;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class UserService {
|
public class UserService {
|
||||||
@ -27,26 +25,16 @@ public class UserService {
|
|||||||
|
|
||||||
// Benutzer anhand des Benutzernamens suchen
|
// Benutzer anhand des Benutzernamens suchen
|
||||||
public User getUserByUsername(String username) {
|
public User getUserByUsername(String username) {
|
||||||
return userRepository.findByUsername(username).orElse(null);
|
return userRepository.findByUsername(username);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Benutzer anhand der E-Mail suchen
|
// Benutzer anhand der E-Mail suchen
|
||||||
public User getUserByEmail(String email) {
|
public User getUserByEmail(String email) {
|
||||||
return userRepository.findByEmail(email).orElseThrow(()->new UserNotFoundException("User not found: "+email));
|
return userRepository.findByEmail(email);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Passwort überprüfen
|
// Passwort überprüfen
|
||||||
public boolean checkPassword(String rawPassword, String hashedPassword) {
|
public boolean checkPassword(String rawPassword, String hashedPassword) {
|
||||||
return passwordEncoder.matches(rawPassword, hashedPassword);
|
return passwordEncoder.matches(rawPassword, hashedPassword);
|
||||||
}
|
}
|
||||||
public User updateUser(String email, User updatedUser) {
|
|
||||||
User existingUser = userRepository.findByEmail(email)
|
|
||||||
.orElseThrow(() -> new UserNotFoundException("User not found: "+email));
|
|
||||||
|
|
||||||
existingUser.setUsername(updatedUser.getUsername());
|
|
||||||
// Weitere Felder falls nötig
|
|
||||||
|
|
||||||
return userRepository.save(existingUser);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.example.backend;
|
package com.example.hangry;
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
class BackendApplicationTests {
|
class HangryApplicationTests {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void contextLoads() {
|
void contextLoads() {
|
||||||
Loading…
x
Reference in New Issue
Block a user