Skip to content

Commit

Permalink
Merge pull request #43 from oasisprotocol/ml/revert-logo-and-app-name
Browse files Browse the repository at this point in the history
Revert logo and app name
  • Loading branch information
lubej authored Mar 19, 2024
2 parents 3b87688 + 23b75df commit 9dcbaf0
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 59 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Oasis Votee
# Oasis voTEE

[![CI build status][github-ci-build-badge]][github-ci-build-link]
[![CI lint status][github-ci-lint-badge]][github-ci-lint-link]
Expand Down
2 changes: 1 addition & 1 deletion frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Voting dApp - frontend
# Oasis voTEE - frontend

Mascot voting dApp, that enables private voting on Oasis Sapphire ParaTime.
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Oasis Votee</title>
<title>Oasis voTEE</title>
</head>
<body>
<div id="root"></div>
Expand Down
68 changes: 14 additions & 54 deletions frontend/src/components/icons/LogoIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { useAppState } from '../../hooks/useAppState.ts'

const logoSizeMap: Record<'large' | 'small', { width: number; height: number }> = {
large: {
width: 259,
height: 39,
width: 153,
height: 50,
},
small: {
width: 126,
width: 55,
height: 18,
},
}
Expand All @@ -22,60 +22,20 @@ export const LogoIcon: FC = () => {
<svg
width={size.width}
height={size.height}
viewBox="0 0 259 39"
viewBox="0 0 153 50"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<g clipPath="url(#clip0_6298_13897)">
<path
d="M66.4002 7.22998C72.9702 7.22998 77.6902 11.95 77.6902 18.03C77.6902 24.11 72.9602 28.83 66.4002 28.83C59.8402 28.83 55.1602 24.11 55.1602 18.03C55.1602 11.95 59.8402 7.22998 66.4002 7.22998ZM66.4002 24.84C70.5002 24.84 73.3902 21.9 73.3902 18.08C73.3902 14.26 70.5102 11.32 66.4002 11.32C62.2902 11.32 59.4102 14.26 59.4102 18.08C59.4102 21.9 62.3402 24.84 66.4002 24.84Z"
fill="white"
/>
<path
d="M92.8402 25.5701H84.7602L83.7402 28.5801H79.4902L86.6802 7.56006H91.0802L98.2202 28.5801H93.8902L92.8502 25.5701H92.8402ZM91.5202 21.6001L88.8302 13.6401L86.1402 21.6001H91.5402H91.5202Z"
fill="white"
/>
<path
d="M108.73 11.15C106.62 11.15 105.3 12.23 105.3 13.66C105.3 14.55 105.9 15.21 106.82 15.54C108.24 16.03 110.38 15.77 112.44 16.36C115.2 17.16 116.94 19.2 116.94 22.02C116.94 25.99 113.78 28.9 108.98 28.9C104.18 28.9 100.85 26.15 100.85 22.18H105.1C105.1 23.82 106.79 24.95 109 24.95C111.21 24.95 112.68 23.78 112.68 22.25C112.68 21.19 111.98 20.56 111.11 20.25C109.69 19.76 107.4 19.92 105.44 19.38C102.56 18.58 100.99 16.49 100.99 13.82C100.99 9.98997 104.15 7.21997 108.75 7.21997C113.35 7.21997 116.56 9.84997 116.56 13.68H112.26C112.26 12.11 110.82 11.12 108.7 11.12L108.72 11.14L108.73 11.15Z"
fill="white"
/>
<path d="M121.39 7.56006H125.69V28.5801H121.39V7.56006Z" fill="white" />
<path
d="M138.1 11.15C135.99 11.15 134.67 12.23 134.67 13.66C134.67 14.55 135.27 15.21 136.19 15.54C137.61 16.03 139.75 15.77 141.81 16.36C144.57 17.16 146.31 19.2 146.31 22.02C146.31 25.99 143.15 28.9 138.35 28.9C133.55 28.9 130.22 26.15 130.22 22.18H134.47C134.47 23.82 136.16 24.95 138.37 24.95C140.58 24.95 142.05 23.78 142.05 22.25C142.05 21.19 141.35 20.56 140.48 20.25C139.06 19.76 136.77 19.92 134.81 19.38C131.93 18.58 130.36 16.49 130.36 13.82C130.36 9.98997 133.52 7.21997 138.12 7.21997C142.72 7.21997 145.93 9.84997 145.93 13.68H141.63C141.63 12.11 140.19 11.12 138.07 11.12L138.09 11.14L138.1 11.15Z"
fill="white"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M35.64 7.56C32.63 3.87 28.25 1.55 23.38 1.55C13.98 1.55 7.09 9.96 7.09 19.07C7.09 25.41 11.47 30.18 16.34 30.18C16.81 30.18 17.24 30.13 17.71 30.06C14.43 27.74 12.31 23.53 12.31 19.02C12.31 11.81 17.38 6.22 23.35 6.22C29.87 6.22 34.39 12.44 34.39 19.02C34.39 23.9 32.55 28.74 29.39 32.31C26.63 35.43 23.02 37.41 19.09 38.02C19.09 38.02 19.41 38.07 19.84 38.07C30.78 38.07 39.64 29.55 39.64 19.05C39.64 14.73 38.15 10.76 35.61 7.57H35.63L35.64 7.56ZM32.63 19.04C32.63 12.7 28.25 7.93 23.38 7.93C22.91 7.93 22.48 7.98 22.01 8.05C25.29 10.35 27.36 14.51 27.36 19.04C27.36 26.25 22.29 31.84 16.32 31.84C9.8 31.84 5.28 25.62 5.28 19.04C5.28 14.16 7.12 9.32 10.28 5.75C13.03 2.63 16.64 0.66 20.57 0.05C20.57 0.05 20.25 0 19.8 0C8.85 0 0 8.52 0 19.02C0 23.34 1.49 27.31 4.03 30.5C7.04 34.19 11.44 36.51 16.29 36.51C25.79 36.56 32.65 28.15 32.65 19.02L32.63 19.04Z"
fill="white"
/>
<path
d="M168.83 28.7601L160.09 7.59009H164.77L170.76 22.2901L176.66 7.59009H181.43L172.66 28.7601H168.81H168.83Z"
fill="white"
/>
<path
d="M201.61 25.92C199.47 28.06 196.89 29.13 193.87 29.13C190.85 29.13 188.27 28.06 186.13 25.92C183.99 23.78 182.92 21.2 182.92 18.18C182.92 15.16 183.99 12.58 186.13 10.44C188.27 8.29998 190.85 7.22998 193.87 7.22998C196.89 7.22998 199.47 8.29998 201.61 10.44C203.75 12.58 204.82 15.16 204.82 18.18C204.82 21.2 203.75 23.78 201.61 25.92ZM189.21 22.97C190.49 24.29 192.05 24.95 193.88 24.95C195.71 24.95 197.26 24.29 198.55 22.97C199.84 21.65 200.47 20.05 200.47 18.18C200.47 16.31 199.83 14.72 198.55 13.39C197.27 12.07 195.71 11.41 193.88 11.41C192.05 11.41 190.5 12.07 189.21 13.39C187.93 14.71 187.29 16.31 187.29 18.18C187.29 20.05 187.93 21.64 189.21 22.97Z"
fill="white"
/>
<path
d="M212.51 28.7601V11.7101H206.87V7.6001H222.55V11.7101H216.86V28.7701H212.51V28.7601Z"
fill="white"
/>
<path
d="M226.729 28.7601V7.59009H239.91V11.7001H231.049V16.0501H238.119V20.1601H231.049V24.6301H239.91V28.7401H226.729V28.7601Z"
fill="white"
/>
<path
d="M244.859 28.7601V7.59009H258.039V11.7001H249.179V16.0501H256.249V20.1601H249.179V24.6301H258.039V28.7401H244.859V28.7601Z"
fill="white"
/>
</g>
<defs>
<clipPath id="clip0_6298_13897">
<rect width="258.04" height="38.06" fill="white" />
</clipPath>
</defs>
<path
d="M65.882 36L59.031 20.5H63.712L67.804 30.42L71.896 20.5H76.639L69.757 36H65.882ZM90.2073 34.016C88.616 35.566 86.694 36.341 84.4413 36.341C82.1886 36.341 80.2666 35.566 78.6753 34.016C77.084 32.4453 76.2883 30.5233 76.2883 28.25C76.2883 25.9973 77.084 24.0857 78.6753 22.515C80.2666 20.9443 82.1886 20.159 84.4413 20.159C86.694 20.159 88.616 20.9443 90.2073 22.515C91.7986 24.0857 92.5943 25.9973 92.5943 28.25C92.5943 30.5233 91.7986 32.4453 90.2073 34.016ZM84.4413 32.373C85.5366 32.373 86.446 31.9907 87.1693 31.226C87.9133 30.4407 88.2853 29.4487 88.2853 28.25C88.2853 27.0513 87.9133 26.0697 87.1693 25.305C86.446 24.5197 85.5366 24.127 84.4413 24.127C83.3253 24.127 82.3953 24.5197 81.6513 25.305C80.928 26.0697 80.5663 27.0513 80.5663 28.25C80.5663 29.4487 80.928 30.4407 81.6513 31.226C82.3953 31.9907 83.3253 32.373 84.4413 32.373ZM96.3453 36V18.268H90.4863V13.99H106.792V18.268H100.871V36H96.3453ZM108.973 36V13.99H122.675V18.268H113.468V22.794H120.815V27.072H113.468V31.722H122.675V36H108.973ZM125.663 36V13.99H139.365V18.268H130.158V22.794H137.505V27.072H130.158V31.722H139.365V36H125.663Z"
fill="white"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M40.438 11.9201C37.0276 7.57101 32.0669 4.81953 26.5305 4.81953C15.8563 4.81953 8.06102 14.7604 8.06102 25.5444C8.06102 33.0444 13.0217 38.6805 18.5581 38.6805C19.0896 38.6805 19.5768 38.6361 20.1083 38.5473C16.3878 35.7959 13.9961 30.8254 13.9961 25.5C13.9961 16.9793 19.7539 10.3669 26.5305 10.3669C33.9272 10.3669 39.065 17.7337 39.065 25.5C39.065 31.2692 36.9833 36.9941 33.3957 41.2101C30.251 44.8935 26.1762 47.2456 21.7028 47.9556C21.7028 47.9556 22.0571 48 22.5443 48C34.9459 48 45 37.926 45 25.5C45 20.3965 43.3169 15.6923 40.438 11.9201ZM37.0276 25.5C37.0276 18 32.0669 12.3639 26.5305 12.3639C25.999 12.3639 25.5118 12.4083 24.9803 12.497C28.7008 15.2041 31.0482 20.1302 31.0482 25.5C31.0482 34.0207 25.2904 40.6331 18.5138 40.6331C11.1171 40.6331 5.97933 33.2663 5.97933 25.5C5.97933 19.7308 8.06102 14.0059 11.6486 9.78994C14.7933 6.10651 18.8681 3.75444 23.3415 3.04438C23.3415 3.04438 22.9872 3 22.4557 3C10.0541 3 0 13.074 0 25.5C0 30.6035 1.68307 35.3077 4.56201 39.0799C7.97244 43.429 12.9774 46.1805 18.4695 46.1805C29.2323 46.2249 37.0276 36.284 37.0276 25.5Z"
fill="white"
/>
</svg>
)
}
4 changes: 2 additions & 2 deletions frontend/src/constants/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const POLL_CHOICES: readonly PollChoice[] = Object.freeze([
{
name: 'Capybara',
description:
'A friendly capybara with a rose on its head, symbolizing the interoperability pioneered by the Oasis Network.',
'A friendly capybara with a rose in its hand, symbolizing the interoperability pioneered by the Oasis Network.',
imagePath: 'https://fakeimg.pl/182x182',
},
{
Expand All @@ -72,7 +72,7 @@ export const POLL_CHOICES: readonly PollChoice[] = Object.freeze([
{
name: 'Fennec Fox',
description:
'A nimble fox with sunglasses on its eyes, symbolizing the integrity pioneered by the Oasis Network.',
'A nimble fox with sunglasses on its eyes, symbolizing the privacy pioneered by the Oasis Network.',
imagePath: 'https://fakeimg.pl/182x182',
},
])
Expand Down

0 comments on commit 9dcbaf0

Please sign in to comment.