dodanie szkieletu frontendu
This commit is contained in:
parent
43e77b3700
commit
85c43b34a4
14
.vscode/launch.json
vendored
Normal file
14
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Launch",
|
||||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "auto",
|
||||
"program": "${fileDirname}",
|
||||
"env": {},
|
||||
"args": []
|
||||
}
|
||||
]
|
||||
}
|
23
client/.gitignore
vendored
Normal file
23
client/.gitignore
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
/.pnp
|
||||
.pnp.js
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
# production
|
||||
/build
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
.env.local
|
||||
.env.development.local
|
||||
.env.test.local
|
||||
.env.production.local
|
||||
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
68
client/README.md
Normal file
68
client/README.md
Normal file
@ -0,0 +1,68 @@
|
||||
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
|
||||
|
||||
## Available Scripts
|
||||
|
||||
In the project directory, you can run:
|
||||
|
||||
### `npm start`
|
||||
|
||||
Runs the app in the development mode.<br>
|
||||
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
|
||||
|
||||
The page will reload if you make edits.<br>
|
||||
You will also see any lint errors in the console.
|
||||
|
||||
### `npm test`
|
||||
|
||||
Launches the test runner in the interactive watch mode.<br>
|
||||
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
|
||||
|
||||
### `npm run build`
|
||||
|
||||
Builds the app for production to the `build` folder.<br>
|
||||
It correctly bundles React in production mode and optimizes the build for the best performance.
|
||||
|
||||
The build is minified and the filenames include the hashes.<br>
|
||||
Your app is ready to be deployed!
|
||||
|
||||
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
|
||||
|
||||
### `npm run eject`
|
||||
|
||||
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
|
||||
|
||||
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
|
||||
|
||||
Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
|
||||
|
||||
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
|
||||
|
||||
## Learn More
|
||||
|
||||
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
|
||||
|
||||
To learn React, check out the [React documentation](https://reactjs.org/).
|
||||
|
||||
### Code Splitting
|
||||
|
||||
This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
|
||||
|
||||
### Analyzing the Bundle Size
|
||||
|
||||
This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
|
||||
|
||||
### Making a Progressive Web App
|
||||
|
||||
This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
|
||||
|
||||
### Advanced Configuration
|
||||
|
||||
This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
|
||||
|
||||
### Deployment
|
||||
|
||||
This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
|
||||
|
||||
### `npm run build` fails to minify
|
||||
|
||||
This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
|
15060
client/package-lock.json
generated
Normal file
15060
client/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
25
client/package.json
Normal file
25
client/package.json
Normal file
@ -0,0 +1,25 @@
|
||||
{
|
||||
"name": "client",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"react": "^16.7.0",
|
||||
"react-dom": "^16.7.0",
|
||||
"react-scripts": "2.1.2"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "react-app"
|
||||
},
|
||||
"browserslist": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not ie <= 11",
|
||||
"not op_mini all"
|
||||
]
|
||||
}
|
BIN
client/public/favicon.ico
Normal file
BIN
client/public/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.8 KiB |
41
client/public/index.html
Normal file
41
client/public/index.html
Normal file
@ -0,0 +1,41 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, initial-scale=1, shrink-to-fit=no"
|
||||
/>
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<!--
|
||||
manifest.json provides metadata used when your web app is added to the
|
||||
homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
||||
-->
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||
<!--
|
||||
Notice the use of %PUBLIC_URL% in the tags above.
|
||||
It will be replaced with the URL of the `public` folder during the build.
|
||||
Only files inside the `public` folder can be referenced from the HTML.
|
||||
|
||||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
|
||||
work correctly both with client-side routing and a non-root public URL.
|
||||
Learn how to configure a non-root public URL by running `npm run build`.
|
||||
-->
|
||||
<title>React App</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
<div id="root"></div>
|
||||
<!--
|
||||
This HTML file is a template.
|
||||
If you open it directly in the browser, you will see an empty page.
|
||||
|
||||
You can add webfonts, meta tags, or analytics to this file.
|
||||
The build step will place the bundled scripts into the <body> tag.
|
||||
|
||||
To begin the development, run `npm start` or `yarn start`.
|
||||
To create a production bundle, use `npm run build` or `yarn build`.
|
||||
-->
|
||||
</body>
|
||||
</html>
|
15
client/public/manifest.json
Normal file
15
client/public/manifest.json
Normal file
@ -0,0 +1,15 @@
|
||||
{
|
||||
"short_name": "React App",
|
||||
"name": "Create React App Sample",
|
||||
"icons": [
|
||||
{
|
||||
"src": "favicon.ico",
|
||||
"sizes": "64x64 32x32 24x24 16x16",
|
||||
"type": "image/x-icon"
|
||||
}
|
||||
],
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"theme_color": "#000000",
|
||||
"background_color": "#ffffff"
|
||||
}
|
32
client/src/App.css
Normal file
32
client/src/App.css
Normal file
@ -0,0 +1,32 @@
|
||||
.App {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.App-logo {
|
||||
animation: App-logo-spin infinite 20s linear;
|
||||
height: 40vmin;
|
||||
}
|
||||
|
||||
.App-header {
|
||||
background-color: #282c34;
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: calc(10px + 2vmin);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.App-link {
|
||||
color: #61dafb;
|
||||
}
|
||||
|
||||
@keyframes App-logo-spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
31
client/src/App.js
Normal file
31
client/src/App.js
Normal file
@ -0,0 +1,31 @@
|
||||
import React, { Component } from 'react';
|
||||
import logo from './logo.svg';
|
||||
import './App.css';
|
||||
|
||||
import Login from './components/Login/Login'
|
||||
|
||||
class App extends Component {
|
||||
render() {
|
||||
return (
|
||||
<div className="App">
|
||||
<header className="App-header">
|
||||
<img src={logo} className="App-logo" alt="logo" />
|
||||
<p>
|
||||
Edit <code>src/App.js</code> and save to reload.
|
||||
</p>
|
||||
<a
|
||||
className="App-link"
|
||||
href="https://reactjs.org"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
Learn React
|
||||
</a>
|
||||
</header>
|
||||
<Login></Login>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default App;
|
9
client/src/App.test.js
Normal file
9
client/src/App.test.js
Normal file
@ -0,0 +1,9 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import App from './App';
|
||||
|
||||
it('renders without crashing', () => {
|
||||
const div = document.createElement('div');
|
||||
ReactDOM.render(<App />, div);
|
||||
ReactDOM.unmountComponentAtNode(div);
|
||||
});
|
54
client/src/components/Login/Login.js
Normal file
54
client/src/components/Login/Login.js
Normal file
@ -0,0 +1,54 @@
|
||||
import React, { Component } from "react";
|
||||
import { userService } from "../../services/userService";
|
||||
|
||||
class Login extends Component {
|
||||
state = {
|
||||
login: "",
|
||||
pass: ""
|
||||
};
|
||||
|
||||
onLoginChanged = event => {
|
||||
this.setState({
|
||||
login: event.target.value
|
||||
});
|
||||
};
|
||||
|
||||
onPassChanged = event => {
|
||||
this.setState({
|
||||
pass: event.target.value
|
||||
});
|
||||
};
|
||||
|
||||
onSubmitClick = event => {
|
||||
event.preventDefault(); // nie odswieza strony
|
||||
userService.login(this.state.login, this.state.pass).then(result => {
|
||||
console.log(result);
|
||||
});
|
||||
};
|
||||
render() {
|
||||
return (
|
||||
<div className="Login">
|
||||
<form onSubmit={event => this.onSubmitClick(event)}>
|
||||
<input
|
||||
onChange={event => this.onLoginChanged(event)}
|
||||
value={this.state.login}
|
||||
placeholder="Adres e-mail"
|
||||
type="text"
|
||||
className=""
|
||||
/>
|
||||
<input
|
||||
onChange={this.onPassChanged}
|
||||
value={this.state.pass}
|
||||
placeholder="Hasło"
|
||||
type="password"
|
||||
/>
|
||||
<button type="submit">
|
||||
Zaloguj
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default Login;
|
28
client/src/helpers/apiHelper.js
Normal file
28
client/src/helpers/apiHelper.js
Normal file
@ -0,0 +1,28 @@
|
||||
export const baseUrl = 'http://localhost:8000/api';
|
||||
|
||||
export function authHeader() {
|
||||
// return authorization header with basic auth credentials
|
||||
let user = JSON.parse(localStorage.getItem('user'));
|
||||
|
||||
if (user && user.token) {
|
||||
return { 'Authorization': 'bearer ' + user.token };
|
||||
} else {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
export function handleResponse(response, onError = null) {
|
||||
return response.text().then(text => {
|
||||
const data = text && JSON.parse(text);
|
||||
if (!response.ok || !data.status) {
|
||||
if (onError) {
|
||||
onError(response);
|
||||
}
|
||||
|
||||
const error = (data && data.message) || response.statusText;
|
||||
return Promise.reject(error);
|
||||
}
|
||||
|
||||
return data;
|
||||
});
|
||||
}
|
14
client/src/index.css
Normal file
14
client/src/index.css
Normal file
@ -0,0 +1,14 @@
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
|
||||
"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
|
||||
sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
|
||||
monospace;
|
||||
}
|
12
client/src/index.js
Normal file
12
client/src/index.js
Normal file
@ -0,0 +1,12 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import './index.css';
|
||||
import App from './App';
|
||||
import * as serviceWorker from './serviceWorker';
|
||||
|
||||
ReactDOM.render(<App />, document.getElementById('root'));
|
||||
|
||||
// If you want your app to work offline and load faster, you can change
|
||||
// unregister() to register() below. Note this comes with some pitfalls.
|
||||
// Learn more about service workers: http://bit.ly/CRA-PWA
|
||||
serviceWorker.unregister();
|
7
client/src/logo.svg
Normal file
7
client/src/logo.svg
Normal file
@ -0,0 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
|
||||
<g fill="#61DAFB">
|
||||
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
|
||||
<circle cx="420.9" cy="296.5" r="45.7"/>
|
||||
<path d="M520.5 78.1z"/>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 2.6 KiB |
135
client/src/serviceWorker.js
Normal file
135
client/src/serviceWorker.js
Normal file
@ -0,0 +1,135 @@
|
||||
// This optional code is used to register a service worker.
|
||||
// register() is not called by default.
|
||||
|
||||
// This lets the app load faster on subsequent visits in production, and gives
|
||||
// it offline capabilities. However, it also means that developers (and users)
|
||||
// will only see deployed updates on subsequent visits to a page, after all the
|
||||
// existing tabs open on the page have been closed, since previously cached
|
||||
// resources are updated in the background.
|
||||
|
||||
// To learn more about the benefits of this model and instructions on how to
|
||||
// opt-in, read http://bit.ly/CRA-PWA
|
||||
|
||||
const isLocalhost = Boolean(
|
||||
window.location.hostname === 'localhost' ||
|
||||
// [::1] is the IPv6 localhost address.
|
||||
window.location.hostname === '[::1]' ||
|
||||
// 127.0.0.1/8 is considered localhost for IPv4.
|
||||
window.location.hostname.match(
|
||||
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
|
||||
)
|
||||
);
|
||||
|
||||
export function register(config) {
|
||||
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
|
||||
// The URL constructor is available in all browsers that support SW.
|
||||
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
|
||||
if (publicUrl.origin !== window.location.origin) {
|
||||
// Our service worker won't work if PUBLIC_URL is on a different origin
|
||||
// from what our page is served on. This might happen if a CDN is used to
|
||||
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
|
||||
return;
|
||||
}
|
||||
|
||||
window.addEventListener('load', () => {
|
||||
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
|
||||
|
||||
if (isLocalhost) {
|
||||
// This is running on localhost. Let's check if a service worker still exists or not.
|
||||
checkValidServiceWorker(swUrl, config);
|
||||
|
||||
// Add some additional logging to localhost, pointing developers to the
|
||||
// service worker/PWA documentation.
|
||||
navigator.serviceWorker.ready.then(() => {
|
||||
console.log(
|
||||
'This web app is being served cache-first by a service ' +
|
||||
'worker. To learn more, visit http://bit.ly/CRA-PWA'
|
||||
);
|
||||
});
|
||||
} else {
|
||||
// Is not localhost. Just register service worker
|
||||
registerValidSW(swUrl, config);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function registerValidSW(swUrl, config) {
|
||||
navigator.serviceWorker
|
||||
.register(swUrl)
|
||||
.then(registration => {
|
||||
registration.onupdatefound = () => {
|
||||
const installingWorker = registration.installing;
|
||||
if (installingWorker == null) {
|
||||
return;
|
||||
}
|
||||
installingWorker.onstatechange = () => {
|
||||
if (installingWorker.state === 'installed') {
|
||||
if (navigator.serviceWorker.controller) {
|
||||
// At this point, the updated precached content has been fetched,
|
||||
// but the previous service worker will still serve the older
|
||||
// content until all client tabs are closed.
|
||||
console.log(
|
||||
'New content is available and will be used when all ' +
|
||||
'tabs for this page are closed. See http://bit.ly/CRA-PWA.'
|
||||
);
|
||||
|
||||
// Execute callback
|
||||
if (config && config.onUpdate) {
|
||||
config.onUpdate(registration);
|
||||
}
|
||||
} else {
|
||||
// At this point, everything has been precached.
|
||||
// It's the perfect time to display a
|
||||
// "Content is cached for offline use." message.
|
||||
console.log('Content is cached for offline use.');
|
||||
|
||||
// Execute callback
|
||||
if (config && config.onSuccess) {
|
||||
config.onSuccess(registration);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error during service worker registration:', error);
|
||||
});
|
||||
}
|
||||
|
||||
function checkValidServiceWorker(swUrl, config) {
|
||||
// Check if the service worker can be found. If it can't reload the page.
|
||||
fetch(swUrl)
|
||||
.then(response => {
|
||||
// Ensure service worker exists, and that we really are getting a JS file.
|
||||
const contentType = response.headers.get('content-type');
|
||||
if (
|
||||
response.status === 404 ||
|
||||
(contentType != null && contentType.indexOf('javascript') === -1)
|
||||
) {
|
||||
// No service worker found. Probably a different app. Reload the page.
|
||||
navigator.serviceWorker.ready.then(registration => {
|
||||
registration.unregister().then(() => {
|
||||
window.location.reload();
|
||||
});
|
||||
});
|
||||
} else {
|
||||
// Service worker found. Proceed as normal.
|
||||
registerValidSW(swUrl, config);
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
console.log(
|
||||
'No internet connection found. App is running in offline mode.'
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
export function unregister() {
|
||||
if ('serviceWorker' in navigator) {
|
||||
navigator.serviceWorker.ready.then(registration => {
|
||||
registration.unregister();
|
||||
});
|
||||
}
|
||||
}
|
51
client/src/services/userService.js
Normal file
51
client/src/services/userService.js
Normal file
@ -0,0 +1,51 @@
|
||||
import { handleResponse, baseUrl } from '../helpers/apiHelper'
|
||||
|
||||
export const userService = {
|
||||
login,
|
||||
register,
|
||||
logout
|
||||
};
|
||||
|
||||
async function login(username, password) {
|
||||
const requestOptions = {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ 'email': username, password })
|
||||
};
|
||||
|
||||
const response = await fetch(baseUrl + `/login`, requestOptions);
|
||||
const data = await handleResponse(response, onLoginError);
|
||||
// login successful if there's a user in the response
|
||||
if (data.account) {
|
||||
localStorage.setItem('user', JSON.stringify(data.account));
|
||||
}
|
||||
return data.account;
|
||||
}
|
||||
|
||||
async function register(username, password) {
|
||||
const requestOptions = {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ 'email': username, password })
|
||||
};
|
||||
|
||||
const response = await fetch(baseUrl + `/register`, requestOptions);
|
||||
const data = await handleResponse(response, onLoginError);
|
||||
// login successful if there's a user in the response
|
||||
if (data.account) {
|
||||
localStorage.setItem('user', JSON.stringify(data.account));
|
||||
}
|
||||
return data.account;
|
||||
}
|
||||
|
||||
function logout() {
|
||||
// remove user from local storage to log user out
|
||||
localStorage.removeItem('user');
|
||||
}
|
||||
|
||||
function onLoginError(response) {
|
||||
if (response.status === 401) {
|
||||
// auto logout if 401 response returned from api
|
||||
logout();
|
||||
}
|
||||
}
|
8681
client/yarn.lock
Normal file
8681
client/yarn.lock
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,2 +1,3 @@
|
||||
db_name = Ewelina
|
||||
db_pass = p455w0rd
|
||||
db_pass = p455w0rd
|
||||
token_password = thisIsTheJwtSecretPassword
|
34
server/controllers/authController.go
Normal file
34
server/controllers/authController.go
Normal file
@ -0,0 +1,34 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"ExpiryDatesManager/server/model"
|
||||
"ExpiryDatesManager/server/utils"
|
||||
"encoding/json"
|
||||
)
|
||||
|
||||
var CreateAccount = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
account := &model.Account{}
|
||||
err := json.NewDecoder(r.Body).Decode(account) //decode the request body into struct and failed if any error occur
|
||||
if err != nil {
|
||||
utils.Respond(w, utils.Message(false, "Invalid request"))
|
||||
return
|
||||
}
|
||||
|
||||
resp := account.Create() //Create account
|
||||
utils.Respond(w, resp)
|
||||
}
|
||||
|
||||
var Authenticate = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
account := &model.Account{}
|
||||
err := json.NewDecoder(r.Body).Decode(account) //decode the request body into struct and failed if any error occur
|
||||
if err != nil {
|
||||
utils.Respond(w, utils.Message(false, "Invalid request"))
|
||||
return
|
||||
}
|
||||
|
||||
resp := model.Login(account.Email, account.Password)
|
||||
utils.Respond(w, resp)
|
||||
}
|
@ -15,7 +15,7 @@ var GetCompanies = func(w http.ResponseWriter, r *http.Request) {
|
||||
utils.Respond(w, resp)
|
||||
}
|
||||
|
||||
var CreateCompany = func(w http.ResponseWriter, r *http.Request) {
|
||||
var CreateOrUpdateCompany = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
company := &model.Company{}
|
||||
|
||||
@ -25,7 +25,12 @@ var CreateCompany = func(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
data := company.Create()
|
||||
data := company.CreateOrUpdate()
|
||||
if data.ID == 0 {
|
||||
utils.Respond(w, utils.Message(false, "Database error"))
|
||||
return
|
||||
}
|
||||
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
|
37
server/controllers/productExpiryPositionsController.go
Normal file
37
server/controllers/productExpiryPositionsController.go
Normal file
@ -0,0 +1,37 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"ExpiryDatesManager/server/model"
|
||||
"ExpiryDatesManager/server/utils"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
var GetPositions = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
data := model.GetPositions()
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
}
|
||||
|
||||
var CreateOrUpdatePosition = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
position := &model.ProductExpiryPosition{}
|
||||
|
||||
err := json.NewDecoder(r.Body).Decode(position)
|
||||
if err != nil {
|
||||
utils.Respond(w, utils.Message(false, "Error while decoding request body"))
|
||||
return
|
||||
}
|
||||
|
||||
data := position.CreateOrUpdate()
|
||||
if data.ID == 0 {
|
||||
utils.Respond(w, utils.Message(false, "Database error"))
|
||||
return
|
||||
}
|
||||
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
}
|
@ -1,6 +1,8 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"github.com/gorilla/mux"
|
||||
"ExpiryDatesManager/server/model"
|
||||
"ExpiryDatesManager/server/utils"
|
||||
"net/http"
|
||||
@ -9,6 +11,36 @@ import (
|
||||
var GetProducts = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
data := model.GetProducts()
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
}
|
||||
|
||||
var GetProduct = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
vars := mux.Vars(r)
|
||||
data := model.GetProduct(vars["code"])
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
}
|
||||
|
||||
var CreateOrUpdateProduct = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
product := &model.Product{}
|
||||
|
||||
err := json.NewDecoder(r.Body).Decode(product)
|
||||
if err != nil {
|
||||
utils.Respond(w, utils.Message(false, "Error while decoding request body"))
|
||||
return
|
||||
}
|
||||
|
||||
data := product.CreateOrUpdate()
|
||||
if data.ID == 0 {
|
||||
utils.Respond(w, utils.Message(false, "Database error"))
|
||||
return
|
||||
}
|
||||
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
|
46
server/controllers/reportPositionsController.go
Normal file
46
server/controllers/reportPositionsController.go
Normal file
@ -0,0 +1,46 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"encoding/json"
|
||||
"github.com/gorilla/mux"
|
||||
"ExpiryDatesManager/server/model"
|
||||
"ExpiryDatesManager/server/utils"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
var GetReportsPositionsForReport = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
vars := mux.Vars(r)
|
||||
companyID, err := strconv.ParseUint(vars["reportId"], 10, 0)
|
||||
if err != nil {
|
||||
utils.Respond(w, utils.Message(false, "Error while decoding request body"))
|
||||
return
|
||||
}
|
||||
|
||||
data := model.GetReportPositionsForReport(uint(companyID))
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
}
|
||||
|
||||
var CreateOrUpdateReportPosition = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
reportPosition := &model.ReportPosition{}
|
||||
|
||||
err := json.NewDecoder(r.Body).Decode(reportPosition)
|
||||
if err != nil {
|
||||
utils.Respond(w, utils.Message(false, "Error while decoding request body"))
|
||||
return
|
||||
}
|
||||
|
||||
data := reportPosition.CreateOrUpdate()
|
||||
if data.ID == 0 {
|
||||
utils.Respond(w, utils.Message(false, "Database error"))
|
||||
return
|
||||
}
|
||||
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
}
|
46
server/controllers/reportsController.go
Normal file
46
server/controllers/reportsController.go
Normal file
@ -0,0 +1,46 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"encoding/json"
|
||||
"github.com/gorilla/mux"
|
||||
"ExpiryDatesManager/server/model"
|
||||
"ExpiryDatesManager/server/utils"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
var GetReportsForCompany = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
vars := mux.Vars(r)
|
||||
companyID, err := strconv.ParseUint(vars["companyId"], 10, 0)
|
||||
if err != nil {
|
||||
utils.Respond(w, utils.Message(false, "Error while decoding request body"))
|
||||
return
|
||||
}
|
||||
|
||||
data := model.GetReportsForCompany(uint(companyID))
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
}
|
||||
|
||||
var CreateOrUpdateReport = func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
report := &model.Report{}
|
||||
|
||||
err := json.NewDecoder(r.Body).Decode(report)
|
||||
if err != nil {
|
||||
utils.Respond(w, utils.Message(false, "Error while decoding request body"))
|
||||
return
|
||||
}
|
||||
|
||||
data := report.CreateOrUpdate()
|
||||
if data.ID == 0 {
|
||||
utils.Respond(w, utils.Message(false, "Database error"))
|
||||
return
|
||||
}
|
||||
|
||||
resp := utils.Message(true, "success")
|
||||
resp["data"] = data
|
||||
utils.Respond(w, resp)
|
||||
}
|
@ -3,6 +3,7 @@ package main
|
||||
import (
|
||||
"ExpiryDatesManager/server/model"
|
||||
"ExpiryDatesManager/server/controllers"
|
||||
"ExpiryDatesManager/server/middleware"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"github.com/gorilla/mux"
|
||||
@ -11,10 +12,24 @@ import (
|
||||
func main() {
|
||||
fmt.Printf("hello, world\n")
|
||||
router := mux.NewRouter()
|
||||
router.Use(middleware.JwtAuthentication)
|
||||
|
||||
router.HandleFunc("/api/login", controllers.Authenticate).Methods("POST")
|
||||
router.HandleFunc("/api/register", controllers.CreateAccount).Methods("POST")
|
||||
router.HandleFunc("/api/products/{code}", controllers.GetProduct).Methods("GET")
|
||||
router.HandleFunc("/api/products", controllers.CreateOrUpdateProduct).Methods("POST")
|
||||
router.HandleFunc("/api/products", controllers.GetProducts).Methods("GET")
|
||||
router.HandleFunc("/api/companies", controllers.GetCompanies).Methods("GET")
|
||||
router.HandleFunc("/api/companies", controllers.CreateCompany).Methods("POST")
|
||||
router.HandleFunc("/api/companies", controllers.CreateOrUpdateCompany).Methods("POST")
|
||||
router.HandleFunc("/api/reports", controllers.CreateOrUpdateReport).Methods("POST")
|
||||
router.HandleFunc("/api/reports/{companyId}", controllers.GetReportsForCompany).Methods("GET")
|
||||
router.HandleFunc("/api/expiryPositions", controllers.GetPositions).Methods("GET")
|
||||
router.HandleFunc("/api/expiryPositions", controllers.CreateOrUpdatePosition).Methods("POST")
|
||||
router.HandleFunc("/api/reportPositions", controllers.CreateOrUpdatePosition).Methods("POST")
|
||||
router.HandleFunc("/api/reportPositions", controllers.GetReportsPositionsForReport).Methods("GET")
|
||||
router.Handle("/", http.FileServer(http.Dir("../client/build")))
|
||||
router.PathPrefix("/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.Dir("../client/build/static"))))
|
||||
router.PathPrefix("/").Handler(http.StripPrefix("/", http.FileServer(http.Dir("../client/build"))))
|
||||
|
||||
defer model.GetDB().Close()
|
||||
|
||||
|
79
server/middleware/authMiddleware.go
Normal file
79
server/middleware/authMiddleware.go
Normal file
@ -0,0 +1,79 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"ExpiryDatesManager/server/utils"
|
||||
"strings"
|
||||
"ExpiryDatesManager/server/model"
|
||||
jwt "github.com/dgrijalva/jwt-go"
|
||||
"os"
|
||||
)
|
||||
|
||||
var JwtAuthentication = func(next http.Handler) http.Handler {
|
||||
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
notAuth := []string{"/api/register", "/api/login", "/static", "/", ""} //List of endpoints that doesn't require auth
|
||||
requestPath := r.URL.Path //current request path
|
||||
|
||||
if !strings.HasPrefix(requestPath, "/api") {
|
||||
next.ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
//check if request does not need authentication, serve the request if it doesn't need it
|
||||
for _, value := range notAuth {
|
||||
|
||||
if value == requestPath {
|
||||
next.ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
response := make(map[string] interface{})
|
||||
tokenHeader := r.Header.Get("Authorization") //Grab the token from the header
|
||||
|
||||
if tokenHeader == "" { //Token is missing, returns with error code 403 Unauthorized
|
||||
response = utils.Message(false, "Missing auth token")
|
||||
w.WriteHeader(http.StatusForbidden)
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
utils.Respond(w, response)
|
||||
return
|
||||
}
|
||||
|
||||
splitted := strings.Split(tokenHeader, " ") //The token normally comes in format `Bearer {token-body}`, we check if the retrieved token matched this requirement
|
||||
if len(splitted) != 2 {
|
||||
response = utils.Message(false, "Invalid/Malformed auth token")
|
||||
w.WriteHeader(http.StatusForbidden)
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
utils.Respond(w, response)
|
||||
return
|
||||
}
|
||||
|
||||
tokenPart := splitted[1] //Grab the token part, what we are truly interested in
|
||||
tk := &model.Token{}
|
||||
|
||||
token, err := jwt.ParseWithClaims(tokenPart, tk, func(token *jwt.Token) (interface{}, error) {
|
||||
return []byte(os.Getenv("token_password")), nil
|
||||
})
|
||||
|
||||
if err != nil { //Malformed token, returns with http code 403 as usual
|
||||
response = utils.Message(false, "Malformed authentication token")
|
||||
w.WriteHeader(http.StatusForbidden)
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
utils.Respond(w, response)
|
||||
return
|
||||
}
|
||||
|
||||
if !token.Valid { //Token is invalid, maybe not signed on this server
|
||||
response = utils.Message(false, "Token is not valid.")
|
||||
w.WriteHeader(http.StatusForbidden)
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
utils.Respond(w, response)
|
||||
return
|
||||
}
|
||||
|
||||
//Everything went well, proceed with the request
|
||||
next.ServeHTTP(w, r) //proceed in the middleware chain!
|
||||
});
|
||||
}
|
107
server/model/account.go
Normal file
107
server/model/account.go
Normal file
@ -0,0 +1,107 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"github.com/dgrijalva/jwt-go"
|
||||
"ExpiryDatesManager/server/utils"
|
||||
"strings"
|
||||
"github.com/jinzhu/gorm"
|
||||
"os"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
/*
|
||||
JWT claims struct
|
||||
*/
|
||||
type Token struct {
|
||||
UserID uint
|
||||
jwt.StandardClaims
|
||||
}
|
||||
|
||||
// Account - a struct to rep user account
|
||||
type Account struct {
|
||||
gorm.Model
|
||||
Active bool
|
||||
Admin bool
|
||||
Email string
|
||||
Password string
|
||||
Token string `sql:"-"`
|
||||
}
|
||||
|
||||
//Validate incoming user details...
|
||||
func (account *Account) Validate() (map[string] interface{}, bool) {
|
||||
|
||||
if !strings.Contains(account.Email, "@") {
|
||||
return utils.Message(false, "Email address is required"), false
|
||||
}
|
||||
|
||||
if len(account.Password) < 3 {
|
||||
return utils.Message(false, "Password is required"), false
|
||||
}
|
||||
|
||||
//Email must be unique
|
||||
temp := &Account{}
|
||||
|
||||
//check for errors and duplicate emails
|
||||
err := GetDB().Where("email = ?", account.Email).First(temp).Error
|
||||
if err != nil && err != gorm.ErrRecordNotFound {
|
||||
return utils.Message(false, "Connection error. Please retry"), false
|
||||
}
|
||||
if temp.Email != "" {
|
||||
return utils.Message(false, "Email address already in use by another user."), false
|
||||
}
|
||||
|
||||
return utils.Message(false, "Requirement passed"), true
|
||||
}
|
||||
|
||||
func (account *Account) Create() (map[string] interface{}) {
|
||||
|
||||
if resp, ok := account.Validate(); !ok {
|
||||
return resp
|
||||
}
|
||||
|
||||
hashedPassword, _ := bcrypt.GenerateFromPassword([]byte(account.Password), bcrypt.DefaultCost)
|
||||
account.Password = string(hashedPassword)
|
||||
account.Admin = false
|
||||
account.Active = false
|
||||
|
||||
GetDB().Create(account)
|
||||
|
||||
if account.ID <= 0 {
|
||||
return utils.Message(false, "Failed to create account, connection error.")
|
||||
}
|
||||
|
||||
account.Password = "" //delete password
|
||||
|
||||
response := utils.Message(true, "Account has been created, wait for activation")
|
||||
response["account"] = account
|
||||
return response
|
||||
}
|
||||
|
||||
func Login(email, password string) (map[string]interface{}) {
|
||||
|
||||
account := &Account{}
|
||||
err := GetDB().Where("email = ? and active = ?", email, true).First(account).Error
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
return utils.Message(false, "Email address not found")
|
||||
}
|
||||
return utils.Message(false, "Connection error. Please retry")
|
||||
}
|
||||
|
||||
err = bcrypt.CompareHashAndPassword([]byte(account.Password), []byte(password))
|
||||
if err != nil && err == bcrypt.ErrMismatchedHashAndPassword { //Password does not match!
|
||||
return utils.Message(false, "Invalid login credentials. Please try again")
|
||||
}
|
||||
//Worked! Logged In
|
||||
account.Password = ""
|
||||
|
||||
//Create JWT token
|
||||
tk := &Token{UserID: account.ID}
|
||||
token := jwt.NewWithClaims(jwt.GetSigningMethod("HS256"), tk)
|
||||
tokenString, _ := token.SignedString([]byte(os.Getenv("token_password")))
|
||||
account.Token = tokenString //Store the token in the response
|
||||
|
||||
resp := utils.Message(true, "Logged In")
|
||||
resp["account"] = account
|
||||
return resp
|
||||
}
|
@ -26,9 +26,9 @@ func init() {
|
||||
fmt.Println(err)
|
||||
}
|
||||
db = conn
|
||||
db.AutoMigrate(&Company{}, &Product{}, &ProductExpiryPosition{}, &Report{}, &ReportPosition{})
|
||||
db.AutoMigrate(&Company{}, &Product{}, &ProductExpiryPosition{}, &Report{}, &ReportPosition{}, &Account{})
|
||||
db.Model(&Product{}).AddForeignKey("company_id", "companies(id)", "RESTRICT", "RESTRICT")
|
||||
db.Model(&ProductExpiryPosition{}).AddForeignKey("product_id", "product_expiry_positions(id)", "RESTRICT", "RESTRICT")
|
||||
db.Model(&ProductExpiryPosition{}).AddForeignKey("product_id", "products(id)", "RESTRICT", "RESTRICT")
|
||||
db.Model(&Report{}).AddForeignKey("company_id", "companies(id)", "RESTRICT", "RESTRICT")
|
||||
db.Model(&ReportPosition{}).AddForeignKey("report_id", "reports(id)", "RESTRICT", "RESTRICT")
|
||||
db.Model(&ReportPosition{}).AddForeignKey("product_expiry_position_id", "product_expiry_positions(id)", "RESTRICT", "RESTRICT")
|
||||
|
@ -17,9 +17,8 @@ func GetCompanies() ([]*Company) {
|
||||
return comapnies
|
||||
}
|
||||
|
||||
func (company *Company) Create() (*Company) {
|
||||
func (company *Company) CreateOrUpdate() (*Company) {
|
||||
|
||||
GetDB().Create(company)
|
||||
GetDB().Save(company)
|
||||
|
||||
return company;
|
||||
|
@ -18,4 +18,21 @@ func GetProducts() ([]*Product) {
|
||||
GetDB().Find(&products)
|
||||
|
||||
return products
|
||||
}
|
||||
|
||||
func GetProduct(barcode string) (*Product) {
|
||||
|
||||
product := &Product{}
|
||||
if GetDB().Where("code = ?", barcode).First(product).RecordNotFound() {
|
||||
return nil
|
||||
}
|
||||
|
||||
return product
|
||||
}
|
||||
|
||||
func (product *Product) CreateOrUpdate() (*Product) {
|
||||
|
||||
GetDB().Save(product)
|
||||
|
||||
return product;
|
||||
}
|
@ -11,5 +11,24 @@ type ProductExpiryPosition struct {
|
||||
BatchNumber string
|
||||
Product Product
|
||||
ProductID uint
|
||||
}
|
||||
|
||||
func GetPositions() ([]*ProductExpiryPosition) {
|
||||
|
||||
positions := make([]*ProductExpiryPosition, 0)
|
||||
GetDB().Find(&positions)
|
||||
|
||||
return positions
|
||||
}
|
||||
|
||||
func DeletePositions(positions []*ProductExpiryPosition) () {
|
||||
|
||||
GetDB().Delete(positions)
|
||||
}
|
||||
|
||||
func (position *ProductExpiryPosition) CreateOrUpdate() (*ProductExpiryPosition) {
|
||||
|
||||
GetDB().Save(position)
|
||||
|
||||
return position;
|
||||
}
|
@ -8,4 +8,21 @@ type Report struct {
|
||||
gorm.Model
|
||||
Company Company
|
||||
CompanyID uint
|
||||
}
|
||||
|
||||
func (report *Report) CreateOrUpdate() (*Report) {
|
||||
|
||||
GetDB().Save(report)
|
||||
|
||||
return report;
|
||||
}
|
||||
|
||||
func GetReportsForCompany(companyID uint) ([]*Report) {
|
||||
|
||||
reports := make([]*Report, 0)
|
||||
if GetDB().Where("companyID = ?", companyID).Find(&reports).RecordNotFound() {
|
||||
return nil
|
||||
}
|
||||
|
||||
return reports
|
||||
}
|
@ -12,4 +12,21 @@ type ReportPosition struct {
|
||||
ProductExpiryPositionID uint
|
||||
Report Report
|
||||
ReportID uint
|
||||
}
|
||||
|
||||
func (reportPosition *ReportPosition) CreateOrUpdate() (*ReportPosition) {
|
||||
|
||||
GetDB().Save(reportPosition)
|
||||
|
||||
return reportPosition;
|
||||
}
|
||||
|
||||
func GetReportPositionsForReport(reportID uint) ([]*ReportPosition) {
|
||||
|
||||
reportsPositions := make([]*ReportPosition, 0)
|
||||
if GetDB().Where("reportID = ?", reportID).Find(&reportsPositions).RecordNotFound() {
|
||||
return nil
|
||||
}
|
||||
|
||||
return reportsPositions
|
||||
}
|
Loading…
Reference in New Issue
Block a user