@@ -116,3 +123,5 @@
}
+PhoneOfferDetailsComponent.contextType = UserContext
+
export default PhoneOfferDetailsComponent
Index: phonelux-frontend/src/components/PhoneWithOffersComponent/PhoneWithOffersComponent.css
===================================================================
--- phonelux-frontend/src/components/PhoneWithOffersComponent/PhoneWithOffersComponent.css (revision 775e15e60ae9ae29421f2ec15ebde7525163294d)
+++ phonelux-frontend/src/components/PhoneWithOffersComponent/PhoneWithOffersComponent.css (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -69,2 +69,4 @@
border-radius: 50px;
}
+
+
Index: phonelux-frontend/src/components/PhoneWithOffersComponent/PhoneWithOffersComponent.js
===================================================================
--- phonelux-frontend/src/components/PhoneWithOffersComponent/PhoneWithOffersComponent.js (revision 775e15e60ae9ae29421f2ec15ebde7525163294d)
+++ phonelux-frontend/src/components/PhoneWithOffersComponent/PhoneWithOffersComponent.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -5,4 +5,6 @@
import './PhoneWithOffersComponent.css'
import phoneImg from '../../images/phone.png'
+import UserContext from '../../context/UserContext'
+
export class PhoneWithOffersComponent extends Component {
@@ -12,5 +14,6 @@
this.state = {
- phone_offers: []
+ phone_offers: [],
+ loggedUserFavouriteOffers: []
}
}
@@ -21,6 +24,29 @@
this.setState({
phone_offers: response.data
+ }, this.getFavouriteOffersForLoggedUser)
+ }).catch(error => console.log(error))
+ }
+
+ getFavouriteOffersForLoggedUser = () => {
+ if(localStorage.getItem('token'))
+ {
+ var config = {
+ method: 'get',
+ url: '/user/'+this.context.userId+'/favouriteoffers',
+ headers: {
+ 'Authorization': 'Bearer '+localStorage.getItem('token')
+ }
+ };
+
+ axios(config)
+ .then(response => {
+ this.setState({
+ loggedUserFavouriteOffers: response.data
})
- }).catch(error => console.log(error))
+ })
+ .catch(error => {
+ console.log(error);
+ });
+ }
}
@@ -60,5 +86,6 @@
this.state.phone_offers.map((offer,idx) =>
)
}
@@ -73,3 +100,5 @@
}
+PhoneWithOffersComponent.contextType = UserContext
+
export default PhoneWithOffersComponent
Index: phonelux-frontend/src/components/SuperAdminComponent/SuperAdminComponent.css
===================================================================
--- phonelux-frontend/src/components/SuperAdminComponent/SuperAdminComponent.css (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
+++ phonelux-frontend/src/components/SuperAdminComponent/SuperAdminComponent.css (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -0,0 +1,56 @@
+.superadmin-section-header{
+ background-color: #B6E2C8;
+ justify-content: center;
+ align-content: center;
+ margin-top: -30px;
+ width: 100%;
+ display: flex;
+ font-size: 18px;
+}
+.superadmin-section-header-text{
+ width: fit-content;
+}
+
+.superadmin-section-table-row:nth-of-type(even){
+ background-color: #eef2f0;
+}
+
+.superadmin-section-table{
+ border-collapse: collapse;
+ width: 100%;
+ table-layout: fixed;
+}
+
+.superadmin-section-table-row{
+ border: 1px solid gainsboro;
+ padding: 20px ;
+ font-size: 18px;
+}
+
+.superadmin-section-table td{
+ text-align: center;
+ word-wrap: break-word;
+}
+
+.superadmin-section-table-head{
+ background-color: #a6c9ab;
+ font-size: 22px;
+}
+
+.superadmin-section-table-head th{
+ word-wrap: break-word;
+ width: 100%;
+}
+.search-user-field{
+ /* display: flex;
+ height: fit-content;
+ border-radius: 20px; */
+ border: 1px solid rgb(131, 125, 125);
+ width: 100%;
+}
+
+.search-user-input{
+margin:5px;
+width: 100%;
+}
+
Index: phonelux-frontend/src/components/SuperAdminComponent/SuperAdminComponent.js
===================================================================
--- phonelux-frontend/src/components/SuperAdminComponent/SuperAdminComponent.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
+++ phonelux-frontend/src/components/SuperAdminComponent/SuperAdminComponent.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -0,0 +1,201 @@
+import { Pagination } from '@mui/material'
+import { styled, alpha } from '@mui/material/styles';
+import axios from 'axios'
+import React, { Component } from 'react'
+import HeaderComponent from '../HeaderComponent/HeaderComponent'
+import UserComponent from '../UserComponent/UserComponent'
+import "./SuperAdminComponent.css"
+import SearchIcon from '@mui/icons-material/Search';
+import InputBase from '@mui/material/InputBase';
+
+
+const Search = styled('div')(({ theme }) => ({
+ position: 'relative',
+ borderRadius: theme.shape.borderRadius,
+ backgroundColor: alpha(theme.palette.common.white, 0.15),
+ '&:hover': {
+ backgroundColor: alpha(theme.palette.common.white, 0.25),
+ },
+ marginRight: theme.spacing(2),
+ marginLeft: 0,
+ width: '100%',
+ [theme.breakpoints.up('sm')]: {
+ marginLeft: theme.spacing(3),
+ width: 'auto',
+ },
+}));
+
+const SearchIconWrapper = styled('div')(({ theme }) => ({
+ padding: theme.spacing(0, 2),
+ height: '100%',
+ position: 'absolute',
+ pointerEvents: 'none',
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center',
+}));
+
+const StyledInputBase = styled(InputBase)(({ theme }) => ({
+ color: 'inherit',
+ '& .MuiInputBase-input': {
+ padding: theme.spacing(1, 1, 1, 0),
+ // vertical padding + font size from searchIcon
+ paddingLeft: `calc(1em + ${theme.spacing(4)})`,
+ transition: theme.transitions.create('width'),
+ width: '100%',
+ [theme.breakpoints.up('md')]: {
+ width: '20ch',
+ },
+ },
+}));
+
+
+export class SuperAdminComponent extends Component {
+
+ constructor(props) {
+ super(props)
+
+ this.state = {
+ users: [],
+ currentUsers: [],
+ usersPerPage:10,
+ numberOfPages: 0,
+ currentPage: 1,
+ // numberOfUsers: 0,
+ // numberOfAdmins: 0
+ }
+ }
+
+ componentDidMount(){
+ this.getUsers()
+ }
+
+ addAdmin = (id) => {
+ var config = {
+ method: 'put',
+ url: '/management/addadmin/'+id,
+ headers: {
+ 'Authorization': 'Bearer '+localStorage.getItem('token')
+ }
+ };
+
+ axios(config)
+ .then(response => {
+ this.getUsers()
+ })
+ .catch(error => {
+ console.log(error);
+ });
+
+ }
+
+ removeAdmin = (id) => {
+ var config = {
+ method: 'put',
+ url: '/management/removeadmin/'+id,
+ headers: {
+ 'Authorization': 'Bearer '+localStorage.getItem('token')
+ }
+ };
+
+ axios(config)
+ .then(response => {
+ this.getUsers()
+ })
+ .catch(error => {
+ console.log(error);
+ });
+ }
+
+ getUsers = (filter) =>{
+ let queryParams = '?'
+ if(filter)
+ {
+ queryParams+='searchValue='+filter
+ }
+ var config = {
+ method: 'get',
+ url: '/management/users'+queryParams,
+ headers: {
+ 'Authorization': 'Bearer '+localStorage.getItem('token')
+ }
+ };
+
+ axios(config)
+ .then(response => {
+ this.setState({
+ users: response.data,
+ // numberOfUsers: response.data.filter(user => user.userRole == 'USER').length,
+ // numberOfAdmins: response.data.filter(user => user.userRole == 'ADMIN').length,
+ numberOfPages: Math.ceil(response.data.length / this.state.usersPerPage)
+ },(e) => this.setNewPage(e,this.state.currentPage))
+ })
+ .catch(error => {
+ console.log(error);
+ });
+ }
+
+ setNewPage = (event,page) => {
+
+ const indexOfLastUser = parseInt(page) * this.state.usersPerPage;
+ const indexOfFirstUser = indexOfLastUser - this.state.usersPerPage;
+
+ const currUsers = this.state.users.slice(indexOfFirstUser, indexOfLastUser)
+
+ this.setState({
+ currentPage: parseInt(page),
+ currentUsers: currUsers
+ })
+
+ }
+
+ render() {
+ return (
+
+
+
+
+ Менаџмент со корисници
+
+
+
+
+
+
+
+ | Име |
+ Презиме |
+ Е-маил адреса |
+ Привилегии |
+
+ this.getUsers(event.target.value)} className="search-user-field">
+
+
+
+
+
+ |
+
+
+
+ {
+ this.state.currentUsers.map((user,idx) => )
+ }
+
+
+
+
+
+
+ )
+ }
+}
+
+export default SuperAdminComponent
Index: phonelux-frontend/src/components/UserComponent/UserComponent.css
===================================================================
--- phonelux-frontend/src/components/UserComponent/UserComponent.css (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
+++ phonelux-frontend/src/components/UserComponent/UserComponent.css (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -0,0 +1,29 @@
+.superadmin-addadmin-button{
+ font-size: 15px;
+ background-color: #B6E2C8;
+ width: 100%;
+ border-radius: 20px;
+ border: 1px solid black;
+}
+
+.superadmin-addadmin-button:hover{
+ cursor: pointer;
+ background-color: rgb(166, 201, 171);
+ box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19);
+ transition: box-shadow 0.5s, background-color 0.5s ;
+}
+
+.superadmin-removeadmin-button{
+ font-size: 15px;
+ width: 100%;
+ border-radius: 20px;
+ border: 2px solid red;
+ background-color: rgb(243, 203, 203);
+}
+
+.superadmin-removeadmin-button:hover{
+ cursor: pointer;
+ background-color: rgb(228, 179, 179);
+ box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19);
+ transition: box-shadow 0.5s, background-color 0.5s ;
+}
Index: phonelux-frontend/src/components/UserComponent/UserComponent.js
===================================================================
--- phonelux-frontend/src/components/UserComponent/UserComponent.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
+++ phonelux-frontend/src/components/UserComponent/UserComponent.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -0,0 +1,36 @@
+import React, { Component } from 'react'
+import './UserComponent.css'
+
+export class UserComponent extends Component {
+
+ constructor(props) {
+ super(props)
+
+ this.state = {
+
+ }
+ }
+
+
+ render() {
+ return (
+
+ | {this.props.firstname} |
+ {this.props.lastname} |
+ {this.props.email} |
+ {this.props.role == 'USER' ? 'Регистриран корисник' : 'Администратор'} |
+ {
+ this.props.role == 'USER' ?
+ :
+
+ } |
+
+ )
+ }
+}
+
+export default UserComponent
Index: phonelux-frontend/src/components/UserFavouriteOffersComponent/UserFavouriteOffersComponent.css
===================================================================
--- phonelux-frontend/src/components/UserFavouriteOffersComponent/UserFavouriteOffersComponent.css (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
+++ phonelux-frontend/src/components/UserFavouriteOffersComponent/UserFavouriteOffersComponent.css (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -0,0 +1,13 @@
+.user-favourite-offers-header{
+ background-color: #B6E2C8;
+ justify-content: center;
+ align-content: center;
+ margin-top: -30px;
+ width: 100%;
+ display: flex;
+ font-size: 18px;
+}
+.user-favourite-offers-header-text{
+ width: fit-content;
+}
+
Index: phonelux-frontend/src/components/UserFavouriteOffersComponent/UserFavouriteOffersComponent.js
===================================================================
--- phonelux-frontend/src/components/UserFavouriteOffersComponent/UserFavouriteOffersComponent.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
+++ phonelux-frontend/src/components/UserFavouriteOffersComponent/UserFavouriteOffersComponent.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -0,0 +1,105 @@
+import axios from 'axios'
+import React, { Component } from 'react'
+import UserContext from '../../context/UserContext'
+import HeaderComponent from '../HeaderComponent/HeaderComponent'
+import "./UserFavouriteOffersComponent.css"
+import StarIcon from '@mui/icons-material/Star';
+import PhoneOfferComponent from '../PhoneOfferComponent/PhoneOfferComponent'
+import CheaperOffersComponent from '../CheaperOffersComponent/CheaperOffersComponent'
+
+export class UserFavouriteOffersComponent extends Component {
+ constructor(props) {
+ super(props)
+
+ this.state = {
+ userFavouriteOffers: [],
+ openModal : false,
+ cheaperOffers: [],
+ openedOfferPrice: 0,
+ }
+ }
+
+ componentDidMount(){
+ this.getFavouriteOffersForLoggedUser()
+ }
+
+ getFavouriteOffersForLoggedUser = () => {
+ var config = {
+ method: 'get',
+ url: '/user/'+this.context.userId+'/favouriteoffers',
+ headers: {
+ 'Authorization': 'Bearer '+localStorage.getItem('token')
+ }
+ };
+
+ axios(config)
+ .then(response => {
+ this.setState({
+ userFavouriteOffers: response.data
+ })
+ })
+ .catch(error => {
+ console.log(error)
+ })
+ }
+
+ handleClose = () =>{
+ this.setState({
+ openModal: false
+ })
+ }
+
+ handleOpen = (cheaperOffersToShow,offer_price) =>{
+ this.setState({
+ openModal: true,
+ cheaperOffers: cheaperOffersToShow,
+ openedOfferPrice: offer_price
+ })
+ }
+
+ render() {
+
+
+ return (
+
+
+
+
+
+ Омилени понуди
+
+
+
+
+
+
+ | Продавница |
+ Име на понуда |
+ Цена |
+ |
+
+
+
+ {
+ this.state.userFavouriteOffers.map((offer,idx) => )
+ }
+
+
+
+
+
+ )
+ }
+}
+
+UserFavouriteOffersComponent.contextType = UserContext
+export default UserFavouriteOffersComponent
Index: phonelux-frontend/src/context/UserContext.js
===================================================================
--- phonelux-frontend/src/context/UserContext.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
+++ phonelux-frontend/src/context/UserContext.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -0,0 +1,74 @@
+import axios from 'axios'
+import React, { Component } from 'react'
+
+const UserContext = React.createContext()
+
+export class UserProvider extends Component {
+
+ constructor(props) {
+ super(props)
+
+ this.state = {
+ userId: '',
+ name: '',
+ role: '',
+ userFavouriteOffers: []
+ }
+ }
+
+ componentDidMount(){
+ if(localStorage.getItem('token'))
+ {
+ let token = localStorage.getItem('token')
+ axios.get('/token/'+token)
+ .then(response => {
+ const {id, firstName,userRole} = response.data
+ this.setState({
+ userId: id,
+ name: firstName,
+ role: userRole
+ }, this.updateUserFavouriteOffers)
+ }).catch(error => console.log(error))
+ }
+ }
+
+ // updateUserFavouriteOffers = () =>{
+ // var config = {
+ // method: 'get',
+ // url: '/user/'+this.state.userId+'/favouriteoffers',
+ // headers: {
+ // 'Authorization': 'Bearer '+localStorage.getItem('token')
+ // }
+ // };
+
+ // axios(config)
+ // .then(response => {
+ // this.setState({
+ // userFavouriteOffers: response.data
+ // })
+ // })
+ // .catch(error => {
+ // console.log(error)
+ // })
+ // }
+
+
+
+ render() {
+ const {userId,name,role, userFavouriteOffers} = this.state
+ // const {updateUserFavouriteOffers} = this
+ return (
+
+ {this.props.children}
+
+ )
+ }
+}
+
+export default UserContext
Index: phonelux-frontend/src/index.js
===================================================================
--- phonelux-frontend/src/index.js (revision 775e15e60ae9ae29421f2ec15ebde7525163294d)
+++ phonelux-frontend/src/index.js (revision 7e88e4629bb341cb3730a26b5197ab06068ce0db)
@@ -4,7 +4,5 @@
import App from './App';
import reportWebVitals from './reportWebVitals';
-import Data from './components/DataManager';
-window.Data = Data;
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(