Changeset 47f4eaf for phonelux-frontend/src/components

Timestamp:

11/20/22 16:34:52 (2 years ago)

Author:

Marko <Marko@…>

Branches:

master

Parents:

ffd50db

Message:

Final features implemented

Location:

phonelux-frontend/src/components

Files:

• EditOfferComponent/EditOfferComponent.js (modified) (1 diff)
• HomepageComponent.js (modified) (1 diff)
• LoginRegisterComponents/LoginFormComponent.css (modified) (1 diff)
• LoginRegisterComponents/LoginFormComponent.js (modified) (2 diffs)
• NavbarComponent/NavbarComponent.js (modified) (2 diffs)
• OfferReportsComponent/OfferReportsComponent.css (added)
• OfferReportsComponent/OfferReportsComponent.js (added)
• OfferReportsComponent/SingleReportComponent.css (added)
• OfferReportsComponent/SingleReportComponent.js (added)
• PhoneOfferDetailsComponent/PhoneOfferDetailsComponent.css (modified) (1 diff)
• PhoneOfferDetailsComponent/PhoneOfferDetailsComponent.js (modified) (5 diffs)
• ScrappersComponent/ScrapperInfoComponent.js (added)
• ScrappersComponent/ScrappersComponent.css (added)
• ScrappersComponent/ScrappersComponent.js (added)
• SuperAdminComponent/SuperAdminComponent.js (modified) (1 diff)

phonelux-frontend/src/components/EditOfferComponent/EditOfferComponent.js

@@ -17 +17 @@
 
     componentDidMount(){
-        // if(!localStorage.getItem('token'))
-        // {
-        //     window.location.href = "/"
-        // }
-
-        // if(this.context.role != 'ADMIN' && this.context.role != 'SUPERADMIN')
-        // {
-        //     window.location.href = "/"
-        // }
-
         var config = {
             method: 'get',

phonelux-frontend/src/components/HomepageComponent.js

@@ -220 +220 @@
   render() {
     // console.log(this.context)
-    // console.log(localStorage.getItem('token'))
+    console.log(localStorage.getItem('token'))
     // console.log(this.state)
     return (

phonelux-frontend/src/components/LoginRegisterComponents/LoginFormComponent.css

@@ -162 +162 @@
   background-color: rgb(251, 224, 224);
  }
+
+ .login-with-facebook-image{
+  width: 40%;
+ }
+
+.login-with-facebook-image:hover{
+  cursor: pointer;
+}
+
+ .login-with-facebook-wrapper{
+  display: flex;
+  justify-content: center;
+ }

phonelux-frontend/src/components/LoginRegisterComponents/LoginFormComponent.js

@@ -6 +6 @@
 import { Link } from 'react-router-dom';
 import axios from 'axios';
+import FacebookLogin from 'react-facebook-login'
 
 export class LoginFormComponent extends Component {
@@ -18 +19 @@
     }
   }
-  
-  changeHandler = (e) =>{
-      this.setState({[e.target.name] : e.target.value})
-  }
+
 
   submitHandler = (e) => {

phonelux-frontend/src/components/NavbarComponent/NavbarComponent.js

@@ -12 +12 @@
 import SupervisorAccountIcon from '@mui/icons-material/SupervisorAccount';
 import CompareIcon from '@mui/icons-material/Compare';
+import BugReportIcon from '@mui/icons-material/BugReport';
+import ReportIcon from '@mui/icons-material/Report';
+import UpdateIcon from '@mui/icons-material/Update';
 
 export class NavbarComponent extends Component {
@@ -36 +39 @@
             <Link style={{color: 'black'}} to={"/management/users"}>
               <SupervisorAccountIcon style={{fontSize: '40px', marginTop: '10px', marginRight: '10px' }} className='navbar-superadmin-icon'/>
+            </Link>
+          </Tippy> : <></>
+        }
+         {
+          localStorage.getItem('token') && this.context.role == 'SUPERADMIN' ? 
+          <Tippy placement='bottom' content='Преземање на содржина'>
+            <Link style={{color: 'black'}} to={"/scrapperinfo"}>
+              <UpdateIcon style={{fontSize: '40px', marginTop: '10px', marginRight: '10px' }} className='navbar-superadmin-icon'/>
+            </Link>
+          </Tippy> : <></>
+        }
+         {
+          localStorage.getItem('token') && (this.context.role == 'SUPERADMIN' || this.context.role == 'ADMIN') ? 
+          <Tippy placement='bottom' content='Пријавени понуди'>
+            <Link style={{color: 'black'}} to={"/offerreport/reports"}>
+              <BugReportIcon style={{fontSize: '40px', marginTop: '10px', marginRight: '10px' }} className='navbar-offerreports-icon'/>
             </Link>
           </Tippy> : <></>

phonelux-frontend/src/components/PhoneOfferDetailsComponent/PhoneOfferDetailsComponent.css

@@ -140 +140 @@
 }
 
+.offerdetails-report-icon{
+    cursor: pointer;
+}
 
 
+

phonelux-frontend/src/components/PhoneOfferDetailsComponent/PhoneOfferDetailsComponent.js

@@ -9 +9 @@
 import VisibilityIcon from '@mui/icons-material/Visibility';
 import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
+import ReportIcon from '@mui/icons-material/Report';
 
 
@@ -61 +62 @@
   }
 
+    reportOffer = () =>{
+      alert('Пратена е пријава до администратор за невалидност на спецификациите на понудата!')
+      var config = {
+        method: 'post',
+        url: '/offerreport/'+this.state.offerId+'/'+this.context.userId,
+        headers: { 
+          'Authorization': 'Bearer '+localStorage.getItem('token')
+        }
+      };
+      
+      axios(config)
+      .then(function (response) {
+        console.log(JSON.stringify(response.data));
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+    }
+
   render() {
     console.log(this.state)
@@ -71 +91 @@
           {
             localStorage.getItem('token') ? 
+            <Tippy placement='bottom' content='Пријави понуда за неточни спецификации'>
+            <ReportIcon onClick={this.reportOffer} className='offerdetails-report-icon' style={{fontSize: '45px'}}/>
+         </Tippy> : <></>
+          }
+          {
+            localStorage.getItem('token') ? 
             this.state.showAllSpecs ? 
               <Tippy placement='bottom' content='Прикажи ги избраните спецификации'>
@@ -103 +129 @@
 
           })()}
+
         </div>
         <div className='phone-offer-details-last-updated-wrapper'></div>
@@ -109 +136 @@
         <table className='phone-offer-details-table'>
           <thead>
-          <tr><th colSpan={2}>Детали за понудата</th></tr>
+          <tr><th colSpan={2}>
+            Детали за понудата
+          </th></tr>
           </thead>
           <tbody>

phonelux-frontend/src/components/SuperAdminComponent/SuperAdminComponent.js

@@ -69 +69 @@
 
     componentDidMount(){
-      // if(!localStorage.getItem('token'))
-      // {
-      //     window.location.href = "/"
-      // }
-
-      // if(this.context.role != 'SUPERADMIN')
-      // {
-      //     window.location.href = "/"
-      // }
       this.getUsers()
     }