updated routes & navigation

guruakashsm · Mar 25, 2024 · 8ad2bf0 · 8ad2bf0
1 parent 59fd1c9
commit 8ad2bf0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/frontend/home/index.html b/frontend/home/index.html
@@ -1068,7 +1068,7 @@ <h3 class="newsletter-title">Subscribe Newsletter.</h3>
         <ul class="desktop-menu-category-list">
 
           <li class="menu-category">
-            <a href="#" class="menu-title">Home</a>
+            <a onclick="HomePage()" class="menu-title">Home</a>
           </li>
 
           <li class="menu-category">
@@ -1326,19 +1326,20 @@ <h3 class="newsletter-title">Subscribe Newsletter.</h3>
 
     </nav>
 
-    <div class="mobile-bottom-navigation">
 
-      <button class="action-btn" data-mobile-menu-open-btn>
-        <ion-icon name="menu-outline"></ion-icon>
+    <div class="mobile-bottom-navigation" onclick="DisplayOrders()">
+
+      <button class="action-btn" data-mobile-menu-open-btn >
+        <ion-icon name="person-outline"></ion-icon>
       </button>
 
-      <button class="action-btn">
+      <button class="action-btn" onclick="DisplayCart()">
         <ion-icon name="bag-handle-outline"></ion-icon>
 
         <span class="count">0</span>
       </button>
 
-      <button class="action-btn">
+      <button class="action-btn" onclick="HomePage()">
         <ion-icon name="home-outline"></ion-icon>
       </button>
 

diff --git a/frontend/seller/signin/script.js b/frontend/seller/signin/script.js
@@ -41,7 +41,7 @@ sellerForm.addEventListener('click', (e) => {
         const jsonString = JSON.stringify(sellerData);
         localStorage.setItem('sellerdata', `${jsonString}`);
         setTimeout(()=>{
-          window.location.href = "/seller/drashboard"
+          window.location.href = "/seller/dashboard"
         },2000)
       }
 

diff --git a/frontend/signin/index.html b/frontend/signin/index.html
@@ -30,7 +30,7 @@
             <div class="container">
                 <br>
                 <h9 class="message"></h9>
-                <button class="js-continue" onclick="window.location.href='/anon/home'">Continue</button>
+                <button class="js-continue" onclick="window.location.href='/home'">Continue</button>
                 <button class="new-signin"
                     onclick="document.querySelector('.sign-in').style.display = 'block';document.querySelector('.allready-signin').style.display = 'none';localStorage.removeItem('userdata')">SignIn</button>
                 <br>
@@ -47,7 +47,7 @@
                         <figure>
                             <img src="./images/login-image.gif" alt="sing up image" style="max-width: 140%;height: 340px;margin-left: -50px;" class="js-image">
                         </figure>
-                        <a href="/anon/signup" class="signup-image-link">Create an account</a>
+                        <a href="/signup" class="signup-image-link">Create an account</a>
                     </div>
 
                     <div class="signin-form">

diff --git a/router/router.go b/router/router.go
@@ -18,6 +18,7 @@ func Router() *gin.Engine {
 	router.Static("/signin", "./frontend/signin")
 	router.Static("/seller/signin","./frontend/seller/signin")
 	router.Static("/seller/signup", "./frontend/seller/signup")
+	router.Static("/seller/dashboard", "./frontend/seller/dashboard")
 
 	// Define your routes
 	router.GET("/getallcustomerdata", controller.GetallCustomerdata)

diff --git a/service/Feedback.go b/service/Feedback.go
@@ -116,16 +116,16 @@ func Deletefeedback(delete models.FeedbackDB) int32 {
 }
 
 // Get all Feedbacks
-func GetFeedBacks() []models.Feedback {
+func GetFeedBacks() []models.FeedbackDB {
 	filter := bson.M{}
 	cursor, err := config.Feedback_Collection.Find(context.Background(), filter)
-	var Feedback []models.Feedback
+	var Feedback []models.FeedbackDB
 	if err != nil {
 		log.Println(err)
 	}
 
 	for cursor.Next(context.Background()) {
-		var feedback models.Feedback
+		var feedback models.FeedbackDB
 		err := cursor.Decode(&feedback)
 		if err != nil {
 			log.Println(err)

diff --git a/service/Seller.go b/service/Seller.go
@@ -498,7 +498,7 @@ func GetCustromerOrderforSeller(details models.GetOrder) (*models.AddOrder, stri
 	if err != nil {
 		return &orderDetails, "No Result found", err
 	}
-	if orderDetails.SellerId != id  {
+	if orderDetails.SellerId != id && orderDetails.CustomerId != id {
 		return nil, "Order not Found", nil
 	}
 	return &orderDetails, "Success", nil