From 5bc0a4b233b1803f70c503d4df740a2528ae97b2 Mon Sep 17 00:00:00 2001 From: Iryna Vynnychenko Date: Tue, 22 Feb 2022 00:02:59 +0200 Subject: [PATCH 01/12] add upd on main screen --- dapp/package-lock.json | 16 ++++++++++++++++ dapp/src/components/brand/TZProfileLogo.svelte | 2 -- dapp/src/components/page/Nav/Nav.svelte | 12 ++++++------ dapp/src/routes/Faq/Faq.svelte | 2 +- dapp/src/routes/Splash/Splash.svelte | 8 ++++---- dapp/src/routes/Splash/splash.scss | 11 ++++++++--- dapp/tailwind.config.js | 3 ++- 7 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dapp/package-lock.json b/dapp/package-lock.json index 53e3bf4e..355bc666 100644 --- a/dapp/package-lock.json +++ b/dapp/package-lock.json @@ -1615,6 +1615,7 @@ }, "node_modules/cliui": { "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dependencies": { "string-width": "^4.2.0", @@ -2572,6 +2573,7 @@ }, "node_modules/didkit-wasm-node": { "version": "0.1.6", + "resolved": "https://registry.npmjs.org/didkit-wasm-node/-/didkit-wasm-node-0.1.6.tgz", "integrity": "sha512-qvPd4CyuPTJIlWrcoAPXlMu4247o6lBzpUfNC2cDbzlCaNdXp8WT2v+6IZSG+K1w7ZuLtO+GTHMPDTii22H9fA==" }, "node_modules/didyoumean": { @@ -3349,6 +3351,7 @@ }, "node_modules/fsevents": { "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true, @@ -11012,6 +11015,7 @@ }, "node_modules/typedarray-to-buffer": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-4.0.0.tgz", "integrity": "sha512-6dOYeZfS3O9RtRD1caom0sMxgK59b27+IwoNy8RDPsmslSGOyU+mpTamlaIW7aNKi90ZQZ9DFaZL3YRoiSCULQ==" }, "node_modules/typescript": { @@ -11526,6 +11530,7 @@ }, "node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dependencies": { "ansi-styles": "^4.0.0", @@ -11581,6 +11586,7 @@ }, "node_modules/y18n": { "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "engines": { "node": ">=10" @@ -11603,6 +11609,7 @@ }, "node_modules/yargs": { "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dependencies": { "cliui": "^7.0.2", @@ -11619,6 +11626,7 @@ }, "node_modules/yargs-parser": { "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "engines": { "node": ">=10" @@ -12998,6 +13006,7 @@ }, "cliui": { "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "requires": { "string-width": "^4.2.0", @@ -13779,6 +13788,7 @@ }, "didkit-wasm-node": { "version": "0.1.6", + "resolved": "https://registry.npmjs.org/didkit-wasm-node/-/didkit-wasm-node-0.1.6.tgz", "integrity": "sha512-qvPd4CyuPTJIlWrcoAPXlMu4247o6lBzpUfNC2cDbzlCaNdXp8WT2v+6IZSG+K1w7ZuLtO+GTHMPDTii22H9fA==" }, "didyoumean": { @@ -14432,6 +14442,7 @@ }, "fsevents": { "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true @@ -20645,6 +20656,7 @@ }, "typedarray-to-buffer": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-4.0.0.tgz", "integrity": "sha512-6dOYeZfS3O9RtRD1caom0sMxgK59b27+IwoNy8RDPsmslSGOyU+mpTamlaIW7aNKi90ZQZ9DFaZL3YRoiSCULQ==" }, "typescript": { @@ -21046,6 +21058,7 @@ }, "wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "requires": { "ansi-styles": "^4.0.0", @@ -21081,6 +21094,7 @@ }, "y18n": { "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yallist": { @@ -21097,6 +21111,7 @@ }, "yargs": { "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "requires": { "cliui": "^7.0.2", @@ -21110,6 +21125,7 @@ }, "yargs-parser": { "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" }, "yocto-queue": { diff --git a/dapp/src/components/brand/TZProfileLogo.svelte b/dapp/src/components/brand/TZProfileLogo.svelte index 187e8fa5..f3b6cc53 100644 --- a/dapp/src/components/brand/TZProfileLogo.svelte +++ b/dapp/src/components/brand/TZProfileLogo.svelte @@ -4,8 +4,6 @@
{ @@ -52,21 +52,21 @@ class="cursor-pointer flex flex-row items-center" > -
Tezos Profiles
+
{#if $userData} - My Profile + My Profile {/if} - Search Profiles + Search Profiles {#if !$wallet} - FAQ + FAQ {/if} {#if $userData} -
+
diff --git a/dapp/src/routes/Faq/Faq.svelte b/dapp/src/routes/Faq/Faq.svelte index cabc47f1..78a199a8 100644 --- a/dapp/src/routes/Faq/Faq.svelte +++ b/dapp/src/routes/Faq/Faq.svelte @@ -3,7 +3,7 @@ -

FAQ

+

FAQ

diff --git a/dapp/src/routes/Splash/Splash.svelte b/dapp/src/routes/Splash/Splash.svelte index f9ac80b1..d5b0ae60 100644 --- a/dapp/src/routes/Splash/Splash.svelte +++ b/dapp/src/routes/Splash/Splash.svelte @@ -25,7 +25,7 @@
-
+
Control Your Identity on Tezos
@@ -34,14 +34,14 @@ Tezos account.
-
+
connect()} text="Connect Wallet" /> navigate('/search')} text="Search Profiles" secondary diff --git a/dapp/src/routes/Splash/splash.scss b/dapp/src/routes/Splash/splash.scss index 00abe15d..3410162a 100644 --- a/dapp/src/routes/Splash/splash.scss +++ b/dapp/src/routes/Splash/splash.scss @@ -1,11 +1,16 @@ -.splash-container{ +.splash-container { margin: 50px auto; max-width: 800px; display: flex; flex-direction: column; padding: 24px; + + @media(max-width: 1023px) { + padding: 24px 16px; + margin-top: 40px; + } } -.subtitle-container{ +.subtitle-container { max-width: 550px -} \ No newline at end of file +} diff --git a/dapp/tailwind.config.js b/dapp/tailwind.config.js index 40be663e..76f3a094 100644 --- a/dapp/tailwind.config.js +++ b/dapp/tailwind.config.js @@ -27,13 +27,14 @@ module.exports = { }, maxWidth: { '2/3': '66.67%', + '48': '12rem', // 192px }, maxHeight: { '2/3': '66.67%', '5/6': '83.33%' }, minWidth: { - '72': '18rem' + '72': '18rem', // 288px }, minHeight: { '8': '2rem', From 257797ca63e373cba867c31bbde5b2fcbc058227 Mon Sep 17 00:00:00 2001 From: Iryna Vynnychenko Date: Tue, 22 Feb 2022 21:28:17 +0200 Subject: [PATCH 02/12] add some upd --- dapp/src/components/alerts/Alert.svelte | 2 +- dapp/src/components/icons/CloseIcon.svelte | 10 +++--- dapp/src/components/modals/FileModal.svelte | 18 +++++----- dapp/src/components/modals/Modal.svelte | 2 +- dapp/src/components/select/select.scss | 36 ++++++++++++++++--- dapp/src/routes/Connect/Connect.svelte | 40 ++++++++++++--------- dapp/tailwind.config.js | 36 +++++++++---------- 7 files changed, 89 insertions(+), 55 deletions(-) diff --git a/dapp/src/components/alerts/Alert.svelte b/dapp/src/components/alerts/Alert.svelte index 1cf25896..51af6a15 100644 --- a/dapp/src/components/alerts/Alert.svelte +++ b/dapp/src/components/alerts/Alert.svelte @@ -72,6 +72,6 @@ >{$alert?.message} - +
diff --git a/dapp/src/components/icons/CloseIcon.svelte b/dapp/src/components/icons/CloseIcon.svelte index 5229b436..902f4f08 100644 --- a/dapp/src/components/icons/CloseIcon.svelte +++ b/dapp/src/components/icons/CloseIcon.svelte @@ -1,10 +1,10 @@ - - + + diff --git a/dapp/src/components/modals/FileModal.svelte b/dapp/src/components/modals/FileModal.svelte index 0de674f0..3642baac 100644 --- a/dapp/src/components/modals/FileModal.svelte +++ b/dapp/src/components/modals/FileModal.svelte @@ -16,8 +16,12 @@
-
-
innerClose()} - > - +
+
innerClose()} + > +
diff --git a/dapp/src/components/modals/Modal.svelte b/dapp/src/components/modals/Modal.svelte index 3b6682af..2fe2c0ec 100644 --- a/dapp/src/components/modals/Modal.svelte +++ b/dapp/src/components/modals/Modal.svelte @@ -52,7 +52,7 @@

- +

diff --git a/dapp/src/components/select/select.scss b/dapp/src/components/select/select.scss index e2fb03a8..8adf48c6 100644 --- a/dapp/src/components/select/select.scss +++ b/dapp/src/components/select/select.scss @@ -1,5 +1,31 @@ -.select-container{ - padding: 12px; - border-radius: 6px; - background-color: #f7f7f7; -} \ No newline at end of file +.select-container { + padding: 12px; + border-radius: 6px; + background-color: #f7f7f7; + max-width: 240px; + width: 100%; + margin-left: auto; + margin-right: auto; + /* for Firefox */ + -moz-appearance: none; + /* for Chrome */ + -webkit-appearance: none; + &:focus { + outline: none; + } + &:-ms-expand { + display: none; + } +} + +.arrow { + border: solid black; + border-width: 0 2px 2px 0; + display: inline-block; + padding: 3px; +} + +.down { + transform: rotate(45deg); + -webkit-transform: rotate(45deg); +} diff --git a/dapp/src/routes/Connect/Connect.svelte b/dapp/src/routes/Connect/Connect.svelte index 900de14b..7590f429 100644 --- a/dapp/src/routes/Connect/Connect.svelte +++ b/dapp/src/routes/Connect/Connect.svelte @@ -40,23 +40,31 @@ {#if !$userData}
-
Choose network and connect
- +
+ Choose network and connect +
+
+ +
+
+
+
{#if showWalletButton} { await initWallet(); const scrollY = document.body.style.top; @@ -64,8 +72,8 @@ document.body.style.top = ''; document.body.style.height = '100%'; - document.body.style["overflow-y"] = 'auto'; - document.body.style["padding-right"] = '0px'; + document.body.style['overflow-y'] = 'auto'; + document.body.style['padding-right'] = '0px'; window.scrollTo(0, parseInt(scrollY || '0') * -1); navigate('/connect'); diff --git a/dapp/tailwind.config.js b/dapp/tailwind.config.js index 76f3a094..0ea5f08d 100644 --- a/dapp/tailwind.config.js +++ b/dapp/tailwind.config.js @@ -1,59 +1,57 @@ module.exports = { tableLayout: false, - purge: [ - './src/**/*.html', - './src/**/*.js', - './src/**/*.svelte', - ], + purge: ['./src/**/*.html', './src/**/*.js', './src/**/*.svelte'], darkMode: false, theme: { extend: { lineHeight: { - 16: '4rem' + 16: '4rem', }, colors: { green: { - 550: '#429383' + 550: '#429383', }, blue: { 350: '#1DA1F2', - 550: '#3A83A3' + 550: '#3A83A3', }, gray: { 350: '#AAAAAA', 370: '#A0A4A8', - 650: '#3E3E3E' + 650: '#3E3E3E', }, }, maxWidth: { '2/3': '66.67%', - '48': '12rem', // 192px + 48: '12rem', // 192px + 52.5: '13.125rem', // 210px + 60: '15rem', // 240px }, maxHeight: { '2/3': '66.67%', - '5/6': '83.33%' + '5/6': '83.33%', }, minWidth: { - '72': '18rem', // 288px + 72: '18rem', // 288px }, minHeight: { - '8': '2rem', + 8: '2rem', }, width: { 'fit-content': 'fit-content', - '15': '3.75rem' + 15: '3.75rem', }, height: { 'fit-content': 'fit-content', - '15': '3.75rem' + 15: '3.75rem', }, outline: { green: ['2px solid #429383', '-6px'], }, fontFamily: { - 'poppins': ['Poppins'], - 'inter': ['Inter'], - 'monserrat': ['Montserrat'], + poppins: ['Poppins'], + inter: ['Inter'], + monserrat: ['Montserrat'], }, }, }, @@ -62,7 +60,7 @@ module.exports = { backgroundColor: ['checked'], borderColor: ['checked'], opacity: ['disabled'], - } + }, }, plugins: [], }; From 36fdefbc8a563e57ce5f251d1e6d081cb501174f Mon Sep 17 00:00:00 2001 From: Iryna Vynnychenko Date: Wed, 23 Feb 2022 00:25:06 +0200 Subject: [PATCH 03/12] add some styles updates --- dapp/src/components/alerts/Alert.svelte | 4 +--- dapp/src/components/icons/DiscordIcon.svelte | 7 +++---- dapp/src/components/page/Nav/Nav.svelte | 18 +++++++++--------- dapp/src/components/page/Nav/nav.scss | 8 ++------ .../page/home/AvailableCredentials.svelte | 10 +++++----- .../page/home/availablecredentials.scss | 16 ++++++++++++++++ .../page/view/PublicProfileView.svelte | 2 +- dapp/src/routes/Claims.svelte | 2 +- dapp/src/routes/Connect/Connect.svelte | 2 +- dapp/tailwind.config.js | 1 + 10 files changed, 40 insertions(+), 30 deletions(-) diff --git a/dapp/src/components/alerts/Alert.svelte b/dapp/src/components/alerts/Alert.svelte index 51af6a15..d7b95fd8 100644 --- a/dapp/src/components/alerts/Alert.svelte +++ b/dapp/src/components/alerts/Alert.svelte @@ -59,9 +59,7 @@