Skip to content

Commit

Permalink
Merge pull request #401 from credebl/dashboard-UI-changes
Browse files Browse the repository at this point in the history 
fix:Dashboard UI changes
  • Loading branch information
@nishad-ayanworks
nishad-ayanworks authored Nov 1, 2023
2 parents 06a91f6 + 8e2cb21 commit 1a26db8
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 79 deletions.
150 changes: 82 additions & 68 deletions src/app/SideBar.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,16 @@ import { pathRoutes } from '../config/pathRoutes';
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="flex-shrink-0 w-6 h-6 pt-1 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
width="21"
height="22"
fill="none"
viewBox="0 0 21 22"
>
<path
fill="#6B7280"
fill="currentColor"
fill-rule="evenodd"
stroke="#6B7280"
stroke="currentColor"
stroke-width=".5"
d="M11.1 6.996c.887 0 1.691.368 2.276.965l1.821-1.09a2.812 2.812 0 0 1-.12-.817c0-1.51 1.186-2.733 2.649-2.733s2.649 1.224 2.649 2.733c0 1.51-1.186 2.733-2.65 2.733a2.6 2.6 0 0 1-1.865-.793l-1.77 1.06c.158.394.246.826.246 1.28 0 .773-.254 1.485-.682 2.05l2.83 3.383c.257-.085.53-.131.814-.131 1.463 0 2.65 1.223 2.65 2.732 0 1.51-1.187 2.734-2.65 2.734-1.463 0-2.65-1.224-2.65-2.734 0-.737.284-1.406.744-1.897l-2.702-3.229a3.144 3.144 0 0 1-1.839.421l-.469 1.72c.63.5 1.037 1.286 1.037 2.169 0 1.509-1.186 2.733-2.65 2.733-1.462 0-2.649-1.224-2.649-2.733 0-1.51 1.187-2.733 2.65-2.733.147 0 .292.012.432.036l.423-1.548a3.333 3.333 0 0 1-1.699-2.314h-2.33c-.286 1.191-1.329 2.074-2.572 2.074-1.463 0-2.649-1.223-2.649-2.733 0-1.509 1.186-2.733 2.65-2.733 1.242 0 2.285.884 2.57 2.075h2.331a3.364 3.364 0 0 1 .82-1.634l-1.098-1.6c-.25.082-.517.126-.794.126-1.463 0-2.649-1.224-2.649-2.733 0-1.51 1.186-2.733 2.65-2.733 1.463 0 2.649 1.223 2.649 2.733 0 .75-.293 1.428-.767 1.922l1.049 1.525a3.141 3.141 0 0 1 1.314-.286ZM3.024 8.919c-.758 0-1.372.633-1.372 1.415s.614 1.416 1.372 1.416c.758 0 1.373-.634 1.373-1.416 0-.782-.615-1.415-1.373-1.415Zm5.745 7.217c-.758 0-1.372.634-1.372 1.416 0 .782.614 1.416 1.372 1.416.758 0 1.373-.634 1.373-1.416 0-.782-.615-1.416-1.373-1.416Zm8.529.817c-.758 0-1.372.634-1.372 1.415 0 .782.614 1.416 1.372 1.416.758 0 1.372-.634 1.372-1.416 0-.781-.614-1.415-1.372-1.415Zm.428-12.315c-.758 0-1.373.634-1.373 1.416 0 .782.615 1.416 1.373 1.416s1.372-.634 1.372-1.416c0-.782-.614-1.416-1.372-1.416ZM6.854 2.418c-.758 0-1.372.635-1.372 1.417S6.096 5.25 6.854 5.25c.758 0 1.373-.633 1.373-1.415s-.615-1.416-1.373-1.416ZM11.1 8.314c-1.083 0-1.96.905-1.96 2.021 0 1.117.877 2.022 1.96 2.022 1.082 0 1.96-.905 1.96-2.022 0-1.116-.878-2.021-1.96-2.021Z"
clip-rule="evenodd"></path>
Expand Down Expand Up @@ -351,7 +352,82 @@ import { pathRoutes } from '../config/pathRoutes';
</li>
</ul>
</li>
<EcosystemSidebarOption client:load />
<li>
<EcosystemSidebarOption client:load />
</li>
<li>
<a
href={'https://github.com/credebl'}
target="_blank"
class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 group dark:text-gray-200 dark:hover:bg-gray-700"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="flex-shrink-0 w-6 h-6 pt-1 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
fill="currentColor"
stroke="currentColor"
stroke-width=".5"
d="M11.296 2.012c-.074.007-.304.035-.508.058-.844.094-2.024.419-2.775.763a9.912 9.912 0 0 0-3.185 2.25c-3.467 3.57-3.784 9.14-.743 13.04 1.607 2.058 3.838 3.368 6.45 3.783.785.125 2.145.125 2.93 0 2.174-.344 4.077-1.302 5.602-2.828 3.267-3.254 3.87-8.242 1.481-12.22-.715-1.197-1.853-2.386-3.017-3.168a10.1 10.1 0 0 0-4.182-1.608c-.376-.055-1.771-.106-2.053-.07Zm1.994 1.247c1.43.22 2.806.806 4.022 1.714.453.336 1.305 1.181 1.634 1.611.785 1.045 1.328 2.152 1.614 3.302.825 3.305-.297 6.708-2.935 8.907a9.241 9.241 0 0 1-2.35 1.396l-.344.137v-1.334c0-1.463-.035-1.823-.21-2.26a1.682 1.682 0 0 1-.09-.255c.003-.004.171-.063.375-.13 1.884-.63 3.087-1.955 3.447-3.798.078-.383.067-1.47-.02-1.877-.136-.677-.359-1.248-.687-1.756l-.2-.313.047-.247c.07-.367.063-1.322-.015-1.666-.137-.602-.426-.978-.829-1.068-.508-.113-1.298.145-2.306.747l-.313.188-.45-.094c-1.16-.242-2.508-.223-3.564.047l-.219.055-.3-.176c-.446-.262-.982-.528-1.287-.63-.402-.137-.875-.196-1.098-.133-.371.106-.657.489-.79 1.064-.078.344-.085 1.299-.015 1.666l.047.247-.2.313c-.328.508-.55 1.08-.687 1.756-.086.407-.098 1.494-.02 1.877.36 1.843 1.563 3.169 3.447 3.799.204.066.372.125.376.129.004.004-.032.113-.086.238-.051.13-.118.356-.149.509-.05.266-.059.274-.207.328-.246.09-.747.075-.938-.023a1.432 1.432 0 0 1-.57-.536c-.419-.618-.743-.939-1.185-1.17a2.073 2.073 0 0 0-.84-.222h-.18l.05.536c.024.297.048.563.051.586 0 .028.04.051.09.051.16 0 .473.18.653.376.098.105.262.32.367.477.106.16.301.391.43.52.5.497 1.357.759 2.049.626l.164-.031v1.584l-.34-.137c-3.792-1.526-6.047-5.414-5.465-9.423.22-1.502.813-2.883 1.79-4.182.329-.43 1.181-1.275 1.634-1.611 1.388-1.04 2.838-1.6 4.628-1.788.32-.031 1.58.016 1.974.074ZM7.896 6.854c.274.086.61.25 1.075.528.238.141.48.282.543.305.164.075.434.063.907-.043a6.47 6.47 0 0 1 1.849-.168c.492.02.762.047 1.118.125.59.133.938.16 1.094.09.067-.027.317-.172.563-.32.512-.306.973-.517 1.204-.556l.16-.023.035.187c.05.31.027 1.103-.043 1.37-.117.45-.086.59.211.993.254.344.485.833.614 1.31.09.345.105.466.105.998.004.641-.066 1.036-.258 1.479-.422.966-1.29 1.728-2.392 2.096-.414.137-.707.204-1.43.32a37.76 37.76 0 0 0-.614.106c-.012.016.278.454.614.927.328.462.41.626.465.92.027.14.043.805.043 1.701v1.471l-.282.047a9.863 9.863 0 0 1-1.477.121c-.45 0-1.032-.047-1.473-.121l-.286-.047v-1.447c0-.81.02-1.561.04-1.702.05-.305.132-.47.468-.943s.626-.91.614-.927a22.41 22.41 0 0 0-.614-.105c-.723-.117-1.016-.184-1.43-.32-1.102-.369-1.97-1.131-2.392-2.098-.192-.442-.262-.837-.258-1.478 0-.532.015-.653.105-.998a4.14 4.14 0 0 1 .614-1.31c.297-.403.328-.544.211-.994-.07-.266-.094-1.06-.043-1.365.035-.207.059-.215.34-.129Z"
></path>
</svg>

<span class="ml-3" sidebar-toggle-item>GitHub Repository</span>
</a>
</li>
<li>
<a
href={pathRoutes.documentation.root}
target="_blank"
class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 group dark:text-gray-200 dark:hover:bg-gray-700"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="flex-shrink-0 w-6 h-6 pt-1 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
fill="currentColor"
d="M5 21c-.55 0-1.02-.196-1.413-.587A1.926 1.926 0 0 1 3 19V5c0-.55.196-1.02.587-1.413A1.926 1.926 0 0 1 5 3h4.2a3.01 3.01 0 0 1 1.088-1.45A2.857 2.857 0 0 1 12 1c.633 0 1.204.183 1.713.55.508.367.87.85 1.087 1.45H19c.55 0 1.02.196 1.413.587.39.393.587.863.587 1.413v14c0 .55-.196 1.02-.587 1.413A1.926 1.926 0 0 1 19 21H5Zm0-2h14V5H5v14Zm2-2h7v-2H7v2Zm0-4h10v-2H7v2Zm0-4h10V7H7v2Zm5-4.75a.728.728 0 0 0 .75-.75.728.728 0 0 0-.75-.75.728.728 0 0 0-.75.75.728.728 0 0 0 .75.75Z"
></path>
</svg>

<span class="ml-3" sidebar-toggle-item>Documentation</span>
</a>
</li>

<li>
<a
href="https://discord.com/invite/w4hnQT7NJG"
target="_blank"
class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 group dark:text-gray-200 dark:hover:bg-gray-700"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="flex-shrink-0 w-6 h-6 pt-1 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
fill="currentColor"
d="m12 22-.25-3h-.25c-2.367 0-4.375-.825-6.025-2.475C3.825 14.875 3 12.867 3 10.5c0-2.367.825-4.375 2.475-6.025C7.125 2.825 9.133 2 11.5 2a8.28 8.28 0 0 1 3.313.663 8.585 8.585 0 0 1 4.524 4.525A8.28 8.28 0 0 1 20 10.5c0 1.25-.204 2.45-.613 3.6a12.739 12.739 0 0 1-1.675 3.2 14.164 14.164 0 0 1-2.524 2.675A15.65 15.65 0 0 1 12 22Zm2-3.65c1.183-1 2.146-2.17 2.887-3.513A8.822 8.822 0 0 0 18 10.5c0-1.817-.63-3.354-1.887-4.612C14.854 4.629 13.317 4 11.5 4c-1.817 0-3.354.63-4.612 1.888C5.629 7.146 5 8.683 5 10.5c0 1.817.63 3.354 1.888 4.613C8.146 16.37 9.683 17 11.5 17H14v1.35Zm-2.525-2.375c.283 0 .525-.1.725-.3.2-.2.3-.442.3-.725s-.1-.525-.3-.725c-.2-.2-.442-.3-.725-.3s-.525.1-.725.3c-.2.2-.3.442-.3.725s.1.525.3.725c.2.2.442.3.725.3ZM10.75 12.8h1.5c0-.5.05-.85.15-1.05.1-.2.417-.567.95-1.1.3-.3.55-.625.75-.975.2-.35.3-.725.3-1.125 0-.85-.287-1.488-.863-1.913C12.963 6.213 12.284 6 11.5 6c-.733 0-1.35.204-1.85.612-.5.409-.85.905-1.05 1.488l1.4.55a2.32 2.32 0 0 1 .475-.838c.233-.275.575-.412 1.025-.412.45 0 .787.125 1.012.375.226.25.338.525.338.825 0 .283-.083.537-.25.763a6.207 6.207 0 0 1-.6.687c-.583.5-.938.896-1.063 1.188-.124.291-.187.812-.187 1.562Z"
></path>
</svg>

<span class="ml-3" sidebar-toggle-item>Support</span>
</a>
</li>

</ul>

<!-- li>
Expand Down Expand Up @@ -449,50 +525,8 @@ import { pathRoutes } from '../config/pathRoutes';
</div>

<div class="pt-2 space-y-2">
<a
href={'https://github.com/credebl'}
target="_blank"
class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 group dark:text-gray-200 dark:hover:bg-gray-700"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="flex-shrink-0 w-6 h-6 pt-1 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
fill="currentColor"
stroke="currentColor"
stroke-width=".5"
d="M11.296 2.012c-.074.007-.304.035-.508.058-.844.094-2.024.419-2.775.763a9.912 9.912 0 0 0-3.185 2.25c-3.467 3.57-3.784 9.14-.743 13.04 1.607 2.058 3.838 3.368 6.45 3.783.785.125 2.145.125 2.93 0 2.174-.344 4.077-1.302 5.602-2.828 3.267-3.254 3.87-8.242 1.481-12.22-.715-1.197-1.853-2.386-3.017-3.168a10.1 10.1 0 0 0-4.182-1.608c-.376-.055-1.771-.106-2.053-.07Zm1.994 1.247c1.43.22 2.806.806 4.022 1.714.453.336 1.305 1.181 1.634 1.611.785 1.045 1.328 2.152 1.614 3.302.825 3.305-.297 6.708-2.935 8.907a9.241 9.241 0 0 1-2.35 1.396l-.344.137v-1.334c0-1.463-.035-1.823-.21-2.26a1.682 1.682 0 0 1-.09-.255c.003-.004.171-.063.375-.13 1.884-.63 3.087-1.955 3.447-3.798.078-.383.067-1.47-.02-1.877-.136-.677-.359-1.248-.687-1.756l-.2-.313.047-.247c.07-.367.063-1.322-.015-1.666-.137-.602-.426-.978-.829-1.068-.508-.113-1.298.145-2.306.747l-.313.188-.45-.094c-1.16-.242-2.508-.223-3.564.047l-.219.055-.3-.176c-.446-.262-.982-.528-1.287-.63-.402-.137-.875-.196-1.098-.133-.371.106-.657.489-.79 1.064-.078.344-.085 1.299-.015 1.666l.047.247-.2.313c-.328.508-.55 1.08-.687 1.756-.086.407-.098 1.494-.02 1.877.36 1.843 1.563 3.169 3.447 3.799.204.066.372.125.376.129.004.004-.032.113-.086.238-.051.13-.118.356-.149.509-.05.266-.059.274-.207.328-.246.09-.747.075-.938-.023a1.432 1.432 0 0 1-.57-.536c-.419-.618-.743-.939-1.185-1.17a2.073 2.073 0 0 0-.84-.222h-.18l.05.536c.024.297.048.563.051.586 0 .028.04.051.09.051.16 0 .473.18.653.376.098.105.262.32.367.477.106.16.301.391.43.52.5.497 1.357.759 2.049.626l.164-.031v1.584l-.34-.137c-3.792-1.526-6.047-5.414-5.465-9.423.22-1.502.813-2.883 1.79-4.182.329-.43 1.181-1.275 1.634-1.611 1.388-1.04 2.838-1.6 4.628-1.788.32-.031 1.58.016 1.974.074ZM7.896 6.854c.274.086.61.25 1.075.528.238.141.48.282.543.305.164.075.434.063.907-.043a6.47 6.47 0 0 1 1.849-.168c.492.02.762.047 1.118.125.59.133.938.16 1.094.09.067-.027.317-.172.563-.32.512-.306.973-.517 1.204-.556l.16-.023.035.187c.05.31.027 1.103-.043 1.37-.117.45-.086.59.211.993.254.344.485.833.614 1.31.09.345.105.466.105.998.004.641-.066 1.036-.258 1.479-.422.966-1.29 1.728-2.392 2.096-.414.137-.707.204-1.43.32a37.76 37.76 0 0 0-.614.106c-.012.016.278.454.614.927.328.462.41.626.465.92.027.14.043.805.043 1.701v1.471l-.282.047a9.863 9.863 0 0 1-1.477.121c-.45 0-1.032-.047-1.473-.121l-.286-.047v-1.447c0-.81.02-1.561.04-1.702.05-.305.132-.47.468-.943s.626-.91.614-.927a22.41 22.41 0 0 0-.614-.105c-.723-.117-1.016-.184-1.43-.32-1.102-.369-1.97-1.131-2.392-2.098-.192-.442-.262-.837-.258-1.478 0-.532.015-.653.105-.998a4.14 4.14 0 0 1 .614-1.31c.297-.403.328-.544.211-.994-.07-.266-.094-1.06-.043-1.365.035-.207.059-.215.34-.129Z"
></path>
</svg>

<span class="ml-3" sidebar-toggle-item>GitHub Repository</span>
</a>
<a
href={pathRoutes.documentation.root}
target="_blank"
class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 group dark:text-gray-200 dark:hover:bg-gray-700"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="flex-shrink-0 w-6 h-6 pt-1 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
fill="currentColor"
d="M5 21c-.55 0-1.02-.196-1.413-.587A1.926 1.926 0 0 1 3 19V5c0-.55.196-1.02.587-1.413A1.926 1.926 0 0 1 5 3h4.2a3.01 3.01 0 0 1 1.088-1.45A2.857 2.857 0 0 1 12 1c.633 0 1.204.183 1.713.55.508.367.87.85 1.087 1.45H19c.55 0 1.02.196 1.413.587.39.393.587.863.587 1.413v14c0 .55-.196 1.02-.587 1.413A1.926 1.926 0 0 1 19 21H5Zm0-2h14V5H5v14Zm2-2h7v-2H7v2Zm0-4h10v-2H7v2Zm0-4h10V7H7v2Zm5-4.75a.728.728 0 0 0 .75-.75.728.728 0 0 0-.75-.75.728.728 0 0 0-.75.75.728.728 0 0 0 .75.75Z"
></path>
</svg>

<span class="ml-3" sidebar-toggle-item>Documentation</span>
</a>


<!-- <a
href="/alerts"
target="_blank"
Expand All @@ -509,27 +543,7 @@ import { pathRoutes } from '../config/pathRoutes';
>
<span class="ml-3" sidebar-toggle-item>FAQ's</span>
</a> -->
<a
href="https://discord.com/invite/w4hnQT7NJG"
target="_blank"
class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 group dark:text-gray-200 dark:hover:bg-gray-700"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="flex-shrink-0 w-6 h-6 pt-1 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
width="24"
height="24"
fill="none"
viewBox="0 0 24 24"
>
<path
fill="currentColor"
d="m12 22-.25-3h-.25c-2.367 0-4.375-.825-6.025-2.475C3.825 14.875 3 12.867 3 10.5c0-2.367.825-4.375 2.475-6.025C7.125 2.825 9.133 2 11.5 2a8.28 8.28 0 0 1 3.313.663 8.585 8.585 0 0 1 4.524 4.525A8.28 8.28 0 0 1 20 10.5c0 1.25-.204 2.45-.613 3.6a12.739 12.739 0 0 1-1.675 3.2 14.164 14.164 0 0 1-2.524 2.675A15.65 15.65 0 0 1 12 22Zm2-3.65c1.183-1 2.146-2.17 2.887-3.513A8.822 8.822 0 0 0 18 10.5c0-1.817-.63-3.354-1.887-4.612C14.854 4.629 13.317 4 11.5 4c-1.817 0-3.354.63-4.612 1.888C5.629 7.146 5 8.683 5 10.5c0 1.817.63 3.354 1.888 4.613C8.146 16.37 9.683 17 11.5 17H14v1.35Zm-2.525-2.375c.283 0 .525-.1.725-.3.2-.2.3-.442.3-.725s-.1-.525-.3-.725c-.2-.2-.442-.3-.725-.3s-.525.1-.725.3c-.2.2-.3.442-.3.725s.1.525.3.725c.2.2.442.3.725.3ZM10.75 12.8h1.5c0-.5.05-.85.15-1.05.1-.2.417-.567.95-1.1.3-.3.55-.625.75-.975.2-.35.3-.725.3-1.125 0-.85-.287-1.488-.863-1.913C12.963 6.213 12.284 6 11.5 6c-.733 0-1.35.204-1.85.612-.5.409-.85.905-1.05 1.488l1.4.55a2.32 2.32 0 0 1 .475-.838c.233-.275.575-.412 1.025-.412.45 0 .787.125 1.012.375.226.25.338.525.338.825 0 .283-.083.537-.25.763a6.207 6.207 0 0 1-.6.687c-.583.5-.938.896-1.063 1.188-.124.291-.187.812-.187 1.562Z"
></path>
</svg>

<span class="ml-3" sidebar-toggle-item>Support</span>
</a>

</div>
</div>

Expand Down
5 changes: 2 additions & 3 deletions src/components/organization/invitations/Invitations.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,14 @@ const Invitations = () => {
</div>
<div className="flex-1">
<p
className="text-base font-semibold text-gray-900 leading-none truncate mb-0.5 dark:text-white"
className="text-base font-regular text-gray-900 leading-none mb-0.5 dark:text-white "
>
{invitation.email}
</p>

<div className="flow-root h-auto">
<ul className="divide-y divide-gray-200 dark:divide-gray-700">
<li className="pt-3 sm:pt-3 overflow-auto">
<li className="pt-1 sm:pt-3 overflow-auto">
<div className="items-center space-x-4">
<div className="inline-flex items-center text-base font-normal text-gray-900 dark:text-white">
{invitation.orgRoles.length>1 ? 'Roles:' : 'Role:'}
Expand Down Expand Up @@ -226,7 +226,6 @@ const Invitations = () => {
>
Invited On: &nbsp;<DateTooltip date={invitation.createDateTime}>{dateConversion(invitation.createDateTime)}</DateTooltip>
</p>

</div>
</li>
))
Expand Down
Loading

0 comments on commit 1a26db8

Please sign in to comment.