{`Total price: ${total}`}}
- />
-
-
- );
- });
- }, [invoices]);
-
- return (
- {invoiceElements && {invoiceElements}}
- );
-};
-
-export default MyInvoicesPage;
diff --git a/media-store/app-src/src/components/PersonPage.jsx b/media-store/app-src/src/components/PersonPage.jsx
deleted file mode 100644
index d312a233..00000000
--- a/media-store/app-src/src/components/PersonPage.jsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import React, { useState } from 'react';
-import { Form, Button, message, Input } from 'antd';
-import { omit, map } from 'lodash';
-import { fetchPerson, confirmPerson } from '../api/calls';
-import { useErrors } from '../hooks/useErrors';
-import { useAppState } from '../hooks/useAppState';
-import { MESSAGE_TIMEOUT } from '../util/constants';
-import { useAbortableEffect } from '../hooks/useAbortableEffect';
-
-const PERSON_PROP = {
- address: 'Address ',
- city: 'City ',
- country: 'Country ',
- fax: 'Fax: ',
- firstName: 'First name: ',
- lastName: 'Last name: ',
- phone: 'Phone: ',
- postalCode: 'Postal code: ',
- state: 'State',
- email: 'email',
- company: 'Company: ',
-};
-
-const PersonPage = () => {
- const { setLoading } = useAppState();
- const { handleError } = useErrors();
- const [form] = Form.useForm();
- const [person, setPerson] = useState({
- lastName: '',
- firstName: '',
- city: '',
- state: '',
- address: '',
- country: '',
- phone: '',
- postalCode: '',
- fax: '',
- email: '',
- company: '',
- });
-
- useAbortableEffect((status) => {
- setLoading(true);
-
- fetchPerson()
- .then(({ data }) => {
- const personData = omit(data, '@odata.context', 'ID');
- if (!status.aborted) {
- setPerson(personData);
- }
- })
- .catch(handleError)
- .finally(() => setLoading(false));
- }, []);
-
- const onConfirmChanges = (newPerson) => {
- setLoading(true);
- confirmPerson(newPerson)
- .then(() => {
- message.success('Person successfully updated', MESSAGE_TIMEOUT);
- })
- .catch(handleError)
- .finally(() => setLoading(false));
- };
-
- const personProperties = map(Object.keys(person), (currentKey) => (
-
-
-
-
-
- ));
-
- return (
- <>
- {person.lastName !== '' && (
-
- )}
-
- );
-};
-
-export default PersonPage;
diff --git a/media-store/app-src/src/components/Router.jsx b/media-store/app-src/src/components/Router.jsx
deleted file mode 100644
index e0cf5d4f..00000000
--- a/media-store/app-src/src/components/Router.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
-import { isEmpty } from 'lodash';
-import TracksContainer from './TracksPage';
-import Header from './Header';
-import PersonPage from './PersonPage';
-import ErrorPage from './ErrorPage';
-import InvoicePage from './InvoicePage';
-import ManageStore from './ManageStore';
-import MyInvoicesPage from './MyInvoicesPage';
-import Login from './Login';
-import { withRestrictions } from '../hocs/withRestrictions';
-import { requireEmployee } from '../util/constants';
-
-const RestrictedLogin = withRestrictions(Login, ({ user }) => !user);
-const RestrictedInvoicePage = withRestrictions(
- InvoicePage,
- ({ user, invoicedItems }) => !requireEmployee(user) && !isEmpty(invoicedItems)
-);
-const RestrictedPersonPage = withRestrictions(PersonPage, ({ user }) => !!user);
-const RestrictedManageStore = withRestrictions(ManageStore, ({ user }) => requireEmployee(user));
-
-const MyRouter = () => {
- return (
-
-
-
- Loading...
}>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-export { MyRouter };
diff --git a/media-store/app-src/src/components/TracksPage.css b/media-store/app-src/src/components/TracksPage.css
deleted file mode 100644
index c3855497..00000000
--- a/media-store/app-src/src/components/TracksPage.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.ant-select > div.ant-select-selector {
- padding: 5px;
- min-width: 300px;
-}
diff --git a/media-store/app-src/src/components/TracksPage.jsx b/media-store/app-src/src/components/TracksPage.jsx
deleted file mode 100644
index ed6c9835..00000000
--- a/media-store/app-src/src/components/TracksPage.jsx
+++ /dev/null
@@ -1,215 +0,0 @@
-import React, { useState } from 'react';
-import { debounce } from 'lodash';
-import { Input, Col, Row, Select, Pagination } from 'antd';
-import { Track } from './tracks/Track';
-import { ManagedTrack } from './tracks/ManagedTrack';
-import { useAppState } from '../hooks/useAppState';
-import { useErrors } from '../hooks/useErrors';
-import { fetchTacks, countTracks, fetchGenres } from '../api/calls';
-import { useAbortableEffect } from '../hooks/useAbortableEffect';
-import { requireEmployee } from '../util/constants';
-import './TracksPage.css';
-
-const { Search } = Input;
-const { Option } = Select;
-
-const DEBOUNCE_TIMER = 500;
-const DEBOUNCE_OPTIONS = {
- leading: true,
- trailing: false,
-};
-
-const renderGenres = (genres) =>
- genres.map(({ ID, name }) => (
-
- ));
-
-const TracksContainer = () => {
- const { setLoading, user } = useAppState();
- const { handleError } = useErrors();
- const [state, setState] = useState({
- tracks: [],
- genres: [],
- pagination: {
- currentPage: 1,
- totalItems: 0,
- pageSize: 20,
- },
- searchOptions: {
- substr: '',
- genreIds: [],
- },
- });
-
- useAbortableEffect((status) => {
- setLoading(true);
-
- const countTracksReq = countTracks();
- const getTracksRequest = fetchTacks();
- const getGenresReq = fetchGenres();
-
- Promise.all([countTracksReq, getTracksRequest, getGenresReq])
- .then(
- ([
- { data: totalItems },
- {
- data: { value: tracks },
- },
- {
- data: { value: genres },
- },
- ]) => {
- if (!status.aborted) {
- setState({
- ...state,
- tracks,
- genres,
- pagination: { ...state.pagination, totalItems },
- });
- }
- }
- )
- .catch(handleError)
- .finally(() => setLoading(false));
- }, []);
-
- const onSearch = debounce(
- () => {
- setLoading(true);
- const options = {
- $top: state.pagination.pageSize,
- substr: state.searchOptions.substr.replace(`'`, `''`),
- genreIds: state.searchOptions.genreIds,
- };
-
- Promise.all([
- fetchTacks(options),
- countTracks({
- substr: options.substr,
- genreIds: options.genreIds,
- }),
- ])
- .then(([{ data: { value: tracks } }, { data: totalItems }]) =>
- setState({
- ...state,
- tracks,
- pagination: { ...state.pagination, totalItems },
- })
- )
- .catch(handleError)
- .finally(() => setLoading(false));
- },
- DEBOUNCE_TIMER,
- DEBOUNCE_OPTIONS
- );
- const onSelectChange = (genres) => {
- setState({
- ...state,
- searchOptions: {
- ...state.searchOptions,
- genreIds: genres.map((value) => parseInt(value, 10)),
- },
- });
- };
- const onSearchChange = (event) => {
- setState({
- ...state,
- searchOptions: { ...state.searchOptions, substr: event.target.value },
- });
- };
- const onChangePage = (pageNumber) => {
- document.querySelector('section.ant-layout').scrollTo({ top: 0, left: 0, behavior: 'smooth' });
- setLoading(true);
-
- const options = {
- $top: state.pagination.pageSize,
- substr: state.searchOptions.substr,
- genreIds: state.searchOptions.genreIds,
- $skip: (pageNumber - 1) * state.pagination.pageSize,
- };
- fetchTacks(options)
- .then((response) =>
- setState({
- ...state,
- tracks: response.data.value,
- pagination: { ...state.pagination, currentPage: pageNumber },
- })
- )
- .catch(handleError)
- .finally(() => setLoading(false));
- };
- const deleteTrack = (ID) => {
- setState({
- ...state,
- tracks: state.tracks.filter(({ ID: curID }) => curID !== ID),
- });
- };
- const renderTracks = (tracks) => {
- const isEmployee = requireEmployee(user);
- const TrackComponent = isEmployee ? ManagedTrack : Track;
- return tracks.map((track) => {
- const isAlreadyOrdered = !isEmployee && track.alreadyOrdered;
- const onDeleteTrack = isEmployee && ((ID) => deleteTrack(ID));
- return (
-
-
-
- );
- });
- };
-
- const trackElements = renderTracks(state.tracks);
- const genreElements = renderGenres(state.genres);
-
- return (
- <>
-
-
-
-
-
- {trackElements}
-
-
-
- );
-};
-
-export default TracksContainer;
diff --git a/media-store/app-src/src/components/manage-store/AddAlbumForm.jsx b/media-store/app-src/src/components/manage-store/AddAlbumForm.jsx
deleted file mode 100644
index 0a4978ae..00000000
--- a/media-store/app-src/src/components/manage-store/AddAlbumForm.jsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { useEffect } from 'react';
-import { Form, Input, Select } from 'antd';
-import { useSearch } from '@umijs/hooks';
-import { useErrors } from '../../hooks/useErrors';
-import { fetchArtistsByName } from '../../api/calls';
-
-const REQUIRED = [
- {
- required: true,
- message: 'This filed is required!',
- },
-];
-const ARTISTS_LIMIT = 10;
-
-const getArtists = function (value) {
- return fetchArtistsByName(value, ARTISTS_LIMIT)
- .then((response) => response.data.value)
- .catch(this.handleError);
-};
-
-const AddAlbumForm = () => {
- const { handleError } = useErrors();
- const {
- data: artists,
- loading: isArtistsLoading,
- onChange: onChangeArtistInput,
- cancel: onArtistCancel,
- } = useSearch(getArtists.bind({ handleError }));
-
- useEffect(() => {
- onChangeArtistInput();
- }, []);
-
- return (
- <>
- Add album
-
-
-
-
-
-
-
- );
-};
-
-export { AddAlbumForm };
diff --git a/media-store/app-src/src/components/manage-store/AddArtistForm.jsx b/media-store/app-src/src/components/manage-store/AddArtistForm.jsx
deleted file mode 100644
index 3cc7567f..00000000
--- a/media-store/app-src/src/components/manage-store/AddArtistForm.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import { Form, Input } from 'antd';
-
-const REQUIRED = [
- {
- required: true,
- message: 'This filed is required!',
- },
-];
-
-const AddArtistForm = () => {
- return (
- <>
- Add artist
-
-
-
-
- );
-};
-
-export { AddArtistForm };
diff --git a/media-store/app-src/src/components/manage-store/TrackForm.jsx b/media-store/app-src/src/components/manage-store/TrackForm.jsx
deleted file mode 100644
index 47a7d9fe..00000000
--- a/media-store/app-src/src/components/manage-store/TrackForm.jsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
-import { Form, Input, Select, InputNumber } from 'antd';
-import { head } from 'lodash';
-import { useSearch } from '@umijs/hooks';
-import { useAppState } from '../../hooks/useAppState';
-import { fetchAlbumsByName, fetchGenres } from '../../api/calls';
-import { useErrors } from '../../hooks/useErrors';
-
-const ALBUMS_LIMIT = 10;
-const REQUIRED = [
- {
- required: true,
- message: 'This filed is required!',
- },
-];
-
-function getAlbums(value) {
- return fetchAlbumsByName(value, ALBUMS_LIMIT)
- .then((response) => response.data.value)
- .catch(this.handleError);
-}
-
-const TrackForm = ({ initialAlbumTitle }) => {
- const { handleError } = useErrors();
- const {
- data: albums,
- loading: isAlbumsLoading,
- onChange: onChangeAlbumInput,
- cancel: onAlbumCancel,
- } = useSearch(getAlbums.bind({ handleError }));
- const { setLoading } = useAppState();
- const [genres, setGenres] = useState([]);
-
- useEffect(() => {
- setLoading(true);
- Promise.all([fetchGenres(), onChangeAlbumInput(initialAlbumTitle)])
- .then((responses) => setGenres(head(responses).data.value))
- .catch(handleError)
- .finally(() => setLoading(false));
- }, []);
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- value.replace(/\$\s?|(,*)/g, '')}
- />
-
-
- );
-};
-
-TrackForm.propTypes = {
- initialAlbumTitle: PropTypes.string,
-};
-TrackForm.defaultProps = {
- initialAlbumTitle: undefined,
-};
-
-export { TrackForm };
diff --git a/media-store/app-src/src/components/tracks/DeleteAction.jsx b/media-store/app-src/src/components/tracks/DeleteAction.jsx
deleted file mode 100644
index 948fc7ab..00000000
--- a/media-store/app-src/src/components/tracks/DeleteAction.jsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { Modal, message } from 'antd';
-import { DeleteOutlined } from '@ant-design/icons';
-import { deleteTrack } from '../../api/calls';
-import { useErrors } from '../../hooks/useErrors';
-import { MESSAGE_TIMEOUT } from '../../util/constants';
-
-const DeleteAction = ({ ID, onDeleteTrack }) => {
- const [modalVisible, setModalVisible] = useState(false);
- const { handleError } = useErrors();
-
- const onOk = () => {
- setModalVisible(false);
- deleteTrack(ID)
- .then(() => {
- onDeleteTrack();
- setModalVisible(false);
- message.success('Track successfully deleted!', MESSAGE_TIMEOUT);
- })
- .catch(handleError);
- };
-
- const onCancel = () => setModalVisible(false);
- const onOpenModal = () => {
- setModalVisible(true);
- };
-
- return (
- <>
- Delete
-
- Are You really want to delete this track?
-
-
- );
-};
-
-DeleteAction.propTypes = {
- ID: PropTypes.number.isRequired,
- onDeleteTrack: PropTypes.func.isRequired,
-};
-
-export { DeleteAction };
diff --git a/media-store/app-src/src/components/tracks/EditAction.jsx b/media-store/app-src/src/components/tracks/EditAction.jsx
deleted file mode 100644
index 1c8c42e6..00000000
--- a/media-store/app-src/src/components/tracks/EditAction.jsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Button, Modal, Form, message } from 'antd';
-import { EditOutlined, LoadingOutlined } from '@ant-design/icons';
-import { useErrors } from '../../hooks/useErrors';
-import { TrackForm } from '../manage-store/TrackForm';
-import { updateTrack, getTrack } from '../../api/calls';
-import { MESSAGE_TIMEOUT } from '../../util/constants';
-
-const EditAction = ({ ID, name, composer, genre, unitPrice, album, afterTrackUpdate }) => {
- const [visible, setVisible] = React.useState(false);
- const [confirmLoading, setConfirmLoading] = React.useState(false);
- const [updateLoading, setUpdateLoading] = React.useState(false);
- const [form] = Form.useForm();
- const { handleError } = useErrors();
-
- const onShowModal = () => {
- setVisible(true);
- };
-
- const afterCloseModal = () => {
- setUpdateLoading(true);
- getTrack(ID)
- .then((response) => {
- afterTrackUpdate(response.data);
- setUpdateLoading(false);
- })
- .catch(handleError);
- };
-
- const onFinish = (value) => {
- setConfirmLoading(true);
- updateTrack({
- ID,
- name: value.name,
- composer: value.composer,
- album: { ID: value.albumID },
- genre: { ID: value.genreID },
- unitPrice: value.unitPrice.toString(),
- })
- .then(() => {
- message.success('Track successfully updated!', MESSAGE_TIMEOUT);
- setConfirmLoading(false);
- setVisible(false);
- afterCloseModal();
- })
- .catch(handleError);
- };
-
- const handleOk = () => {
- form.submit();
- };
-
- const handleCancel = () => {
- setVisible(false);
- };
-
- return (
- <>
- {updateLoading ? : }
-
- Cancel
- ,
- ,
- ]}
- >
-
-
-
- );
-};
-
-EditAction.propTypes = {
- ID: PropTypes.number.isRequired,
- name: PropTypes.string.isRequired,
- composer: PropTypes.string.isRequired,
- genre: PropTypes.object.isRequired,
- unitPrice: PropTypes.number.isRequired,
- album: PropTypes.object.isRequired,
- afterTrackUpdate: PropTypes.func.isRequired,
-};
-
-export { EditAction };
diff --git a/media-store/app-src/src/components/tracks/ManagedTrack.css b/media-store/app-src/src/components/tracks/ManagedTrack.css
deleted file mode 100644
index e2107b16..00000000
--- a/media-store/app-src/src/components/tracks/ManagedTrack.css
+++ /dev/null
@@ -1,7 +0,0 @@
-span > span.anticon.anticon-delete:hover {
- color: #ff4d4f;
-}
-
-.card-element {
- transition: opacity 0.5s ease-in-out;
-}
diff --git a/media-store/app-src/src/components/tracks/ManagedTrack.jsx b/media-store/app-src/src/components/tracks/ManagedTrack.jsx
deleted file mode 100644
index 42bea8c8..00000000
--- a/media-store/app-src/src/components/tracks/ManagedTrack.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { useState, useRef } from 'react';
-import { Card } from 'antd';
-import PropTypes from 'prop-types';
-import { EditAction } from './EditAction';
-import { DeleteAction } from './DeleteAction';
-import { TrackCardBody } from './TrackCardBody';
-import './ManagedTrack.css';
-
-const ManagedTrack = ({ initialTrack, onDeleteTrack }) => {
- const trackElement = useRef();
- const [track, setTrack] = useState(initialTrack);
-
- return (
-
- {
- trackElement.current.style.opacity = 0;
- setTimeout(() => onDeleteTrack(track.ID), 500);
- }}
- />,
- setTrack(value)}
- />,
- ]}
- title={track.name}
- bordered={false}
- >
-
-
-
- );
-};
-
-ManagedTrack.propTypes = {
- initialTrack: PropTypes.object.isRequired,
- onDeleteTrack: PropTypes.func.isRequired,
-};
-
-export { ManagedTrack };
diff --git a/media-store/app-src/src/components/tracks/Track.jsx b/media-store/app-src/src/components/tracks/Track.jsx
deleted file mode 100644
index 3fb90950..00000000
--- a/media-store/app-src/src/components/tracks/Track.jsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { useState, useRef } from 'react';
-import PropTypes from 'prop-types';
-import { Card, Button } from 'antd';
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons';
-import { useAppState } from '../../hooks/useAppState';
-import { TrackCardBody } from './TrackCardBody';
-
-const Track = ({ initialTrack, isAlreadyOrdered }) => {
- const trackElement = useRef();
- const { setInvoicedItems, invoicedItems } = useAppState();
- const [isJustInvoiced, setIsJustInvoiced] = useState(
- invoicedItems.find((curTrack) => curTrack.ID === initialTrack.ID)
- );
-
- const onChangedStatus = () => {
- const newIsJustInvoiced = !isJustInvoiced;
- if (newIsJustInvoiced) {
- setInvoicedItems([
- ...invoicedItems,
- {
- ID: initialTrack.ID,
- name: initialTrack.name,
- artist: initialTrack.album.artist.name,
- albumTitle: initialTrack.album.title,
- unitPrice: initialTrack.unitPrice,
- },
- ]);
- } else {
- setInvoicedItems(invoicedItems.filter(({ ID: curID }) => curID !== initialTrack.ID));
- }
- setIsJustInvoiced(newIsJustInvoiced);
- };
-
- return (
-
-
- {!isAlreadyOrdered && (
-
- )}
- ,
- ]}
- title={initialTrack.name}
- bordered={false}
- >
-
-
-
- Artist:
- {track.album.artist.name}
-
-
- Album:
- {track.album.title}
-
-
- Genre:
- {track.genre.name}
-
-
- {track.composer && (
-
- Compositor:
- {track.composer}
-
- )}
-
-
-
- Price:
- {track.unitPrice}
-
-
-
- );
-};
-
-TrackCardBody.propTypes = {
- track: PropTypes.object.isRequired,
-};
-
-export { TrackCardBody };
diff --git a/media-store/app-src/src/contexts/AppStateContext.jsx b/media-store/app-src/src/contexts/AppStateContext.jsx
deleted file mode 100644
index 5b5dd180..00000000
--- a/media-store/app-src/src/contexts/AppStateContext.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { useMemo, createContext, useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { getUserFromLS, getLocaleFromLS, setUserToLS } from '../util/localStorageService';
-import { changeUserDefaults } from '../api/axiosInstance';
-import { emitter } from '../util/EventEmitter';
-
-const globalContext = {
- error: {},
- loading: true,
- user: {
- ID: undefined,
- roles: [],
- email: undefined,
- accessToken: undefined,
- refreshToken: undefined,
- },
- locale: undefined,
- invoicedItems: [],
- notifications: [],
-};
-const AppStateContext = createContext(globalContext);
-
-const AppStateContextProvider = ({ children }) => {
- const [invoicedItems, setInvoicedItems] = useState([]);
- const [loading, setLoading] = useState(false);
- const [error, setError] = useState({});
- const [user, setUser] = useState(getUserFromLS());
- const [locale, setLocale] = useState(getLocaleFromLS());
-
- useEffect(() => {
- const updateUser = (newUser) => {
- console.log('USER_UPDATE WAS TRIGGERED');
- changeUserDefaults(newUser);
- setUserToLS(newUser);
- setUser(newUser);
- };
- emitter.on('UPDATE_USER', updateUser);
- return () => {
- emitter.removeListener('UPDATE_USER', updateUser);
- };
- }, []);
-
- const value = useMemo(
- () => ({
- error,
- loading,
- invoicedItems,
- user,
- locale,
- setLoading,
- setError,
- setInvoicedItems,
- setUser,
- setLocale,
- }),
- [locale, user, loading, error, invoicedItems]
- );
-
- return {children};
-};
-
-AppStateContextProvider.propTypes = {
- children: PropTypes.element.isRequired,
-};
-
-export { AppStateContextProvider, AppStateContext };
diff --git a/media-store/app-src/src/hocs/withRestrictions.jsx b/media-store/app-src/src/hocs/withRestrictions.jsx
deleted file mode 100644
index 26eedba3..00000000
--- a/media-store/app-src/src/hocs/withRestrictions.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { Redirect } from 'react-router-dom';
-import { useAppState } from '../hooks/useAppState';
-
-const withRestrictions = (Component, isUserMeetRestrictions) => {
- return (props) => {
- const { user, invoicedItems } = useAppState();
- return isUserMeetRestrictions({ user, invoicedItems }) ? (
-
- ) : (
-
- );
- };
-};
-
-export { withRestrictions };
diff --git a/media-store/app-src/src/hooks/useAbortableEffect.js b/media-store/app-src/src/hooks/useAbortableEffect.js
deleted file mode 100644
index 648d923d..00000000
--- a/media-store/app-src/src/hooks/useAbortableEffect.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useEffect } from 'react';
-
-function useAbortableEffect(effect, dependencies) {
- const status = {}; // mutable status object
- useEffect(() => {
- status.aborted = false;
- // pass the mutable object to the effect callback
- // store the returned value for cleanup
- const cleanUpFn = effect(status);
- return () => {
- // mutate the object to signal the consumer
- // this effect is cleaning up
- status.aborted = true;
- if (typeof cleanUpFn === 'function') {
- // run the cleanup function
- cleanUpFn();
- }
- };
- }, [...dependencies]);
-}
-
-export { useAbortableEffect };
diff --git a/media-store/app-src/src/hooks/useAppState.js b/media-store/app-src/src/hooks/useAppState.js
deleted file mode 100644
index 831ae73d..00000000
--- a/media-store/app-src/src/hooks/useAppState.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useContext } from 'react';
-import { AppStateContext } from '../contexts/AppStateContext';
-
-const useAppState = () => useContext(AppStateContext);
-
-export { useAppState };
diff --git a/media-store/app-src/src/hooks/useErrors.js b/media-store/app-src/src/hooks/useErrors.js
deleted file mode 100644
index 4ccdd694..00000000
--- a/media-store/app-src/src/hooks/useErrors.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { useHistory } from 'react-router-dom';
-import { useAppState } from './useAppState';
-
-const useErrors = () => {
- const history = useHistory();
- const { setError } = useAppState();
-
- const handleError = (error) => {
- console.error('Error', error);
-
- if (error.response) {
- const { status, statusText, data } = error.response;
- setError({
- status,
- statusText,
- message: data.error ? data.error.message : data,
- });
- } else {
- setError({
- status: '',
- statusText: 'Error',
- message: 'Something went wrong. Seems like request is too long',
- });
- }
-
- history.push('/error');
- };
-
- return {
- handleError,
- };
-};
-
-export { useErrors };
diff --git a/media-store/app-src/src/index.jsx b/media-store/app-src/src/index.jsx
deleted file mode 100644
index 8110e69e..00000000
--- a/media-store/app-src/src/index.jsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-// import * as serviceWorker from './serviceWorker';
-
-ReactDOM.render(, 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: https://bit.ly/CRA-PWA
-// serviceWorker.unregister();
diff --git a/media-store/app-src/src/logo.svg b/media-store/app-src/src/logo.svg
deleted file mode 100644
index 6b60c104..00000000
--- a/media-store/app-src/src/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/media-store/app-src/src/serviceWorker.js b/media-store/app-src/src/serviceWorker.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/media-store/app-src/src/setupTests.js b/media-store/app-src/src/setupTests.js
deleted file mode 100644
index 74b1a275..00000000
--- a/media-store/app-src/src/setupTests.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';
diff --git a/media-store/app-src/src/util/EventEmitter.js b/media-store/app-src/src/util/EventEmitter.js
deleted file mode 100644
index b28a45af..00000000
--- a/media-store/app-src/src/util/EventEmitter.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import EventEmitter from 'events';
-
-const emitter = new EventEmitter();
-
-export { emitter };
diff --git a/media-store/app-src/src/util/constants.js b/media-store/app-src/src/util/constants.js
deleted file mode 100644
index 4b9b4460..00000000
--- a/media-store/app-src/src/util/constants.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const AVAILABLE_LOCALES = ['en', 'fr', 'de'];
-
-export const MESSAGE_TIMEOUT = 2;
-
-export const requireEmployee = (user) => !!user && user.roles.includes('employee');
-
-export const requireCustomer = (user) => !!user && user.roles.includes('customer');
diff --git a/media-store/app-src/src/util/localStorageService.js b/media-store/app-src/src/util/localStorageService.js
deleted file mode 100644
index 853b4817..00000000
--- a/media-store/app-src/src/util/localStorageService.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { isValidUser } from './validateUser';
-import { AVAILABLE_LOCALES } from './constants';
-
-const setUserToLS = (user) => {
- if (user) {
- localStorage.setItem('user', JSON.stringify(user));
- } else {
- localStorage.removeItem('user');
- }
-};
-
-const getUserFromLS = () => {
- let userFromLS;
- try {
- userFromLS = JSON.parse(localStorage.getItem('user'));
- if (isValidUser(userFromLS)) {
- return userFromLS;
- }
- } catch (e) {
- console.error('User from local storage are not valid');
- }
- return undefined;
-};
-
-const getLocaleFromLS = () => {
- const localeFromLS = localStorage.getItem('locale');
- return localeFromLS && localeFromLS !== 'undefined' && AVAILABLE_LOCALES.includes(localeFromLS)
- ? localeFromLS
- : 'en';
-};
-
-const setLocaleToLS = (locale) => {
- localStorage.setItem('locale', locale);
-};
-
-export { setLocaleToLS, getLocaleFromLS, getUserFromLS, setUserToLS };
diff --git a/media-store/app-src/src/util/validateUser.js b/media-store/app-src/src/util/validateUser.js
deleted file mode 100644
index b2d52b29..00000000
--- a/media-store/app-src/src/util/validateUser.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { isArray, isEmpty, isString, isNumber } from 'lodash';
-
-const CUSTOMER_ROLE = 'customer';
-const EMPLOYEE_ROLE = 'employee';
-
-const isValidUser = (user) => {
- return (
- !isEmpty(user) &&
- isNumber(user.ID) &&
- isArray(user.roles) &&
- !!user.roles.some((role) => role === CUSTOMER_ROLE || role === EMPLOYEE_ROLE) &&
- isString(user.email) &&
- isString(user.accessToken) &&
- isString(user.refreshToken)
- );
-};
-
-export { isValidUser };
diff --git a/media-store/app-src/webpack/common-plugins.js b/media-store/app-src/webpack/common-plugins.js
deleted file mode 100644
index 9ae39a04..00000000
--- a/media-store/app-src/webpack/common-plugins.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CopyPlugin = require('copy-webpack-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-
-module.exports = {
- plugins: [
- new CleanWebpackPlugin(),
- new HtmlWebpackPlugin({
- template: path.join(__dirname, '../public/index.html'),
- filename: path.join(__dirname, '../../app/index.html'),
- publicPath: '/static/', // for js bundles path
- }),
- new InterpolateHtmlPlugin(HtmlWebpackPlugin, {
- PUBLIC_URL: '',
- }),
- new CopyPlugin({
- patterns: [
- {
- from: path.join(__dirname, '../public'),
- to: path.join(__dirname, '../../app'),
- globOptions: {
- dot: true,
- ignore: ['**/index.html'],
- },
- },
- ],
- }),
- new webpack.ProgressPlugin(),
- ],
-};
diff --git a/media-store/app-src/webpack/common-rules.js b/media-store/app-src/webpack/common-rules.js
deleted file mode 100644
index 1afcc25e..00000000
--- a/media-store/app-src/webpack/common-rules.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
- rules: [
- {
- test: /\.(js|jsx)$/,
- exclude: /(node_modules)/,
- use: {
- loader: 'babel-loader',
- options: {
- presets: ['@babel/preset-env', '@babel/preset-react'],
- },
- },
- },
- {
- test: /\.(png|jpg)$/,
- use: [{ loader: 'url-loader' }],
- },
- ],
-};
diff --git a/media-store/app-src/webpack/webpack-dev-server.js b/media-store/app-src/webpack/webpack-dev-server.js
deleted file mode 100644
index f0efb72e..00000000
--- a/media-store/app-src/webpack/webpack-dev-server.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const { rules } = require('./common-rules');
-
-module.exports = {
- mode: 'development',
- devtool: 'inline-source-map',
- entry: {
- index: './src/index.jsx',
- },
- devServer: {
- contentBase: './dist',
- compress: true, // compress files to gzip to increase download speed
- port: 3000,
- disableHostCheck: false, // by default true, it is not recomended,
- // because it makes app vulnerable to DNS rebinding attacks
- headers: {
- 'X-Custom-header': 'custom', // this requires apps with authentication
- // useful config obj
- },
- open: true, // open the browser after server had been started
- hot: true, // hot module replacement
- historyApiFallback: true, // needs for react-router-dom
- },
- plugins: [
- new CleanWebpackPlugin({ cleanStaleWebpackAssets: false }),
- new HtmlWebpackPlugin({
- template: path.join(__dirname, '../public/index.html'),
- }),
- new InterpolateHtmlPlugin(HtmlWebpackPlugin, {
- PUBLIC_URL: '',
- }),
- new webpack.ProgressPlugin(),
- new webpack.DefinePlugin({
- 'process.env.SERVICE_URL': JSON.stringify('http://localhost:4004/'),
- }),
- // new webpack.HotModuleReplacementPlugin(), // for hot module replacement option of devServer
- ],
- output: {
- filename: '[name].[fullhash].js',
- path: path.resolve(__dirname, 'dist'),
- },
- module: {
- rules: [
- ...rules,
- {
- test: /\.css$/,
- use: [{ loader: 'style-loader' }, { loader: 'css-loader' }],
- },
- ],
- },
- resolve: { extensions: ['*', '.js', '.jsx'] },
-};
diff --git a/media-store/app-src/webpack/webpack.common.js b/media-store/app-src/webpack/webpack.common.js
deleted file mode 100644
index 83b11f1f..00000000
--- a/media-store/app-src/webpack/webpack.common.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const path = require('path');
-
-module.exports = {
- entry: {
- app: './src/index.jsx', // Bundle with our code
- react: ['react', 'react-dom'],
- lodash: ['lodash'],
- moment: ['moment'],
- events: ['events'],
- axios: ['axios'],
- antd: ['antd'],
- },
- output: {
- // [name] - name of the entry (bundle),
- // [checksum] or [hash] - to cache different bundles
- // from update when developing (doing changes in the files)
- filename: '[name].[fullhash].js',
- // in this folder path bundles will be placed
- path: path.resolve(__dirname, '../../app/static'),
- // where you uploaded your bundled files. (Relative to server root)
- // needs for react-router-dom
- publicPath: '/static/',
- },
- resolve: { extensions: ['*', '.js', '.jsx'] },
-};
diff --git a/media-store/app-src/webpack/webpack.dev.js b/media-store/app-src/webpack/webpack.dev.js
deleted file mode 100644
index ef02a698..00000000
--- a/media-store/app-src/webpack/webpack.dev.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const webpack = require('webpack');
-const { merge } = require('webpack-merge');
-const common = require('./webpack.common.js');
-const { rules } = require('./common-rules');
-const { plugins } = require('./common-plugins');
-
-module.exports = merge(common, {
- mode: 'development',
- devtool: 'inline-source-map',
- plugins: [
- ...plugins,
- new webpack.DefinePlugin({
- 'process.env.SERVICE_URL': JSON.stringify('http://localhost:4004/'),
- }),
- ],
- module: {
- rules: [
- ...rules,
- {
- test: /\.css$/,
- use: [{ loader: 'style-loader' }, { loader: 'css-loader' }],
- },
- ],
- },
-});
diff --git a/media-store/app-src/webpack/webpack.prod.js b/media-store/app-src/webpack/webpack.prod.js
deleted file mode 100644
index bb047d76..00000000
--- a/media-store/app-src/webpack/webpack.prod.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const webpack = require('webpack');
-const { merge } = require('webpack-merge');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
-const common = require('./webpack.common.js');
-const { rules } = require('./common-rules');
-const { plugins } = require('./common-plugins');
-
-module.exports = merge(common, {
- mode: 'production',
- devtool: 'source-map',
- plugins: [
- ...plugins,
- new webpack.DefinePlugin({
- 'process.env.SERVICE_URL': JSON.stringify('api/'),
- }),
- new MiniCssExtractPlugin({
- filename: '[name].css',
- chunkFilename: '[id].css',
- }),
- ],
- optimization: {
- splitChunks: {
- // To split up js code to different bundles.
- chunks: 'all', // Now bundle with our code will be cleaned up
- }, // from vendors imports (2mb ~> 100kb)
- minimize: true,
- minimizer: [new TerserPlugin(), new CssMinimizerPlugin()], // to minimize file size
- },
- module: {
- rules: [
- ...rules,
- {
- test: /\.css$/,
- use: [MiniCssExtractPlugin.loader, 'css-loader'],
- },
- ],
- },
-});
diff --git a/media-store/deployers/approuter/package.json b/media-store/deployers/approuter/package.json
deleted file mode 100644
index d9a4cd89..00000000
--- a/media-store/deployers/approuter/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "media-store-approuter",
- "description": "Approuter",
- "version": "1.0.0",
- "dependencies": {
- "@sap/approuter": "^6.8.2"
- },
- "scripts": {
- "start": "node node_modules/@sap/approuter/approuter.js"
- }
-}
diff --git a/media-store/deployers/approuter/xs-app.json b/media-store/deployers/approuter/xs-app.json
deleted file mode 100644
index 4270e0cb..00000000
--- a/media-store/deployers/approuter/xs-app.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "welcomeFile": "/index.html",
- "authenticationMethod": "none",
- "routes": [
- {
- "source": "/api/(.*)",
- "target": "$1",
- "destination": "srv-binding",
- "authenticationType": "none"
- },
- {
- "source": "^(.*)",
- "target": "mediastore/$1",
- "service": "html5-apps-repo-rt"
- }
- ]
-}
diff --git a/media-store/deployers/html5Deployer/package.json b/media-store/deployers/html5Deployer/package.json
deleted file mode 100644
index 09f597b2..00000000
--- a/media-store/deployers/html5Deployer/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "media-store-html5deployer",
- "engines": {
- "node": ">=6.0.0"
- },
- "dependencies": {
- "@sap/html5-app-deployer": "^2.0.0"
- },
- "scripts": {
- "start": "node node_modules/@sap/html5-app-deployer/index.js"
- }
-}
diff --git a/media-store/deployers/xs-security.json b/media-store/deployers/xs-security.json
deleted file mode 100644
index fd42b7a2..00000000
--- a/media-store/deployers/xs-security.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "xsappname": "media-store-xsuaa",
- "tenant-mode": "dedicated",
- "scopes": [],
- "attributes": [],
- "role-templates": []
-}
diff --git a/media-store/mta.yaml b/media-store/mta.yaml
index 60f2ca04..fff60868 100644
--- a/media-store/mta.yaml
+++ b/media-store/mta.yaml
@@ -48,7 +48,7 @@ modules:
- name: media-store-hmtl5-deployer
# ------------------------------------------------------------
type: com.sap.html5.application-content
- path: deployers/html5Deployer
+ path: app/deployers/html5Deployer
requires:
- name: media-store-html5-host
build-parameters:
@@ -71,7 +71,7 @@ modules:
- name: media-store-approuter
# ------------------------------------------------------------
type: approuter.nodejs
- path: deployers/approuter
+ path: app/deployers/approuter
requires:
- name: media-store-html5-runtime
- name: media-store-xsuaa
@@ -119,7 +119,7 @@ resources:
- name: media-store-xsuaa
# ------------------------------------------------------------
parameters:
- path: deployers/xs-security.json
+ path: app/deployers/xs-security.json
service-plan: application
service: xsuaa
type: org.cloudfoundry.managed-service