Skip to content

Ft/membership placement icon #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions public/images/membership/Member_icon_double_gold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/membership/Member_icon_gold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/membership/Member_icon_green.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions public/images/membership/Member_icon_triple_gold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/membership/Member_icon_white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 13 additions & 3 deletions src/app/[locale]/seller/registration/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
TelephoneInput
} from '@/components/shared/Forms/Inputs/Inputs';
import ConfirmDialog from '@/components/shared/confirm';
import MembershipIcon from '@/components/shared/membership/MembershipIcon';
import OnlineShopping from '@/components/shared/Seller/ShopItem';
import ToggleCollapse from '@/components/shared/Seller/ToggleCollapse';
import Skeleton from '@/components/skeleton/skeleton';
Expand Down Expand Up @@ -372,9 +373,18 @@ const SellerRegistrationForm = () => {
return (
<>
<div className="w-full md:w-[500px] md:mx-auto p-4">
<div className="text-center mb-5">
<h3 className="text-gray-400 text-sm">
{dbSeller ? dbSeller.name : ''}
<div className="w-full flex flex-col items-center mb-5">
<h3 className="text-gray-400 text-sm flex items-center">
{dbSeller ? dbSeller.name : ''}
<MembershipIcon
category='triple_gold'
className="ml-1"
styleComponent={{
display: "inline-block",
objectFit: "contain",
verticalAlign: "middle"
}}
/>
</h3>
<h1 className={HEADER}>
{t('SCREEN.SELLER_REGISTRATION.SELLER_REGISTRATION_HEADER')}
Expand Down
18 changes: 15 additions & 3 deletions src/app/[locale]/seller/sale-items/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import React, { useEffect, useState, useContext, useRef } from 'react';

import ConfirmDialog from '@/components/shared/confirm';
import { Button, OutlineBtn } from '@/components/shared/Forms/Buttons/Buttons';
import { Select, TextArea } from '@/components/shared/Forms/Inputs/Inputs';
import MembershipIcon from '@/components/shared/membership/MembershipIcon';
import TrustMeter from '@/components/shared/Review/TrustMeter';
import { ListItem } from '@/components/shared/Seller/ShopItem';
import ToggleCollapse from '@/components/shared/Seller/ToggleCollapse';
import Skeleton from '@/components/skeleton/skeleton';
import { ISeller, IUserSettings, IUser, SellerItem } from '@/constants/types';
Expand All @@ -19,8 +22,6 @@ import { checkAndAutoLoginUser } from '@/utils/auth';

import { AppContext } from '../../../../../../context/AppContextProvider';
import logger from '../../../../../../logger.config.mjs';
import { ListItem, ShopItem } from '@/components/shared/Seller/ShopItem';
import { Select, TextArea } from '@/components/shared/Forms/Inputs/Inputs';

export default function BuyFromSellerForm({ params }: { params: { id: string } }) {
const SUBHEADER = "font-bold mb-2";
Expand Down Expand Up @@ -178,7 +179,18 @@ export default function BuyFromSellerForm({ params }: { params: { id: string } }
/>
</div>
<div className="my-auto">
<h2 className="font-bold mb-2">{sellerShopInfo.name}</h2>
<h2 className="font-bold text-[18px] mb-2 flex items-center">
{sellerShopInfo.name}
<MembershipIcon
category='triple_gold'
className="ml-1"
styleComponent={{
display: "inline-block",
objectFit: "contain",
verticalAlign: "middle"
}}
/>
</h2>
<p className="text-sm">{translateSellerCategory(sellerShopInfo.seller_type)}</p>
</div>
</div>
Expand Down
37 changes: 23 additions & 14 deletions src/components/shared/map/MapMarkerPopup.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { useTranslations, useLocale } from 'next-intl';
import Image from 'next/image';
import Link from 'next/link';

import TrustMeter from '@/components/shared/Review/TrustMeter';
import MembershipIcon from '../membership/MembershipIcon';
import { Button } from '../Forms/Buttons/Buttons';

import logger from '../../../../logger.config.mjs';

const MapMarkerPopup = ({ seller }: { seller: any }) => {
Expand Down Expand Up @@ -39,18 +38,28 @@ const MapMarkerPopup = ({ seller }: { seller: any }) => {
<div style={{ position: 'relative', zIndex: 20, padding: '10px' }}>
{/* Seller name and type - Close with a small gap */}
<div style={{ textAlign: 'center', marginBottom: '5px' }}>
<h2
style={{
fontWeight: 'bold',
fontSize: '15px',
marginBottom: '2px',
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}
>
{truncateChars(seller.name, 12)} {/* Adjust limit as needed */}
</h2>
<div className="flex gap-1 justify-center items-center">
<h2
style={{
fontWeight: 'bold',
fontSize: '15px',
marginBottom: '2px',
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}
>
{truncateChars(seller.name, 12)} {/* Adjust limit as needed */}
</h2>
<MembershipIcon
category='triple_gold'
styleComponent={{
display: "inline-block",
objectFit: "contain",
verticalAlign: "middle"
}}
/>
</div>

{seller.seller_type && (
<p style={{ fontSize: '14px', color: '#6B7280', marginTop: '0px', marginBottom: '4px' }}>
Expand Down
Loading