hide address & fix symbol

bahram1249 · Mar 13, 2024 · f60c500 · f60c500
1 parent e785fc3
commit f60c500
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 63 deletions.
diff --git a/apps/discount-coffe/src/controller/buffet/buffet.service.ts b/apps/discount-coffe/src/controller/buffet/buffet.service.ts
@@ -104,6 +104,7 @@ export class BuffetService {
       layout: 'discountcoffe',
       buffet: buffet.toJSON(),
       user: req.user,
+      url: req.url,
     };
   }
 

diff --git a/apps/ui/public/src/discountcoffe/styles/custom.min.css b/apps/ui/public/src/discountcoffe/styles/custom.min.css
@@ -237,3 +237,16 @@ section.cases {
   padding: 11px 20px;
   line-height: normal;
 }
+
+.loginLink {
+  border-radius: 21px;
+  background: #643303;
+  color: #fff;
+  padding: 12px;
+  display: inline-block;
+  text-align: center;
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: normal;
+}
diff --git a/apps/ui/views/discount-coffe/buffets/index.hbs b/apps/ui/views/discount-coffe/buffets/index.hbs
@@ -87,72 +87,83 @@
               class='popup'
             >مشاهده منوی کافه</button></a>
         </div>
-        <div class='address'>
-          <h3 class='head'>آدرس و اطلاعات</h3>
-          <div class='item'>
-            <span>آدرس کافه:</span>
-            {{buffet.buffetAddress}}
-          </div>
-          <div class='item'>
-            <span>شماره تلفن کافه: </span>
-            {{buffet.buffetPhone}}
+        {{#if (isnotnull user)}}
+          <div class='address'>
+            <h3 class='head'>آدرس و اطلاعات</h3>
+            <div class='item'>
+              <span>آدرس کافه:</span>
+              {{buffet.buffetAddress}}
+            </div>
+            <div class='item'>
+              <span>شماره تلفن کافه: </span>
+              {{buffet.buffetPhone}}
+            </div>
           </div>
-        </div>
-        <div class='navigation'>
-          <h5>مسیریابی کافه در</h5>
-          <div class='items'>
-            {{#if (isDefined buffet.neshanLink)}}
-              <div class='item'>
-                <a href='{{buffet.neshanLink}}'>
-                  <img
-                    src='/theme/discountcoffe/assets/img/png/neshan.png'
-                    alt=''
-                  />
+          <div class='navigation'>
+            <h5>مسیریابی کافه در</h5>
+            <div class='items'>
+              {{#if (isDefined buffet.neshanLink)}}
+                <div class='item'>
+                  <a href='{{buffet.neshanLink}}'>
+                    <img
+                      src='/theme/discountcoffe/assets/img/png/neshan.png'
+                      alt=''
+                    />
 
-                  <span>نشان</span>
-                </a>
-              </div>
-            {{/if}}
-            {{#if (isDefined buffet.baladLink)}}
-              <div class='item'>
-                <a href='{{buffet.baladLink}}'>
-                  <img
-                    src='/theme/discountcoffe/assets/img/png/balad.png'
-                    alt=''
-                  />
+                    <span>نشان</span>
+                  </a>
+                </div>
+              {{/if}}
+              {{#if (isDefined buffet.baladLink)}}
+                <div class='item'>
+                  <a href='{{buffet.baladLink}}'>
+                    <img
+                      src='/theme/discountcoffe/assets/img/png/balad.png'
+                      alt=''
+                    />
 
-                  <span>بلد</span>
-                </a>
-              </div>
-            {{/if}}
-            {{#if (isDefined buffet.googleMapLink)}}
-              <div class='item'>
-                <a href='{{buffet.googleMapLink}}'>
-                  <img
-                    src='/theme/discountcoffe/assets/img/png/google.png'
-                    alt=''
-                  />
-                  <span>گوگل مپ</span>
-                </a>
-              </div>
+                    <span>بلد</span>
+                  </a>
+                </div>
+              {{/if}}
+              {{#if (isDefined buffet.googleMapLink)}}
+                <div class='item'>
+                  <a href='{{buffet.googleMapLink}}'>
+                    <img
+                      src='/theme/discountcoffe/assets/img/png/google.png'
+                      alt=''
+                    />
+                    <span>گوگل مپ</span>
+                  </a>
+                </div>
 
-            {{/if}}
-            {{#if (isDefined buffet.wazeLink)}}
-              <div class='item'>
-                <a href='{{buffet.wazeLink}}'>
-                  <img
-                    src='/theme/discountcoffe/assets/img/png/waze.png'
-                    alt=''
-                  />
-                  <span>ویز</span>
-                </a>
-              </div>
-            {{/if}}
+              {{/if}}
+              {{#if (isDefined buffet.wazeLink)}}
+                <div class='item'>
+                  <a href='{{buffet.wazeLink}}'>
+                    <img
+                      src='/theme/discountcoffe/assets/img/png/waze.png'
+                      alt=''
+                    />
+                    <span>ویز</span>
+                  </a>
+                </div>
+              {{/if}}
+            </div>
           </div>
-        </div>
-        <div class='maps'>
-          <div id='map'></div>
-        </div>
+          <div class='maps'>
+            <div id='map'></div>
+          </div>
+        {{else}}
+          <div class='address'>
+            <h3 class='head'>آدرس و اطلاعات</h3>
+            <div class='item'>
+              <span>برای نمایش آدرس لطفا وارد شوید</span>
+              <a class='loginLink' href='/login?redirectUrl={{url}}'>وارد شدن</a>
+            </div>
+
+          </div>
+        {{/if}}
         {{! <div class='comment'>
           <h3 class='head'>نظرات</h3>
           <div class='counts'>

diff --git a/apps/ui/views/discount-coffe/home/index.hbs b/apps/ui/views/discount-coffe/home/index.hbs
@@ -215,8 +215,8 @@
       </div>
       <div class='col-md-7'>
         <div class='heading'>
-          <h5>کافه های شگفت انگیز</h5>
-          <p>کافه های شگفت انگیز بیش از 10 درصد تخفیف</p>
+          <h5>کافه های تخفیف شگفت انگیز</h5>
+          <p>کافه های با تخفیف شگفت انگیز بیش از 10 درصد</p>
           <a class='more' href='/buffet/list?buffetCostId=3'>همه کافه ها</a>
         </div>
         <div class='offersSlider'>