nostr/primal-web-app
1
0
Fork 0
mirror of https://github.com/PrimalHQ/primal-web-app.git synced 2024-09-28 16:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redesign

Browse Source
This commit is contained in:
Bojan Mojsilovic 2023-10-24 13:54:33 +02:00
parent 28803ba01d
commit fa6319e440
175 changed files with 4799 additions and 3200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
fonts-google.css
View File

@ -1,181 +0,0 @@
/* cyrillic-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-wmF9lp.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-UmF9lp.woff2) format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-ImF9lp.woff2) format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-4mF9lp.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-8mF9lp.woff2) format('woff2');
unicode-range: U+0100-02AF, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-EmFw.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-wmF9lp.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-UmF9lp.woff2) format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-ImF9lp.woff2) format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-4mF9lp.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-8mF9lp.woff2) format('woff2');
unicode-range: U+0100-02AF, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-EmFw.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-wmF9lp.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-UmF9lp.woff2) format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-ImF9lp.woff2) format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-4mF9lp.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-8mF9lp.woff2) format('woff2');
unicode-range: U+0100-02AF, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: swap;
src: url(https://fonts.gstatic.com/s/robotoflex/v9/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-EmFw.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

BIN
public/public/Nacelle/Nacelle-Black.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-BlackItalic.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-Bold.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-BoldItalic.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-Heavy.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-HeavyItalic.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-Italic.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-Light.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-LightItalic.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-Regular.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-SemiBold.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-SemiBoldItalic.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-Thin.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-ThinItalic.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-UltraLight.otf Normal file
View File

Binary file not shown.

BIN
public/public/Nacelle/Nacelle-UltraLightItalic.otf Normal file
View File

Binary file not shown.

91
public/public/Nacelle/SIL Open Font License.txt Normal file
View File

@ -0,0 +1,91 @@
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

202
public/public/RobotoCondensed/LICENSE.txt Normal file
View File

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

BIN
public/public/RobotoCondensed/RobotoCondensed-Bold.ttf Normal file
View File

Binary file not shown.

BIN
public/public/RobotoCondensed/RobotoCondensed-BoldItalic.ttf Normal file
View File

Binary file not shown.

BIN
public/public/RobotoCondensed/RobotoCondensed-Italic.ttf Normal file
View File

Binary file not shown.

BIN
public/public/RobotoCondensed/RobotoCondensed-Light.ttf Normal file
View File

Binary file not shown.

BIN
public/public/RobotoCondensed/RobotoCondensed-LightItalic.ttf Normal file
View File

Binary file not shown.

BIN
public/public/RobotoCondensed/RobotoCondensed-Medium.ttf Normal file
View File

Binary file not shown.

BIN
public/public/RobotoCondensed/RobotoCondensed-Regular.ttf Normal file
View File

Binary file not shown.

281
public/public/fonts.css
View File

@ -1,176 +1,143 @@
/* cyrillic-ext */
/* Thin */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-family: 'Nacelle';
font-weight: 100;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-wmF9lp.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
font-style: normal;
src: url(/public/Nacelle/Nacelle-Thin.otf) format('opentype');
}
/* cyrillic */
/* Thin Italic */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-family: 'Nacelle';
font-weight: 100;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-UmF9lp.woff2) format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
font-style: italic;
src: url(/public/Nacelle/Nacelle-ThinItalic.otf) format('opentype');
}
/* greek */
/* Ultra Light */
@font-face {
font-family: 'Roboto Flex';
font-family: 'Nacelle';
font-weight: 200;
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-ImF9lp.woff2) format('woff2');
unicode-range: U+0370-03FF;
src: url(/public/Nacelle/Nacelle-UltraLight.otf) format('opentype');
}
/* vietnamese */
/* Ultra Light Italic */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-4mF9lp.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
font-family: 'Nacelle';
font-weight: 200;
font-style: italic;
src: url(/public/Nacelle/Nacelle-UltraLightItalic.otf) format('opentype');
}
/* latin-ext */
/* Light */
@font-face {
font-family: 'Roboto Flex';
font-family: 'Nacelle';
font-weight: 300;
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-8mF9lp.woff2) format('woff2');
unicode-range: U+0100-02AF, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
src: url(/public/Nacelle/Nacelle-Light.otf) format('opentype');
}
/* Light Italic */
@font-face {
font-family: 'Nacelle';
font-weight: 300;
font-style: italic;
src: url(/public/Nacelle/Nacelle-LightItalic.otf) format('opentype');
}
/* Regular */
@font-face {
font-family: 'Nacelle';
font-weight: 400;
font-style: normal;
src: url(/public/Nacelle/Nacelle-Regular.otf) format('opentype');
}
/* Regular Italic */
@font-face {
font-family: 'Nacelle';
font-weight: 400;
font-style: italic;
src: url(/public/Nacelle/Nacelle-Italic.otf) format('opentype');
}
/* Semi-Bold */
@font-face {
font-family: 'Nacelle';
font-weight: 600;
font-style: normal;
src: url(/public/Nacelle/Nacelle-SemiBold.otf) format('opentype');
}
/* Semi-Bold Italic */
@font-face {
font-family: 'Nacelle';
font-weight: 600;
font-style: italic;
src: url(/public/Nacelle/Nacelle-SemiBoldItalic.otf) format('opentype');
}
/* Bold */
@font-face {
font-family: 'Nacelle';
font-weight: 700;
font-style: normal;
src: url(/public/Nacelle/Nacelle-Bold.otf) format('opentype');
}
/* Bold Italic */
@font-face {
font-family: 'Nacelle';
font-weight: 700;
font-style: italic;
src: url(/public/Nacelle/Nacelle-BoldItalic.otf) format('opentype');
}
/* Heavy */
@font-face {
font-family: 'Nacelle';
font-weight: 800;
font-style: normal;
src: url(/public/Nacelle/Nacelle-Heavy.otf) format('opentype');
}
/* Heavy Italic */
@font-face {
font-family: 'Nacelle';
font-weight: 800;
font-style: italic;
src: url(/public/Nacelle/Nacelle-HeavyItalic.otf) format('opentype');
}
/* Black */
@font-face {
font-family: 'Nacelle';
font-weight: 900;
font-style: normal;
src: url(/public/Nacelle/Nacelle-Black.otf) format('opentype');
}
/* Black Italic */
@font-face {
font-family: 'Nacelle';
font-weight: 900;
font-style: italic;
src: url(/public/Nacelle/Nacelle-BlackItalic.otf) format('opentype');
}
@font-face {
font-family: 'Roboto Condensed';
font-weight: 500;
font-style: normal;
src: url(/public/RobotoCondensed/RobotoCondensed-Medium.ttf) format('truetype');
}
/* latin */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 100;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-EmFw.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-wmF9lp.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-UmF9lp.woff2) format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-ImF9lp.woff2) format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-4mF9lp.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-8mF9lp.woff2) format('woff2');
unicode-range: U+0100-02AF, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 400;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-EmFw.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-wmF9lp.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-UmF9lp.woff2) format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-ImF9lp.woff2) format('woff2');
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-4mF9lp.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Roboto Flex';
font-style: normal;
font-weight: 700;
font-stretch: 100%;
font-display: block;
src: url(/public/NaNeepOXO_NexZs0b5QrzlOHb8wCikXpYqmZsWI-__OGfttPZktqc2VdZ80KvCLZaPcSBZtOx2MifRuWR28sPJtUMbsFEK6cRrleUx9Xgbm3WLHa_F4Ep4Fm0PN19Ik5Dntczx0wZGzhPlL1YNMYKbv9_1IQXOw7AiUJVXRrV8cWW4O8LJCoXjCnwSRSaLshNP1d9-8mF9lp.woff2) format('woff2');
unicode-range: U+0100-02AF, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto Flex';
font-family: 'Roboto Black';
font-style: normal;
font-weight: 700;
font-stretch: 100%;

3
src/assets/icons/ellipsis.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="3" height="4" viewBox="0 0 3 4" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="1.5" cy="2" r="1.5" fill="#757575"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 148 B

9
src/assets/icons/feed_reply.svg
View File

@ -1,3 +1,10 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.8 11.1953V13.5911C5.8 13.7988 6.01543 13.9029 6.14142 13.756L8.33726 11.1953H14.8C15.6837 11.1953 16.4 10.3599 16.4 9.32938V4.73175C16.4 3.70126 15.6837 2.86588 14.8 2.86588H4.2C3.31634 2.86588 2.6 3.70126 2.6 4.73175V9.32938C2.6 10.3599 3.31634 11.1953 4.2 11.1953H5.8ZM4.88284 17.8624C4.63086 18.1563 4.2 17.9482 4.2 17.5326L4.2 13.0611C2.43269 13.0611 1 11.3904 1 9.32938V4.73175C1 2.67076 2.43269 1 4.2 1H14.8C16.5673 1 18 2.67076 18 4.73175V9.32938C18 11.3904 16.5673 13.0611 14.8 13.0611H9L4.88284 17.8624Z" fill="#666666"/>
<g clip-path="url(#clip0_2584_7892)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.0841 11.2595L3.78577 14.6592L7.20662 12.4102L7.81646 12.4814C8.20105 12.5264 8.59631 12.5498 9 12.5498C11.1503 12.5498 13.0338 11.8857 14.3431 10.891C15.6512 9.89724 16.3125 8.6471 16.3125 7.39992C16.3125 6.15274 15.6512 4.9026 14.3431 3.90884C13.0338 2.91415 11.1503 2.25 9 2.25C6.84965 2.25 4.96617 2.91415 3.65687 3.90884C2.34881 4.9026 1.6875 6.15274 1.6875 7.39992C1.6875 8.56858 2.26553 9.73351 3.41097 10.6947L4.0841 11.2595ZM2.77093 17.3459C2.37805 17.6042 1.86047 17.2951 1.90158 16.8267L2.32624 11.9874C0.880583 10.7743 0 9.16522 0 7.39992C0 3.62372 4.02944 0.5625 9 0.5625C13.9706 0.5625 18 3.62372 18 7.39992C18 11.1761 13.9706 14.2373 9 14.2373C8.53096 14.2373 8.07029 14.2101 7.62061 14.1575L2.77093 17.3459Z" fill="#666666"/>
</g>
<defs>
<clipPath id="clip0_2584_7892">
<rect width="18" height="18" fill="white"/>
</clipPath>
</defs>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 686 B

After

Width:  |  Height:  |  Size: 1.0 KiB

9
src/assets/icons/feed_reply_fill.svg
View File

@ -1,3 +1,10 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.88284 17.8624C4.63086 18.1563 4.2 17.9482 4.2 17.5326L4.2 13.0611C2.43269 13.0611 1 11.3904 1 9.32938V4.73175C1 2.67076 2.43269 1 4.2 1H14.8C16.5673 1 18 2.67076 18 4.73175V9.32938C18 11.3904 16.5673 13.0611 14.8 13.0611H9L4.88284 17.8624Z" fill="#CCCCCC"/>
<g clip-path="url(#clip0_2584_7890)">
<path d="M9 14.2373C13.9706 14.2373 18 11.1761 18 7.39992C18 3.62372 13.9706 0.5625 9 0.5625C4.02944 0.5625 0 3.62372 0 7.39992C0 9.16522 0.880583 10.7743 2.32624 11.9874L1.90158 16.8267C1.86047 17.2951 2.37805 17.6042 2.77093 17.3459L7.62061 14.1575C8.07029 14.2101 8.53096 14.2373 9 14.2373Z" fill="#CCCCCC"/>
</g>
<defs>
<clipPath id="clip0_2584_7890">
<rect width="18" height="18" fill="white"/>
</clipPath>
</defs>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 413 B

After

Width:  |  Height:  |  Size: 561 B

3
src/assets/icons/feed_reply_fill_old.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.88284 17.8624C4.63086 18.1563 4.2 17.9482 4.2 17.5326L4.2 13.0611C2.43269 13.0611 1 11.3904 1 9.32938V4.73175C1 2.67076 2.43269 1 4.2 1H14.8C16.5673 1 18 2.67076 18 4.73175V9.32938C18 11.3904 16.5673 13.0611 14.8 13.0611H9L4.88284 17.8624Z" fill="#CCCCCC"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 413 B

3
src/assets/icons/feed_reply_old.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.8 11.1953V13.5911C5.8 13.7988 6.01543 13.9029 6.14142 13.756L8.33726 11.1953H14.8C15.6837 11.1953 16.4 10.3599 16.4 9.32938V4.73175C16.4 3.70126 15.6837 2.86588 14.8 2.86588H4.2C3.31634 2.86588 2.6 3.70126 2.6 4.73175V9.32938C2.6 10.3599 3.31634 11.1953 4.2 11.1953H5.8ZM4.88284 17.8624C4.63086 18.1563 4.2 17.9482 4.2 17.5326L4.2 13.0611C2.43269 13.0611 1 11.3904 1 9.32938V4.73175C1 2.67076 2.43269 1 4.2 1H14.8C16.5673 1 18 2.67076 18 4.73175V9.32938C18 11.3904 16.5673 13.0611 14.8 13.0611H9L4.88284 17.8624Z" fill="#666666"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 686 B

5
src/assets/icons/home.svg
View File

@ -1,4 +1,3 @@
<svg width="24" height="23" viewBox="0 0 24 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.8823 0.405304C12.3564 0.0227762 11.6438 0.0227762 11.1178 0.405304L0.411899 8.19142C-0.0347537 8.51626 -0.133504 9.14168 0.191334 9.58833C0.516173 10.035 1.14159 10.1337 1.58824 9.8089L11.1178 2.8783C11.6438 2.49577 12.3564 2.49577 12.8823 2.8783L22.4119 9.8089C22.8586 10.1337 23.484 10.035 23.8088 9.58833C24.1336 9.14168 24.0349 8.51626 23.5882 8.19142L12.8823 0.405304Z" fill="#AAAAAA"/>
<path d="M4.4 10.7C4.14819 10.8888 4 11.1852 4 11.5V21C4 22.1046 4.89543 23 6 23H18C19.1046 23 20 22.1046 20 21V11.5C20 11.1852 19.8518 10.8888 19.6 10.7L18.4 9.79999C18.2352 9.67638 18 9.79398 18 9.99999V20C18 20.5523 17.5523 21 17 21H7C6.44771 21 6 20.5523 6 20V9.99999C6 9.79398 5.76481 9.67638 5.6 9.79999L4.4 10.7Z" fill="#AAAAAA"/>
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5881 9.47872L12.6018 1.20132C12.2455 0.932895 11.7545 0.932895 11.3982 1.20132L0.411896 9.47872C-0.0347535 9.81524 -0.133503 10.4631 0.191333 10.9259C0.51617 11.3886 1.14158 11.4909 1.58823 11.1543L3.0001 10.0906V20.7479C3.0001 21.8525 3.89554 22.7479 5.00011 22.7479H19C20.1046 22.7479 21 21.8525 21 20.7479V10.0907L22.4118 11.1543C22.8584 11.4909 23.4838 11.3886 23.8087 10.9259C24.1335 10.4631 24.0348 9.81524 23.5881 9.47872ZM19 8.58384L12.6017 3.76323C12.2455 3.4948 11.7545 3.49481 11.3983 3.76323L5.00009 8.58376V19.676C5.00009 20.2283 5.44781 20.676 6.00009 20.676H18C18.5523 20.676 19 20.2283 19 19.676V8.58384Z" fill="#AAAAAA"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 795 B

3
src/assets/icons/home_fill.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5881 9.47872L12.6018 1.20132C12.2455 0.932895 11.7545 0.932895 11.3982 1.20132L0.411896 9.47872C-0.0347535 9.81524 -0.133503 10.4631 0.191333 10.9259C0.51617 11.3886 1.14158 11.4909 1.58823 11.1543L3.0001 10.0906V20.7479C3.0001 21.8525 3.89554 22.7479 5.00011 22.7479H19C20.1046 22.7479 21 21.8525 21 20.7479V10.0907L22.4118 11.1543C22.8584 11.4909 23.4838 11.3886 23.8087 10.9259C24.1335 10.4631 24.0348 9.81524 23.5881 9.47872Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 602 B

3
src/assets/icons/reply.svg
View File

@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.56205 11L12 13.865V11.1221L12.6668 10.8865C13.4449 10.6114 14 9.86925 14 9V5C14 3.89543 13.1046 3 12 3H4C2.89543 3 2 3.89543 2 5V9C2 10.1046 2.89543 11 4 11H8.56205ZM13 16L8.2 12H4C2.34315 12 1 10.6569 1 9V5C1 3.34315 2.34315 2 4 2H12C13.6569 2 15 3.34315 15 5V9C15 10.3062 14.1652 11.4175 13 11.8293V16Z" fill="black"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 476 B

3
src/assets/icons/reply_filled.svg
View File

@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M13 16L8.2 12H4C2.34315 12 1 10.6569 1 9V5C1 3.34315 2.34315 2 4 2H12C13.6569 2 15 3.34315 15 5V9C15 10.3062 14.1652 11.4175 13 11.8293V16Z" fill="black"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 308 B

4
src/assets/icons/search.svg
View File

@ -1,3 +1,3 @@
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2131 18.8362C15.5068 20.1908 13.3479 21 11 21C5.47715 21 1 16.5228 1 11C1 5.47715 5.47715 1 11 1C16.5228 1 21 5.47715 21 11C21 13.3479 20.1908 15.5068 18.8362 17.2131L26.1885 24.5654C26.6367 25.0136 26.6367 25.7403 26.1885 26.1885V26.1885C25.7403 26.6367 25.0136 26.6367 24.5654 26.1885L17.2131 18.8362ZM20 11C20 15.9706 15.9706 20 11 20C6.02944 20 2 15.9706 2 11C2 6.02944 6.02944 2 11 2C15.9706 2 20 6.02944 20 11Z" fill="black"/>
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7563 17.4146C13.251 18.4163 11.4437 19 9.5 19C4.25329 19 0 14.7467 0 9.5C0 4.25329 4.25329 0 9.5 0C14.7467 0 19 4.25329 19 9.5C19 11.4437 18.4163 13.251 17.4146 14.7563L22.6709 20.0126C23.4049 20.7467 23.4049 21.9368 22.6709 22.6709C21.9368 23.4049 20.7467 23.4049 20.0126 22.6709L14.7563 17.4146ZM17 9.5C17 13.6421 13.6421 17 9.5 17C5.35786 17 2 13.6421 2 9.5C2 5.35786 5.35786 2 9.5 2C13.6421 2 17 5.35786 17 9.5Z" fill="#AAAAAA"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 590 B

13
src/assets/icons/search_filled.svg
View File

@ -1,4 +1,11 @@
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M19 11C19 15.4183 15.4183 19 11 19C6.58172 19 3 15.4183 3 11C3 6.58172 6.58172 3 11 3C15.4183 3 19 6.58172 19 11Z" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.8362 17.2131C20.1908 15.5068 21 13.3479 21 11C21 5.47715 16.5228 1 11 1C5.47715 1 1 5.47715 1 11C1 16.5228 5.47715 21 11 21C13.3479 21 15.5068 20.1908 17.2131 18.8362L24.5654 26.1885C25.0136 26.6367 25.7403 26.6367 26.1885 26.1885V26.1885C26.6367 25.7403 26.6367 25.0136 26.1885 24.5654L18.8362 17.2131ZM11 20C15.9706 20 20 15.9706 20 11C20 6.02944 15.9706 2 11 2C6.02944 2 2 6.02944 2 11C2 15.9706 6.02944 20 11 20Z" fill="black"/>
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_3074_1417)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7554 17.4135C13.2502 18.4152 11.443 18.9988 9.49942 18.9988C4.25304 18.9988 0 14.7458 0 9.49942C0 4.25304 4.25304 0 9.49942 0C14.7458 0 18.9988 4.25304 18.9988 9.49942C18.9988 11.443 18.4152 13.2502 17.4135 14.7554L22.6695 20.0114C23.4035 20.7454 23.4035 21.9355 22.6695 22.6695C21.9355 23.4035 20.7454 23.4035 20.0114 22.6695L14.7554 17.4135ZM16.999 9.49942C16.999 13.6413 13.6413 16.999 9.49942 16.999C5.35754 16.999 1.99988 13.6413 1.99988 9.49942C1.99988 5.35754 5.35754 1.99988 9.49942 1.99988C13.6413 1.99988 16.999 5.35754 16.999 9.49942Z" fill="white"/>
<path d="M15.839 9.49992C15.839 13.0009 13.0009 15.839 9.49992 15.839C5.99896 15.839 3.16086 13.0009 3.16086 9.49992C3.16086 5.99896 5.99896 3.16086 9.49992 3.16086C13.0009 3.16086 15.839 5.99896 15.839 9.49992Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_3074_1417">
<rect width="24" height="24" fill="white"/>
</clipPath>
</defs>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 728 B

After

Width:  |  Height:  |  Size: 1.1 KiB

10
src/assets/icons/send.svg Normal file
View File

@ -0,0 +1,10 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_2046_2)">
<path d="M21.6145 11.2328C22.1289 10.7205 22.1284 9.87239 21.6134 9.36074L12.3274 0.136003C12.1448 -0.0453342 11.8552 -0.0453344 11.6726 0.136003L2.38661 9.36074C1.87157 9.87239 1.87106 10.7205 2.3855 11.2328C2.87675 11.722 3.65717 11.7226 4.14924 11.2343L10.7079 4.72565V22.6725C10.7079 23.4057 11.2864 24 12 24C12.7136 24 13.2921 23.4057 13.2921 22.6725V4.72565L19.8508 11.2343C20.3428 11.7226 21.1232 11.722 21.6145 11.2328Z" fill="#AAAAAA"/>
</g>
<defs>
<clipPath id="clip0_2046_2">
<rect width="24" height="24" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 689 B

3
src/components/AddToHomeFeedButton/AddToHomeFeedButton.module.scss
View File

@ -2,10 +2,9 @@
display: flex;
position: absolute;
bottom: 0px;
width: 100%;
height: 35px;
justify-content: flex-end;
align-items: flex-end;
align-items: center;
.noAdd {
display: flex;

30
src/components/Avatar/Avatar.module.scss
View File

@ -20,7 +20,7 @@
height: 15px;
display: inline-block;
margin: 0px 0px;
background-color: var(--accent-2);
background-color: var(--accent);
-webkit-mask: url(../../assets/icons/verified.svg) no-repeat 0px / 15px;
mask: url(../../assets/icons/verified.svg) no-repeat 0px / 15px;
}
@ -85,6 +85,23 @@
}
}
.vvsAvatar {
@include avatar;
width: 36px;
height: 36px;
.missingBack {
width: 36px;
height: 36px;
}
.iconBackground {
@include iconBackground;
bottom: -6px;
right: -6px;
}
}
.vsAvatar {
@include avatar;
width: 42px;
@ -221,6 +238,13 @@
font-size: 10px;
}
.vvsMissing {
@include missing;
width: 36px;
height: 36px;
font-size: 10px;
}
.vsMissing {
@include missing;
width: 42px;
@ -264,8 +288,8 @@
}
.highlightBorder {
background: var(--brand-gradient);
padding: 2px;
background: none;
// padding: 2px;
}
.cacheFlag {

5
src/components/Avatar/Avatar.tsx
View File

@ -10,7 +10,7 @@ import styles from './Avatar.module.scss';
const Avatar: Component<{
src?: string | undefined,
size?: "xxs" | "xss" | "xs" | "vs" | "sm" | "md" | "lg" | "xl" | "xxl",
size?: "xxs" | "xss" | "xs" | "vvs" | "vs" | "sm" | "md" | "lg" | "xl" | "xxl",
user?: PrimalUser,
highlightBorder?: boolean,
id?: string,
@ -28,6 +28,7 @@ const Avatar: Component<{
xxs: styles.xxsAvatar,
xss: styles.xssAvatar,
xs: styles.xsAvatar,
vvs: styles.vvsAvatar,
vs: styles.vsAvatar,
sm: styles.smallAvatar,
md: styles.midAvatar,
@ -40,6 +41,7 @@ const Avatar: Component<{
xxs: styles.xxsMissing,
xss: styles.xssMissing,
xs: styles.xsMissing,
vvs: styles.vvsMissing,
vs: styles.vsMissing,
sm: styles.smallMissing,
md: styles.midMissing,
@ -71,6 +73,7 @@ const Avatar: Component<{
case 'xxs':
case 'xss':
case 'xs':
case 'vvs':
case 'vs':
case 'sm':
case 'md':

1
src/components/Branding/Branding.module.scss
View File

@ -11,6 +11,7 @@
span {
// margin-right: 12px;
font-family: "Roboto Black";
font-weight: 700;
font-size: 30px;
line-height: 30px;

44
src/components/Branding/Branding.tsx
View File

@ -6,42 +6,40 @@ import { useIntl } from '@cookbook/solid-intl';
import { branding } from '../../translations';
import PageNav from '../PageNav/PageNav';
const Branding: Component<{ small?: boolean, isHome?: boolean, showNav?: boolean }> = (props) => {
const Branding: Component<{ small?: boolean, isHome?: boolean }> = (props) => {
const navigate = useNavigate();
const intl = useIntl();
const onClick = () => {
const toHomeOrScrollToTop = () => {
if (props.isHome) {
window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
return;
}
navigate('/home');
navigate('/');
}
return (
<Show when={!props.showNav} fallback={<PageNav />}>
<button
class={styles.logoLink}
onClick={onClick}
>
<Show
when={!props.small}
fallback={
<div class={styles.brandingSmall}>
<div class={styles.logo} />
</div>
}
>
<div class={styles.branding}>
<button
class={styles.logoLink}
onClick={toHomeOrScrollToTop}
>
<Show
when={!props.small}
fallback={
<div class={styles.brandingSmall}>
<div class={styles.logo} />
<span>
{intl.formatMessage(branding)}
</span>
</div>
</Show>
</button>
</Show>
}
>
<div class={styles.branding}>
<div class={styles.logo} />
<span>
{intl.formatMessage(branding)}
</span>
</div>
</Show>
</button>
)
}

40
src/components/Buttons/ButtonFlip.tsx Normal file
View File

@ -0,0 +1,40 @@
import { Component, JSXElement, Match, Show, Switch } from 'solid-js';
import { hookForDev } from '../../lib/devTools';
import { Button } from "@kobalte/core";
import styles from './Buttons.module.scss';
const ButtonFollow: Component<{
id?: string,
onClick?: (e: MouseEvent) => void,
when?: boolean,
children?: JSXElement,
fallback?: JSXElement,
disabled?: boolean,
type?: 'button' | 'submit' | 'reset' | undefined,
}> = (props) => {
const klass = () => {
return props.when ? styles.flipActive : styles.flipInactive;
}
return (
<Button.Root
id={props.id}
class={klass()}
onClick={props.onClick}
disabled={props.disabled}
type={props.type}
>
<span>
<Show
when={props.when}
fallback={props.fallback}
>
{props.children}
</Show>
</span>
</Button.Root>
)
}
export default hookForDev(ButtonFollow);

74
src/components/Buttons/ButtonFollow.tsx
View File

@ -1,74 +0,0 @@
import { useIntl } from '@cookbook/solid-intl';
import { Button } from '@kobalte/core';
import { Component, Show } from 'solid-js';
import { useAccountContext } from '../../contexts/AccountContext';
import { hookForDev } from '../../lib/devTools';
import { account as t, actions } from '../../translations';
import { PrimalUser } from '../../types/primal';
import { useToastContext } from '../Toaster/Toaster';
import styles from './Buttons.module.scss';
const ButtonFollow: Component<{
person: PrimalUser | undefined,
id?: string,
onFollow?: (person: PrimalUser | undefined) => void,
then?: (remove: boolean, pubkey: string) => void,
}> = (props) => {
const toast = useToastContext()
const account = useAccountContext();
const intl = useIntl();
const isFollowed = () => {
return props.person &&
account?.publicKey &&
account?.following.includes(props.person.pubkey);
}
const onFollow = (e: MouseEvent) => {
e.preventDefault();
if (props.onFollow) {
props.onFollow(props.person);
return
}
if (!account || !account.hasPublicKey() || !props.person) {
account?.actions.showGetStarted();
// toast?.sendWarning(intl.formatMessage(t.needToLogin))
return;
}
const action = isFollowed() ?
account.actions.removeFollow :
account.actions.addFollow;
action(props.person.pubkey, props.then);
}
const klass = () => {
return isFollowed() ? styles.unfollow : styles.follow;
}
return (
<Show when={props.person}>
<Button.Root
id={props.id}
class={klass()}
onClick={onFollow}
disabled={account?.followInProgress === props.person?.pubkey}
>
<Show
when={isFollowed()}
fallback={intl.formatMessage(t.follow)}
>
{intl.formatMessage(t.unfollow)}
</Show>
</Button.Root>
</Show>
)
}
export default hookForDev(ButtonFollow);

6
src/components/Buttons/ButtonPrimary.tsx
View File

@ -9,6 +9,7 @@ const ButtonPrimary: Component<{
onClick?: (e: MouseEvent) => void,
children?: JSXElement,
disabled?: boolean,
type?: 'button' | 'submit' | 'reset' | undefined,
}> = (props) => {
return (
<Button.Root
@ -16,10 +17,9 @@ const ButtonPrimary: Component<{
class={styles.primary}
onClick={props.onClick}
disabled={props.disabled}
type={props.type}
>
<span>
{props.children}
</span>
{props.children}
</Button.Root>
)
}

25
src/components/Buttons/ButtonSecondary.tsx
View File

@ -9,19 +9,32 @@ const ButtonSecondary: Component<{
onClick?: (e: MouseEvent) => void,
children?: JSXElement,
disabled?: boolean,
shrink?: boolean,
light?: boolean,
type?: 'button' | 'submit' | 'reset' | undefined,
}> = (props) => {
const klass = () => {
let cls = styles.secondary;
if (props.shrink)
cls += ` ${styles.shrunk}`;
if (props.light)
cls += ` ${styles.light}`;
return cls;
}
return (
<Button.Root
id={props.id}
class={styles.secondary}
class={klass()}
onClick={props.onClick}
disabled={props.disabled}
type={props.type || "button"}
>
<div>
<span>
{props.children}
</span>
</div>
{props.children}
</Button.Root>
);
}

134
src/components/Buttons/Buttons.module.scss
View File

@ -1,44 +1,46 @@
.primary {
display: flex;
justify-content: center;
align-items: center;
border: none;
border-radius: 6px;
margin: 0px 8px;
padding-inline: 10px;
padding-block: 6px;
font-size: 14px;
line-height: 20px;
font-weight: 700;
background: var(--brand-gradient-vertical);
color: white;
>span {
opacity: 0.75;
}
border-radius: 99999px;
margin: 0px;
padding-inline: 18px;
padding-block: 10px;
font-size: 16px;
line-height: 16px;
font-weight: 600;
background: var(--accent);
color: var(--text-primary-button);
width: fit-content;
min-height: 36px;
}
.secondary {
display: flex;
justify-content: center;
align-items: center;
border: none;
border-radius: 6px;
padding: 1px;
font-size: 14px;
line-height: 20px;
font-weight: 700;
background: var(--brand-gradient-vertical);
color: var(--text-tertiary-2);
>div {
width: 100%;
height: 100%;
vertical-align: middle;
border-radius: 6px;
background-color: var(--background-card);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding-inline: 10px;
padding-block: 6px;
border-radius: 99999px;
margin: 0px;
padding-inline: 38px;
font-size: 16px;
line-height: 16px;
font-weight: 600;
background: var(--background-input);
color: var(--text-secondary);
width: fit-content;
height: 36px;
&.light {
background-color: var(--subtile-devider);
}
}
.shrunk {
padding-inline: 0;
min-width: 36px;
}
.copy {
.copyIcon {
@ -64,7 +66,7 @@
color: var(--text-tertiary-2);
font-size: 14px;
font-weight: 400;
line-height: 12px;
line-height: 16px;
background: none;
margin: 0;
padding: 0;
@ -113,52 +115,44 @@
}
}
.follow {
.flipInactive {
display: flex;
align-items: center;
justify-content: center;
width: fit-content;
height: fit-content;
min-width: 96px;
align-items: center;
border: none;
border-radius: 6px;
border-radius: 99999px;
margin: 0px;
padding: 10px;
padding-inline: 18px;
padding-block: 10px;
font-size: 16px;
line-height: 20px;
font-weight: 700;
line-height: 16px;
font-weight: 600;
background: var(--text-primary);
color: var(--background-site);
&:hover {
color: var(--subtile-devider);
}
width: fit-content;
&:focus {
box-shadow: none;
}
}
.unfollow {
.flipActive {
display: flex;
align-items: center;
justify-content: center;
width: fit-content;
height: fit-content;
min-width: 96px;
border-radius: 99999px;
border: none;
border-radius: 6px;
margin: 0px;
padding: 10px;
padding-inline: 18px;
padding-block: 10px;
font-size: 16px;
line-height: 20px;
font-weight: 700;
background: var(--background-input);
color: var(--text-primary);
&:hover {
background-color: var(--subtile-devider);
}
width: fit-content;
&:focus {
box-shadow: none;
@ -175,11 +169,11 @@
border-radius: 6px;
margin: 0px;
padding: 0px;
font-size: 16px;
font-size: 15px;
line-height: 20px;
font-weight: 700;
font-weight: 400;
background: none;
color: var(--accent-1);
color: var(--accent);
&:hover {
text-decoration: underline;
@ -191,18 +185,18 @@
}
.tertiary {
border-radius: 6px;
padding-inline: 10px;
padding-block: 6px;
font-size: 12px;
line-height: 16px;
font-weight: 700;
margin: 0px;
color: var(--text-primary);
background: var(--background-card);
border: 1px solid var(--subtile-devider);
border-radius: 6px;
padding-inline: 10px;
padding-block: 6px;
font-size: 12px;
line-height: 16px;
font-weight: 700;
margin: 0px;
color: var(--text-primary);
background: var(--background-card);
border: 1px solid var(--subtile-devider);
&:hover {
border: 1px solid var(--text-tertiary);
}
&:hover {
border: 1px solid var(--text-tertiary);
}
}

9
src/components/ConfirmModal/ConfirmModal.module.scss
View File

@ -4,10 +4,7 @@
position: fixed;
width: 420px;
color: var(--text-secondary);
background-color: var(--background-site);
background: linear-gradient(var(--background-site),
var(--background-site)) padding-box,
var(--brand-gradient) border-box;
background-color: var(--background-input);
border: 1px solid transparent;
border-radius: 6px;
@ -36,6 +33,10 @@
display: flex;
justify-content: space-between;
>button {
min-width: 178px;
}
.feedRestoreConfirm {
background: var(--brand-gradient-vertical);
border: none;

17
src/components/ConfirmModal/ConfirmModal.tsx
View File

@ -14,6 +14,8 @@ import { confirmDefaults as t } from '../../translations';
import styles from './ConfirmModal.module.scss';
import { hookForDev } from '../../lib/devTools';
import ButtonPrimary from '../Buttons/ButtonPrimary';
import ButtonSecondary from '../Buttons/ButtonSecondary';
const ConfirmModal: Component<{
id?: string,
@ -39,21 +41,20 @@ const ConfirmModal: Component<{
</div>
<div class={styles.feedConfirmationActions}>
<Show when={props.onConfirm}>
<button
class={styles.feedRestoreConfirm}
<ButtonPrimary
onClick={props.onConfirm}
>
{props.confirmLabel || intl.formatMessage(t.confirm)}
</button>
{props.confirmLabel || intl.formatMessage(t.confirm)}
</ButtonPrimary>
</Show>
<Show when={props.onAbort}>
<button
class={styles.feedRestoreAbort}
<ButtonSecondary
onClick={props.onAbort}
light={true}
>
{props.abortLablel || intl.formatMessage(t.abort)}
</button>
{props.abortLablel || intl.formatMessage(t.abort)}
</ButtonSecondary>
</Show>
</div>
</div>

33
src/components/CreateAccountModal/CreateAccountModal.module.scss
View File

@ -1,17 +1,13 @@
.modal {
position: fixed;
width: 420px;
width: 440px;
color: var(--text-secondary);
background-color: var(--background-site);
background: linear-gradient(var(--background-site),
var(--background-site)) padding-box,
var(--brand-gradient) border-box;
border: 1px solid transparent;
border-radius: 6px;
background-color: var(--background-input);
border-radius: 8px;
display: flex;
flex-direction: column;
padding: 22px;
padding: 24px;
.xClose {
background: none;
@ -46,17 +42,16 @@
}
.title {
font-weight: 800;
font-size: 18px;
line-height: 18px;
color: var(--text-secondary);
text-transform: uppercase;
font-weight: 600;
line-height: 20px;
color: var(--text-primary);
margin-bottom: 20px;
}
.description {
color: var(--text-secondary);
font-size: 16px;
color: var(--text-primary);
font-size: 15px;
font-weight: 400;
line-height: 20px;
margin-bottom: 28px;
@ -69,16 +64,18 @@
button {
width: fit-content;
padding: 10px;
padding-block: 10px;
padding-inline: 30px;
margin: 0px;
}
}
.alternative {
color: var(--text-secondary);
font-size: 14px;
color: var(--text-primary);
font-size: 15px;
font-style: normal;
font-weight: 400;
line-height: 24px;
line-height: 20px;
}
}

44
src/components/CreatePinModal/CreatePinModal.module.scss
View File

@ -1,17 +1,13 @@
.modal {
position: fixed;
width: 452px;
color: var(--text-secondary);
background-color: var(--background-site);
background: linear-gradient(var(--background-site),
var(--background-site)) padding-box,
var(--brand-gradient) border-box;
border: 1px solid transparent;
border-radius: 6px;
width: 440px;
color: var(--text-primary);
background-color: var(--background-input);
border-radius: 8px;
display: flex;
flex-direction: column;
padding: 22px;
padding: 24px;
.xClose {
background: none;
@ -46,49 +42,45 @@
}
.title {
font-weight: 800;
font-size: 18px;
line-height: 18px;
color: var(--text-secondary);
text-transform: uppercase;
font-weight: 600;
line-height: 20px;
color: var(--text-primary);
margin-bottom: 20px;
}
.description {
color: var(--text-secondary);
font-size: 16px;
color: var(--text-primary);
font-size: 15px;
font-weight: 400;
line-height: 20px;
margin-bottom: 28px;
}
.inputs {
margin-bottom: 4px;
> div {
margin-bottom: 4px;
.description {
margin-bottom: 20px;
}
}
.actions {
display: flex;
justify-content: space-between;
margin-bottom: 20px;
button {
width: fit-content;
min-width: 192px;
padding-block: 10px;
padding-inline: 36px;
margin: 0px;
>div {
padding: 10px;
}
}
}
.alternative {
color: var(--text-secondary);
font-size: 14px;
color: var(--text-primary);
font-size: 15px;
font-style: normal;
font-weight: 400;
line-height: 24px;
line-height: 20px;
}
}

42
src/components/CreatePinModal/CreatePinModal.tsx
View File

@ -83,26 +83,29 @@ const CreatePinModal: Component<{
<div class={styles.description}>
{intl.formatMessage(tPin.description)}
</div>
<div class={styles.inputs}>
<TextInput
type="password"
ref={pinInput}
value={pin()}
onKeyUp={onKeyUp}
onChange={(val: string) => setPin(val)}
validationState={pin().length === 0 || isValidPin() ? 'valid' : 'invalid'}
errorMessage={intl.formatMessage(tPin.invalidPin)}
/>
<TextInput
type="password"
value={rePin()}
onKeyUp={onKeyUp}
onChange={(val: string) => setRePin(val)}
label={intl.formatMessage(tPin.reEnter)}
validationState={rePin().length === 0 || isValidRePin() ? 'valid' : 'invalid'}
errorMessage={intl.formatMessage(tPin.invalidRePin)}
/>
<TextInput
type="password"
ref={pinInput}
value={pin()}
onKeyUp={onKeyUp}
onChange={(val: string) => setPin(val)}
validationState={pin().length === 0 || isValidPin() ? 'valid' : 'invalid'}
errorMessage={intl.formatMessage(tPin.invalidPin)}
/>
<div class={styles.description}>
{intl.formatMessage(tPin.reEnter)}
</div>
<TextInput
type="password"
value={rePin()}
onKeyUp={onKeyUp}
onChange={(val: string) => setRePin(val)}
validationState={rePin().length === 0 || isValidRePin() ? 'valid' : 'invalid'}
errorMessage={intl.formatMessage(tPin.invalidRePin)}
/>
<div class={styles.actions}>
<ButtonPrimary
onClick={onSetPin}
@ -112,6 +115,7 @@ const CreatePinModal: Component<{
</ButtonPrimary>
<ButtonSecondary
onClick={onOptout}
light={true}
>
{intl.formatMessage(tActions.optoutPin)}
</ButtonSecondary>

91
src/components/CustomZap/CustomZap.module.scss
View File

@ -1,22 +1,19 @@
.customZap {
position: fixed;
width: 420px;
height: 285px;
color: var(--text-secondary);
background-color: var(--background-site);
background: linear-gradient(var(--background-site), var(--background-site)) padding-box,
var(--brand-gradient) border-box;
border: 1px solid transparent;
border-radius: 6px;
width: 432px;
color: var(--text-primary);
background-color: var(--background-input);
border-radius: 8px;
display: flex;
flex-direction: column;
padding: 22px;
padding: 20px;
.header {
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 24px;
.title {
display: flex;
@ -28,13 +25,13 @@
font-size: 18px;
line-height: 18px;
color: var(--text-secondary);
text-transform: uppercase;
.amount {
color: var(--text-primary);
}
.units {
margin-left: 8px;
font-weight: 800;
font-size: 12px;
line-height: 20px;
@ -62,28 +59,71 @@
}
}
.description {
color: var(--text-secondary);
font-size: 17px;
font-weight: 600;
line-height: 24px;
.amount {
color: var(--text-primary);
font-size: 20px;
font-weight: 600;
line-height: 24px;
}
.units {
margin-left: 4px;
}
}
.options {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
grid-template-columns: 120px 120px 120px;
grid-column-gap: 12px;
grid-row-gap: 16px;
grid-row-gap: 12px;
margin-top: 24px;
margin-bottom: 20px;
padding-bottom: 20px;
border-bottom: 1px solid var(--subtile-devider);
.zapOption {
height: 40px;
border-radius: 20px;
width: 120px;
height: 36px;
border-radius: 18px;
border: none;
outline: none;
padding: 0;
padding-top: 4px;
padding-left: 16px;
margin: 0;
box-shadow: none;
background-color: var(--background-input);
background-color: var(--background-header-input);
color: var(--text-primary);
text-transform: uppercase;
font-size: 16px;
font-weight: 600;
line-height: 20px;
display: flex;
justify-content: flex-start;
align-items: center;
.sats {
color: var(--text-tertiary);
font-size: 12px;
font-style: normal;
font-weight: 400;
line-height: 20px;
}
&.selected, &:hover {
background-color: var(--text-primary);
color: var(--background-site);
.sats {
color: var(--text-tertiary-2);
}
}
}
@ -96,12 +136,10 @@
border-radius: 6px;
background-color: var(--background-site);
color: var(--text-secondary);
padding-block: 6px;
padding-inline: 13px;
font-weight: 400;
font-size: 14px;
line-height: 20px;
margin-top: 16px;
&::placeholder {
color: var(--subtile-devider);
@ -113,19 +151,10 @@
}
.action {
width: 100%;
height: 32px;
background: var(--brand-gradient-vertical);
border: none;
outline: none;
padding: 0;
margin: 0;
box-shadow: none;
.caption {
font-weight: 700;
font-size: 14px;
line-height: 20px;
color: white;
margin-top: 24px;
>button {
width: 100%;
height: 38px;
}
}

75
src/components/CustomZap/CustomZap.tsx
View File

@ -5,10 +5,12 @@ import { useSettingsContext } from '../../contexts/SettingsContext';
import { hookForDev } from '../../lib/devTools';
import { zapNote } from '../../lib/zap';
import { userName } from '../../stores/profile';
import { toastZapFail, zapCustomOption } from '../../translations';
import { toastZapFail, zapCustomOption, actions as tActions, placeholders as tPlaceholders } from '../../translations';
import { PrimalNote } from '../../types/primal';
import { debounce } from '../../utils';
import ButtonPrimary from '../Buttons/ButtonPrimary';
import Modal from '../Modal/Modal';
import TextInput from '../TextInput/TextInput';
import { useToastContext } from '../Toaster/Toaster';
import styles from './CustomZap.module.scss';
@ -28,6 +30,7 @@ const CustomZap: Component<{
const settings = useSettingsContext();
const [selectedValue, setSelectedValue] = createSignal(settings?.availableZapOptions[0] || 10);
const [comment, setComment] = createSignal('');
createEffect(() => {
setSelectedValue(settings?.availableZapOptions[0] || 10)
@ -35,15 +38,6 @@ const CustomZap: Component<{
const isSelected = (value: number) => value === selectedValue();
let comment = '';
const setComment = (e: InputEvent) => {
debounce(() => {
const target = e.target as HTMLInputElement;
comment = target.value;
}, 500);
};
const truncateNumber = (amount: number) => {
const t = 1000;
@ -81,7 +75,13 @@ const CustomZap: Component<{
const submit = async () => {
if (account?.hasPublicKey()) {
props.onConfirm(selectedValue());
const success = await zapNote(props.note, account.publicKey, selectedValue(), comment, account.relays);
const success = await zapNote(
props.note,
account.publicKey,
selectedValue(),
comment(),
account.relays,
);
if (success) {
props.onSuccess(selectedValue());
@ -101,20 +101,25 @@ const CustomZap: Component<{
<div id={props.id} class={styles.customZap}>
<div class={styles.header}>
<div class={styles.title}>
<div class={styles.zapIcon}></div>
<div class={styles.caption}>
{intl.formatMessage(zapCustomOption,{
user: userName(props.note.user),
})}
<span class={styles.amount}>
{truncateNumber(selectedValue())}
</span> <span class={styles.units}>sats</span>
{intl.formatMessage(tActions.zap)}
</div>
</div>
<button class={styles.close} onClick={() => props.onFail(0)}>
</button>
</div>
<div class={styles.description}>
{intl.formatMessage(zapCustomOption,{
user: userName(props.note.user),
})}
<span class={styles.amount}>
{truncateNumber(selectedValue())}
</span>
<span class={styles.units}>sats</span>
</div>
<div class={styles.options}>
<For each={settings?.availableZapOptions}>
{(value) =>
@ -122,33 +127,33 @@ const CustomZap: Component<{
class={`${styles.zapOption} ${isSelected(value) ? styles.selected : ''}`}
onClick={() => setSelectedValue(value)}
>
{truncateNumber(value)}
<div>
{truncateNumber(value)} <span class={styles.sats}>sats</span>
</div>
</button>
}
</For>
</div>
<input
<TextInput
type="text"
class={styles.comment}
value={comment}
placeholder={'Comment'}
onInput={setComment}
value={comment()}
placeholder={intl.formatMessage(tPlaceholders.addComment)}
onChange={setComment}
noExtraSpace={true}
/>
<button
<div
class={styles.action}
onClick={submit}
>
<div class={styles.caption}>
{intl.formatMessage(zapCustomOption,{
user: userName(props.note.user),
})}
<span class={styles.amount}>
{truncateNumber(selectedValue())}
</span> <span class={styles.units}>sats</span>
</div>
</button>
<ButtonPrimary
onClick={submit}
>
<div class={styles.caption}>
{intl.formatMessage(tActions.zap)}
</div>
</ButtonPrimary>
</div>
</div>
</Modal>

4
src/components/EmbeddedNote/EmbeddedNote.module.scss
View File

@ -1,8 +1,8 @@
.mentionedNote {
border: solid 1px var(--border-embedded-card);
border: none;
border-radius: 8px;
background-color: var(--background-embedded_card);
background-color: var(--background-input);
margin-block: 6px;
padding: 18px;
display: grid;

23
src/components/EnterPinModal/EnterPinModal.module.scss
View File

@ -1,17 +1,13 @@
.modal {
position: fixed;
width: 452px;
width: 440px;
color: var(--text-secondary);
background-color: var(--background-site);
background: linear-gradient(var(--background-site),
var(--background-site)) padding-box,
var(--brand-gradient) border-box;
border: 1px solid transparent;
border-radius: 6px;
background-color: var(--background-input);
border-radius: 8px;
display: flex;
flex-direction: column;
padding: 22px;
padding: 24px;
.xClose {
background: none;
@ -46,17 +42,16 @@
}
.title {
font-weight: 800;
font-size: 18px;
line-height: 18px;
color: var(--text-secondary);
text-transform: uppercase;
font-weight: 600;
line-height: 20px;
color: var(--text-primary);
margin-bottom: 20px;
}
.description {
color: var(--text-secondary);
font-size: 16px;
color: var(--text-primary);
font-size: 15px;
font-weight: 400;
line-height: 20px;
margin-bottom: 28px;

4
src/components/EnterPinModal/EnterPinModal.tsx
View File

@ -99,6 +99,9 @@ const EnterPinModal: Component<{
<div class={styles.title}>
{intl.formatMessage(tPin.enterTitle)}
</div>
<div class={styles.description}>
{intl.formatMessage(tPin.enter)}
</div>
<div class={styles.inputs}>
<TextInput
type="password"
@ -106,7 +109,6 @@ const EnterPinModal: Component<{
value={pin()}
onKeyUp={onKeyUp}
onChange={(val: string) => setPin(val)}
label={intl.formatMessage(tPin.enter)}
validationState={pin().length === 0 || isValidPin() ? 'valid' : 'invalid'}
errorMessage={intl.formatMessage(tPin.invalidRePin)}
/>

23
src/components/ExploreMenuItem/ExploreMenuItem.module.scss
View File

@ -1,12 +1,14 @@
.exploreMenuItem {
display: flex;
width: 100%;
width: calc(100% - 2px);
height: 100px;
background-color: var(--background-card);
justify-content: space-between;
padding-left: 24px;
margin-bottom: 16px;
border-radius: 4px;
padding: 10px 20px;
border-radius: 0;
border-bottom: 1px solid var(--devider);
.itemInfo {
display: flex;
@ -25,16 +27,16 @@
.itemCaption {
font-size: 18px;
font-weight: 600;
line-height: 24px;
font-weight: 700;
color: var(--text-primary);
margin-right: 12px;
}
.itemStat {
font-size: 24px;
font-weight: 400;
line-height: 28px;
font-weight: 300;
color: var(--text-primary);
}
@ -44,8 +46,8 @@
.itemDescription {
font-size: 12px;
font-weight: 400;
line-height: 16px;
font-weight: 300;
color: var(--text-secondary);
}
}
@ -60,7 +62,7 @@
.option {
width: 72px;
height: 92px;
height: 100%;
border: none;
margin: 4px;
padding: 0px;
@ -71,6 +73,7 @@
flex-direction: column;
align-items: center;
justify-content: center;
border-radius: var(--border-radius-big);
cursor: pointer;
>div {
@ -89,11 +92,9 @@
&:hover {
outline: none;
text-decoration: none;
border: solid 1px var(--subtile-devider);
border-radius: 4px;
background-color: var(--background-input);
>div {
background: var(--highlight-gradient);
background: var(--accent);
}
}
}

5
src/components/ExploreMenuItem/ExploreMenuItem.tsx
View File

@ -2,6 +2,7 @@ import { useIntl } from '@cookbook/solid-intl';
import { A } from '@solidjs/router';
import type { Component } from 'solid-js';
import { hookForDev } from '../../lib/devTools';
import { interpretLineBreak } from '../../translationHelpers';
import { scopeDescriptors, timeframeDescriptors } from '../../translations';
import { ScopeDescriptor } from '../../types/primal';
@ -68,7 +69,9 @@ const ExploreMenuItem: Component<{ scope: string, stat: number, id?: string }> =
</div>
<div class={styles.footer}>
<div class={styles.itemDescription}>
{intl.formatMessage(item().description)}
{intl.formatMessage(item().description, {
div: interpretLineBreak,
})}
</div>
</div>
</div>

27
src/components/FeedSelect/FeedSelect.tsx
View File

@ -2,8 +2,9 @@ import { Component } from 'solid-js';
import { useHomeContext } from '../../contexts/HomeContext';
import { useSettingsContext } from '../../contexts/SettingsContext';
import { hookForDev } from '../../lib/devTools';
import { FeedOption, PrimalFeed } from '../../types/primal';
import { FeedOption, PrimalFeed, SelectionOption } from '../../types/primal';
import SelectBox from '../SelectBox/SelectBox';
import SelectionBox from '../SelectionBox/SelectionBox';
const FeedSelect: Component<{ isPhone?: boolean, id?: string}> = (props) => {
@ -61,17 +62,15 @@ const FeedSelect: Component<{ isPhone?: boolean, id?: string}> = (props) => {
return false;
}
const options:() => FeedOption[] = () => {
const options:() => SelectionOption[] = () => {
if (settings?.availableFeeds === undefined) {
return [];
}
return settings.availableFeeds.map(feed => {
return ({
label: feed.name,
value: `${feed.hex}_${feed.includeReplies}`,
});
});
return settings.availableFeeds.map(feed => ({
label: feed.name,
value: `${feed.hex}_${feed.includeReplies}`,
}));
};
const initialValue = () => {
@ -100,11 +99,19 @@ const FeedSelect: Component<{ isPhone?: boolean, id?: string}> = (props) => {
}
}
const selectedValue = () => {
if (!home?.selectedFeed)
return initialValue();
return { label: home.selectedFeed.name, value: `${home.selectedFeed.hex}_${home.selectedFeed.includeReplies}` };
};
return (
<SelectBox
options={options}
<SelectionBox
options={options()}
onChange={selectFeed}
initialValue={initialValue()}
value={selectedValue()}
isSelected={isSelected}
isPhone={props.isPhone}
/>

37
src/components/FeedSorter/FeedSorter.module.scss
View File

@ -3,6 +3,9 @@
padding: 0;
border: none;
background-color: unset;
display: flex;
justify-content: center;
align-items: center;
opacity: 0.7;
transition: opacity 0.4s;
@ -20,11 +23,11 @@
.feedItem {
width: 100%;
height: 40px;
background-color: var(--background-site);
color: var(--text-tertiary);
font-size: 16px;
line-height: 14px;
background-color: var(--background-sheet);
color: var(--active-reply);
font-size: 14px;
font-weight: 400;
line-height: 12px;
padding-inline: 12px;
margin-block: 8px;
@ -34,6 +37,10 @@
justify-content: flex-start;
cursor: grab;
&:hover, &:focus {
background-color: var(--background-input);
}
.sortControls {
margin-right: 5px;
.sortButton {
@ -85,26 +92,30 @@
width: 100%;
.feedNameInput {
height: 32px;
background-color: var(--background-site);
background-color: var(--background-header-input);
color: var(--text-tertiary);
font-size: 16px;
line-height: 14px;
font-weight: 400;
margin: 0;
border: none;
box-shadow: none;
outline: none;
border-radius: 16px;
}
.feedEditControl {
position: absolute;
top: 2px;
right: 0;
height: 32px;
right: 4px;
height: 28px;
display: flex;
justify-content: flex-end;
align-items: center;
>button {
@include controlButton();
width: 32px;
height: 32px;
width: 20px;
height: 28px;
}
}
@ -122,8 +133,8 @@
}
.closeIcon {
width: 20px;
height: 20px;
width: 10px;
height: 10px;
display: inline-block;
margin: 0px 0px;
background-color: var(--text-secondary);
@ -132,8 +143,8 @@
}
.checkIcon {
width: 20px;
height: 20px;
width: 14px;
height: 14px;
display: inline-block;
margin: 0px 0px;
background-color: var(--text-secondary);

12
src/components/FloatingNewPostButton/FloatingNewPostButton.tsx
View File

@ -1,11 +1,16 @@
import { Component } from "solid-js";
import { useAccountContext } from "../../contexts/AccountContext";
import { hookForDev } from "../../lib/devTools";
import ButtonPrimary from "../Buttons/ButtonPrimary";
import { actions as tActions } from "../../translations";
import styles from "./FloatingNewPostButton.module.scss";
import { useIntl } from "@cookbook/solid-intl";
const FloatingNewPostButton: Component<{ id?: string }> = (props) => {
const account = useAccountContext();
const intl = useIntl();
const showNewNoteForm = () => {
account?.actions?.showNewNoteForm();
@ -13,13 +18,12 @@ const FloatingNewPostButton: Component<{ id?: string }> = (props) => {
return (
<button
<ButtonPrimary
id={props.id}
class={styles.newPostButton}
onClick={showNewNoteForm}
>
<div class={styles.postIcon}></div>
</button>
{intl.formatMessage(tActions.newNote)}
</ButtonPrimary>
)
}

131
src/components/FollowButton/FollowButton.module.scss
View File

@ -1,65 +1,86 @@
@mixin followButton {
grid-area: follow;
display: flex;
button {
background: var(--brand-gradient-vertical);
border-radius: 6px;
padding: 0px;
font-size: 12px;
line-height: 16px;
font-weight: 700;
margin: 0px;
}
.large {
button {
width: 100px;
text-transform: lowercase;
}
}
.primaryButton {
width: 90px;
height: 40px;
.small {
max-width: 72px;
button {
max-width: 100%;
height: 28px;
padding-block: 0;
font-size: 12px;
font-weight: 600;
line-height: 12px;
text-transform: lowercase;
}
}
.follow {
@include followButton;
button {
color: var(--text-primary);
background: linear-gradient(var(--background-card), var(--background-card)) padding-box,
var(--brand-gradient) border-box;
border: 1px solid transparent;
&:hover {
background: linear-gradient(var(--background-site), var(--background-site)) padding-box,
var(--brand-gradient) border-box;
}
}
}
// @mixin followButton {
// grid-area: follow;
// display: flex;
// button {
// background: var(--brand-gradient-vertical);
// border-radius: 6px;
// padding: 0px;
// font-size: 12px;
// line-height: 16px;
// font-weight: 700;
// margin: 0px;
// }
// }
.unfollow {
@include followButton;
button {
color: var(--text-primary);
background: var(--background-card);
border: 1px solid var(--subtile-devider);
// .primaryButton {
// width: 90px;
// height: 40px;
// }
&:hover {
border: 1px solid var(--text-tertiary);
}
}
}
// .follow {
// @include followButton;
// button {
// color: var(--text-primary);
// background: linear-gradient(var(--background-card), var(--background-card)) padding-box,
// var(--brand-gradient) border-box;
// border: 1px solid transparent;
.large {
button {
width: 90px;
height: 40px;
margin: 0px 8px;
font-size: 16px;
line-height: 20px;
}
// &:hover {
// background: linear-gradient(var(--background-site), var(--background-site)) padding-box,
// var(--brand-gradient) border-box;
// }
// }
// }
}
// .unfollow {
// @include followButton;
// button {
// color: var(--text-primary);
// background: var(--background-card);
// border: 1px solid var(--subtile-devider);
.small {
button {
width: 64px;
height: 40px;
}
}
// &:hover {
// border: 1px solid var(--text-tertiary);
// }
// }
// }
// .large {
// button {
// width: 90px;
// height: 40px;
// margin: 0px 8px;
// font-size: 16px;
// line-height: 20px;
// }
// }
// .small {
// button {
// width: 64px;
// height: 40px;
// }
// }

20
src/components/FollowButton/FollowButton.tsx
View File

@ -4,6 +4,8 @@ import { useAccountContext } from '../../contexts/AccountContext';
import { hookForDev } from '../../lib/devTools';
import { account as t, actions } from '../../translations';
import { PrimalUser } from '../../types/primal';
import ButtonFlip from '../Buttons/ButtonFlip';
import ButtonFollow from '../Buttons/ButtonFlip';
import { useToastContext } from '../Toaster/Toaster';
import styles from './FollowButton.module.scss';
@ -42,20 +44,20 @@ const FollowButton: Component<{
}
const klass = () => {
return `${isFollowed() ? styles.unfollow : styles.follow} ${props.large ? styles.large : styles.small}`;
return props.large ? styles.large : styles.small;
}
return (
<Show when={props.person}>
<div id={props.id} class={klass()}>
<button onClick={onFollow} disabled={account?.followInProgress === props.person?.pubkey}>
<Show
when={isFollowed()}
fallback={intl.formatMessage(t.follow)}
>
{intl.formatMessage(t.unfollow)}
</Show>
</button>
<ButtonFlip
onClick={onFollow}
disabled={account?.followInProgress === props.person?.pubkey}
when={isFollowed()}
fallback={intl.formatMessage(t.follow)}
>
{intl.formatMessage(t.unfollow)}
</ButtonFlip>
</div>
</Show>
)

175
src/components/HomeHeader/HomeHeader.module.scss
View File

@ -1,13 +1,12 @@
.fullHeader {
display: grid;
height: 120px;
padding-top: 26px;
display: flex;
flex-direction: column;
z-index: var(--z-index-header);
}
.smallHeader {
display: grid;
height: 32px;
grid-template-rows: 1fr 4px;
position:absolute;
height: 84px;
}
.smallHeaderMain {
@ -15,7 +14,11 @@
flex-direction: row;
justify-content: stretch;
align-items: flex-end;
height: 84px;
background-color: var(--background-site);
padding-inline: 12px;
border-block: 1px solid var(--devider);
z-index: var(--z-index-header);
}
.smallHeaderBottomBorder {
@ -46,7 +49,6 @@
}
.smallLeft {
width: 100%;
flex-grow: 20;
flex-shrink: 1;
visibility: hidden;
@ -56,16 +58,30 @@
max-width: 50%;
flex-grow: 1;
margin-bottom: 4px;
margin-left: 8px;
// margin: auto;
button {
font-size: 14px;
font-weight: 600;
line-height: 20px;
div {
width: 12px;
height: 12px;
display: inline-block;
margin-inline: 8px;
background-color: var(--text-secondary);
-webkit-mask: url(/src/assets/icons/caret.svg) no-repeat 0 0/12px 12px;
mask: url(/src/assets/icons/caret.svg) no-repeat 0 0/12px 12px;
}
}
}
.fixedSelector {
position:fixed;
top: 0px;
width: 640px;
height: 48px;
// align-items: center;
// background-color: var(--background-site);
width: calc(var(--central-content-width) - 2px);
height: var(--header-height);
z-index: var(--z-index-header);
transition: 0.3s;
transform: translateY(0px);
@ -85,52 +101,81 @@
.hiddenSelector {
transition: 0.3s;
transform: translateY(-48px);
transform: translateY(-134px);
}
.instaHide {
top: -48px;
display: none
}
.bigFeedSelect {
display: flex;
align-items: center;
justify-content: space-between;
background-color: unset;
margin: 0px;
outline: none;
width: 100%;
padding-block: 10px;
padding-inline: 14px;
border-bottom: 1px solid var(--devider);
z-index: var(--z-index-header);
.newContentItem {
color: var(--accent-links);
font-size: 14px;
font-style: normal;
font-weight: 400;
line-height: 15px;
background: none;
border: none;
box-shadow: none;
outline: none;
width: fit-content;
margin: 0;
padding: 0;
}
}
.feedPlaceholder {
width: 600px;
height: 20px;
background-color: red;
}
.callToAction {
display: grid;
height: 72px;
grid-template-columns: 72px 1fr;
grid-column-gap: 17px;
display: flex;
align-items: center;
justify-content: flex-start;
background-color: unset;
margin: 0px;
padding: 0px;
border: none;
outline: none;
p {
font-size: 34px;
line-height: 34px;
padding: 0px;
margin: 0px;
}
.border {
height: 36px;
padding: 1px;
background: var(--brand-gradient);
border-radius: 6px;
margin-left: 10px
}
padding-block: 21px;
padding-inline: 12px;
border: none;
border-bottom: 1px solid var(--devider);
border-radius: 0;
justify-content: flex-start;
.input {
height: 34px;
font-size: 18px;
width: 100%;
height: 36px;
font-size: 16px;
font-weight: 400;
line-height: 20px;
margin: 0px;
border-radius: 6px;
margin-left: 8px;
border-radius: 18px;
border: none;
color: var(--text-tertiary);
background-color: var(--background-site);
background-color: var(--background-header-input);
display: flex;
align-items: center;
padding-left: 12px;
justify-content: flex-start;
padding-inline: 16px;
}
}
@ -138,12 +183,13 @@
display: flex;
justify-content: space-between;
align-items: center;
height: 72px;
font-weight: 300;
font-weight: 400;
font-size: 32px;
line-height: 34px;
color: var(--brand-text);
text-transform: lowercase;
padding-block: 24px;
padding-inline: 12px;
border-block: 1px solid var(--devider);
button {
width: fit-content;
@ -155,13 +201,58 @@
.welcomeMessageSmall {
display: grid;
align-content: center;
font-weight: 300;
font-weight: 400;
font-size: 24px;
line-height: 28px;
color: var(--brand-text);
text-transform: lowercase;
}
.newContentNotification {
width: var(--central-content-width);
z-index: 20;
display: flex;
justify-content: center;
>button {
display: flex;
align-items: center;
justify-content: center;
width: auto;
height: 40px;
color: var(--text-primary-button);
background: var(--accent);
font-size: 14px;
font-weight: 400;
line-height: 18px;
border: none;
border-radius: 20px;
padding-block: 0;
padding-left: 4px;
margin: 0;
text-transform: lowercase;
.avatars {
display: flex;
align-items: center;
height: 40px;
.avatar {
border: solid 2px var(--text-primary-button);
border-radius: 50%;
width: 30px;
height: 30px;
transition: margin-right 0.2s;
margin-right: -9px;
}
}
.counter {
margin-left: 24px;
}
}
}
@media only screen and (max-width: 720px) {
.fullHeader {
width: 100%;

90
src/components/HomeHeader/HomeHeader.tsx
View File

@ -1,4 +1,4 @@
import { Component, createSignal, onCleanup, onMount, Show } from 'solid-js';
import { Component, createSignal, For, onCleanup, onMount, Show } from 'solid-js';
import Avatar from '../Avatar/Avatar';
import styles from './HomeHeader.module.scss';
@ -8,24 +8,34 @@ import SmallCallToAction from '../SmallCallToAction/SmallCallToAction';
import { useHomeContext } from '../../contexts/HomeContext';
import { useIntl } from '@cookbook/solid-intl';
import { useSettingsContext } from '../../contexts/SettingsContext';
import { placeholders as t, actions as tActions } from '../../translations';
import { placeholders as t, actions as tActions, feedNewPosts } from '../../translations';
import { hookForDev } from '../../lib/devTools';
import ButtonPrimary from '../Buttons/ButtonPrimary';
import CreateAccountModal from '../CreateAccountModal/CreateAccountModal';
import LoginModal from '../LoginModal/LoginModal';
import { userName } from '../../stores/profile';
import { PrimalUser } from '../../types/primal';
const HomeHeader: Component< { id?: string} > = (props) => {
const HomeHeader: Component< {
id?: string,
hasNewPosts: () => boolean,
loadNewContent: () => void,
newPostCount: () => number,
newPostAuthors: PrimalUser[],
} > = (props) => {
const account = useAccountContext();
const home = useHomeContext();
const settings = useSettingsContext();
const intl = useIntl();
let smallHeader: HTMLDivElement | undefined;
let lastScrollTop = document.body.scrollTop || document.documentElement.scrollTop;
const onScroll = () => {
const scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
const smallHeader = document.getElementById('small_header');
// const smallHeader = document.getElementById('small_header');
const border = document.getElementById('small_bottom_border');
home?.actions.updateScrollTop(scrollTop);
@ -33,16 +43,17 @@ const HomeHeader: Component< { id?: string} > = (props) => {
const isScrollingDown = scrollTop > lastScrollTop;
lastScrollTop = scrollTop;
if (scrollTop < 117) {
if (scrollTop < 2) {
if (border) {
border.style.display = 'none';
}
smallHeader?.classList.add(styles.instaHide);
smallHeader?.classList.remove(styles.hiddenSelector);
smallHeader?.classList.remove(styles.fixedSelector);
return;
}
if (lastScrollTop < 117) {
if (lastScrollTop < 2) {
smallHeader?.classList.add(styles.instaHide);
return;
}
@ -96,18 +107,41 @@ const HomeHeader: Component< { id?: string} > = (props) => {
<button class={styles.callToAction} onClick={onShowNewNoteinput}>
<Avatar
user={activeUser()}
size="lg"
size="vs"
/>
<div class={styles.border}>
<div class={styles.input}>
{intl.formatMessage(t.noteCallToAction)}
</div>
<div class={styles.input}>
{intl.formatMessage(t.noteCallToAction)}
</div>
</button>
</Show>
<div class={styles.bigFeedSelect}>
<Show
when={settings?.availableFeeds && settings?.availableFeeds.length > 0 && home?.selectedFeed}
>
<FeedSelect />
</Show>
<div id="small_header" class={styles.smallHeader}>
<Show
when={props.hasNewPosts()}
>
<button
class={styles.newContentItem}
onClick={props.loadNewContent}
>
<div class={styles.counter}>
{intl.formatMessage(
feedNewPosts,
{
number: props.newPostCount() >= 99 ? 99 : props.newPostCount(),
},
)}
</div>
</button>
</Show>
</div>
<div class={`${styles.smallHeader} ${styles.instaHide}`} ref={smallHeader}>
<div class={styles.smallHeaderMain}>
<Show
when={account?.hasPublicKey()}
@ -136,6 +170,38 @@ const HomeHeader: Component< { id?: string} > = (props) => {
<div class={styles.leftCorner}></div>
<div class={styles.rightCorner}></div>
</div>
<Show when={
props.hasNewPosts() && !account?.showNewNoteForm
}>
<div class={styles.newContentNotification}>
<button
onClick={props.loadNewContent}
>
<div class={styles.avatars}>
<For each={props.newPostAuthors}>
{(user) => (
<div
class={styles.avatar}
title={userName(user)}
>
<Avatar user={user} size="xss" />
</div>
)}
</For>
</div>
<div class={styles.counter}>
{intl.formatMessage(
feedNewPosts,
{
number: props.newPostCount(),
},
)}
</div>
</button>
</div>
</Show>
</div>
</div>
);

2
src/components/HomeHeaderPhone/HomeHeaderPhone.module.scss
View File

@ -1,6 +1,6 @@
.fullHeader {
display: grid;
width: 100%;
width: 100vw;
grid-template-columns: 1fr;
grid-template-rows: 48px 4px;
grid-template-areas: "phone_header" "phone_border";

3
src/components/HomeSidebar/HomeSidebar.module.scss
View File

@ -4,8 +4,7 @@
top: 0px;
width: 100%;
height: 44px;
// background-color: var(--background-site);
background: var(--fade-gradient-vertical);
background-color: var(--background-site);
z-index: 5;
padding-bottom: 22px;
display:flex;

320
src/components/HomeSidebar/HomeSidebar.tsx
View File

@ -1,15 +1,16 @@
import { Component, createEffect, createSignal, For, onCleanup } from 'solid-js';
import { Component, createEffect, createSignal, For, onCleanup, onMount, Show } from 'solid-js';
import { createStore } from 'solid-js/store';
import { APP_ID } from '../../App';
import { getMostZapped4h, getTrending24h } from '../../lib/feed';
import { humanizeNumber } from '../../lib/stats';
import { convertToNotes, sortingPlan } from '../../stores/note';
import { convertToNotes, sortByRecency, sortingPlan } from '../../stores/note';
import { Kind } from '../../constants';
import {
isConnected,
refreshSocketListeners,
removeSocketListeners,
socket
socket,
subscribeTo
} from '../../sockets';
import {
FeedPage,
@ -17,7 +18,13 @@ import {
NostrEvent,
NostrEventContent,
NostrMentionContent,
PrimalNote
NostrNoteActionsContent,
NostrNoteContent,
NostrStatsContent,
NostrUserContent,
NoteActions,
PrimalNote,
SelectionOption
} from '../../types/primal';
import styles from './HomeSidebar.module.scss';
@ -28,174 +35,211 @@ import { hourNarrow } from '../../formats';
import { home as t } from '../../translations';
import { useAccountContext } from '../../contexts/AccountContext';
import { hookForDev } from '../../lib/devTools';
import SelectionBox from '../SelectionBox/SelectionBox';
import { getScoredUsers, searchContent } from '../../lib/search';
import { store } from '../../services/StoreService';
import Loader from '../Loader/Loader';
import { readHomeSidebarSelection, saveHomeSidebarSelection } from '../../lib/localStore';
const [init, setInit] = createSignal(false);
const sidebarOptions = [
{
label: 'Trending 24h',
value: 'trending_24h',
},
{
label: 'Trending 12h',
value: 'trending_12h',
},
{
label: 'Trending 4h',
value: 'trending_4h',
},
{
label: 'Trending 1h',
value: 'trending_1h',
},
{
label: '',
value: '',
disabled: true,
separator: true,
},
const [data, setData] = createStore<Record<string, FeedPage & { notes: PrimalNote[] }>>({
trending: {
messages: [],
users: {},
postStats: {},
notes: [],
mentions: {},
{
label: 'Most-zapped 24h',
value: 'mostzapped_24h',
},
mostzapped: {
messages: [],
users: {},
postStats: {},
notes: [],
mentions: {},
{
label: 'Most-zapped 12h',
value: 'mostzapped_12h',
},
});
{
label: 'Most-zapped 4h',
value: 'mostzapped_4h',
},
{
label: 'Most-zapped 1h',
value: 'mostzapped_1h',
},
];
const HomeSidebar: Component< { id?: string } > = (props) => {
const intl = useIntl();
const account = useAccountContext();
onCleanup(() => {
removeSocketListeners(
socket(),
{ message: onMessage, close: onSocketClose },
);
const [searchResults, setSearchResults] = createStore<{ notes: PrimalNote[], page: FeedPage, isFetching: boolean, query: SelectionOption | undefined }>({
notes: [],
page: {
messages: [],
users: {},
postStats: {},
mentions: {},
noteActions: {},
},
isFetching: false,
query: undefined,
});
const saveNotes = (newNotes: PrimalNote[]) => {
setSearchResults('notes', () => [ ...newNotes.slice(0, 24) ]);
setSearchResults('isFetching', () => false);
};
createEffect(() => {
if (isConnected() && !init()) {
refreshSocketListeners(
socket(),
{ message: onMessage, close: onSocketClose },
const updatePage = (content: NostrEventContent) => {
if (content.kind === Kind.Metadata) {
const user = content as NostrUserContent;
setSearchResults('page', 'users',
(usrs) => ({ ...usrs, [user.pubkey]: { ...user } })
);
setData(() => ({
trending: {
messages: [],
users: {},
postStats: {},
notes: [],
mentions: {},
},
mostzapped: {
messages: [],
users: {},
postStats: {},
notes: [],
mentions: {},
},
}));
if (account?.isKeyLookupDone) {
getTrending24h(account?.publicKey, `sidebar_trending_${APP_ID}`);
getMostZapped4h(account?.publicKey, `sidebar_zapped_${APP_ID}`);
}
}
});
const processNotes = (type: string, key: string, content: NostrEventContent | undefined) => {
const sort = sortingPlan(key);
if (type === 'EOSE') {
const newPosts = sort(convertToNotes({
users: data[key].users,
messages: data[key].messages,
postStats: data[key].postStats,
mentions: data[key].mentions,
}));
setData(key, 'notes', () => [ ...newPosts ]);
setInit(true);
return;
}
if (type === 'EVENT') {
if (content && content.kind === Kind.Metadata) {
setData(key, 'users', (users) => ({ ...users, [content.pubkey]: content}))
}
if (content && (content.kind === Kind.Text || content.kind === Kind.Repost)) {
setData(key, 'messages', (msgs) => [ ...msgs, content]);
}
if (content && content.kind === Kind.NoteStats) {
const stat = JSON.parse(content.content);
setData(key, 'postStats', (stats) => ({ ...stats, [stat.event_id]: stat }))
}
if (content && content.kind === Kind.Mentions) {
const mentionContent = content as NostrMentionContent;
const mention = JSON.parse(mentionContent.content);
if ([Kind.Text, Kind.Repost].includes(content.kind)) {
const message = content as NostrNoteContent;
setData(key, 'mentions',
(mentions) => ({ ...mentions, [mention.id]: { ...mention } })
);
if (searchResults.page.messages.find(m => m.id === message.id)) {
return;
}
}
};
// SOCKET HANDLERS ------------------------------
setSearchResults('page', 'messages',
(msgs) => [ ...msgs, { ...message }]
);
const onSocketClose = (closeEvent: CloseEvent) => {
const webSocket = closeEvent.target as WebSocket;
webSocket.removeEventListener('message', onMessage);
webSocket.removeEventListener('close', onSocketClose);
};
const onMessage = (event: MessageEvent) => {
const message: NostrEvent | NostrEOSE = JSON.parse(event.data);
const [type, subId, content] = message;
if (subId === `sidebar_trending_${APP_ID}`) {
processNotes(type, 'trending', content);
return;
}
if (subId === `sidebar_zapped_${APP_ID}`) {
processNotes(type, 'mostzapped', content);
if (content.kind === Kind.NoteStats) {
const statistic = content as NostrStatsContent;
const stat = JSON.parse(statistic.content);
setSearchResults('page', 'postStats',
(stats) => ({ ...stats, [stat.event_id]: { ...stat } })
);
return;
}
if (content.kind === Kind.Mentions) {
const mentionContent = content as NostrMentionContent;
const mention = JSON.parse(mentionContent.content);
setSearchResults('page', 'mentions',
(mentions) => ({ ...mentions, [mention.id]: { ...mention } })
);
return;
}
if (content.kind === Kind.NoteActions) {
const noteActionContent = content as NostrNoteActionsContent;
const noteActions = JSON.parse(noteActionContent.content) as NoteActions;
setSearchResults('page', 'noteActions',
(actions) => ({ ...actions, [noteActions.event_id]: { ...noteActions } })
);
return;
}
};
const savePage = (page: FeedPage) => {
const newPosts = convertToNotes(page);
saveNotes(newPosts);
};
const doSearch = (query: string) => {
const subid = `home_sidebar_${APP_ID}`;
const unsub = subscribeTo(subid, (type, _, content) => {
if (type === 'EOSE') {
savePage(searchResults.page);
unsub();
return;
}
if (!content) {
return;
}
if (type === 'EVENT') {
updatePage(content);
return;
}
});
setSearchResults('isFetching', () => true);
setSearchResults('notes', () => []);
setSearchResults('page', { messages: [], users: {}, postStats: {}, mentions: {}, noteActions: {} });
getScoredUsers(account?.publicKey, query, 10, subid);
}
createEffect(() => {
const query = searchResults.query?.value;
query && doSearch(query);
});
createEffect(() => {
if (account?.isKeyLookupDone) {
const stored = readHomeSidebarSelection(account.publicKey);
if (stored) {
setSearchResults('query', () => ({...stored}));
return;
}
setSearchResults('query', () => ({ ...sidebarOptions[0]}));
}
});
return (
<div id={props.id}>
<Show when={account?.isKeyLookupDone}>
<div class={styles.headingTrending}>
<div>
<div class={styles.flameIcon}></div>
{intl.formatMessage(t.trending)}
<span>
{intl.formatNumber(24, hourNarrow)}
</span>
</div>
<SelectionBox
options={sidebarOptions}
value={searchResults.query}
onChange={(option: SelectionOption) => {
setSearchResults('query', () => ({...option}));
saveHomeSidebarSelection(account?.publicKey, option)
}}
/>
</div>
<For each={data.trending.notes}>
{(note) => <SmallNote note={note} />}
</For>
<div class={styles.headingZapped}>
<div>
<div class={styles.zapIcon}></div>
{intl.formatMessage(t.mostZapped)}
<span>
{intl.formatNumber(4, hourNarrow)}
</span>
</div>
</div>
<For each={data.mostzapped.notes}>
{
(note) =>
<SmallNote
note={note}
>
{intl.formatMessage(t.zapPostfix,
{
zaps: humanizeNumber(note.post.zaps, true),
sats: humanizeNumber(note.post.satszapped, true),
})}
</SmallNote>
<Show
when={!searchResults.isFetching}
fallback={
<Loader />
}
</For>
>
<For each={searchResults.notes}>
{(note) => <SmallNote note={note} />}
</For>
</Show>
</Show>
</div>
);
}

70
src/components/Layout/Layout.module.scss
View File

@ -1,35 +1,33 @@
.container {
width: 1240px;
// height: 100vh;
width: var(--full-site-w);
margin: 0px auto;
display: grid;
grid-template-columns: 176px 640px 300px;
grid-column-gap: 32px;
grid-template-columns: var(--left-col-w) var(--center-col-w) var(--right-col-w);
}
.leftColumn {
>div {
position: fixed;
width: 176px;
width: var(--left-col-w);
display: grid;
grid-template-rows: 128px 1fr 82px;
grid-template-rows: var(--header-height) 1fr 82px;
height: 100%;
}
.leftHeader {
height: 128px;
height: var(--header-height);
display: grid;
align-items: center;
justify-content: right;
justify-content: flex-start;
}
.leftContent {
position: relative;
display: grid;
height: 100%;
justify-content: right;
padding-top: 30px;
justify-content: left;
.overlay {
position: absolute;
@ -46,28 +44,28 @@
.leftFooter {
height: 82px;
display: flex;
justify-content: flex-end;
justify-content: flex-start;
}
}
.centerColumn {
display: grid;
grid-template-rows: 128px 1fr;
position: relative;
border-inline: 1px solid var(--devider);
min-height: 100vh;
}
.centerHeader {
width: 640px;
width: 600px;
}
.centerContent {
width: 640px;
width: 600px;
.headerFloater {
position: fixed;
opacity: 0;
pointer-events: none;
width: 640px;
width: 600px;
z-index: var(--z-index-floater);
&.animatedShow {
@ -80,23 +78,39 @@
.rightColumn {
display: grid;
width: 300px;
grid-template-rows: 128px 1fr;
width: var(--right-col-w);
grid-template-rows: var(--header-height) 1fr;
grid-row-gap: 28px;
}
.rightHeader {
height: 128px;
width: var(--right-col-w);
height: var(--header-height);
display: grid;
align-items: center;
justify-content: left;
position: fixed;
// background-color: var(--background-site);
z-index: var(--z-index-header);
>div {
display: flex;
justify-content: center;
align-items: center;
height: var(--header-height);
width: var(--right-col-w);
>div {
height: 52px;
}
}
}
.rightContent {
margin-top: 128px;
margin-top: 112px;
>div {
margin-left: 24px;
}
}
.modal {
@ -115,7 +129,7 @@
@media only screen and (max-width: 1300px) {
.container {
width: 1032px;
grid-template-columns: 48px 640px 300px;
grid-template-columns: 48px 600px 332px;
}
.leftColumn {
@ -123,6 +137,16 @@
position: fixed;
width: 48px;
}
.leftHeader {
display: flex;
justify-content: flex-start;
}
.leftFooter {
justify-content: flex-start;
}
}
.rightColumn {
@ -133,7 +157,7 @@
@media only screen and (max-width: 1087px) {
.container {
width: 720px;
grid-template-columns: 48px 640px;
grid-template-columns: 48px 600px;
}
.rightColumn {
@ -145,7 +169,7 @@
.container {
width: 100%;
// height: 100vh;
grid-template-columns: 1fr;
grid-template-columns: 98%;
grid-template-rows: 1fr 48px;
grid-template-areas: "content" "footer";
}

30
src/components/Layout/Layout.tsx
View File

@ -15,7 +15,6 @@ import { useProfileContext } from '../../contexts/ProfileContext';
import Branding from '../Branding/Branding';
export const [isHome, setIsHome] = createSignal(false);
export const [showNav, setShowNav] = createSignal(false);
const Layout: Component = () => {
@ -31,15 +30,17 @@ const Layout: Component = () => {
const newNote = document.getElementById('new_note_input');
const newNoteTextArea = document.getElementById('new_note_text_area') as HTMLTextAreaElement;
if (!newNote || !newNoteTextArea) {
return;
}
if (account?.showNewNoteForm) {
if (!newNote || !newNoteTextArea) {
return;
}
newNote?.classList.add(styles.animatedShow);
newNoteTextArea?.focus();
}
else {
if (!newNote || !newNoteTextArea) {
return;
}
newNote?.classList.remove(styles.animatedShow);
newNoteTextArea.value = '';
}
@ -51,7 +52,6 @@ const Layout: Component = () => {
onMount(() => {
window.addEventListener('resize', onResize);
console.log('OVERLAY: ', location)
});
onCleanup(() => {
@ -100,7 +100,7 @@ const Layout: Component = () => {
<div class={styles.leftColumn}>
<div>
<div id="branding_holder" class={styles.leftHeader}>
<Branding isHome={isHome()} showNav={showNav()} />
<Branding isHome={isHome()} />
</div>
<div class={styles.leftContent}>
@ -120,15 +120,17 @@ const Layout: Component = () => {
<div class={styles.centerColumn}>
<div class={styles.centerContent}>
<div id="new_note_input" class={styles.headerFloater}>
<NewNote onSuccess={onNewNotePosted}/>
</div>
<Show when={account?.isKeyLookupDone}>
<div class={styles.centerContent}>
<div id="new_note_input" class={styles.headerFloater}>
<NewNote onSuccess={onNewNotePosted}/>
</div>
<div>
<Outlet />
<div>
<Outlet />
</div>
</div>
</div>
</Show>
</div>

10
src/components/LinkPreview/LinkPreview.module.scss
View File

@ -1,11 +1,19 @@
.linkPreview {
width: 100%;
text-decoration: none;
color: var(--text-tertiary-2);
color: var(--text-tertiary);
font-size: 16px;
font-weight: 400;
line-height: 22px;
text-align: left;
display: block;
overflow: hidden;
border-radius: var(--border-radius-small);
background-color: var(--background-input);
&:hover {
text-decoration: none !important;
}
}
.previewInfo {

42
src/components/LinkPreview/LinkPreview.tsx
View File

@ -1,21 +1,55 @@
import { Component, Show } from 'solid-js';
import { Component, createMemo, Show } from 'solid-js';
import { useMediaContext } from '../../contexts/MediaContext';
import { hookForDev } from '../../lib/devTools';
import styles from './LinkPreview.module.scss';
const LinkPreview: Component<{ preview: any, id?: string }> = (props) => {
const media = useMediaContext();
const encodedUrl = encodeURI(new URL(props.preview.url).origin);
const image = () => {
const i = media?.actions.getMedia(props.preview.images[0] || '', 'm');
return i;
};
const height = () => {
const img = image();
if (!img) {
return '100%';
}
const mediaHeight = img.h;
const mediaWidth = img.w || 0;
const imgWidth = 524;
const ratio = mediaWidth / imgWidth;
const h = ratio > 1 ?
mediaHeight / ratio :
mediaHeight * ratio;
return `${h}px`;
};
return (
<a
id={props.id}
href={props.preview.url}
class={styles.linkPreview}
>
<Show when={props.preview.images && props.preview.images[0]}>
<div class={styles.previewImage}>
<img src={props.preview.images[0]} />
<Show when={image()}>
<div
class={styles.previewImage}
style={`width: 100%; height: ${height()}`}
>
<img
src={image()?.media_url}
/>
</div>
</Show>

2
src/components/Loader/Loader.module.scss
View File

@ -22,7 +22,7 @@
margin: auto;
height: 32px;
width: 32px;
border: 2px solid var(--brand-1);
border: 2px solid var(--accent);
border-radius: 50%;
opacity: 0;
-webkit-animation: loader-1 1.5s cubic-bezier(0.075, 0.820, 0.165, 1.000) infinite;

34
src/components/LoginModal/LoginModal.module.scss
View File

@ -1,17 +1,13 @@
.modal {
position: fixed;
width: 420px;
width: 440px;
color: var(--text-secondary);
background-color: var(--background-site);
background: linear-gradient(var(--background-site),
var(--background-site)) padding-box,
var(--brand-gradient) border-box;
border: 1px solid transparent;
border-radius: 6px;
background-color: var(--background-input);
border-radius: 8px;
display: flex;
flex-direction: column;
padding: 22px;
padding: 24px;
.xClose {
background: none;
@ -46,17 +42,16 @@
}
.title {
font-weight: 800;
font-size: 18px;
line-height: 18px;
color: var(--text-secondary);
text-transform: uppercase;
font-weight: 600;
line-height: 20px;
color: var(--text-primary);
margin-bottom: 20px;
}
.description {
color: var(--text-secondary);
font-size: 16px;
color: var(--text-primary);
font-size: 15px;
font-weight: 400;
line-height: 20px;
margin-bottom: 28px;
@ -74,17 +69,18 @@
button {
width: fit-content;
min-width: 192px;
padding: 10px;
padding-block: 10px;
padding-inline: 44px;
margin: 0px;
}
}
.alternative {
color: var(--text-secondary);
font-size: 14px;
color: var(--text-primary);
font-size: 15px;
font-style: normal;
font-weight: 400;
line-height: 24px;
line-height: 20px;
}
}

13
src/components/MissingPage/MissingPage.module.scss
View File

@ -1,21 +1,26 @@
.fullHeader {
display: grid;
height: 120px;
height: 84px;
align-items: center;
justify-content: left;
padding-inline: 20px;
border-bottom: 1px solid var(--devider);
>div {
font-weight: 300;
font-size: 32px;
font-weight: 400;
line-height: 34px;
color: var(--brand-text);
color: var(--text-secondary);
text-transform: lowercase;
}
}
.comingSoon {
font-weight: 300;
font-weight: 400;
font-size: 18px;
line-height: 34px;
padding-inline: 20px;
margin-top: 24px;
color: var(--text-secondary);
}

53
src/components/NavHeader/NavHeader.module.scss Normal file
View File

@ -0,0 +1,53 @@
.navHeader {
position: fixed;
display: flex;
justify-content: flex-start;
align-items: flex-start;
height: 72px;
width: calc(var(--central-content-width) - 2px);
margin: 0;
padding: 0;
padding-top: 32px;
background-color: var(--background-modal);
z-index: var(--z-index-header);
backdrop-filter: blur(10px);
font-size: 16px;
font-weight: 600;
line-height: 16px;
color: var(--text-secondary);
border: none;
border-bottom: 1px solid var(--devider);
border-radius: 0;
outline: none;
box-shadow: none;
&:focus {
outline: none;
box-shadow: none;
}
}
.title {
height: 16px;
padding-top: 1px;
}
.backIcon {
display: inline-block;
border: none;
box-shadow: none;
background-color: unset;
margin: 0px;
padding: 0px;
width: 16px;
height: 16px;
margin-left: 20px;
margin-right: 12px;
background-color: var(--text-secondary);
-webkit-mask: url(../../assets/icons/back.svg) no-repeat center;
mask: url(../../assets/icons/back.svg) no-repeat center;
}

19
src/components/NavHeader/NavHeader.tsx Normal file
View File

@ -0,0 +1,19 @@
import { Component} from 'solid-js';
import { hookForDev } from '../../lib/devTools';
import styles from './NavHeader.module.scss';
const NavHeader: Component<{
title: string,
}> = (props) => {
return (
<button class={styles.navHeader} onClick={() => {
window.history.back()
}}>
<div class={styles.backIcon}></div>
<div class={styles.title}>{props.title}</div>
</button>
);
}
export default hookForDev(NavHeader);

167
src/components/NavLink/NavLink.module.scss
View File

@ -1,20 +1,31 @@
@mixin iconNav {
width: 32px;
height: 32px;
width: 24px;
height: 24px;
background-color: var(--text-secondary);
}
.navLink {
position: relative;
text-align: right;
margin: 0px 0px 28px 0px;
margin: 0px 0px 36px 0px;
padding: 0px;
background: none;
border: none;
border-radius: 0px;
display: flex;
justify-content: flex-start;
div {
display: inline;
a {
.label {
margin-left: 16px;
font-size: 18px;
font-weight: 600;
line-height: 20px;
display: flex;
}
&:focus {
background: none;
}
}
p {
@ -34,8 +45,8 @@
.exploreIcon {
@include iconNav;
-webkit-mask: url(../../assets/icons/explore.svg) no-repeat center;
mask: url(../../assets/icons/explore.svg) no-repeat center;
-webkit-mask: url(../../assets/icons/search.svg) no-repeat center;
mask: url(../../assets/icons/search.svg) no-repeat center;
}
.messagesIcon {
@include iconNav;
@ -64,91 +75,103 @@
}
.active {
p {
color: var(--active-link);
text-decoration: underline;
}
div {
background-color: var(--active-link);
display: flex;
justify-content: flex-start;
align-items: flex-end;
background: none;
>div {
background-color: var(--text-primary);
}
.homeIcon {
background-color: var(--text-primary);
}
.exploreIcon {
background-color: var(--text-primary);
}
.messagesIcon {
background-color: var(--text-primary);
}
.notificationsIcon {
background-color: var(--text-primary);
}
.downloadIcon {
background-color: var(--text-primary);
}
.settingsIcon {
background-color: var(--text-primary);
}
.helpIcon {
background-color: var(--text-primary);
.label {
color: var(--text-primary);
background: none;
}
}
.inactive {
p {
color: var(--inactive-link);
display: flex;
justify-content: flex-start;
align-items: flex-end;
>div {
background-color: var(--text-secondary);
}
div {
background-color: var(--inactive-link);
.label {
color: var(--text-secondary);
background: none;
}
}
.bubble {
display: flex;
justify-content: center;
align-items: center;
width: 18px;
height: 18px;
margin-left: 2px;
font-family: 'Roboto Condensed';
font-weight: 500;
font-size: 12px;
line-height: 11px;
background: var(--accent);
border: 1px solid var(--background-site);
border-radius: 9px;
color: var(--text-primary-button);
&.doubleSize {
width: 24px;
}
&.tripleSize {
width: 26px;
padding-left: 2px;
}
}
@media only screen and (max-width: 1300px) {
.navLink {
margin-bottom: 22px;
a {
.label {
display: none;
}
}
}
width: fit-content;
div {
display: inline-block;
.bubble {
width: 8px;
height: 8px;
>div {
display: none;
}
p {
display: none;
&.doubleSize {
width: 8px;
height: 8px;
}
&.tripleSize {
width: 8px;
height: 8px;
}
}
}
@media only screen and (max-width: 720px) {
.navLink {
a {
.label {
display: none;
}
}
}
.hiddenOnSmallScreens {
display: none
}
}
.bubble {
position: absolute;
text-align: center;
padding-top: 2px;
padding-inline: 4px;
top: 0;
right: -18px;
min-width: 18px;
min-height: 18px;
border-radius: 8px;
font-weight: 500;
font-size: 12px;
line-height: 12px;
background: var(--brand-gradient);
border: 1px solid var(--background-site);
color: white;
text-shadow: 0.5px 0.5px 0px black;
&.doubleSize {
right: -24px;
}
&.tripleSize {
right: -30px;
}
}

27
src/components/NavLink/NavLink.tsx
View File

@ -12,21 +12,15 @@ const NavLink: Component<{
bubble?: () => number,
hiddenOnSmallScreens?: boolean,
}> = (props) => {
const navigate = useNavigate();
const location = useLocation();
const shouldScroll = () => props.to === location.pathname;
const onClick = (e: Event) => {
if (shouldScroll()) {
const scrollIfInactive = (e: Event) => {
if (props.to === location.pathname) {
e.preventDefault();
window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
return;
}
navigate('/home');
}
const bubbleClass = () => {
@ -42,17 +36,22 @@ const NavLink: Component<{
}
return (
<button id={props.id} class={`${styles.navLink} ${props.hiddenOnSmallScreens ? styles.hiddenOnSmallScreens : ''}`} onClick={onClick}>
<div id={props.id} class={`${styles.navLink} ${props.hiddenOnSmallScreens ? styles.hiddenOnSmallScreens : ''}`}>
<A
href={props.to}
activeClass={styles.active}
inactiveClass={styles.inactive}
onClick={scrollIfInactive}
>
<div class={styles[props.icon]}></div>
<div class={styles.label}>{props.label}</div>
</A>
<Show when={props.bubble && props.bubble() > 0}>
<div class={`${styles.bubble} ${bubbleClass()}`}>
<div>{props.bubble && props.bubble() < 100 ? props.bubble() : '99+'}</div>
</div>
</Show>
<A href={props.to} activeClass={styles.active} inactiveClass={styles.inactive}>
<div class={styles[props.icon]}></div>
<p>{props.label}</p>
</A>
</button>
</div>
)
}

49
src/components/NavMenu/NavMenu.module.scss
View File

@ -1,38 +1,41 @@
.sideNav {
display: flex;
flex-direction: column;
> div {
margin-bottom: 28px;
}
margin-left: 8px;
}
.callToAction {
display: grid;
justify-content: right;
margin-top: 15px;
margin-left: 8px;
width: 156px;
display: flex;
flex-direction: column;
align-items: center;
>button {
margin: 0;
width: 100% ;
}
.message {
color: var(--text-tertiary);
text-align: right;
font-size: 15px;
font-style: normal;
font-weight: 400;
line-height: 16px;
margin-bottom: 4px;
}
.action {
button {
margin: 0;
}
margin-bottom: 8px;
}
}
@media only screen and (max-width: 1300px) {
.callToAction {
.message, .action {
display: none;
margin-left: 2px;
width: 36px;
height: 36px;
>button {
padding: 0;
margin: 0;
}
}
}
@ -65,3 +68,15 @@
}
}
}
.postIcon {
display: inline-block;
width: 18px;
height: 18px;
vertical-align: middle;
background-color: var(--text-primary-button);
-webkit-mask: url(../../assets/icons/post.svg) no-repeat 0 0 / 18px 18px;
mask: url(../../assets/icons/post.svg) no-repeat 0 0 / 18px 18px;
}

33
src/components/NavMenu/NavMenu.tsx
View File

@ -11,6 +11,7 @@ import FloatingNewPostButton from '../FloatingNewPostButton/FloatingNewPostButto
import styles from './NavMenu.module.scss';
import { hookForDev } from '../../lib/devTools';
import ButtonPrimary from '../Buttons/ButtonPrimary';
import { useMediaContext } from '../../contexts/MediaContext';
const NavMenu: Component< { id?: string } > = (props) => {
const account = useAccountContext();
@ -18,6 +19,7 @@ const NavMenu: Component< { id?: string } > = (props) => {
const messages = useMessagesContext();
const intl = useIntl();
const loc = useLocation();
const media = useMediaContext();
const links = [
{
@ -64,6 +66,8 @@ const NavMenu: Component< { id?: string } > = (props) => {
},
];
const isBigScreen = () => (media?.windowSize.w || 0) > 1300;
return (
<div id={props.id} class={styles.navMenu}>
<nav class={styles.sideNav}>
@ -82,20 +86,35 @@ const NavMenu: Component< { id?: string } > = (props) => {
</nav>
<Show when={account?.hasPublicKey() && !loc.pathname.startsWith('/messages/')}>
<div class={styles.callToAction}>
<FloatingNewPostButton />
<Show
when={isBigScreen()}
fallback={
<ButtonPrimary
id={props.id}
onClick={account?.actions?.showNewNoteForm}
>
<div class={styles.postIcon}></div>
</ButtonPrimary>
}
>
<ButtonPrimary
id={props.id}
onClick={account?.actions?.showNewNoteForm}
>
{intl.formatMessage(tActions.newNote)}
</ButtonPrimary>
</Show>
</div>
</Show>
<Show when={account?.isKeyLookupDone && !account?.hasPublicKey()}>
<Show when={account?.isKeyLookupDone && !account?.hasPublicKey() && isBigScreen()}>
<div class={styles.callToAction}>
<div class={styles.message}>
{intl.formatMessage(tPlaceholders.welcomeMessage)}
</div>
<div class={styles.action}>
<ButtonPrimary onClick={account?.actions.showGetStarted}>
{intl.formatMessage(tActions.getStarted)}
</ButtonPrimary>
</div>
<ButtonPrimary onClick={account?.actions.showGetStarted}>
{intl.formatMessage(tActions.getStarted)}
</ButtonPrimary>
</div>
</Show>
</div>

27
src/components/NewNote/EditBox/EditBox.module.scss
View File

@ -39,8 +39,8 @@
width: 100%;
height: 100%;
padding: 1px;
background: var(--brand-gradient);
border-radius: 6px;
border: 1px solid var(--accent);
display: block;
position: relative;
}
@ -52,8 +52,6 @@
font-size: 18px;
line-height: 20px;
margin: 0px;
border-radius: 6px;
border: none;
color: var(--text-tertiary);
background-color: var(--background-site);
padding-bottom: 11px;
@ -74,18 +72,14 @@
align-items: center;
justify-content: flex-end;
width: calc(100% - 16px);
// border: solid 1px red;
padding-top: 8px;
background-color: var(--background-site);
>button {
width: 80px;
height: 28px;
min-width: 80px;
margin: 0px 0px 11px 8px;
min-width: 110px;
margin-left: 8px;
}
.editorOptions {
width: 100%;
// padding-left: 80px;
.attachIcon {
width: 26px;
@ -144,10 +138,9 @@
.searchSuggestions {
width: 300px;
background-color: var(--background-site);
border: 1px solid var(--text-tertiary-2);
// box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.8);
border-radius: 4px;
background-color: var(--background-input);
border: none;
border-radius: 8px;
position: absolute;
top: 0px;
@ -185,6 +178,7 @@ textarea {
&:focus {
border: none;
outline: none;
box-shadow: none;
}
}
@ -238,7 +232,7 @@ textarea::-webkit-scrollbar{
color: var(--text-primary);
margin: 0px 14px 32px 0px;
padding: 0px;
background-color: var(--background-card);
background-color: var(--background-sheet);
border-radius: 4px;
padding: 12px;
}
@ -252,9 +246,8 @@ textarea::-webkit-scrollbar{
max-height: 200px;
overflow-y: scroll;
padding: 4px;
background-color: var(--background-site);
border: 1px solid var(--text-tertiary-2);
// box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.8);
background-color: var(--background-input);
border: none;
border-radius: 8px;
top: 0px;

21
src/components/NewNote/EditBox/EditBox.tsx
View File

@ -36,6 +36,8 @@ import {
} from "../../../translations";
import { useMediaContext } from "../../../contexts/MediaContext";
import { hookForDev } from "../../../lib/devTools";
import ButtonPrimary from "../../Buttons/ButtonPrimary";
import ButtonSecondary from "../../Buttons/ButtonSecondary";
type AutoSizedTextArea = HTMLTextAreaElement & { _baseScrollHeight: number };
@ -1212,22 +1214,15 @@ const EditBox: Component<{
<label for={`upload-${instanceId}`} class={`attach_icon ${styles.attachIcon}`}>
</label>
</div>
<button
class={styles.primaryButton}
<ButtonPrimary
onClick={postNote}
disabled={isPostingInProgress()}
>
<span>
{intl.formatMessage(tActions.notePostNew)}
</span>
</button>
<button class={styles.secondaryButton} onClick={closeEditor}>
<div>
<span>
{intl.formatMessage(tActions.cancel)}
</span>
</div>
</button>
{intl.formatMessage(tActions.notePostNew)}
</ButtonPrimary>
<ButtonSecondary onClick={closeEditor}>
{intl.formatMessage(tActions.cancel)}
</ButtonSecondary>
</div>
</div>
)

4
src/components/NewNote/NewNote.module.scss
View File

@ -34,7 +34,7 @@
width: 100%;
height: 100%;
padding: 1px;
background: var(--brand-gradient);
background: none;
border-radius: 6px;
display: block;
position: relative;
@ -48,7 +48,7 @@
line-height: 20px;
margin: 0px;
border-radius: 6px;
border: none;
border: 2px solid var(--accent);
color: var(--text-tertiary);
background-color: var(--background-site);
padding-bottom: 11px;

8
src/components/NostrStats/NostrStats.module.scss
View File

@ -16,16 +16,16 @@
.netstat {
.number {
font-size: 24px;
font-size: 22px;
font-weight: 400;
line-height: 28px;
font-weight: 300;
color: var(--text-primary);
}
.label {
font-size: 16px;
font-size: 15px;
font-weight: 400;
line-height: 20px;
font-weight: 300;
color: var(--text-tertiary);
text-transform: lowercase;
}

267
src/components/Note/Note.module.scss
View File

@ -1,83 +1,154 @@
.post {
background-color: var(--background-card);
.note {
display: flex;
flex-direction: column;
// grid-template-columns: 60px 1fr;
// grid-template-rows: 1fr;
// grid-template-areas: "avatar content";
padding: 0px;
border-radius: 8px;
// pointer-events: none;
padding: 12px;
margin: 0px;
text-decoration: none;
color: unset;
background-color: var(--background-site);
border: none;
border-bottom: 1px solid var(--devider);
border-radius: 0;
width: calc(100% - 2px);
&.parent {
border: none;
}
.header {
position: relative;
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
.repostedBy {
padding-bottom: 16px;
display: flex;
>span {
>a {
margin-inline: 5px;
color: var(--text-tertiary);
text-decoration: none;
}
color: var(--text-tertiary);
font-size: 14px;
line-height: 14px;
font-weight: 400;
>span {
text-transform: lowercase;
}
}
}
}
.content {
grid-area: content;
display: flex;
flex-direction: column;
margin-top: 21px;
margin-left: 60px;
// grid-template-columns: 1fr;
// grid-template-rows: 48px 1fr 28px;
// grid-row-gap: 16px;
// grid-template-areas: "header" "message" "footer";
display: grid;
grid-template-columns: 50px 1fr;
.leftSide {
width: 42px;
margin-right: 8px;
.message {
position: relative;
grid-area: message;
color: var(--text-primary);
word-break: break-word;
font-size: 16px;
line-height: 24px;
width: 100%;
// max-height: 650px;
// overflow: hidden;
margin-bottom: 17px;
.ancestorLine {
border-left: 1px solid var(--devider);
height: calc(100% - 12px);
margin-left: 21px;
}
}
a:hover {
text-decoration: underline;
.rightSide {
display: flex;
flex-direction: column;
.message {
color: var(--text-primary);
word-break: break-word;
font-size: 15px;
font-weight: 400px;
line-height: 20px;
margin-top: 4px;
margin-bottom: 16px;
}
.messageFade {
position: absolute;
z-index: 1;
top: 610px;
left: 0;
pointer-events: none;
background-image: var(--fade-note-vertical);
width: 100%;
height: 40px;
}
.replyingTo {
font-size: 15px;
font-weight: 400;
line-height: 20px;
margin-top: 6px;
.label {
color: var(--text-primary);
}
.author {
color: var(--accent);
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
}
}
}
}
.authorInfo {
display: flex;
justify-content: flex-start;
overflow: hidden;
align-items: center;
justify-content: flex-start;
width: 524px;
position: relative;
.userName {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
max-width: 226px;
color: var(--text-primary);
.postLink {
text-decoration: none;
color: unset;
margin: 0px;
padding: 16px 20px;
// background: var(--brand-gradient-vertical);
background-color: var(--background-card);
border-radius: 8px;
display: block;
transition: 0.2s padding;
margin-top: 8px;
>div {
border-radius: 4px;
transition: 0.2s border-radius ease-out;
font-size: 14px;
font-weight: 700;
line-height: 14px;
}
.time{
display: flex;
margin-left: 2px;
min-width: fit-content;
font-size: 14px;
font-weight: 400;
line-height: 14px;
color: var(--text-tertiary);
// &:hover {
// padding-left: 4px;
// transition: 0.2s padding;
// border-radius: 4px;
// >div {
// border-radius: 0px 4px 4px 0px;
// transition: 0.2s border-radius ease-out;
// }
// }
.ellipsisIcon {
width: 11px;
height: 14px;
background-color: var(--text-tertiary);
-webkit-mask: url(../../assets/icons/ellipsis.svg) no-repeat center;
mask: url(../../assets/icons/ellipsis.svg) no-repeat center;
}
}
.verification {
max-width: 216px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
color: var(--text-tertiary);
font-size: 14px;
font-weight: 400;
line-height: 14px;
}
}
.repostIcon {
width: 16px;
height: 16px;
background-color: var(--text-tertiary);
-webkit-mask: url(../../assets/icons/feed_repost.svg) no-repeat 0 / 100%;
mask: url(../../assets/icons/feed_repost.svg) no-repeat 0 / 100%;
}
.repostedBy {
@ -86,10 +157,12 @@
>span {
>a {
margin-inline: 5px;
color: var(--text-tertiary);
text-decoration: none;
}
color: var(--text-tertiary);
font-size: 16px;
line-height: 16px;
font-size: 14px;
line-height: 14px;
font-weight: 400;
>span {
text-transform: lowercase;
@ -97,21 +170,61 @@
}
}
.contextMenu {
position: relative;
width: 16px;
height: 32px;
display: flex;
align-items: center;
text-align: center;
font-weight: bold;
@media only screen and (max-width: 720px) {
.postLink {
width: 100vw;
.post {
width: 100%;
// grid-template-columns: 62px 1fr;
margin-left: 0px;
margin-right: 0px;
padding-right: 0px;
.content {
margin-left: 0;
}
.contextButton {
width: 16px;
height: 32px;
padding: 0;
margin: 0;
background: none;
border: none;
outline: none;
display: flex;
justify-content: center;
align-items: flex-start;
&:focus {
outline: none;
box-shadow: none;
}
.contextIcon {
width: 16px;
height: 14px;
background-color: var(--text-secondary-2);
-webkit-mask: url(../../assets/icons/context.svg) no-repeat 0 / 100%;
mask: url(../../assets/icons/context.svg) no-repeat 0 / 100%;
}
&:hover {
.contextIcon {
background-color: var(--text-primary);
}
}
}
}
@media only screen and (max-width: 720px) {
.note {
width: 100vw;
.content {
.rightSide {
width: calc(100% - 2px);
}
}
}
.authorInfo{
width: 100%;
}
}

87
src/components/Note/Note.tsx
View File

@ -1,5 +1,5 @@
import { A } from '@solidjs/router';
import { Component, createEffect, createSignal, Show } from 'solid-js';
import { Component, createSignal, Show } from 'solid-js';
import { PrimalNote } from '../../types/primal';
import ParsedNote from '../ParsedNote/ParsedNote';
import NoteFooter from './NoteFooter/NoteFooter';
@ -8,12 +8,18 @@ import NoteHeader from './NoteHeader/NoteHeader';
import styles from './Note.module.scss';
import { useThreadContext } from '../../contexts/ThreadContext';
import { useIntl } from '@cookbook/solid-intl';
import { authorName, truncateNpub } from '../../stores/profile';
import { authorName, userName } from '../../stores/profile';
import { note as t } from '../../translations';
import { hookForDev } from '../../lib/devTools';
import NoteReplyHeader from './NoteHeader/NoteReplyHeader';
import Avatar from '../Avatar/Avatar';
import NoteAuthorInfo from './NoteAuthorInfo';
import NoteRepostHeader from './NoteRepostHeader';
import PrimalMenu from '../PrimalMenu/PrimalMenu';
import NoteContextMenu from './NoteContextMenu';
import NoteReplyToHeader from './NoteReplyToHeader';
const Note: Component<{ note: PrimalNote, id?: string }> = (props) => {
const Note: Component<{ note: PrimalNote, id?: string, parent?: boolean }> = (props) => {
const threadContext = useThreadContext();
const intl = useIntl();
@ -24,66 +30,45 @@ const Note: Component<{ note: PrimalNote, id?: string }> = (props) => {
threadContext?.actions.setPrimaryNote(note);
};
const reposterName = () => {
const r = repost();
if (!r) {
return '';
}
return authorName(r.user);
}
const [openCustomZap, setOpenCustomZap] = createSignal(false);
return (
<A
id={props.id}
class={styles.postLink}
class={`${styles.note} ${props.parent ? styles.parent : ''}`}
href={`/e/${props.note?.post.noteId}`}
onClick={() => navToThread(props.note)}
data-event={props.note.post.id}
data-event-bech32={props.note.post.noteId}
>
<Show when={repost()}>
<div class={styles.repostedBy}>
<div class={styles.repostIcon}></div>
<span>
<A href={`/p/${repost()?.user.npub}`} >
{reposterName()}
</A>
<span>
{intl.formatMessage(t.reposted)}
</span>
</span>
</div>
</Show>
<div class={styles.post}>
<Show
when={props.note.replyTo}
fallback={
<NoteHeader
note={props.note}
openCustomZap={() => {
setOpenCustomZap(true);
setTimeout(() => setOpenCustomZap(false), 10);
}}
/>
}
>
<NoteReplyHeader
note={props.note}
openCustomZap={() => {
setOpenCustomZap(true);
setTimeout(() => setOpenCustomZap(false), 10);
}}
/>
<div class={styles.header}>
<Show when={repost()}>
<NoteRepostHeader repost={props.note.repost} />
</Show>
<div class={styles.content}>
</div>
<div class={styles.content}>
<div class={styles.leftSide}>
<A href={`/p/${props.note.user.npub}`}>
<Avatar user={props.note.user} size="vs" />
</A>
<Show
when={props.parent}
>
<div class={styles.ancestorLine}></div>
</Show>
</div>
<div class={styles.rightSide}>
<NoteAuthorInfo
author={props.note.user}
time={props.note.post.created_at}
/>
<NoteReplyToHeader note={props.note} />
<div class={styles.message}>
<ParsedNote note={props.note} />
</div>
<NoteFooter note={props.note} doCustomZap={openCustomZap()} />
<NoteFooter note={props.note} />
</div>
</div>
</A>

59
src/components/Note/NoteAuthorInfo.tsx Normal file
View File

@ -0,0 +1,59 @@
import { A } from '@solidjs/router';
import { Component, createSignal, Show } from 'solid-js';
import { PrimalNote, PrimalUser } from '../../types/primal';
import ParsedNote from '../ParsedNote/ParsedNote';
import NoteFooter from './NoteFooter/NoteFooter';
import NoteHeader from './NoteHeader/NoteHeader';
import styles from './Note.module.scss';
import { useThreadContext } from '../../contexts/ThreadContext';
import { useIntl } from '@cookbook/solid-intl';
import { authorName, nip05Verification, truncateNpub } from '../../stores/profile';
import { note as t } from '../../translations';
import { hookForDev } from '../../lib/devTools';
import NoteReplyHeader from './NoteHeader/NoteReplyHeader';
import Avatar from '../Avatar/Avatar';
import { date } from '../../lib/dates';
import VerificationCheck from '../VerificationCheck/VerificationCheck';
const NoteAuthorInfo: Component<{
author: PrimalUser,
time: number,
id?: string,
}> = (props) => {
const threadContext = useThreadContext();
const intl = useIntl();
return (
<div class={styles.authorInfo}>
<span class={styles.userName}>
{authorName(props.author)}
</span>
<VerificationCheck user={props.author} />
<Show
when={props.author.nip05}
>
<span
class={styles.verification}
title={props.author.nip05}
>
{nip05Verification(props.author)}
</span>
</Show>
<span
class={styles.time}
title={date(props.time).date.toLocaleString()}
>
<div class={styles.ellipsisIcon}></div>
{date(props.time).label}
</span>
</div>
)
}
export default hookForDev(NoteAuthorInfo);

218
src/components/Note/NoteContextMenu.tsx Normal file
View File

@ -0,0 +1,218 @@
import { A } from '@solidjs/router';
import { Component, createEffect, createSignal, Show } from 'solid-js';
import { MenuItem, NostrRelaySignedEvent, PrimalNote, PrimalRepost, PrimalUser } from '../../types/primal';
import ParsedNote from '../ParsedNote/ParsedNote';
import NoteFooter from './NoteFooter/NoteFooter';
import NoteHeader from './NoteHeader/NoteHeader';
import styles from './Note.module.scss';
import { useThreadContext } from '../../contexts/ThreadContext';
import { useIntl } from '@cookbook/solid-intl';
import { authorName, nip05Verification, truncateNpub, userName } from '../../stores/profile';
import { note as t, actions as tActions, toast as tToast } from '../../translations';
import { hookForDev } from '../../lib/devTools';
import NoteReplyHeader from './NoteHeader/NoteReplyHeader';
import Avatar from '../Avatar/Avatar';
import { date } from '../../lib/dates';
import VerificationCheck from '../VerificationCheck/VerificationCheck';
import PrimalMenu from '../PrimalMenu/PrimalMenu';
import { useAccountContext } from '../../contexts/AccountContext';
import { APP_ID } from '../../App';
import { reportUser } from '../../lib/profile';
import { useToastContext } from '../Toaster/Toaster';
import { broadcastEvent } from '../../lib/notes';
import { getScreenCordinates } from '../../utils';
const NoteContextMenu: Component<{
note: PrimalNote,
openCustomZap?: () => void;
id?: string,
}> = (props) => {
const account = useAccountContext();
const toaster = useToastContext();
const intl = useIntl();
const [showContext, setContext] = createSignal(false);
const [confirmReportUser, setConfirmReportUser] = createSignal(false);
const [confirmMuteUser, setConfirmMuteUser] = createSignal(false);
const openContextMenu = (e: MouseEvent) => {
e.preventDefault();
setContext(true);
};
const doMuteUser = () => {
account?.actions.addToMuteList(props.note.post.pubkey);
};
const doUnmuteUser = () => {
account?.actions.removeFromMuteList(props.note.post.pubkey);
};
const doReportUser = () => {
reportUser(props.note.user.pubkey, `report_user_${APP_ID}`, props.note.user);
setContext(false);
toaster?.sendSuccess(intl.formatMessage(tToast.noteAuthorReported, { name: userName(props.note.user)}));
};
const copyNoteLink = () => {
navigator.clipboard.writeText(`${window.location.origin}/e/${props.note.post.noteId}`);
setContext(false);
toaster?.sendSuccess(intl.formatMessage(tToast.notePrimalLinkCoppied));
};
const copyNoteText = () => {
navigator.clipboard.writeText(`${props.note.post.content}`);
setContext(false);
toaster?.sendSuccess(intl.formatMessage(tToast.notePrimalTextCoppied));
};
const copyNoteId = () => {
navigator.clipboard.writeText(`${props.note.post.noteId}`);
setContext(false);
toaster?.sendSuccess(intl.formatMessage(tToast.noteIdCoppied));
};
const copyRawData = () => {
navigator.clipboard.writeText(`${JSON.stringify(props.note.msg)}`);
setContext(false);
toaster?.sendSuccess(intl.formatMessage(tToast.noteRawDataCoppied));
};
const copyUserNpub = () => {
navigator.clipboard.writeText(`${props.note.user.npub}`);
setContext(false);
toaster?.sendSuccess(intl.formatMessage(tToast.noteAuthorNpubCoppied));
};
const broadcastNote = async () => {
if (!account) {
return;
}
const { success } = await broadcastEvent(props.note.msg as NostrRelaySignedEvent, account?.relays, account?.relaySettings);
setContext(false);
if (success) {
toaster?.sendSuccess(intl.formatMessage(tToast.noteBroadcastSuccess));
return;
}
toaster?.sendWarning(intl.formatMessage(tToast.noteBroadcastFail));
};
const onClickOutside = (e: MouseEvent) => {
if (
!document?.getElementById(`note_context_${props.note.post.id}`)?.contains(e.target as Node)
) {
setContext(false);
}
}
createEffect(() => {
if (showContext()) {
document.addEventListener('click', onClickOutside);
}
else {
document.removeEventListener('click', onClickOutside);
}
});
const isVerifiedByPrimal = () => {
return !!props.note.user.nip05 &&
props.note.user.nip05.endsWith('primal.net');
}
const noteContextForEveryone: MenuItem[] = [
{
label: intl.formatMessage(tActions.noteContext.zap),
action: () => {
props.openCustomZap && props.openCustomZap();
setContext(false);
},
icon: 'feed_zap',
},
{
label: intl.formatMessage(tActions.noteContext.copyLink),
action: copyNoteLink,
icon: 'copy_note_link',
},
{
label: intl.formatMessage(tActions.noteContext.copyText),
action: copyNoteText,
icon: 'copy_note_text',
},
{
label: intl.formatMessage(tActions.noteContext.copyId),
action: copyNoteId,
icon: 'copy_note_id',
},
{
label: intl.formatMessage(tActions.noteContext.copyRaw),
action: copyRawData,
icon: 'copy_raw_data',
},
{
label: intl.formatMessage(tActions.noteContext.breadcast),
action: broadcastNote,
icon: 'broadcast',
},
{
label: intl.formatMessage(tActions.noteContext.copyPubkey),
action: copyUserNpub,
icon: 'copy_pubkey',
},
];
const noteContextForOtherPeople: MenuItem[] = [
{
label: intl.formatMessage(tActions.noteContext.muteAuthor),
action: () => {
setConfirmMuteUser(true);
setContext(false);
},
icon: 'mute_user',
warning: true,
},
{
label: intl.formatMessage(tActions.noteContext.reportAuthor),
action: () => {
setConfirmReportUser(true);
setContext(false);
},
icon: 'report',
warning: true,
},
];
const noteContext = account?.publicKey !== props.note.post.pubkey ?
[ ...noteContextForEveryone, ...noteContextForOtherPeople] :
noteContextForEveryone;
let context: HTMLDivElement | undefined;
const determineOrient = () => {
const coor = getScreenCordinates(context);
const height = 380;
return (coor.y || 0) + height < window.innerHeight + window.scrollY ? 'down' : 'up';
}
return (
<div class={styles.contextMenu} ref={context}>
<button
class={styles.contextButton}
onClick={openContextMenu}
>
<div class={styles.contextIcon} ></div>
</button>
<PrimalMenu
id={`note_context_${props.note.post.id}`}
items={noteContext}
hidden={!showContext()}
position="note_footer"
orientation={determineOrient()}
/>
</div>
)
}
export default hookForDev(NoteContextMenu);

52
src/components/Note/NoteFooter/NoteFooter.module.scss
View File

@ -6,30 +6,35 @@
@mixin typeDiv {
display: flex;
min-width: 64px;
align-items: center;
}
.footer {
display: flex;
display: grid;
grid-template-columns: 128px 128px 128px 128px;
position: relative;
width: 100%;
.context {
position: absolute;
top: 0;
right: 0;
background: none;
display: flex;
justify-content: flex-end;
align-items: center;
}
.stat {
// display: grid;
// grid-template-columns: 18px 1fr;
// grid-template-rows: 1fr;
// grid-column-gap: 5px;
font-weight: 400;
font-size: 18px;
font-size: 14px;
line-height: 16px;
align-items: center;
margin: 0px;
padding: 0px;
margin-right: 60px;
border: none;
background-color: unset;
width: auto;
min-width: 64px;
width: fit-content;
position: relative;
.likeType {
@ -71,10 +76,10 @@
&:hover, &.highlighted {
.zapType {
.statNumber {
color: #FF9F2F;
color: var(--active-zap);
}
.icon {
background-color: #FF9F2F;
background-color: var(--active-zap);
-webkit-mask: url(../../../assets/icons/feed_zap_fill.svg) no-repeat 0 / 100%;
mask: url(../../../assets/icons/feed_zap_fill.svg) no-repeat 0 / 100%;
}
@ -82,10 +87,10 @@
.likeType {
.statNumber {
color: #BC1870;
color: var(--active-liked);
}
.icon {
background-color: #BC1870;
background-color: var(--active-liked);
-webkit-mask: url(../../../assets/icons/feed_like_fill.svg) no-repeat 0 / 100%;
mask: url(../../../assets/icons/feed_like_fill.svg) no-repeat 0 / 100%;
}
@ -93,10 +98,10 @@
.replyType {
.statNumber {
color: #CCCCCC;
color: var(--active-reply);
}
.icon {
background-color: #CCCCCC;
background-color: var(--active-reply);
-webkit-mask: url(../../../assets/icons/feed_reply_fill.svg) no-repeat 0 / 100%;
mask: url(../../../assets/icons/feed_reply_fill.svg) no-repeat 0 / 100%;
}
@ -104,10 +109,10 @@
.repostType {
.statNumber {
color: #66E205;
color: var(--active-reposted);
}
.icon {
background-color: #66E205;
background-color: var(--active-reposted);
-webkit-mask: url(../../../assets/icons/feed_repost_fill.svg) no-repeat 0 / 100%;
mask: url(../../../assets/icons/feed_repost_fill.svg) no-repeat 0 / 100%;
}
@ -119,8 +124,8 @@
.statNumber {
text-align: left;
color: var(--text-secondary);
margin-left: 7px;
color: var(--text-tertiary-2);
padding-left: 7px;
}
}
}
@ -142,7 +147,7 @@
@media only screen and (max-width: 720px) {
.footer {
width: auto;
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
@ -151,5 +156,10 @@
min-width: 0px;
margin-right: 0;
}
.context {
display: none;
}
}
}

45
src/components/Note/NoteFooter/NoteFooter.tsx
View File

@ -18,8 +18,10 @@ import { medZapLimit } from '../../../constants';
import { toast as t } from '../../../translations';
import PrimalMenu from '../../PrimalMenu/PrimalMenu';
import { hookForDev } from '../../../lib/devTools';
import NoteContextMenu from '../NoteContextMenu';
import { getScreenCordinates } from '../../../utils';
const NoteFooter: Component<{ note: PrimalNote, doCustomZap?: boolean, id?: string }> = (props) => {
const NoteFooter: Component<{ note: PrimalNote, id?: string }> = (props) => {
const account = useAccountContext();
const toast = useToastContext();
@ -222,7 +224,7 @@ const NoteFooter: Component<{ note: PrimalNote, doCustomZap?: boolean, id?: stri
return;
}
const newLeft = 116;
const newLeft = 120;
const newTop = -8;
smallZapAnimation.style.left = `${newLeft}px`;
@ -257,7 +259,7 @@ const NoteFooter: Component<{ note: PrimalNote, doCustomZap?: boolean, id?: stri
return;
}
const newLeft = 20;
const newLeft = 24;
const newTop = -35;
medZapAnimation.style.left = `${newLeft}px`;
@ -372,16 +374,19 @@ const NoteFooter: Component<{ note: PrimalNote, doCustomZap?: boolean, id?: stri
});
createEffect(() => {
if (props.doCustomZap) {
setIsCustomZap(true);
}
});
const [showSmallZapAnim, setShowSmallZapAnim] = createSignal(false);
const [showMedZapAnim, setShowMedZapAnim] = createSignal(false);
const [hideZapIcon, setHideZapIcon] = createSignal(false);
let repostMenu: HTMLDivElement | undefined;
const determineOrient = () => {
const coor = getScreenCordinates(repostMenu);
const height = 100;
return (coor.y || 0) + height < window.innerHeight + window.scrollY ? 'down' : 'up';
}
return (
<div id={props.id} class={styles.footer} ref={footerDiv}>
<Show when={showSmallZapAnim()}>
@ -440,7 +445,10 @@ const NoteFooter: Component<{ note: PrimalNote, doCustomZap?: boolean, id?: stri
onClick={showRepostMenu}
title={reposts().toLocaleString()}
>
<div class={`${buttonTypeClasses.repost}`}>
<div
class={`${buttonTypeClasses.repost}`}
ref={repostMenu}
>
<div
class={styles.icon}
style={'visibility: visible'}
@ -452,22 +460,33 @@ const NoteFooter: Component<{ note: PrimalNote, doCustomZap?: boolean, id?: stri
id={`repost_menu_${props.note.post.id}`}
items={repostMenuItems}
position="note_footer"
orientation={determineOrient()}
hidden={!isRepostMenuVisible()}
/>
</div>
</button>
<div class={styles.context}>
<NoteContextMenu
note={props.note}
openCustomZap={() => {
setIsCustomZap(true);
setTimeout(() => setIsCustomZap(false), 10);
}}
/>
</div>
<CustomZap
open={isCustomZap()}
note={props.note}
onConfirm={(amount) => {
onConfirm={(amount: number) => {
setIsCustomZap(false);
setZappedAmount(() => amount || 0);
setZappedNow(true);
setZapped(true);
animateZap();
}}
onSuccess={(amount) => {
onSuccess={(amount: number) => {
setIsCustomZap(false);
setIsZapping(false);
// setZappedAmount(() => amount || 0);
@ -478,7 +497,7 @@ const NoteFooter: Component<{ note: PrimalNote, doCustomZap?: boolean, id?: stri
setHideZapIcon(false);
setZapped(true);
}}
onFail={(amount) => {
onFail={(amount: number) => {
setZappedAmount(() => -(amount || 0));
setZappedNow(true);
setIsCustomZap(false);

2
src/components/Note/NoteHeader/NoteHeader.module.scss
View File

@ -28,7 +28,6 @@
}
.postInfo {
display: flex;
flex-direction: column;
font-size: 14px;
line-height: 16px;
font-weight: 400;
@ -117,7 +116,6 @@
background-color: var(--text-secondary-2);
-webkit-mask: url(../../../assets/icons/context.svg) no-repeat 0 / 100%;
mask: url(../../../assets/icons/context.svg) no-repeat 0 / 100%;
}
&:hover {

21
src/components/Note/NoteHeader/NoteHeader.tsx
View File

@ -217,6 +217,17 @@ const NoteHeader: Component<{ note: PrimalNote, openCustomZap?: () => void, id?:
<VerificationCheck user={props.note.user} />
<Show
when={props.note.user?.nip05}
>
<span
class={styles.verification}
title={props.note.user?.nip05}
>
{nip05Verification(props.note.user)}
</span>
</Show>
<span
class={styles.time}
title={date(props.note.post?.created_at).date.toLocaleString()}
@ -225,16 +236,6 @@ const NoteHeader: Component<{ note: PrimalNote, openCustomZap?: () => void, id?:
</span>
</div>
<Show
when={props.note.user?.nip05}
>
<span
class={styles.verification}
title={props.note.user?.nip05}
>
{nip05Verification(props.note.user)}
</span>
</Show>
</div>
</div>

19
src/components/Note/NotePrimary/NotePrimary.module.scss
View File

@ -1,21 +1,14 @@
.border {
background: var(--brand-gradient-vertical);
border-radius: 4px 0px 0px 4px;
width: 4px;
position: absolute;
top: 0;
left: 0;
height: 100%;
}
.post {
position: relative;
background-color: var(--background-card);
margin-top: 8px;
display: flex;
flex-direction: column;
padding: 16px 20px;
border-radius: 0px 4px 4px 0px;
padding: 12px;
padding-top: 0;
border-radius: 0;
border: 1px solid var(--devider);
border-top: none;
border-bottom: none;
.content {
grid-area: content;

50
src/components/Note/NoteReplyToHeader.tsx Normal file
View File

@ -0,0 +1,50 @@
import { A } from '@solidjs/router';
import { Component, createMemo, createSignal, Show } from 'solid-js';
import { PrimalNote, PrimalRepost, PrimalUser } from '../../types/primal';
import ParsedNote from '../ParsedNote/ParsedNote';
import NoteFooter from './NoteFooter/NoteFooter';
import NoteHeader from './NoteHeader/NoteHeader';
import styles from './Note.module.scss';
import { useThreadContext } from '../../contexts/ThreadContext';
import { useIntl } from '@cookbook/solid-intl';
import { authorName, nip05Verification, truncateNpub, userName } from '../../stores/profile';
import { note as t } from '../../translations';
import { hookForDev } from '../../lib/devTools';
import Avatar from '../Avatar/Avatar';
import { date } from '../../lib/dates';
import VerificationCheck from '../VerificationCheck/VerificationCheck';
const NoteReplyHeader: Component<{
note: PrimalNote,
id?: string,
}> = (props) => {
const intl = useIntl();
const rootAuthor = createMemo(() => {
const replyTo = props.note.replyTo;
const mentions = props.note.mentionedNotes;
if (replyTo && mentions && mentions[replyTo]) {
return mentions[replyTo].user;
}
});
return (
<Show when={props.note.replyTo}>
<span class={styles.replyingTo}>
<span class={styles.label}>
{intl.formatMessage(t.reply)}
</span>&nbsp;
<A
href={`/p/${rootAuthor()?.npub}`}
class={styles.author}
>
@{userName(rootAuthor())}
</A>
</span>
</Show>
)
}
export default hookForDev(NoteReplyHeader);

48
src/components/Note/NoteRepostHeader.tsx Normal file
View File

@ -0,0 +1,48 @@
import { A } from '@solidjs/router';
import { Component, createSignal, Show } from 'solid-js';
import { PrimalNote, PrimalRepost, PrimalUser } from '../../types/primal';
import ParsedNote from '../ParsedNote/ParsedNote';
import NoteFooter from './NoteFooter/NoteFooter';
import NoteHeader from './NoteHeader/NoteHeader';
import styles from './Note.module.scss';
import { useThreadContext } from '../../contexts/ThreadContext';
import { useIntl } from '@cookbook/solid-intl';
import { authorName, nip05Verification, truncateNpub } from '../../stores/profile';
import { note as t } from '../../translations';
import { hookForDev } from '../../lib/devTools';
import NoteReplyHeader from './NoteHeader/NoteReplyHeader';
import Avatar from '../Avatar/Avatar';
import { date } from '../../lib/dates';
import VerificationCheck from '../VerificationCheck/VerificationCheck';
const NoteRepostHeader: Component<{
repost?: PrimalRepost,
id?: string,
}> = (props) => {
const intl = useIntl();
const reposterName = () => {
if (!props.repost) {
return '';
}
return authorName(props.repost.user);
}
return (
<div class={styles.repostedBy}>
<div class={styles.repostIcon}></div>
<span>
<A href={`/p/${props.repost?.user.npub}`} >
{reposterName()}
</A>
<span>
{intl.formatMessage(t.reposted)}
</span>
</span>
</div>
)
}
export default hookForDev(NoteRepostHeader);

2
src/components/Note/NotificationNote/NotificationNote.module.scss
View File

@ -6,7 +6,7 @@
grid-template-areas: "content";
padding: 0px 16px 16px 0px;
border-radius: 4px;
// width: 640px;
// width: 600px;
// pointer-events: none;
.content {

Some files were not shown because too many files have changed in this diff Show More