Skip to content
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

U3 v2 #626

Merged
merged 122 commits into from
Mar 18, 2024
Merged

U3 v2 #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
16dfd76
feat: u3 v2 layout
friendlysxw Feb 27, 2024
8006787
feat: notification layout & save layout
friendlysxw Feb 28, 2024
50002f7
reconstruct files
sin-bufan Feb 28, 2024
b09d89a
reconstruct profile route
sin-bufan Feb 28, 2024
766b429
rearrange data flow of profile
sin-bufan Feb 28, 2024
aaf4aa4
rearrange components structure and data flow of profile
sin-bufan Feb 28, 2024
ca4a1eb
reconstruct files
sin-bufan Feb 28, 2024
b206fb3
reconstruct profile route
sin-bufan Feb 28, 2024
b2da767
rearrange data flow of profile
sin-bufan Feb 28, 2024
c11d845
rearrange components structure and data flow of profile
sin-bufan Feb 28, 2024
0130a0e
feat: explore layout on PC
friendlysxw Feb 29, 2024
eac671f
Merge pull request #578 from us3r-network/F-explorePcLayout-shixuewen
friendlysxw Feb 29, 2024
d601d15
add filter to profile posts and contacts
sin-bufan Mar 1, 2024
cc06d06
merge
sin-bufan Mar 1, 2024
8ac60cc
fix some styles in profile
sin-bufan Mar 1, 2024
c48ae91
add u3 v2 cicd
sin-bufan Mar 1, 2024
4a70638
fix identity address
sin-bufan Mar 1, 2024
150a797
Merge pull request #582 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 1, 2024
94a8391
fix profile info card contacts link
sin-bufan Mar 1, 2024
66bfe51
fix fav list styles
sin-bufan Mar 1, 2024
826334b
fix profile menu bug
sin-bufan Mar 1, 2024
5f98c44
Merge pull request #583 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 1, 2024
044f328
feat: v2 mobile layout
friendlysxw Mar 2, 2024
473c70b
hide fav menu for others
sin-bufan Mar 4, 2024
a90d74a
Merge pull request #585 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 4, 2024
29d23bc
Merge branch 'u3-v2' into F-v2MobileLayout-shixuewen
friendlysxw Mar 4, 2024
d19aec2
feat: mobile header layout
friendlysxw Mar 4, 2024
b2b2f2c
feat: community & explore ui
friendlysxw Mar 4, 2024
3d13b88
fix: community href active
friendlysxw Mar 4, 2024
c2d8770
Merge pull request #586 from us3r-network/F-v2MobileLayout-shixuewen
friendlysxw Mar 4, 2024
481b467
reconstruct profile info
sin-bufan Mar 5, 2024
dfb2a2a
fix contacts bugs
sin-bufan Mar 5, 2024
df2831d
reconstruct files
sin-bufan Mar 5, 2024
cff0494
reconstruct profile info
sin-bufan Mar 5, 2024
92354cc
fix contacts bugs
sin-bufan Mar 5, 2024
67c3db5
reconstruct files
sin-bufan Mar 5, 2024
11d9f31
Merge branch 'F-reconstructProfile-bufan' of github.com:us3r-network/…
sin-bufan Mar 5, 2024
9925e1b
remove unuused file
sin-bufan Mar 5, 2024
f6ac4fe
updaate profile info style
sin-bufan Mar 5, 2024
c162db5
feat: add caster daily route
friendlysxw Mar 5, 2024
2ee4e8c
Merge pull request #587 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 5, 2024
95255cc
Merge pull request #589 from us3r-network/F-casterDailyRoute-shixuewen
friendlysxw Mar 5, 2024
a077e24
feat: add to menu when browsing channel
friendlysxw Mar 5, 2024
e7a0ffb
profile drop menu
sin-bufan Mar 5, 2024
d3bd08c
profile drop menu
sin-bufan Mar 5, 2024
d44f436
profile drop menu
sin-bufan Mar 5, 2024
b0a0d58
Merge pull request #591 from us3r-network/F-browsingChannel-shixuewen
friendlysxw Mar 6, 2024
3ec4203
profile drop menu
sin-bufan Mar 5, 2024
718a731
profile drop menu
sin-bufan Mar 5, 2024
8d08ebb
profile drop menu
sin-bufan Mar 5, 2024
4b58fae
Merge branch 'F-reconstructProfile-bufan' of github.com:us3r-network/…
sin-bufan Mar 6, 2024
ac8d0aa
Merge pull request #592 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 6, 2024
9eb19cb
add account submenu to profile menu
sin-bufan Mar 6, 2024
3fdbc16
Merge pull request #594 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 6, 2024
0ffe0c1
profile stats
sin-bufan Mar 6, 2024
1706f96
profile stats
sin-bufan Mar 6, 2024
b3ff969
remove extra file
sin-bufan Mar 6, 2024
3a4ac3d
remove extra code
sin-bufan Mar 6, 2024
7570747
feat: v2 message
friendlysxw Mar 6, 2024
4ac88a6
reconstruct follow pages
sin-bufan Mar 7, 2024
2bc451e
Merge pull request #596 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 7, 2024
f102868
feat: update message layout
friendlysxw Mar 7, 2024
6208b4c
Merge branch 'u3-v2' into F-v2Message-shixuewen
friendlysxw Mar 7, 2024
b0f2798
Merge pull request #597 from us3r-network/F-v2Message-shixuewen
friendlysxw Mar 7, 2024
2aec918
optimize user following ctx
sin-bufan Mar 8, 2024
e32157e
feat: message profile info
friendlysxw Mar 8, 2024
32912fb
mobile adaptation
sin-bufan Mar 8, 2024
9dbc119
Merge pull request #598 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 8, 2024
c8871f3
using route login gate at notificaiton page
sin-bufan Mar 8, 2024
add76b3
fix profile page style
sin-bufan Mar 8, 2024
ceb8659
add mobile profile header
sin-bufan Mar 8, 2024
54e5603
feat: profile info headless
friendlysxw Mar 8, 2024
a3b8fe0
Merge pull request #601 from us3r-network/F-messageProfileInfo-shixuewen
friendlysxw Mar 8, 2024
b63b7a6
feat: message mobile layout
friendlysxw Mar 8, 2024
34f1c78
Merge branch 'u3-v2' into F-messageMobileLayout-shixuewen
friendlysxw Mar 8, 2024
bda7674
feat: message route permission
friendlysxw Mar 11, 2024
d91ec63
Merge pull request #599 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 11, 2024
553ba08
Merge pull request #602 from us3r-network/F-messageMobileLayout-shixu…
friendlysxw Mar 11, 2024
0eb2f9f
add profile mobile header
sin-bufan Mar 11, 2024
3cb5316
Merge pull request #603 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 11, 2024
e22564b
fix: posts cache sorting and splitting
friendlysxw Mar 11, 2024
f3a29d5
fix: Leave the channel you are browsing
friendlysxw Mar 11, 2024
0b589a3
fix: sidebar bgCorlor
friendlysxw Mar 11, 2024
fbefdcc
fix save page of profile
sin-bufan Mar 11, 2024
f45c282
Merge pull request #605 from us3r-network/B-fixPostsCache-shixuewen
friendlysxw Mar 11, 2024
ff4a619
fix some styles in profile pages
sin-bufan Mar 11, 2024
5fda13b
Merge pull request #606 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 11, 2024
8746564
fix: mobile navigation text font size
friendlysxw Mar 12, 2024
ccf7785
feat: communities v2
friendlysxw Mar 13, 2024
fac4531
notifications
sin-bufan Mar 13, 2024
e494019
notifications
sin-bufan Mar 13, 2024
8aa5b6f
Merge pull request #608 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 13, 2024
2b3b7ca
feat: growing communities & join action
friendlysxw Mar 13, 2024
ac31330
Merge pull request #607 from us3r-network/B-mobileNavTextSize-shixuewen
friendlysxw Mar 13, 2024
33c0649
update dep version
sin-bufan Mar 13, 2024
f882353
Merge pull request #610 from us3r-network/F-communitiesV2-shixuewen
friendlysxw Mar 13, 2024
112a150
Merge pull request #611 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 13, 2024
7359470
feat: browsing community
friendlysxw Mar 14, 2024
5efa960
fix: community routing activation & community type filter text
friendlysxw Mar 14, 2024
6c8c665
Merge pull request #613 from us3r-network/F-browsingCommunity-shixuewen
friendlysxw Mar 14, 2024
a5426ce
feat: community floating window
friendlysxw Mar 14, 2024
4b9a0e3
fav page
sin-bufan Mar 14, 2024
add21fa
Merge pull request #614 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 14, 2024
7ecd4af
fav page mobile
sin-bufan Mar 14, 2024
9abded4
add login to mobile header
sin-bufan Mar 14, 2024
c8e058b
add login to mobile header
sin-bufan Mar 14, 2024
8e4fbac
Merge pull request #617 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 14, 2024
c960846
fix: select click event passthrough underneath
friendlysxw Mar 14, 2024
f3ee877
Merge pull request #616 from us3r-network/F-communityFloatingWindow-s…
friendlysxw Mar 14, 2024
21e7e16
feat: explore hot communities
friendlysxw Mar 14, 2024
e14833e
remove console.log
sin-bufan Mar 15, 2024
88cd6a9
fix: community description style
friendlysxw Mar 15, 2024
2bed590
mobile profile drawer
sin-bufan Mar 15, 2024
bafb627
Merge pull request #620 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 15, 2024
2d2a725
feat: organize mobile header menu
friendlysxw Mar 15, 2024
13d3d7c
Merge pull request #618 from us3r-network/F-exploreHotCommunities-shi…
friendlysxw Mar 15, 2024
d2d57ea
Merge pull request #623 from us3r-network/F-organizeMobileHeaderMenu-…
friendlysxw Mar 15, 2024
93c1e78
feat: add explore and login buttons to the sidebar
friendlysxw Mar 15, 2024
59ba7c3
fix mobile header style
sin-bufan Mar 15, 2024
46642f8
Merge pull request #624 from us3r-network/F-updateSidebarLayout-shixu…
friendlysxw Mar 15, 2024
be9e3fd
Merge pull request #625 from us3r-network/F-reconstructProfile-bufan
sin-bufan Mar 15, 2024
f843ae0
Merge branch 'u3-dev' into u3-v2
sin-bufan Mar 18, 2024
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
51 changes: 50 additions & 1 deletion .github/workflows/u3-firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ name: Deploy u3 to Firebase Hosting on merge
branches:
- u3
- u3-dev
- u3-v2
- u3-pwa
jobs:
prod_build_and_deploy:
Expand Down Expand Up @@ -123,7 +124,7 @@ jobs:
env:
CI: false
REACT_APP_NAME: "U3 DEV"
NODE_OPTIONS: "--max_old_space_size=4096"
NODE_OPTIONS: "--max_old_space_size=8192"
REACT_APP_API_BASE_URL: "${{ vars.REACT_APP_API_BASE_URL }}"
REACT_APP_S3_API_BASE_URL: "${{ vars.REACT_APP_S3_API_BASE_URL }}"
REACT_APP_US3R_UPLOAD_IMAGE_ENDPOINT: "${{ vars.REACT_APP_US3R_UPLOAD_IMAGE_ENDPOINT }}"
Expand Down Expand Up @@ -153,3 +154,51 @@ jobs:
projectId: us3r-network
target: u3-pwa
entryPoint: "./apps/u3/"
v2_build_and_deploy:
if: github.ref == 'refs/heads/u3-v2'
runs-on: ubuntu-latest
environment:
name: development
url: https://v2.u3.xyz
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "20"
- run: |
cd apps/u3
yarn install --ignore-engines
yarn build
env:
CI: false
REACT_APP_NAME: "U3 V2 DEV"
NODE_OPTIONS: "--max_old_space_size=8192"
REACT_APP_API_BASE_URL: "${{ vars.REACT_APP_API_BASE_URL }}"
REACT_APP_S3_API_BASE_URL: "${{ vars.REACT_APP_S3_API_BASE_URL }}"
REACT_APP_US3R_UPLOAD_IMAGE_ENDPOINT: "${{ vars.REACT_APP_US3R_UPLOAD_IMAGE_ENDPOINT }}"
REACT_APP_CERAMIC_HOST: "${{ vars.REACT_APP_CERAMIC_HOST }}"
REACT_APP_CHROME_EXTENSION_URL: "${{ vars.REACT_APP_CHROME_EXTENSION_URL }}"
REACT_APP_API_SOCIAL_URL: "${{ vars.REACT_APP_API_SOCIAL_URL }}"
REACT_APP_XMTP_ENV: "${{ vars.REACT_APP_XMTP_ENV }}"
REACT_APP_LENS_ENV: "${{ vars.REACT_APP_LENS_ENV }}"
REACT_APP_FARCASTER_HUB_URL: "${{ vars.REACT_APP_FARCASTER_HUB_URL }}"
REACT_APP_FARCASTER_NETWORK: "${{ vars.REACT_APP_FARCASTER_NETWORK }}"
REACT_APP_NFT_STORAGE_API_KEY: "${{ vars.REACT_APP_NFT_STORAGE_API_KEY }}"
REACT_APP_DAPP_NFT_TO_MINT: "${{ vars.REACT_APP_DAPP_NFT_TO_MINT }}"
REACT_APP_DAPP_NFT_FIXED_PRICE_STRATEGY: "${{ vars.REACT_APP_DAPP_NFT_FIXED_PRICE_STRATEGY }}"
REACT_APP_DAPP_NFT_CHAIN_ID: "${{ vars.REACT_APP_DAPP_NFT_CHAIN_ID }}"
REACT_APP_DAPP_NFT_RECIPIENT_ADDRESS: "${{ vars.REACT_APP_DAPP_NFT_RECIPIENT_ADDRESS }}"
REACT_APP_CASTER_NFT_TO_MINT: "${{ vars.REACT_APP_CASTER_NFT_TO_MINT }}"
REACT_APP_CASTER_NFT_FIXED_PRICE_STRATEGY: "${{ vars.REACT_APP_CASTER_NFT_FIXED_PRICE_STRATEGY }}"
REACT_APP_CASTER_NFT_CHAIN_ID: "${{ vars.REACT_APP_CASTER_NFT_CHAIN_ID }}"
REACT_APP_CASTER_NFT_RECIPIENT_ADDRESS: "${{ vars.REACT_APP_CASTER_NFT_RECIPIENT_ADDRESS }}"
REACT_APP_VAPID_PUBLIC_KEY: "${{ vars.REACT_APP_VAPID_PUBLIC_KEY }}"
REACT_APP_RED_ENVELOPE_PLEDGE_ADDRESS: "${{ vars.REACT_APP_RED_ENVELOPE_PLEDGE_ADDRESS }}"
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_US3R_NETWORK }}"
channelId: live
projectId: us3r-network
target: u3-v2
entryPoint: "./apps/u3/"
3 changes: 3 additions & 0 deletions apps/u3/.firebaserc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
],
"u3-pwa": [
"us3r-u3-pwa"
],
"u3-v2": [
"us3r-u3-v2"
]
}
}
Expand Down
2 changes: 2 additions & 0 deletions apps/u3/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# U3
use --ignore-engines when install deps
```yarn install --ignore-engines```
this project use more mem than node default
```export NODE_OPTIONS=--max_old_space_size=8192```
15 changes: 15 additions & 0 deletions apps/u3/firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,21 @@
"destination": "/index.html"
}
]
},
{
"target": "u3-v2",
"public": "build",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
]
}
4 changes: 4 additions & 0 deletions apps/u3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@
"@radix-ui/react-alert-dialog": "^1.0.5",
"@radix-ui/react-avatar": "^1.0.4",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-collapsible": "^1.0.3",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-hover-card": "^1.0.7",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-navigation-menu": "^1.1.4",
"@radix-ui/react-popover": "^1.0.7",
"@radix-ui/react-select": "^2.0.0",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-tooltip": "^1.0.7",
Expand Down Expand Up @@ -110,6 +113,7 @@
"tslib": "^2.3.0",
"typescript": "^5.3.3",
"validator": "^13.11.0",
"vaul": "^0.9.0",
"viem": "~2.7.11",
"wagmi": "^2.5.7",
"web-vitals": "^2.1.4",
Expand Down
14 changes: 9 additions & 5 deletions apps/u3/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ import { injectStore, injectU3Token } from './services/shared/api/request';
import U3LoginProvider from './contexts/U3LoginContext';
import { XmtpClientProvider } from './contexts/message/XmtpClientCtx';
import { AppLensProvider } from './contexts/social/AppLensCtx';
import { NavProvider } from './contexts/NavCtx';
import FarcasterProvider from './contexts/social/FarcasterCtx';
import LensGlobalModals from './components/social/lens/LensGlobalModals';
import { GlobalModalsProvider } from './contexts/shared/GlobalModalsCtx';
import GlobalModals from './components/shared/modal/GlobalModals';
import { ProfileInfoProvider } from './contexts/profile/ProfileInfoCtx';

init(AIRSTACK_API_KEY);
dayjs.extend(relativeTime);
Expand All @@ -47,6 +47,10 @@ function App() {
<Us3rAuthWithRainbowkitProvider
projectId={WALLET_CONNECT_PROJECT_ID}
appName="U3"
authOpts={{
resources: ['ceramic://*'],
expirationTime: '',
}}
>
<ProfileStateProvider ceramicHost={CERAMIC_HOST}>
<LinkStateProvider ceramicHost={CERAMIC_HOST}>
Expand All @@ -61,13 +65,13 @@ function App() {
<GlobalStyle />
<BrowserRouter>
<FarcasterProvider>
<GlobalModalsProvider>
<NavProvider>
<ProfileInfoProvider>
<GlobalModalsProvider>
<GlobalModals />
<LensGlobalModals />
<Layout />
</NavProvider>
</GlobalModalsProvider>
</GlobalModalsProvider>
</ProfileInfoProvider>
</FarcasterProvider>
</BrowserRouter>
</ReduxProvider>
Expand Down
4 changes: 3 additions & 1 deletion apps/u3/src/components/common/button/ColorButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ export default function ColorButton({
return (
<Button
className={cn(
'h-[48px] p-[12px] gap-[8px] rounded-[12px] text-white text-[16px] font-bold bg-[#5057AA] hover:bg-[#454C99]',
'h-[48px] p-[12px] gap-[8px] rounded-[12px] bg-[#F41F4C] hover:bg-[#F41F4C]',
'text-[#FFF] text-center text-[14px] font-medium leading-[20px]',
'max-sm:h-[36px] max-sm:px-[12px] max-sm:py-[0px]',
className
)}
{...props}
Expand Down
26 changes: 16 additions & 10 deletions apps/u3/src/components/common/card/CardBase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,20 @@
* @LastEditTime: 2022-12-13 19:43:08
* @Description: file description
*/
import styled from 'styled-components';
import { ComponentPropsWithRef } from 'react';
import { cn } from '@/lib/utils';

const CardBase = styled.div`
padding: 20px;
box-sizing: border-box;
background: #1b1e23;
border-radius: 20px;
border: 1px solid #39424c;
overflow: hidden;
`;
export default CardBase;
export default function CardBase({
className,
...props
}: ComponentPropsWithRef<'div'>) {
return (
<div
className={cn(
'p-[20px] box-border bg-[#1b1e23] rounded-[20px] border-[1px] border-solid border-[#39424c] overflow-hidden',
className
)}
{...props}
/>
);
}
26 changes: 26 additions & 0 deletions apps/u3/src/components/common/icons/BookmarkIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { ComponentPropsWithRef } from 'react';

export default function BookmarkIcon(props: ComponentPropsWithRef<'svg'>) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
fill="none"
{...props}
>
<g clipPath="url(#clip0_3813_3053)">
<path
d="M18.6113 9.40181L18.6046 9.40813L15.2639 12.5541L16.1088 17.1054L18.6113 9.40181ZM18.6113 9.40181L18.6178 9.39525M18.6113 9.40181L18.6178 9.39525M18.6178 9.39525C18.9647 9.04361 19.0874 8.53367 18.9326 8.06386L18.9263 8.0439C18.861 7.8162 18.7313 7.61214 18.5526 7.45638C18.3729 7.29969 18.1515 7.19871 17.9155 7.16566L17.9042 7.16389L13.2613 6.35223L11.1744 2.11334C10.9772 1.66964 10.4986 1.39245 10.0302 1.39245C9.53342 1.39245 9.09523 1.69784 8.87995 2.12729L8.87837 2.13049M18.6178 9.39525L8.87837 2.13049M8.87837 2.13049L6.79968 6.35212L2.13642 7.19921C1.63619 7.26783 1.26391 7.61044 1.1028 8.07544L1.09702 8.09211M8.87837 2.13049L1.09702 8.09211M1.09702 8.09211L1.09243 8.10915M1.09702 8.09211L1.09243 8.10915M1.09243 8.10915C0.969548 8.56561 1.11016 9.08833 1.43996 9.42541L1.44804 9.43366M1.09243 8.10915L1.44804 9.43366M1.44804 9.43366L1.45649 9.44153M1.44804 9.43366L1.45649 9.44153M1.45649 9.44153L4.7974 12.5547L3.92063 17.1022C3.92048 17.103 3.92034 17.1037 3.9202 17.1044C3.82383 17.5898 4.04899 18.0966 4.43091 18.3834M1.45649 9.44153L5.7814 18.4756M5.7814 18.4756L5.77307 18.4801C5.58943 18.5788 5.38424 18.6266 5.17896 18.6266C4.91355 18.6266 4.64725 18.546 4.43091 18.3834M5.7814 18.4756L5.78956 18.4708M5.7814 18.4756L5.78956 18.4708M4.43091 18.3834L4.73136 17.9837L4.43127 18.3837C4.43115 18.3836 4.43103 18.3835 4.43091 18.3834ZM5.78956 18.4708L5.78958 18.4708L10.0312 16.3667M5.78956 18.4708L10.0312 16.3667M10.0312 16.3667L14.2537 18.4783C14.2541 18.4785 14.2544 18.4787 14.2548 18.4789C14.4302 18.5671 14.6583 18.639 14.8628 18.639C15.1199 18.639 15.385 18.5602 15.5957 18.385C15.5962 18.3846 15.5966 18.3843 15.597 18.384L15.6071 18.3756C15.9946 18.0792 16.2005 17.5964 16.109 17.1063L10.0312 16.3667ZM15.1106 19.1374V19.1373H15.1066C14.9148 19.1373 14.6747 19.0804 14.4396 18.9628L10.2542 16.8694L10.0314 16.758L9.80828 16.8688L5.59697 18.9588L5.59058 18.9619L5.58427 18.9653C5.39252 19.0674 5.16832 19.1232 4.93595 19.1232L4.934 19.1232C4.63774 19.1244 4.349 19.03 4.11059 18.8542C3.66921 18.5222 3.45034 17.9476 3.55026 17.4477L3.55091 17.4444L4.41222 12.9762L4.4646 12.7044L4.26216 12.5158L0.969024 9.44649C0.783666 9.25629 0.650878 9.02114 0.58376 8.76407C0.516119 8.505 0.517547 8.23274 0.587872 7.97442L0.59045 7.96556C0.774797 7.42313 1.21623 7.06125 1.73694 6.9915L1.74851 6.98995L1.76 6.98786L6.3467 6.15388L6.59455 6.10881L6.70583 5.88281L8.76324 1.70416C8.76344 1.70376 8.76363 1.70337 8.76383 1.70298C9.01399 1.2033 9.51773 0.893311 10.0306 0.893311C10.582 0.893311 11.0877 1.22451 11.2941 1.69396L11.2985 1.70387L11.3033 1.71358L13.3554 5.88155L13.4676 6.10947L13.7178 6.15322L18.3052 6.95525L18.3124 6.95651L18.3197 6.95756C18.5807 6.99538 18.8252 7.10781 19.0238 7.28133C19.2224 7.45485 19.3667 7.68207 19.4392 7.93564L19.4417 7.94439L19.4446 7.95305C19.5269 8.2057 19.5374 8.47627 19.4748 8.73452C19.4122 8.99278 19.279 9.22855 19.0902 9.41548L19.0881 9.41756L19.0823 9.4234L15.7959 12.5181L15.5972 12.7052L15.6471 12.9735L16.4791 17.4497L16.4792 17.4503C16.5774 17.9748 16.3712 18.5103 15.9247 18.8498L15.9245 18.8496L15.914 18.8581C15.6864 19.0411 15.4026 19.1397 15.1106 19.1374Z"
stroke="#718096"
/>
</g>
<defs>
<clipPath id="clip0_3813_3053">
<rect width="20" height="20" fill="white" />
</clipPath>
</defs>
</svg>
);
}
21 changes: 21 additions & 0 deletions apps/u3/src/components/common/icons/ChatRoomIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
import { StyledComponentPropsWithRef } from 'styled-components';
import { ComponentPropsWithRef } from 'react';
import ChatRoomImg from '../assets/pngs/chat-room.png';

export default function ChatRoomIcon(
props: StyledComponentPropsWithRef<'img'>
) {
return <img src={ChatRoomImg} alt="chat room" {...props} />;
}

export function ChatRoomIcon2(props: ComponentPropsWithRef<'svg'>) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
fill="none"
{...props}
>
<path
d="M8.33329 12.5L5.77058 15.0947C5.41311 15.4566 5.23438 15.6376 5.08075 15.6504C4.94747 15.6614 4.81697 15.6079 4.72992 15.5063C4.62959 15.3893 4.62959 15.1349 4.62959 14.6262V13.3263C4.62959 12.8699 4.25585 12.5397 3.8043 12.4736V12.4736C2.71141 12.3135 1.85311 11.4552 1.69302 10.3623C1.66663 10.1821 1.66663 9.96706 1.66663 9.537V5.66663C1.66663 4.26649 1.66663 3.56643 1.93911 3.03165C2.17879 2.56124 2.56124 2.17879 3.03165 1.93911C3.56643 1.66663 4.26649 1.66663 5.66663 1.66663H11.8333C13.2334 1.66663 13.9335 1.66663 14.4683 1.93911C14.9387 2.17879 15.3211 2.56124 15.5608 3.03165C15.8333 3.56643 15.8333 4.26649 15.8333 5.66663V9.16663M15.8333 18.3333L14.0196 17.0724C13.7647 16.8951 13.6372 16.8065 13.4985 16.7437C13.3753 16.6879 13.2459 16.6473 13.1129 16.6228C12.9632 16.5952 12.8079 16.5952 12.4974 16.5952H11C10.0665 16.5952 9.59983 16.5952 9.24331 16.4135C8.92971 16.2538 8.67474 15.9988 8.51495 15.6852C8.33329 15.3287 8.33329 14.862 8.33329 13.9285V11.8333C8.33329 10.8999 8.33329 10.4332 8.51495 10.0766C8.67474 9.76304 8.92971 9.50807 9.24331 9.34828C9.59983 9.16663 10.0665 9.16663 11 9.16663H15.6666C16.6 9.16663 17.0668 9.16663 17.4233 9.34828C17.7369 9.50807 17.9918 9.76304 18.1516 10.0766C18.3333 10.4332 18.3333 10.8999 18.3333 11.8333V14.0952C18.3333 14.8718 18.3333 15.2601 18.2064 15.5663C18.0373 15.9747 17.7128 16.2992 17.3044 16.4683C16.9981 16.5952 16.6099 16.5952 15.8333 16.5952V18.3333Z"
stroke="#718096"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
);
}
34 changes: 34 additions & 0 deletions apps/u3/src/components/common/icons/ContactUsIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { ComponentPropsWithRef } from 'react';

export default function ContactUsIcon(props: ComponentPropsWithRef<'svg'>) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
fill="none"
{...props}
>
<g clipPath="url(#clip0_3813_2998)">
<path
d="M13.0026 10.7233C12.9164 10.6657 12.7948 10.6305 12.6645 10.6256C12.5343 10.6207 12.406 10.6463 12.3079 10.6969C10.7464 11.5031 9.27861 11.5027 7.68895 10.6955C7.64005 10.6706 7.5833 10.6517 7.52195 10.6398C7.4606 10.6278 7.39585 10.6231 7.33139 10.6258C7.26693 10.6286 7.20403 10.6388 7.14628 10.6558C7.08852 10.6729 7.03704 10.6965 6.99478 10.7252C6.95252 10.7539 6.92031 10.7873 6.89998 10.8234C6.87965 10.8594 6.87161 10.8975 6.8763 10.9354C6.881 10.9732 6.89834 11.0102 6.92735 11.0442C6.95635 11.0781 6.99645 11.1084 7.04535 11.1332C8.01925 11.6278 9.01697 11.875 10.011 11.875C11.005 11.875 11.9977 11.6272 12.9577 11.1317C13.0558 11.081 13.1156 11.0096 13.124 10.933C13.1324 10.8564 13.0887 10.781 13.0026 10.7233Z"
fill="#718096"
/>
<path
d="M17.4409 6.95397C17.2219 3.43027 13.9684 0.625 9.99965 0.625C6.03095 0.625 2.77705 3.43027 2.55842 6.95397C2.0132 7.06372 1.52307 7.35592 1.17081 7.7812C0.818545 8.20648 0.625754 8.73877 0.625 9.28817V12.4355C0.632607 13.0622 0.890087 13.6607 1.34162 14.1012C1.79314 14.5417 2.40233 14.7887 3.0371 14.7887C3.67186 14.7887 4.28105 14.5417 4.73257 14.1012C5.1841 13.6607 5.44158 13.0622 5.44919 12.4355V9.28817C5.44835 8.76457 5.27289 8.25583 4.94992 7.84054C4.62695 7.42526 4.17445 7.12655 3.66234 6.99058C3.8633 4.0512 6.62864 1.71393 10.0007 1.71393C13.3727 1.71393 16.136 4.0512 16.3377 6.99058C15.8253 7.12631 15.3726 7.42492 15.0494 7.84023C14.7262 8.25555 14.5506 8.76442 14.5498 9.28817V12.4355C14.5506 12.8805 14.6776 13.3164 14.9164 13.6938C15.1552 14.0711 15.4963 14.3749 15.9011 14.5706C15.6613 15.0838 15.1714 15.8823 14.3287 16.2777C14.0547 15.8947 13.6509 15.6212 13.1903 15.5065C12.7298 15.3919 12.2429 15.4437 11.8177 15.6527C11.3925 15.8616 11.057 16.2139 10.872 16.6458C10.6869 17.0777 10.6645 17.5607 10.8088 18.0075C10.953 18.4543 11.2545 18.8354 11.6585 19.0818C12.0626 19.3283 12.5426 19.4239 13.0119 19.3513C13.4811 19.2788 13.9086 19.0428 14.2169 18.6861C14.5253 18.3295 14.6943 17.8756 14.6932 17.4067C14.6932 17.3756 14.6901 17.3451 14.6887 17.3143C16.04 16.7399 16.7216 15.4803 16.9977 14.8139C17.6309 14.8044 18.235 14.5496 18.6797 14.1044C19.1243 13.6593 19.3741 13.0594 19.375 12.4342V9.2868C19.3739 8.73755 19.1809 8.2055 18.8285 7.78048C18.4761 7.35547 17.986 7.06354 17.4409 6.95397ZM4.34631 9.28817V12.4355C4.34072 12.7747 4.20033 13.0982 3.95541 13.3361C3.71049 13.574 3.38068 13.7073 3.0371 13.7073C2.69351 13.7073 2.3637 13.574 2.11878 13.3361C1.87386 13.0982 1.73347 12.7747 1.72788 12.4355V9.28817C1.73347 8.94897 1.87386 8.62554 2.11878 8.38763C2.3637 8.14971 2.69351 8.01637 3.0371 8.01637C3.38068 8.01637 3.71049 8.14971 3.95541 8.38763C4.20033 8.62554 4.34072 8.94897 4.34631 9.28817ZM12.7002 18.2856C12.5244 18.2856 12.3525 18.2341 12.2063 18.1377C12.0601 18.0412 11.9462 17.9042 11.8789 17.7438C11.8115 17.5835 11.7939 17.407 11.8281 17.2367C11.8624 17.0664 11.947 16.91 12.0713 16.7872C12.1955 16.6644 12.3539 16.5808 12.5263 16.5468C12.6987 16.5129 12.8775 16.5302 13.04 16.5965C13.2024 16.6628 13.3413 16.7752 13.4391 16.9195C13.5369 17.0638 13.5892 17.2334 13.5893 17.407C13.589 17.6398 13.4953 17.8629 13.3286 18.0275C13.1619 18.192 12.9359 18.2846 12.7002 18.2849V18.2856ZM18.2711 12.4355C18.2655 12.7747 18.1251 13.0982 17.8802 13.3361C17.6353 13.574 17.3054 13.7073 16.9619 13.7073C16.6183 13.7073 16.2885 13.574 16.0435 13.3361C15.7986 13.0982 15.6582 12.7747 15.6526 12.4355V9.28817C15.6582 8.94897 15.7986 8.62554 16.0435 8.38763C16.2885 8.14971 16.6183 8.01637 16.9619 8.01637C17.3054 8.01637 17.6353 8.14971 17.8802 8.38763C18.1251 8.62554 18.2655 8.94897 18.2711 9.28817V12.4355Z"
fill="#718096"
/>
<path
d="M7.34716 8.125C7.47227 8.125 7.59225 8.06274 7.68071 7.95192C7.76918 7.8411 7.81887 7.69079 7.81887 7.53407V6.23112C7.82045 6.15225 7.80942 6.07378 7.78641 6.00033C7.76341 5.92688 7.7289 5.85995 7.68493 5.80346C7.64096 5.74698 7.58841 5.70209 7.53037 5.67144C7.47234 5.64079 7.40999 5.625 7.34701 5.625C7.28403 5.625 7.22169 5.64079 7.16365 5.67144C7.10562 5.70209 7.05307 5.74698 7.00909 5.80346C6.96512 5.85995 6.93062 5.92688 6.90761 6.00033C6.88461 6.07378 6.87357 6.15225 6.87515 6.23112V7.53407C6.87515 7.6117 6.88736 7.68857 6.91108 7.76029C6.93481 7.83201 6.96958 7.89717 7.01342 7.95205C7.05725 8.00693 7.10929 8.05045 7.16655 8.08012C7.22382 8.1098 7.28519 8.12505 7.34716 8.125ZM11.8749 7.53407V6.23112C11.8764 6.15225 11.8654 6.07378 11.8424 6.00033C11.8194 5.92688 11.7849 5.85995 11.7409 5.80346C11.6969 5.74698 11.6444 5.70209 11.5863 5.67144C11.5283 5.64079 11.466 5.625 11.403 5.625C11.34 5.625 11.2777 5.64079 11.2196 5.67144C11.1616 5.70209 11.109 5.74698 11.0651 5.80346C11.0211 5.85995 10.9866 5.92688 10.9636 6.00033C10.9406 6.07378 10.9295 6.15225 10.9311 6.23112V7.53407C10.9342 7.68828 10.9853 7.83487 11.0734 7.94257C11.1616 8.05027 11.2799 8.11055 11.403 8.11055C11.5261 8.11055 11.6444 8.05027 11.7325 7.94257C11.8207 7.83487 11.8718 7.68828 11.8749 7.53407Z"
fill="#718096"
/>
</g>
<defs>
<clipPath id="clip0_3813_2998">
<rect width="20" height="20" fill="white" />
</clipPath>
</defs>
</svg>
);
}
19 changes: 19 additions & 0 deletions apps/u3/src/components/common/icons/EmailIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { ComponentPropsWithRef } from 'react';

export default function EmailIcon(props: ComponentPropsWithRef<'svg'>) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
fill="none"
{...props}
>
<path
d="M17.4579 4.24915H2.54222C2.22462 4.24915 1.96716 4.50661 1.96716 4.8242V15.1758C1.96716 15.4934 2.22462 15.7508 2.54222 15.7508H17.4579C17.7755 15.7508 18.033 15.4933 18.033 15.1758V4.8242C18.033 4.50661 17.7755 4.24915 17.4579 4.24915ZM15.7863 5.39926L10.0001 9.91504L4.21376 5.39926H15.7863ZM3.11728 14.6007V6.00247L9.64625 11.0979C9.74729 11.1768 9.87184 11.2196 10.0001 11.2196C10.1283 11.2196 10.2528 11.1768 10.3539 11.0979L16.8828 6.00249V14.6007H3.11728Z"
fill="#718096"
/>
</svg>
);
}
Loading
Loading