{currentSpace?.name}
-
+
{!currentSpace ? (
) : (
diff --git a/web/package-lock.json b/web/package-lock.json
index a3735fd8..dc2ba4d2 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -42,6 +42,7 @@
"fuse.js": "^6.6.2",
"graphql": "^16.3.0",
"graphql-ws": "^5.10.2",
+ "iconoir-react": "^6.10.0",
"install": "^0.13.0",
"is-mobile": "^3.1.1",
"jotai": "^1.8.5",
@@ -8324,6 +8325,14 @@
"node": ">= 6"
}
},
+ "node_modules/iconoir-react": {
+ "version": "6.10.0",
+ "resolved": "https://registry.npmjs.org/iconoir-react/-/iconoir-react-6.10.0.tgz",
+ "integrity": "sha512-gau34HMBa+XwCyIK4GzIYbBCVWWadaSjBVX4CQecqwAZfSDI3FPp7AWLZ40FRGuvGmiUpWz+g0P/T/CQlzOTEw==",
+ "peerDependencies": {
+ "react": "^16.8.6 || ^17 || ^18"
+ }
+ },
"node_modules/iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -21734,6 +21743,12 @@
"debug": "4"
}
},
+ "iconoir-react": {
+ "version": "6.10.0",
+ "resolved": "https://registry.npmjs.org/iconoir-react/-/iconoir-react-6.10.0.tgz",
+ "integrity": "sha512-gau34HMBa+XwCyIK4GzIYbBCVWWadaSjBVX4CQecqwAZfSDI3FPp7AWLZ40FRGuvGmiUpWz+g0P/T/CQlzOTEw==",
+ "requires": {}
+ },
"iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
diff --git a/web/package.json b/web/package.json
index 391567ab..87146b68 100644
--- a/web/package.json
+++ b/web/package.json
@@ -47,6 +47,7 @@
"fuse.js": "^6.6.2",
"graphql": "^16.3.0",
"graphql-ws": "^5.10.2",
+ "iconoir-react": "^6.10.0",
"install": "^0.13.0",
"is-mobile": "^3.1.1",
"jotai": "^1.8.5",
diff --git a/web/pages/space/[slug]/index.tsx b/web/pages/space/[slug]/index.tsx
index 6bfa4357..4e573560 100644
--- a/web/pages/space/[slug]/index.tsx
+++ b/web/pages/space/[slug]/index.tsx
@@ -51,7 +51,7 @@ function CollapsibleTipsBar() {
return (
-
+
{
-
-
+
+
-
+
-
+
diff --git a/web/pages/space/[slug]/profile/[profileId].tsx b/web/pages/space/[slug]/profile/[profileId].tsx
index afe629c6..1dfeb4f9 100644
--- a/web/pages/space/[slug]/profile/[profileId].tsx
+++ b/web/pages/space/[slug]/profile/[profileId].tsx
@@ -260,7 +260,7 @@ const ProfilePage: CustomPage = () => {
listing?.profile_listing_to_space_tags.map((item) => item.space_tag_id)
);
- router;
+ const fullName = getFullNameOfUser(profileData?.profile_by_pk?.user);
return (
@@ -279,64 +279,68 @@ const ProfilePage: CustomPage = () => {
-
-
-
+
+
+
-
+
-
+
- {first_name} {last_name}
+ {fullName}
-
-
{listing?.headline}
+
+
{listing?.headline}
- {isMyProfile ? (
-
-
-
-
-
- ) : (
-
-
@@ -385,41 +389,50 @@ const ProfilePage: CustomPage = () => {
*/}
-
- {currentSpace?.space_tag_categories.map((category) => {
- const tags = category.space_tags.filter((tag) =>
- profileTagIds.has(tag.id)
- );
- return (
-
-
- {category.title}
-
-
-
- {tags.length > 0 ? (
- tags.map((tag) => {
- return (
-
- );
- })
- ) : (
-
- No tags
-
- )}
+
+
+ Tags
+
+
+
+ {currentSpace?.space_tag_categories.map((category) => {
+ const tags = category.space_tags.filter((tag) =>
+ profileTagIds.has(tag.id)
+ );
+ return (
+
+
+ {category.title}
+
+
+ {tags.length > 0 ? (
+ tags.map((tag) => {
+ return (
+
+ );
+ })
+ ) : (
+
+ No tags
+
+ )}
+
-
- );
- })}
+ );
+ })}
+
@@ -431,14 +444,13 @@ const ProfilePage: CustomPage = () => {
Profiles
-
{email}
-
-
+
+
{email}
diff --git a/web/styles/globals.css b/web/styles/globals.css
index 4d5730b5..55c49b9e 100644
--- a/web/styles/globals.css
+++ b/web/styles/globals.css
@@ -1,4 +1,4 @@
-@import url("https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,400;0,500;0,600;1,400;1,500;1,600&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,500;0,600;1,400;1,500;1,600&display=swap");
@tailwind base;
@tailwind components;
@@ -12,7 +12,7 @@
/* Input slider */
.slider-thumb::-webkit-slider-thumb {
- @apply appearance-none w-4 h-4 rounded-full cursor-pointer bg-white shadow-md;
+ @apply h-4 w-4 cursor-pointer appearance-none rounded-full bg-white shadow-md;
border: 0.5px solid lightgray;
}
@@ -33,7 +33,7 @@
}
.ProseMirror p {
- @apply text-body2;
+ @apply text-body1;
display: block;
margin-block-start: 0.5rem;
@@ -44,7 +44,7 @@
.ProseMirror h1 {
@apply text-heading4;
-
+
display: block;
margin-block-start: 0.5rem;
margin-block-end: 0.5rem;
@@ -80,7 +80,7 @@
}
.swiper-pagination-bullet {
- @apply h-3 w-3 rounded-full border border-green-700 mx-2;
+ @apply mx-2 h-3 w-3 rounded-full border border-green-700;
display: inline-block;
}
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index 3737e066..27f07046 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -25,7 +25,7 @@ module.exports = {
height: "height",
},
fontFamily: {
- sans: ["Rubik", ...defaultTheme.fontFamily.sans],
+ sans: ["Open Sans", ...defaultTheme.fontFamily.sans],
},
spacing: {