Compare commits

..

1 commit

Author SHA1 Message Date
Krishan
a1568f3523 Replace deprecated 'set-output' with '$GITHUB_OUTPUT' 2022-11-08 20:51:56 +05:30
307 changed files with 23609 additions and 12528 deletions

View file

@ -1,2 +1,5 @@
webpack.common.js
webpack.dev.js
webpack.prod.js
experiment
node_modules

View file

@ -4,50 +4,25 @@ module.exports = {
es2021: true,
},
extends: [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"airbnb",
"prettier",
'plugin:react/recommended',
'airbnb',
],
parser: "@typescript-eslint/parser",
parserOptions: {
ecmaFeatures: {
jsx: true,
},
ecmaVersion: "latest",
sourceType: "module",
ecmaVersion: 12,
sourceType: 'module',
},
plugins: ["react", "@typescript-eslint"],
plugins: [
'react',
],
rules: {
"linebreak-style": 0,
"no-underscore-dangle": 0,
"import/prefer-default-export": "off",
"import/extensions": "off",
"import/no-unresolved": "off",
"import/no-extraneous-dependencies": [
"error",
{
devDependencies: true,
},
'linebreak-style': 0,
'no-underscore-dangle': 0,
'react/no-unstable-nested-components': [
'error',
{ allowAsProps: true },
],
"react/no-unstable-nested-components": ["error", { allowAsProps: true }],
"react/jsx-filename-extension": [
"error",
{
extensions: [".tsx", ".jsx"],
},
],
"react/require-default-props": "off",
"react/jsx-props-no-spreading": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"@typescript-eslint/no-unused-vars": "error",
},
};

View file

@ -1,9 +1,9 @@
<!-- Please read https://github.com/ajbura/cinny/blob/dev/CONTRIBUTING.md before submitting your pull request -->
### Description
<!-- Please include a summary of the change. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
Fixes #
#### Type of change

View file

@ -1,10 +1,13 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base", ":dependencyDashboardApproval"],
"labels": ["Dependencies"],
"extends": [
"config:base",
":dependencyDashboardApproval"
],
"labels": [ "Dependencies" ],
"packageRules": [
{
"matchUpdateTypes": ["lockFileMaintenance"]
"matchUpdateTypes": [ "lockFileMaintenance" ]
}
],
"lockFileMaintenance": { "enabled": true },

View file

@ -1,28 +1,26 @@
name: Build pull request
name: 'Build pull request'
on:
pull_request:
types: ["opened", "synchronize"]
types: ['opened', 'synchronize']
jobs:
build-pull-request:
name: Build pull request
name: 'Build pull request'
runs-on: ubuntu-latest
env:
PR_NUMBER: ${{github.event.number}}
steps:
- name: Checkout repository
uses: actions/checkout@v3.2.0
uses: actions/checkout@v3.1.0
- name: Setup node
uses: actions/setup-node@v3.5.1
with:
node-version: 18.12.1
cache: "npm"
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Build app
env:
NODE_OPTIONS: "--max_old_space_size=4096"
run: npm run build
- name: Upload artifact
uses: actions/upload-artifact@v3.1.1

View file

@ -1,36 +0,0 @@
name: "CLA Assistant"
on:
issue_comment:
types: [created]
pull_request_target:
types: [opened, closed, synchronize]
jobs:
CLAssistant:
runs-on: ubuntu-latest
steps:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
# Beta Release
uses: cla-assistant/github-action@v2.2.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# the below token should have repo scope and must be manually added by you in the repository's secret
PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_PAT }}
with:
path-to-signatures: "signatures.json"
path-to-document: "https://github.com/cinnyapp/cla/blob/main/cla.md" # e.g. a CLA or a DCO document
# branch should not be protected
branch: "main"
allowlist: ajbura,bot*
#below are the optional inputs - If the optional inputs are not given, then default values will be taken
remote-organization-name: cinnyapp
remote-repository-name: cla
#create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
#signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
#custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
#custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
#custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
#lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
#use-dco-flag: true - If you are using DCO instead of CLA

View file

@ -1,13 +1,11 @@
name: Deploy PR to Netlify
on:
workflow_run:
workflows: ["Build pull request"]
types: [completed]
jobs:
deploy-pull-request:
name: Deploy pull request
name: 'Deploy pull request'
runs-on: ubuntu-latest
permissions:
contents: read
@ -15,7 +13,7 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Download pr number
uses: dawidd6/action-download-artifact@e6e25ac3a2b93187502a8be1ef9e9603afc34925
uses: dawidd6/action-download-artifact@46b4ae883bf0726f5949d025d31cb62c7a5ac70c
with:
workflow: ${{ github.event.workflow.id }}
run_id: ${{ github.event.workflow_run.id }}
@ -24,7 +22,7 @@ jobs:
id: pr
run: echo "id=$(<pr.txt)" >> $GITHUB_OUTPUT
- name: Download artifact
uses: dawidd6/action-download-artifact@e6e25ac3a2b93187502a8be1ef9e9603afc34925
uses: dawidd6/action-download-artifact@46b4ae883bf0726f5949d025d31cb62c7a5ac70c
with:
workflow: ${{ github.event.workflow.id }}
run_id: ${{ github.event.workflow_run.id }}
@ -32,7 +30,7 @@ jobs:
path: dist
- name: Deploy to Netlify
id: netlify
uses: nwtgck/actions-netlify@5da65c9f74c7961c5501a3ba329b8d0912f39c03
uses: nwtgck/actions-netlify@ac1cb16858bada08a9c71a81240a85cfc3f72913
with:
publish-dir: dist
deploy-message: "Deploy PR ${{ steps.pr.outputs.id }}"
@ -42,15 +40,14 @@ jobs:
enable-commit-comment: false
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_PR_CINNY }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE3_ID }}
timeout-minutes: 1
- name: Comment preview on PR
uses: thollander/actions-comment-pull-request@c22fb302208b7b170d252a61a505d2ea27245eff
- name: Edit PR Description
uses: Beakyn/gha-comment-pull-request@2167a7aee24f9e61ce76a23039f322e49a990409
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
pr_number: ${{ steps.pr.outputs.id }}
comment_tag: ${{ steps.pr.outputs.id }}
message: |
pull-request-number: ${{ steps.pr.outputs.id }}
description-message: |
Preview: ${{ steps.netlify.outputs.deploy-url }}
⚠️ Exercise caution. Use test accounts. ⚠️

View file

@ -1,17 +1,17 @@
name: "Docker check"
name: 'Docker check'
on:
pull_request:
paths:
- "Dockerfile"
- ".github/workflows/docker-pr.yml"
- 'Dockerfile'
- '.github/workflows/docker-pr.yml'
jobs:
docker-build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3.2.0
uses: actions/checkout@v3.1.0
- name: Build Docker image
uses: docker/build-push-action@v3.2.0
with:

View file

@ -3,7 +3,7 @@ name: NPM Lockfile Changes
on:
pull_request:
paths:
- "package-lock.json"
- 'package-lock.json'
jobs:
lockfile_changes:
@ -14,7 +14,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@v3.2.0
uses: actions/checkout@v3.1.0
- name: NPM Lockfile Changes
uses: codepunkt/npm-lockfile-changes@b40543471c36394409466fdb277a73a0856d7891
with:

View file

@ -1,4 +1,4 @@
name: Deploy to Netlify (dev)
name: 'Deploy to Netlify (dev)'
on:
push:
@ -7,24 +7,22 @@ on:
jobs:
deploy-to-netlify:
name: Deploy to Netlify
name: 'Deploy to Netlify'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3.2.0
uses: actions/checkout@v3.1.0
- name: Setup node
uses: actions/setup-node@v3.5.1
with:
node-version: 18.12.1
cache: "npm"
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Build app
env:
NODE_OPTIONS: "--max_old_space_size=4096"
run: npm run build
- name: Deploy to Netlify
uses: nwtgck/actions-netlify@5da65c9f74c7961c5501a3ba329b8d0912f39c03
uses: nwtgck/actions-netlify@ac1cb16858bada08a9c71a81240a85cfc3f72913
with:
publish-dir: dist
deploy-message: "Dev deploy ${{ github.sha }}"
@ -32,8 +30,8 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
production-deploy: true
github-deployment-environment: nightly
github-deployment-description: "Nightly deployment on each commit to dev branch"
github-deployment-description: 'Nightly deployment on each commit to dev branch'
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_DEV }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE2_ID }}
timeout-minutes: 1

View file

@ -1,4 +1,4 @@
name: Production deploy
name: 'Production deploy'
on:
release:
@ -6,24 +6,22 @@ on:
jobs:
deploy-and-tarball:
name: Netlify deploy and tarball
name: 'Netlify deploy and tarball'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3.2.0
uses: actions/checkout@v3.1.0
- name: Setup node
uses: actions/setup-node@v3.5.1
with:
node-version: 18.12.1
cache: "npm"
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Build app
env:
NODE_OPTIONS: "--max_old_space_size=4096"
run: npm run build
- name: Deploy to Netlify
uses: nwtgck/actions-netlify@5da65c9f74c7961c5501a3ba329b8d0912f39c03
uses: nwtgck/actions-netlify@ac1cb16858bada08a9c71a81240a85cfc3f72913
with:
publish-dir: dist
deploy-message: "Prod deploy ${{ github.ref_name }}"
@ -31,14 +29,14 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
production-deploy: true
github-deployment-environment: stable
github-deployment-description: "Stable deployment on each release"
github-deployment-description: 'Stable deployment on each release'
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_APP }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
timeout-minutes: 1
- name: Get version from tag
id: vars
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
- name: Create tar.gz
run: tar -czvf cinny-${{ steps.vars.outputs.tag }}.tar.gz dist
- name: Sign tar.gz
@ -52,7 +50,7 @@ jobs:
gpg --export | xxd -p
echo '${{ secrets.GNUPG_PASSPHRASE }}' | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --armor --detach-sign cinny-${{ steps.vars.outputs.tag }}.tar.gz
- name: Upload tagged release
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
with:
files: |
cinny-${{ steps.vars.outputs.tag }}.tar.gz
@ -66,7 +64,7 @@ jobs:
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v3.2.0
uses: actions/checkout@v3.1.0
- name: Set up QEMU
uses: docker/setup-qemu-action@v2.1.0
- name: Set up Docker Buildx

View file

@ -1,6 +0,0 @@
dist
node_modules
package.json
package-lock.json
LICENSE
README.md

View file

@ -1,8 +0,0 @@
{
"tabWidth": 2,
"semi": true,
"useTabs": false,
"singleQuote": false,
"trailingComma": "es5",
"printWidth": 80
}

View file

@ -1,3 +0,0 @@
{
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
}

View file

@ -1,5 +0,0 @@
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"typescript.tsdk": "node_modules/typescript/lib"
}

View file

@ -5,7 +5,6 @@ First off, thanks for taking the time to contribute! ❤️
All types of contributions are encouraged and valued. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
>
> - Star the project
> - Tweet about it (tag @cinnyapp)
> - Refer this project in your project's readme
@ -19,7 +18,6 @@ Bug reports and feature suggestions must use descriptive and concise titles and
## Pull requests
> ### Legal Notice
>
> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
**NOTE: If you want to add new features, please discuss with maintainers before coding or opening a pull request.** This is to ensure that we are on same track and following our roadmap.
@ -28,9 +26,9 @@ Bug reports and feature suggestions must use descriptive and concise titles and
Example:
| Not ideal | Better |
| ----------------------------------- | --------------------------------------------- |
| Fixed markAllAsRead in RoomTimeline | Fix read marker when paginating room timeline |
|Not ideal|Better|
|---|----|
|Fixed markAllAsRead in RoomTimeline|Fix read marker when paginating room timeline|
It is not always possible to phrase every change in such a manner, but it is desired.
@ -41,7 +39,6 @@ Also, we use [ESLint](https://eslint.org/) for clean and stylistically consisten
**For any query or design discussion, join our [Matrix room](https://matrix.to/#/#cinny:matrix.org).**
## Helpful links
- [BEM methodology](http://getbem.com/introduction/)
- [Atomic design](https://bradfrost.com/blog/post/atomic-web-design/)
- [Matrix JavaScript SDK documentation](https://matrix-org.github.io/matrix-js-sdk/index.html)

View file

@ -1,17 +1,16 @@
## Builder
FROM node:18.12.1-alpine3.15 as builder
FROM node:18.12.0-alpine3.15 as builder
WORKDIR /src
COPY .npmrc package.json package-lock.json /src/
RUN npm ci
COPY . /src/
ENV NODE_OPTIONS=--max_old_space_size=4096
RUN npm run build
## App
FROM nginx:1.23.3-alpine
FROM nginx:1.23.2-alpine
COPY --from=builder /src/dist /app

682
LICENSE
View file

@ -1,661 +1,21 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.
MIT License
Copyright (c) 2021-present Ajay Bura (ajbura)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View file

@ -16,8 +16,6 @@ A Matrix client focusing primarily on simple, elegant and secure interface. The
- [Roadmap](https://github.com/ajbura/cinny/projects/11)
- [Contributing](./CONTRIBUTING.md)
<img align="center" src="https://raw.githubusercontent.com/cinnyapp/cinny-site/main/assets/preview2-light.png" height="380">
## Getting started
Web app is available at https://app.cinny.in and gets updated on each new release. The `dev` branch is continuously deployed at https://dev.cinny.in but keep in mind that it could have things broken.
@ -112,3 +110,12 @@ docker run -p 8080:80 cinny:latest
```
This will forward your `localhost` port 8080 to the container's port 80. You can visit the app in your browser by navigating to `http://localhost:8080`.
## License
Copyright (c) 2021-present Ajay Bura (ajbura)
Code licensed under the MIT License: <http://opensource.org/licenses/MIT>
Graphics licensed under CC-BY 4.0: <https://creativecommons.org/licenses/by/4.0/>

View file

@ -1,4 +0,0 @@
{
"schemaVersion": 2,
"dockerfilePath": "./Dockerfile"
}

View file

@ -1,107 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Cinny</title>
<meta name="name" content="Cinny" />
<meta name="author" content="Ajay Bura" />
<meta
name="description"
content="A Matrix client where you can enjoy the conversation using simple, elegant and secure interface protected by e2ee with the power of open source."
/>
<meta
name="keywords"
content="cinny, cinnyapp, cinnychat, matrix, matrix client, matrix.org, element"
/>
<meta property="og:title" content="Cinny" />
<meta property="og:url" content="https://cinny.in" />
<meta
property="og:image"
content="https://cinny.in/assets/favicon-48x48.png"
/>
<meta
property="og:description"
content="A Matrix client where you can enjoy the conversation using simple, elegant and secure interface protected by e2ee with the power of open source."
/>
<meta name="theme-color" content="#000000" />
<link id="favicon" rel="shortcut icon" href="./public/favicon.ico" />
<link rel="manifest" href="./manifest.json" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="application-name" content="Cinny" />
<meta name="apple-mobile-web-app-title" content="Cinny" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta
name="apple-mobile-web-app-status-bar-style"
content="black-translucent"
/>
<link
rel="apple-touch-icon"
sizes="57x57"
href="./public/res/apple/apple-touch-icon-57x57.png"
/>
<link
rel="apple-touch-icon"
sizes="60x60"
href="./public/res/apple/apple-touch-icon-60x60.png"
/>
<link
rel="apple-touch-icon"
sizes="72x72"
href="./public/res/apple/apple-touch-icon-72x72.png"
/>
<link
rel="apple-touch-icon"
sizes="76x76"
href="./public/res/apple/apple-touch-icon-76x76.png"
/>
<link
rel="apple-touch-icon"
sizes="114x114"
href="./public/res/apple/apple-touch-icon-114x114.png"
/>
<link
rel="apple-touch-icon"
sizes="120x120"
href="./public/res/apple/apple-touch-icon-120x120.png"
/>
<link
rel="apple-touch-icon"
sizes="144x144"
href="./public/res/apple/apple-touch-icon-144x144.png"
/>
<link
rel="apple-touch-icon"
sizes="152x152"
href="./public/res/apple/apple-touch-icon-152x152.png"
/>
<link
rel="apple-touch-icon"
sizes="167x167"
href="./public/res/apple/apple-touch-icon-167x167.png"
/>
<link
rel="apple-touch-icon"
sizes="180x180"
href="./public/res/apple/apple-touch-icon-180x180.png"
/>
</head>
<body id="appBody">
<script>
window.global ||= window;
</script>
<div id="root"></div>
<audio id="notificationSound">
<source src="./public/sound/notification.ogg" type="audio/ogg" />
</audio>
<audio id="inviteSound">
<source src="./public/sound/invite.ogg" type="audio/ogg" />
</audio>
<script type="module" src="./src/index.tsx"></script>
</body>
</html>

17140
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,30 +1,25 @@
{
"name": "cinny",
"version": "2.2.6",
"version": "2.2.2",
"description": "Yet another matrix client",
"main": "index.js",
"engines": {
"node": ">=16.0.0"
},
"scripts": {
"start": "vite",
"build": "vite build",
"lint": "npm run check:eslint && npm run check:prettier",
"check:eslint": "eslint src/*",
"check:prettier": "prettier --check .",
"fix:prettier": "prettier --write .",
"typecheck": "tsc --noEmit"
"start": "webpack serve --config ./webpack.dev.js --open",
"build": "webpack --config ./webpack.prod.js"
},
"keywords": [],
"author": "Ajay Bura",
"license": "AGPL-3.0-only",
"license": "MIT",
"dependencies": {
"@fontsource/inter": "4.5.14",
"@fontsource/roboto": "4.5.8",
"@khanacademy/simple-markdown": "0.8.6",
"@matrix-org/olm": "3.2.14",
"@khanacademy/simple-markdown": "0.8.5",
"@matrix-org/olm": "3.2.13",
"@tippyjs/react": "4.2.6",
"@types/flux": "3.1.11",
"babel-polyfill": "6.26.0",
"blurhash": "2.0.4",
"browser-encrypt-attachment": "0.3.0",
"dateformat": "5.0.3",
@ -33,10 +28,10 @@
"flux": "4.0.3",
"formik": "2.2.9",
"html-react-parser": "3.0.4",
"katex": "0.16.4",
"katex": "0.16.3",
"linkify-html": "4.0.2",
"linkifyjs": "4.0.2",
"matrix-js-sdk": "24.0.0",
"matrix-js-sdk": "21.0.1",
"prop-types": "15.8.1",
"react": "17.0.2",
"react-autosize-textarea": "7.1.0",
@ -46,34 +41,42 @@
"react-dom": "17.0.2",
"react-google-recaptcha": "2.1.0",
"react-modal": "3.16.1",
"sanitize-html": "2.8.0",
"sanitize-html": "2.7.3",
"tippy.js": "6.3.7",
"twemoji": "14.0.2"
},
"devDependencies": {
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
"@rollup/plugin-inject": "5.0.3",
"@rollup/plugin-wasm": "6.1.1",
"@types/dateformat": "5.0.0",
"@types/node": "18.11.18",
"@types/react": "18.0.26",
"@types/react-dom": "18.0.9",
"@typescript-eslint/eslint-plugin": "5.46.1",
"@typescript-eslint/parser": "5.46.1",
"@vitejs/plugin-react": "3.0.0",
"@babel/core": "7.20.2",
"@babel/preset-env": "7.20.2",
"@babel/preset-react": "7.18.6",
"assert": "2.0.0",
"babel-loader": "9.1.0",
"browserify-fs": "1.0.0",
"buffer": "6.0.3",
"eslint": "8.29.0",
"clean-webpack-plugin": "4.0.0",
"copy-webpack-plugin": "11.0.0",
"crypto-browserify": "3.12.0",
"css-loader": "6.7.1",
"css-minimizer-webpack-plugin": "4.2.2",
"eslint": "8.27.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jsx-a11y": "6.6.1",
"eslint-plugin-react": "7.31.11",
"eslint-plugin-react": "7.31.10",
"eslint-plugin-react-hooks": "4.6.0",
"mini-svg-data-uri": "1.4.4",
"prettier": "2.8.1",
"sass": "1.56.2",
"typescript": "4.9.4",
"vite": "4.0.1",
"vite-plugin-static-copy": "0.13.0"
"html-loader": "4.2.0",
"html-webpack-plugin": "5.5.0",
"mini-css-extract-plugin": "2.6.1",
"path-browserify": "1.0.1",
"sass": "1.56.0",
"sass-loader": "13.1.0",
"stream-browserify": "3.0.0",
"style-loader": "3.3.1",
"url": "0.11.0",
"util": "0.12.5",
"webpack": "5.74.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.11.1",
"webpack-merge": "5.8.0"
}
}

50
public/index.html Normal file
View file

@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Cinny</title>
<meta name="name" content="Cinny">
<meta name="author" content="Ajay Bura">
<meta name="description" content="A Matrix client where you can enjoy the conversation using simple, elegant and secure interface protected by e2ee with the power of open source.">
<meta name="keywords" content="cinny, cinnyapp, cinnychat, matrix, matrix client, matrix.org, element">
<meta property="og:title" content="Cinny">
<meta property="og:url" content="https://cinny.in">
<meta property="og:image" content="https://cinny.in/assets/favicon-48x48.png">
<meta property="og:description" content="A Matrix client where you can enjoy the conversation using simple, elegant and secure interface protected by e2ee with the power of open source.">
<meta name="theme-color" content="#000000">
<link id="favicon" rel="shortcut icon" href="./favicon.ico" />
<link rel="manifest" href="./manifest.json" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="application-name" content="Cinny" />
<meta name="apple-mobile-web-app-title" content="Cinny" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<link rel="apple-touch-icon" sizes="57x57" href="./res/apple/apple-touch-icon-57x57.png"/>
<link rel="apple-touch-icon" sizes="60x60" href="./res/apple/apple-touch-icon-60x60.png"/>
<link rel="apple-touch-icon" sizes="72x72" href="./res/apple/apple-touch-icon-72x72.png"/>
<link rel="apple-touch-icon" sizes="76x76" href="./res/apple/apple-touch-icon-76x76.png"/>
<link rel="apple-touch-icon" sizes="114x114" href="./res/apple/apple-touch-icon-114x114.png"/>
<link rel="apple-touch-icon" sizes="120x120" href="./res/apple/apple-touch-icon-120x120.png"/>
<link rel="apple-touch-icon" sizes="144x144" href="./res/apple/apple-touch-icon-144x144.png"/>
<link rel="apple-touch-icon" sizes="152x152" href="./res/apple/apple-touch-icon-152x152.png"/>
<link rel="apple-touch-icon" sizes="167x167" href="./res/apple/apple-touch-icon-167x167.png"/>
<link rel="apple-touch-icon" sizes="180x180" href="./res/apple/apple-touch-icon-180x180.png"/>
</head>
<body id="appBody">
<div id="root"></div>
<audio id="notificationSound">
<source src="./sound/notification.ogg" type="audio/ogg" />
</audio>
<audio id="inviteSound">
<source src="./sound/invite.ogg" type="audio/ogg" />
</audio>
</body>
</html>

View file

@ -11,47 +11,47 @@
"theme_color": "#fff",
"icons": [
{
"src": "/public/android/android-chrome-36x36.png",
"src": "android-chrome-36x36.png",
"sizes": "36x36",
"type": "image/png"
},
{
"src": "/public/android/android-chrome-48x48.png",
"src": "android-chrome-48x48.png",
"sizes": "48x48",
"type": "image/png"
},
{
"src": "/public/android/android-chrome-72x72.png",
"src": "android-chrome-72x72.png",
"sizes": "72x72",
"type": "image/png"
},
{
"src": "/public/android/android-chrome-96x96.png",
"src": "android-chrome-96x96.png",
"sizes": "96x96",
"type": "image/png"
},
{
"src": "/public/android/android-chrome-144x144.png",
"src": "android-chrome-144x144.png",
"sizes": "144x144",
"type": "image/png"
},
{
"src": "/public/android/android-chrome-192x192.png",
"src": "android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/public/android/android-chrome-256x256.png",
"src": "android-chrome-256x256.png",
"sizes": "256x256",
"type": "image/png"
},
{
"src": "/public/android/android-chrome-384x384.png",
"src": "android-chrome-384x384.png",
"sizes": "384x384",
"type": "image/png"
},
{
"src": "/public/android/android-chrome-512x512.png",
"src": "android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}

395
public/res/LICENSE Normal file
View file

@ -0,0 +1,395 @@
Attribution 4.0 International
=======================================================================
Creative Commons Corporation ("Creative Commons") is not a law firm and
does not provide legal services or legal advice. Distribution of
Creative Commons public licenses does not create a lawyer-client or
other relationship. Creative Commons makes its licenses and related
information available on an "as-is" basis. Creative Commons gives no
warranties regarding its licenses, any material licensed under their
terms and conditions, or any related information. Creative Commons
disclaims all liability for damages resulting from their use to the
fullest extent possible.
Using Creative Commons Public Licenses
Creative Commons public licenses provide a standard set of terms and
conditions that creators and other rights holders may use to share
original works of authorship and other material subject to copyright
and certain other rights specified in the public license below. The
following considerations are for informational purposes only, are not
exhaustive, and do not form part of our licenses.
Considerations for licensors: Our public licenses are
intended for use by those authorized to give the public
permission to use material in ways otherwise restricted by
copyright and certain other rights. Our licenses are
irrevocable. Licensors should read and understand the terms
and conditions of the license they choose before applying it.
Licensors should also secure all rights necessary before
applying our licenses so that the public can reuse the
material as expected. Licensors should clearly mark any
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
wiki.creativecommons.org/Considerations_for_licensors
Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
licensed material under specified terms and conditions. If
the licensor's permission is not necessary for any reason--for
example, because of any applicable exception or limitation to
copyright--then that use is not regulated by the license. Our
licenses grant only permissions under copyright and certain
other rights that a licensor has authority to grant. Use of
the licensed material may still be restricted for other
reasons, including because others have copyright or other
rights in the material. A licensor may make special requests,
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More considerations
for the public:
wiki.creativecommons.org/Considerations_for_licensees
=======================================================================
Creative Commons Attribution 4.0 International Public License
By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
Attribution 4.0 International Public License ("Public License"). To the
extent this Public License may be interpreted as a contract, You are
granted the Licensed Rights in consideration of Your acceptance of
these terms and conditions, and the Licensor grants You such rights in
consideration of benefits the Licensor receives from making the
Licensed Material available under these terms and conditions.
Section 1 -- Definitions.
a. Adapted Material means material subject to Copyright and Similar
Rights that is derived from or based upon the Licensed Material
and in which the Licensed Material is translated, altered,
arranged, transformed, or otherwise modified in a manner requiring
permission under the Copyright and Similar Rights held by the
Licensor. For purposes of this Public License, where the Licensed
Material is a musical work, performance, or sound recording,
Adapted Material is always produced where the Licensed Material is
synched in timed relation with a moving image.
b. Adapter's License means the license You apply to Your Copyright
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.
c. Copyright and Similar Rights means copyright and/or similar rights
closely related to copyright including, without limitation,
performance, broadcast, sound recording, and Sui Generis Database
Rights, without regard to how the rights are labeled or
categorized. For purposes of this Public License, the rights
specified in Section 2(b)(1)-(2) are not Copyright and Similar
Rights.
d. Effective Technological Measures means those measures that, in the
absence of proper authority, may not be circumvented under laws
fulfilling obligations under Article 11 of the WIPO Copyright
Treaty adopted on December 20, 1996, and/or similar international
agreements.
e. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.
f. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
License.
g. Licensed Rights means the rights granted to You subject to the
terms and conditions of this Public License, which are limited to
all Copyright and Similar Rights that apply to Your use of the
Licensed Material and that the Licensor has authority to license.
h. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.
i. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.
j. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.
k. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.
Section 2 -- Scope.
a. License grant.
1. Subject to the terms and conditions of this Public License,
the Licensor hereby grants You a worldwide, royalty-free,
non-sublicensable, non-exclusive, irrevocable license to
exercise the Licensed Rights in the Licensed Material to:
a. reproduce and Share the Licensed Material, in whole or
in part; and
b. produce, reproduce, and Share Adapted Material.
2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
License does not apply, and You do not need to comply with
its terms and conditions.
3. Term. The term of this Public License is specified in Section
6(a).
4. Media and formats; technical modifications allowed. The
Licensor authorizes You to exercise the Licensed Rights in
all media and formats whether now known or hereafter created,
and to make technical modifications necessary to do so. The
Licensor waives and/or agrees not to assert any right or
authority to forbid You from making technical modifications
necessary to exercise the Licensed Rights, including
technical modifications necessary to circumvent Effective
Technological Measures. For purposes of this Public License,
simply making modifications authorized by this Section 2(a)
(4) never produces Adapted Material.
5. Downstream recipients.
a. Offer from the Licensor -- Licensed Material. Every
recipient of the Licensed Material automatically
receives an offer from the Licensor to exercise the
Licensed Rights under the terms and conditions of this
Public License.
b. No downstream restrictions. You may not offer or impose
any additional or different terms or conditions on, or
apply any Effective Technological Measures to, the
Licensed Material if doing so restricts exercise of the
Licensed Rights by any recipient of the Licensed
Material.
6. No endorsement. Nothing in this Public License constitutes or
may be construed as permission to assert or imply that You
are, or that Your use of the Licensed Material is, connected
with, or sponsored, endorsed, or granted official status by,
the Licensor or others designated to receive attribution as
provided in Section 3(a)(1)(A)(i).
b. Other rights.
1. Moral rights, such as the right of integrity, are not
licensed under this Public License, nor are publicity,
privacy, and/or other similar personality rights; however, to
the extent possible, the Licensor waives and/or agrees not to
assert any such rights held by the Licensor to the limited
extent necessary to allow You to exercise the Licensed
Rights, but not otherwise.
2. Patent and trademark rights are not licensed under this
Public License.
3. To the extent possible, the Licensor waives any right to
collect royalties from You for the exercise of the Licensed
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
reserves any right to collect such royalties.
Section 3 -- License Conditions.
Your exercise of the Licensed Rights is expressly made subject to the
following conditions.
a. Attribution.
1. If You Share the Licensed Material (including in modified
form), You must:
a. retain the following if it is supplied by the Licensor
with the Licensed Material:
i. identification of the creator(s) of the Licensed
Material and any others designated to receive
attribution, in any reasonable manner requested by
the Licensor (including by pseudonym if
designated);
ii. a copyright notice;
iii. a notice that refers to this Public License;
iv. a notice that refers to the disclaimer of
warranties;
v. a URI or hyperlink to the Licensed Material to the
extent reasonably practicable;
b. indicate if You modified the Licensed Material and
retain an indication of any previous modifications; and
c. indicate the Licensed Material is licensed under this
Public License, and include the text of, or the URI or
hyperlink to, this Public License.
2. You may satisfy the conditions in Section 3(a)(1) in any
reasonable manner based on the medium, means, and context in
which You Share the Licensed Material. For example, it may be
reasonable to satisfy the conditions by providing a URI or
hyperlink to a resource that includes the required
information.
3. If requested by the Licensor, You must remove any of the
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.
4. If You Share Adapted Material You produce, the Adapter's
License You apply must not prevent recipients of the Adapted
Material from complying with this Public License.
Section 4 -- Sui Generis Database Rights.
Where the Licensed Rights include Sui Generis Database Rights that
apply to Your use of the Licensed Material:
a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
portion of the contents of the database;
b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
Rights (but not its individual contents) is Adapted Material; and
c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
For the avoidance of doubt, this Section 4 supplements and does not
replace Your obligations under this Public License where the Licensed
Rights include other Copyright and Similar Rights.
Section 5 -- Disclaimer of Warranties and Limitation of Liability.
a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
c. The disclaimer of warranties and limitation of liability provided
above shall be interpreted in a manner that, to the extent
possible, most closely approximates an absolute disclaimer and
waiver of all liability.
Section 6 -- Term and Termination.
a. This Public License applies for the term of the Copyright and
Similar Rights licensed here. However, if You fail to comply with
this Public License, then Your rights under this Public License
terminate automatically.
b. Where Your right to use the Licensed Material has terminated under
Section 6(a), it reinstates:
1. automatically as of the date the violation is cured, provided
it is cured within 30 days of Your discovery of the
violation; or
2. upon express reinstatement by the Licensor.
For the avoidance of doubt, this Section 6(b) does not affect any
right the Licensor may have to seek remedies for Your violations
of this Public License.
c. For the avoidance of doubt, the Licensor may also offer the
Licensed Material under separate terms or conditions or stop
distributing the Licensed Material at any time; however, doing so
will not terminate this Public License.
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
License.
Section 7 -- Other Terms and Conditions.
a. The Licensor shall not be bound by any additional or different
terms or conditions communicated by You unless expressly agreed.
b. Any arrangements, understandings, or agreements regarding the
Licensed Material not stated herein are separate from and
independent of the terms and conditions of this Public License.
Section 8 -- Interpretation.
a. For the avoidance of doubt, this Public License does not, and
shall not be interpreted to, reduce, limit, restrict, or impose
conditions on any use of the Licensed Material that could lawfully
be made without permission under this Public License.
b. To the extent possible, if any provision of this Public License is
deemed unenforceable, it shall be automatically reformed to the
minimum extent necessary to make it enforceable. If the provision
cannot be reformed, it shall be severed from this Public License
without affecting the enforceability of the remaining terms and
conditions.
c. No term or condition of this Public License will be waived and no
failure to comply consented to unless expressly agreed to by the
Licensor.
d. Nothing in this Public License constitutes or may be interpreted
as a limitation upon, or waiver of, any privileges and immunities
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.
=======================================================================
Creative Commons is not a party to its public
licenses. Notwithstanding, Creative Commons may elect to apply one of
its public licenses to material it publishes and in those instances
will be considered the “Licensor.” The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
the avoidance of doubt, this paragraph does not form part of the
public licenses.
Creative Commons may be contacted at creativecommons.org.

7
public/res/README.md Normal file
View file

@ -0,0 +1,7 @@
Copyright (c) 2021-present Ajay Bura (ajbura)
Graphic content is licensed under a
Creative Commons Attribution 4.0 International License.
You should have received a copy of the license along with this
work. If not, see <http://creativecommons.org/licenses/by/4.0/>;.

View file

@ -1,69 +1,64 @@
import React from "react";
import PropTypes from "prop-types";
import "./Avatar.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Avatar.scss';
import { twemojify } from "../../../util/twemojify";
import { twemojify } from '../../../util/twemojify';
import Text from "../text/Text";
import RawIcon from "../system-icons/RawIcon";
import Text from '../text/Text';
import RawIcon from '../system-icons/RawIcon';
import ImageBrokenSVG from "../../../../public/res/svg/image-broken.svg";
import { avatarInitials } from "../../../util/common";
import ImageBrokenSVG from '../../../../public/res/svg/image-broken.svg';
import { avatarInitials } from '../../../util/common';
const Avatar = React.forwardRef(
({ text, bgColor, iconSrc, iconColor, imageSrc, size }, ref) => {
let textSize = "s1";
if (size === "large") textSize = "h1";
if (size === "small") textSize = "b1";
if (size === "extra-small") textSize = "b3";
const Avatar = React.forwardRef(({
text, bgColor, iconSrc, iconColor, imageSrc, size,
}, ref) => {
let textSize = 's1';
if (size === 'large') textSize = 'h1';
if (size === 'small') textSize = 'b1';
if (size === 'extra-small') textSize = 'b3';
return (
<div
ref={ref}
className={`avatar-container avatar-container__${size} noselect`}
>
{imageSrc !== null ? (
<div ref={ref} className={`avatar-container avatar-container__${size} noselect`}>
{
imageSrc !== null
? (
<img
draggable="false"
src={imageSrc}
onLoad={(e) => {
e.target.style.backgroundColor = "transparent";
}}
onError={(e) => {
e.target.src = ImageBrokenSVG;
}}
onLoad={(e) => { e.target.style.backgroundColor = 'transparent'; }}
onError={(e) => { e.target.src = ImageBrokenSVG; }}
alt=""
/>
) : (
)
: (
<span
style={{
backgroundColor: iconSrc === null ? bgColor : "transparent",
}}
className={`avatar__border${iconSrc !== null ? "--active" : ""}`}
style={{ backgroundColor: iconSrc === null ? bgColor : 'transparent' }}
className={`avatar__border${iconSrc !== null ? '--active' : ''}`}
>
{iconSrc !== null ? (
<RawIcon size={size} src={iconSrc} color={iconColor} />
) : (
text !== null && (
{
iconSrc !== null
? <RawIcon size={size} src={iconSrc} color={iconColor} />
: text !== null && (
<Text variant={textSize} primary>
{twemojify(avatarInitials(text))}
</Text>
)
)}
}
</span>
)}
)
}
</div>
);
}
);
});
Avatar.defaultProps = {
text: null,
bgColor: "transparent",
bgColor: 'transparent',
iconSrc: null,
iconColor: null,
imageSrc: null,
size: "normal",
size: 'normal',
};
Avatar.propTypes = {
@ -72,7 +67,7 @@ Avatar.propTypes = {
iconSrc: PropTypes.string,
iconColor: PropTypes.string,
imageSrc: PropTypes.string,
size: PropTypes.oneOf(["large", "normal", "small", "extra-small"]),
size: PropTypes.oneOf(['large', 'normal', 'small', 'extra-small']),
};
export default Avatar;

View file

@ -1,4 +1,4 @@
@use "../../partials/flex";
@use '../../partials/flex';
.avatar-container {
display: inline-flex;

View file

@ -1,20 +1,15 @@
import { avatarInitials, cssVar } from "../../../util/common";
import { avatarInitials, cssVar } from '../../../util/common';
// renders the avatar and returns it as an URL
export default async function renderAvatar({
text,
bgColor,
imageSrc,
size,
borderRadius,
scale,
text, bgColor, imageSrc, size, borderRadius, scale,
}) {
try {
const canvas = document.createElement("canvas");
const canvas = document.createElement('canvas');
canvas.width = size * scale;
canvas.height = size * scale;
const ctx = canvas.getContext("2d");
const ctx = canvas.getContext('2d');
ctx.scale(scale, scale);
@ -32,7 +27,7 @@ export default async function renderAvatar({
ctx.clip();
const img = new Image();
img.crossOrigin = "anonymous";
img.crossOrigin = 'anonymous';
const promise = new Promise((resolve, reject) => {
img.onerror = reject;
img.onload = resolve;
@ -47,10 +42,10 @@ export default async function renderAvatar({
ctx.fill();
// centered letter
ctx.fillStyle = "#fff";
ctx.font = `${cssVar("--fs-s1")} ${cssVar("--font-primary")}`;
ctx.textBaseline = "middle";
ctx.textAlign = "center";
ctx.fillStyle = '#fff';
ctx.font = `${cssVar('--fs-s1')} ${cssVar('--font-primary')}`;
ctx.textBaseline = 'middle';
ctx.textAlign = 'center';
ctx.fillText(avatarInitials(text), size / 2, size / 2);
}

View file

@ -1,18 +1,14 @@
import React from "react";
import PropTypes from "prop-types";
import "./NotificationBadge.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './NotificationBadge.scss';
import Text from "../text/Text";
import Text from '../text/Text';
function NotificationBadge({ alert, content }) {
const notificationClass = alert ? " notification-badge--alert" : "";
const notificationClass = alert ? ' notification-badge--alert' : '';
return (
<div className={`notification-badge${notificationClass}`}>
{content !== null && (
<Text variant="b3" weight="bold">
{content}
</Text>
)}
{content !== null && <Text variant="b3" weight="bold">{content}</Text>}
</div>
);
}
@ -24,7 +20,10 @@ NotificationBadge.defaultProps = {
NotificationBadge.propTypes = {
alert: PropTypes.bool,
content: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
content: PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
]),
};
export default NotificationBadge;

View file

@ -1,24 +1,21 @@
import React from "react";
import PropTypes from "prop-types";
import "./Button.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Button.scss';
import Text from "../text/Text";
import RawIcon from "../system-icons/RawIcon";
import { blurOnBubbling } from "./script";
import Text from '../text/Text';
import RawIcon from '../system-icons/RawIcon';
import { blurOnBubbling } from './script';
const Button = React.forwardRef(
(
{ id, className, variant, iconSrc, type, onClick, children, disabled },
ref
) => {
const iconClass = iconSrc === null ? "" : `btn-${variant}--icon`;
const Button = React.forwardRef(({
id, className, variant, iconSrc,
type, onClick, children, disabled,
}, ref) => {
const iconClass = (iconSrc === null) ? '' : `btn-${variant}--icon`;
return (
<button
ref={ref}
id={id === "" ? undefined : id}
className={`${
className ? `${className} ` : ""
}btn-${variant} ${iconClass} noselect`}
id={id === '' ? undefined : id}
className={`${className ? `${className} ` : ''}btn-${variant} ${iconClass} noselect`}
onMouseUp={(e) => blurOnBubbling(e, `.btn-${variant}`)}
onClick={onClick}
// eslint-disable-next-line react/button-has-type
@ -26,19 +23,18 @@ const Button = React.forwardRef(
disabled={disabled}
>
{iconSrc !== null && <RawIcon size="small" src={iconSrc} />}
{typeof children === "string" && <Text variant="b1">{children}</Text>}
{typeof children !== "string" && children}
{typeof children === 'string' && <Text variant="b1">{ children }</Text>}
{typeof children !== 'string' && children }
</button>
);
}
);
});
Button.defaultProps = {
id: "",
id: '',
className: null,
variant: "surface",
variant: 'surface',
iconSrc: null,
type: "button",
type: 'button',
onClick: null,
disabled: false,
};
@ -46,15 +42,9 @@ Button.defaultProps = {
Button.propTypes = {
id: PropTypes.string,
className: PropTypes.string,
variant: PropTypes.oneOf([
"surface",
"primary",
"positive",
"caution",
"danger",
]),
variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
iconSrc: PropTypes.string,
type: PropTypes.oneOf(["button", "submit", "reset"]),
type: PropTypes.oneOf(['button', 'submit', 'reset']),
onClick: PropTypes.func,
children: PropTypes.node.isRequired,
disabled: PropTypes.bool,

View file

@ -1,6 +1,6 @@
@use "state";
@use "../../partials/dir";
@use "../../partials/text";
@use 'state';
@use '../../partials/dir';
@use '../../partials/text';
.btn-surface,
.btn-primary,
@ -25,6 +25,7 @@
&--icon {
@include dir.side(padding, var(--sp-tight), var(--sp-loose));
}
.ic-raw {
@include dir.side(margin, 0, var(--sp-extra-tight));
@ -41,6 +42,7 @@
}
}
.btn-surface {
box-shadow: var(--bs-surface-border);
@include color(var(--tc-surface-high), var(--ic-surface-normal));

View file

@ -1,11 +1,12 @@
import React from "react";
import PropTypes from "prop-types";
import "./Checkbox.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Checkbox.scss';
function Checkbox({ variant, isActive, onToggle, disabled, tabIndex }) {
const className = `checkbox checkbox-${variant}${
isActive ? " checkbox--active" : ""
}`;
function Checkbox({
variant, isActive, onToggle,
disabled, tabIndex,
}) {
const className = `checkbox checkbox-${variant}${isActive ? ' checkbox--active' : ''}`;
if (onToggle === null) return <span className={className} />;
return (
// eslint-disable-next-line jsx-a11y/control-has-associated-label
@ -20,7 +21,7 @@ function Checkbox({ variant, isActive, onToggle, disabled, tabIndex }) {
}
Checkbox.defaultProps = {
variant: "primary",
variant: 'primary',
isActive: false,
onToggle: null,
disabled: false,
@ -28,7 +29,7 @@ Checkbox.defaultProps = {
};
Checkbox.propTypes = {
variant: PropTypes.oneOf(["primary", "positive", "caution", "danger"]),
variant: PropTypes.oneOf(['primary', 'positive', 'caution', 'danger']),
isActive: PropTypes.bool,
onToggle: PropTypes.func,
disabled: PropTypes.bool,

View file

@ -1,5 +1,5 @@
@use "../../partials/flex";
@use "./state";
@use '../../partials/flex';
@use './state';
.checkbox {
width: 20px;

View file

@ -1,29 +1,18 @@
import React from "react";
import PropTypes from "prop-types";
import "./IconButton.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './IconButton.scss';
import RawIcon from "../system-icons/RawIcon";
import Tooltip from "../tooltip/Tooltip";
import { blurOnBubbling } from "./script";
import Text from "../text/Text";
import RawIcon from '../system-icons/RawIcon';
import Tooltip from '../tooltip/Tooltip';
import { blurOnBubbling } from './script';
import Text from '../text/Text';
const IconButton = React.forwardRef(
(
{
variant,
size,
type,
tooltip,
tooltipPlacement,
src,
onClick,
tabIndex,
disabled,
isImage,
const IconButton = React.forwardRef(({
variant, size, type,
tooltip, tooltipPlacement, src,
onClick, tabIndex, disabled, isImage,
className,
},
ref
) => {
}, ref) => {
const btn = (
<button
ref={ref}
@ -47,34 +36,27 @@ const IconButton = React.forwardRef(
{btn}
</Tooltip>
);
}
);
});
IconButton.defaultProps = {
variant: "surface",
size: "normal",
type: "button",
variant: 'surface',
size: 'normal',
type: 'button',
tooltip: null,
tooltipPlacement: "top",
tooltipPlacement: 'top',
onClick: null,
tabIndex: 0,
disabled: false,
isImage: false,
className: "",
className: '',
};
IconButton.propTypes = {
variant: PropTypes.oneOf([
"surface",
"primary",
"positive",
"caution",
"danger",
]),
size: PropTypes.oneOf(["normal", "small", "extra-small"]),
type: PropTypes.oneOf(["button", "submit", "reset"]),
variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
size: PropTypes.oneOf(['normal', 'small', 'extra-small']),
type: PropTypes.oneOf(['button', 'submit', 'reset']),
tooltip: PropTypes.string,
tooltipPlacement: PropTypes.oneOf(["top", "right", "bottom", "left"]),
tooltipPlacement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
src: PropTypes.string.isRequired,
onClick: PropTypes.func,
tabIndex: PropTypes.number,

View file

@ -1,4 +1,4 @@
@use "state";
@use 'state';
.ic-btn {
padding: var(--sp-extra-tight);

View file

@ -1,17 +1,14 @@
import React from "react";
import PropTypes from "prop-types";
import "./RadioButton.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './RadioButton.scss';
function RadioButton({ isActive, onToggle, disabled }) {
if (onToggle === null)
return (
<span className={`radio-btn${isActive ? " radio-btn--active" : ""}`} />
);
if (onToggle === null) return <span className={`radio-btn${isActive ? ' radio-btn--active' : ''}`} />;
return (
// eslint-disable-next-line jsx-a11y/control-has-associated-label
<button
onClick={() => onToggle(!isActive)}
className={`radio-btn${isActive ? " radio-btn--active" : ""}`}
className={`radio-btn${isActive ? ' radio-btn--active' : ''}`}
type="button"
disabled={disabled}
/>

View file

@ -1,5 +1,5 @@
@use "../../partials/flex";
@use "./state";
@use '../../partials/flex';
@use './state';
.radio-btn {
@extend .cp-fx__row--c-c;
@ -12,7 +12,7 @@
@include state.disabled;
&::before {
content: "";
content: '';
display: inline-block;
width: 12px;
height: 12px;

View file

@ -1,9 +1,9 @@
import React from "react";
import PropTypes from "prop-types";
import "./Toggle.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Toggle.scss';
function Toggle({ isActive, onToggle, disabled }) {
const className = `toggle${isActive ? " toggle--active" : ""}`;
const className = `toggle${isActive ? ' toggle--active' : ''}`;
if (onToggle === null) return <span className={className} />;
return (
// eslint-disable-next-line jsx-a11y/control-has-associated-label

View file

@ -1,5 +1,5 @@
@use "../../partials/dir";
@use "./state";
@use '../../partials/dir';
@use './state';
.toggle {
width: 44px;
@ -16,13 +16,14 @@
transition: background 200ms ease-in-out;
&::before {
content: "";
content: '';
display: inline-block;
width: 16px;
height: 16px;
background-color: var(--tc-surface-low);
border-radius: calc(var(--bo-radius) / 2);
transition: transform 200ms ease-in-out, opacity 200ms ease-in-out;
transition: transform 200ms ease-in-out,
opacity 200ms ease-in-out;
opacity: 0.6;
}

View file

@ -1,3 +1,4 @@
@mixin hover($color) {
@media (hover: hover) {
&:hover {

View file

@ -10,10 +10,7 @@ function blurOnBubbling(e, selector) {
for (let elIndex = 0; elIndex < bubblingPath.length; elIndex += 1) {
if (bubblingPath[elIndex] === document) {
console.warn(
blurOnBubbling,
"blurOnBubbling: not found selector in bubbling path"
);
console.warn(blurOnBubbling, 'blurOnBubbling: not found selector in bubbling path');
break;
}
if (bubblingPath[elIndex].matches(selector)) {

View file

@ -1,28 +1,24 @@
import React from "react";
import PropTypes from "prop-types";
import "./InfoCard.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './InfoCard.scss';
import Text from "../text/Text";
import RawIcon from "../system-icons/RawIcon";
import IconButton from "../button/IconButton";
import Text from '../text/Text';
import RawIcon from '../system-icons/RawIcon';
import IconButton from '../button/IconButton';
import CrossIC from "../../../../public/res/ic/outlined/cross.svg";
import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
function InfoCard({
className,
style,
variant,
iconSrc,
title,
content,
rounded,
requestClose,
className, style,
variant, iconSrc,
title, content,
rounded, requestClose,
}) {
const classes = [`info-card info-card--${variant}`];
if (rounded) classes.push("info-card--rounded");
if (rounded) classes.push('info-card--rounded');
if (className) classes.push(className);
return (
<div className={classes.join(" ")} style={style}>
<div className={classes.join(' ')} style={style}>
{iconSrc && (
<div className="info-card__icon">
<RawIcon color={`var(--ic-${variant}-high)`} src={iconSrc} />
@ -42,7 +38,7 @@ function InfoCard({
InfoCard.defaultProps = {
className: null,
style: null,
variant: "surface",
variant: 'surface',
iconSrc: null,
content: null,
rounded: false,
@ -52,13 +48,7 @@ InfoCard.defaultProps = {
InfoCard.propTypes = {
className: PropTypes.string,
style: PropTypes.shape({}),
variant: PropTypes.oneOf([
"surface",
"primary",
"positive",
"caution",
"danger",
]),
variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
iconSrc: PropTypes.string,
title: PropTypes.string.isRequired,
content: PropTypes.node,

View file

@ -1,5 +1,5 @@
@use ".././../partials/flex";
@use ".././../partials/dir";
@use '.././../partials/flex';
@use '.././../partials/dir';
.info-card {
display: flex;
@ -34,6 +34,7 @@
&--surface {
border-color: var(--bg-surface-border);
background-color: var(--bg-surface-hover);
}
&--primary {
border-color: var(--bg-primary);

View file

@ -1,17 +1,18 @@
import React from "react";
import PropTypes from "prop-types";
import "./Chip.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Chip.scss';
import Text from "../text/Text";
import RawIcon from "../system-icons/RawIcon";
import Text from '../text/Text';
import RawIcon from '../system-icons/RawIcon';
function Chip({ iconSrc, iconColor, text, children, onClick }) {
function Chip({
iconSrc, iconColor, text, children,
onClick,
}) {
return (
<button className="chip" type="button" onClick={onClick}>
{iconSrc != null && (
<RawIcon src={iconSrc} color={iconColor} size="extra-small" />
)}
{text != null && text !== "" && <Text variant="b3">{text}</Text>}
{iconSrc != null && <RawIcon src={iconSrc} color={iconColor} size="extra-small" />}
{(text != null && text !== '') && <Text variant="b3">{text}</Text>}
{children}
</button>
);

View file

@ -1,4 +1,4 @@
@use "../../partials/dir";
@use '../../partials/dir';
.chip {
padding: var(--sp-ultra-tight) var(--sp-extra-tight);

View file

@ -1,15 +1,17 @@
import React, { useState, useEffect } from "react";
import PropTypes from "prop-types";
import "./ContextMenu.scss";
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import './ContextMenu.scss';
import Tippy from "@tippyjs/react";
import "tippy.js/animations/scale-extreme.css";
import Tippy from '@tippyjs/react';
import 'tippy.js/animations/scale-extreme.css';
import Text from "../text/Text";
import Button from "../button/Button";
import ScrollView from "../scroll/ScrollView";
import Text from '../text/Text';
import Button from '../button/Button';
import ScrollView from '../scroll/ScrollView';
function ContextMenu({ content, placement, maxWidth, render, afterToggle }) {
function ContextMenu({
content, placement, maxWidth, render, afterToggle,
}) {
const [isVisible, setVisibility] = useState(false);
const showMenu = () => setVisibility(true);
const hideMenu = () => setVisibility(false);
@ -24,11 +26,7 @@ function ContextMenu({ content, placement, maxWidth, render, afterToggle }) {
className="context-menu"
visible={isVisible}
onClickOutside={hideMenu}
content={
<ScrollView invisible>
{typeof content === "function" ? content(hideMenu) : content}
</ScrollView>
}
content={<ScrollView invisible>{typeof content === 'function' ? content(hideMenu) : content}</ScrollView>}
placement={placement}
interactive
arrow={false}
@ -41,15 +39,21 @@ function ContextMenu({ content, placement, maxWidth, render, afterToggle }) {
}
ContextMenu.defaultProps = {
maxWidth: "unset",
placement: "right",
maxWidth: 'unset',
placement: 'right',
afterToggle: null,
};
ContextMenu.propTypes = {
content: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
placement: PropTypes.oneOf(["top", "right", "bottom", "left"]),
maxWidth: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
content: PropTypes.oneOfType([
PropTypes.node,
PropTypes.func,
]).isRequired,
placement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
maxWidth: PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
]),
render: PropTypes.func.isRequired,
afterToggle: PropTypes.func,
};
@ -57,7 +61,7 @@ ContextMenu.propTypes = {
function MenuHeader({ children }) {
return (
<div className="context-menu__header">
<Text variant="b3">{children}</Text>
<Text variant="b3">{ children }</Text>
</div>
);
}
@ -66,7 +70,10 @@ MenuHeader.propTypes = {
children: PropTypes.node.isRequired,
};
function MenuItem({ variant, iconSrc, type, onClick, children, disabled }) {
function MenuItem({
variant, iconSrc, type,
onClick, children, disabled,
}) {
return (
<div className="context-menu__item">
<Button
@ -76,33 +83,33 @@ function MenuItem({ variant, iconSrc, type, onClick, children, disabled }) {
onClick={onClick}
disabled={disabled}
>
{children}
{ children }
</Button>
</div>
);
}
MenuItem.defaultProps = {
variant: "surface",
variant: 'surface',
iconSrc: null,
type: "button",
type: 'button',
disabled: false,
onClick: null,
};
MenuItem.propTypes = {
variant: PropTypes.oneOf(["surface", "positive", "caution", "danger"]),
variant: PropTypes.oneOf(['surface', 'positive', 'caution', 'danger']),
iconSrc: PropTypes.string,
type: PropTypes.oneOf(["button", "submit"]),
type: PropTypes.oneOf(['button', 'submit']),
onClick: PropTypes.func,
children: PropTypes.node.isRequired,
disabled: PropTypes.bool,
};
function MenuBorder() {
return (
<div style={{ borderBottom: "1px solid var(--bg-surface-border)" }}> </div>
);
return <div style={{ borderBottom: '1px solid var(--bg-surface-border)' }}> </div>;
}
export { ContextMenu as default, MenuHeader, MenuItem, MenuBorder };
export {
ContextMenu as default, MenuHeader, MenuItem, MenuBorder,
};

View file

@ -1,6 +1,6 @@
@use "../../partials/flex";
@use "../../partials/text";
@use "../../partials/dir";
@use '../../partials/flex';
@use '../../partials/text';
@use '../../partials/dir';
.context-menu {
background-color: var(--bg-surface);
@ -59,7 +59,11 @@
// if item doesn't have icon
.text:first-child {
@include dir.side(margin, calc(var(--ic-small) + var(--sp-tight)), 0);
@include dir.side(
margin,
calc(var(--ic-small) + var(--sp-tight)),
0
);
}
}
.btn-surface:focus {

View file

@ -1,9 +1,9 @@
import React, { useState, useEffect, useRef } from "react";
import React, { useState, useEffect, useRef } from 'react';
import cons from "../../../client/state/cons";
import navigation from "../../../client/state/navigation";
import cons from '../../../client/state/cons';
import navigation from '../../../client/state/navigation';
import ContextMenu from "./ContextMenu";
import ContextMenu from './ContextMenu';
let key = null;
function ReusableContextMenu() {
@ -29,20 +29,14 @@ function ReusableContextMenu() {
return;
}
setData({
placement,
cords,
render,
afterClose,
placement, cords, render, afterClose,
});
};
navigation.on(
cons.events.navigation.REUSABLE_CONTEXT_MENU_OPENED,
handleContextMenuOpen
);
navigation.on(cons.events.navigation.REUSABLE_CONTEXT_MENU_OPENED, handleContextMenuOpen);
return () => {
navigation.removeListener(
cons.events.navigation.REUSABLE_CONTEXT_MENU_OPENED,
handleContextMenuOpen
handleContextMenuOpen,
);
};
}, [data]);
@ -65,24 +59,24 @@ function ReusableContextMenu() {
return (
<ContextMenu
afterToggle={handleAfterToggle}
placement={data?.placement || "right"}
content={data?.render(closeMenu) ?? ""}
placement={data?.placement || 'right'}
content={data?.render(closeMenu) ?? ''}
render={(toggleMenu) => (
<input
ref={openerRef}
onClick={toggleMenu}
type="button"
style={{
width: "32px",
height: "32px",
backgroundColor: "transparent",
position: "fixed",
width: '32px',
height: '32px',
backgroundColor: 'transparent',
position: 'fixed',
top: 0,
left: 0,
padding: 0,
border: "none",
visibility: "hidden",
appearance: "none",
border: 'none',
visibility: 'hidden',
appearance: 'none',
}}
/>
)}

View file

@ -1,38 +1,28 @@
import React from "react";
import PropTypes from "prop-types";
import "./Divider.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Divider.scss';
import Text from "../text/Text";
import Text from '../text/Text';
function Divider({ text, variant, align }) {
const dividerClass = ` divider--${variant} divider--${align}`;
return (
<div className={`divider${dividerClass}`}>
{text !== null && (
<Text className="divider__text" variant="b3" weight="bold">
{text}
</Text>
)}
{text !== null && <Text className="divider__text" variant="b3" weight="bold">{text}</Text>}
</div>
);
}
Divider.defaultProps = {
text: null,
variant: "surface",
align: "center",
variant: 'surface',
align: 'center',
};
Divider.propTypes = {
text: PropTypes.string,
variant: PropTypes.oneOf([
"surface",
"primary",
"positive",
"caution",
"danger",
]),
align: PropTypes.oneOf(["left", "center", "right"]),
variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
align: PropTypes.oneOf(['left', 'center', 'right']),
};
export default Divider;

View file

@ -1,5 +1,5 @@
.divider-line {
content: "";
content: '';
display: inline-block;
flex: 1;
border-bottom: 1px solid var(--local-divider-color);
@ -36,7 +36,7 @@
}
.divider--primary {
--local-divider-color: var(--bg-primary);
--local-divider-opacity: 0.8;
--local-divider-opacity: .8;
.divider__text {
color: var(--tc-primary-high);
background-color: var(--bg-primary);
@ -44,7 +44,7 @@
}
.divider--positive {
--local-divider-color: var(--bg-positive);
--local-divider-opacity: 0.8;
--local-divider-opacity: .8;
.divider__text {
color: var(--bg-surface);
background-color: var(--bg-positive);
@ -52,7 +52,7 @@
}
.divider--danger {
--local-divider-color: var(--bg-danger);
--local-divider-opacity: 0.8;
--local-divider-opacity: .8;
.divider__text {
color: var(--bg-surface);
background-color: var(--bg-danger);
@ -60,7 +60,7 @@
}
.divider--caution {
--local-divider-color: var(--bg-caution);
--local-divider-opacity: 0.8;
--local-divider-opacity: .8;
.divider__text {
color: var(--bg-surface);
background-color: var(--bg-caution);

View file

@ -1,9 +1,13 @@
import React from "react";
import PropTypes from "prop-types";
import "./Header.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Header.scss';
function Header({ children }) {
return <div className="header">{children}</div>;
return (
<div className="header">
{children}
</div>
);
}
Header.propTypes = {
@ -11,7 +15,11 @@ Header.propTypes = {
};
function TitleWrapper({ children }) {
return <div className="header__title-wrapper">{children}</div>;
return (
<div className="header__title-wrapper">
{children}
</div>
);
}
TitleWrapper.propTypes = {

View file

@ -1,5 +1,5 @@
@use "../../partials/text";
@use "../../partials/dir";
@use '../../partials/text';
@use '../../partials/dir';
.header {
@include dir.side(padding, var(--sp-normal), var(--sp-extra-tight));
@ -24,7 +24,7 @@
@extend .cp-txt__ellipsis;
min-width: 0;
}
& > .text-b3 {
& > .text-b3{
flex: 1;
min-width: 0;

View file

@ -1,43 +1,26 @@
import React from "react";
import PropTypes from "prop-types";
import "./Input.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Input.scss';
import TextareaAutosize from "react-autosize-textarea";
import TextareaAutosize from 'react-autosize-textarea';
function Input({
id,
label,
name,
value,
placeholder,
required,
type,
onChange,
forwardRef,
resizable,
minHeight,
onResize,
state,
onKeyDown,
disabled,
autoFocus,
id, label, name, value, placeholder,
required, type, onChange, forwardRef,
resizable, minHeight, onResize, state,
onKeyDown, disabled, autoFocus,
}) {
return (
<div className="input-container">
{label !== "" && (
<label className="input__label text-b2" htmlFor={id}>
{label}
</label>
)}
{resizable ? (
{ label !== '' && <label className="input__label text-b2" htmlFor={id}>{label}</label> }
{ resizable
? (
<TextareaAutosize
dir="auto"
style={{ minHeight: `${minHeight}px` }}
name={name}
id={id}
className={`input input--resizable${
state !== "normal" ? ` input--${state}` : ""
}`}
className={`input input--resizable${state !== 'normal' ? ` input--${state}` : ''}`}
ref={forwardRef}
type={type}
placeholder={placeholder}
@ -56,7 +39,7 @@ function Input({
ref={forwardRef}
id={id}
name={name}
className={`input ${state !== "normal" ? ` input--${state}` : ""}`}
className={`input ${state !== 'normal' ? ` input--${state}` : ''}`}
type={type}
placeholder={placeholder}
required={required}
@ -75,18 +58,18 @@ function Input({
Input.defaultProps = {
id: null,
name: "",
label: "",
value: "",
placeholder: "",
type: "text",
name: '',
label: '',
value: '',
placeholder: '',
type: 'text',
required: false,
onChange: null,
forwardRef: null,
resizable: false,
minHeight: 46,
onResize: null,
state: "normal",
state: 'normal',
onKeyDown: null,
disabled: false,
autoFocus: false,
@ -105,7 +88,7 @@ Input.propTypes = {
resizable: PropTypes.bool,
minHeight: PropTypes.number,
onResize: PropTypes.func,
state: PropTypes.oneOf(["normal", "success", "error"]),
state: PropTypes.oneOf(['normal', 'success', 'error']),
onKeyDown: PropTypes.func,
disabled: PropTypes.bool,
autoFocus: PropTypes.bool,

View file

@ -1,4 +1,4 @@
@use "../../atoms/scroll/scrollbar";
@use '../../atoms/scroll/scrollbar';
.input {
display: block;
@ -47,6 +47,6 @@
box-shadow: var(--bs-primary-border);
}
&::placeholder {
color: var(--tc-surface-low);
color: var(--tc-surface-low)
}
}

View file

@ -1,27 +1,23 @@
import React, { useEffect, useRef } from "react";
import PropTypes from "prop-types";
import "./Math.scss";
import React, { useEffect, useRef } from 'react';
import PropTypes from 'prop-types';
import './Math.scss';
import katex from "katex";
import "katex/dist/katex.min.css";
import katex from 'katex';
import 'katex/dist/katex.min.css';
import "katex/dist/contrib/copy-tex";
import 'katex/dist/contrib/copy-tex';
const Math = React.memo(
({ content, throwOnError, errorColor, displayMode }) => {
const Math = React.memo(({
content, throwOnError, errorColor, displayMode,
}) => {
const ref = useRef(null);
useEffect(() => {
katex.render(content, ref.current, {
throwOnError,
errorColor,
displayMode,
});
katex.render(content, ref.current, { throwOnError, errorColor, displayMode });
}, [content, throwOnError, errorColor, displayMode]);
return <span ref={ref} />;
}
);
});
Math.defaultProps = {
throwOnError: null,
errorColor: null,

View file

@ -1,43 +1,36 @@
import React, { useEffect } from "react";
import PropTypes from "prop-types";
import "./RawModal.scss";
import React, { useEffect } from 'react';
import PropTypes from 'prop-types';
import './RawModal.scss';
import Modal from "react-modal";
import Modal from 'react-modal';
import navigation from "../../../client/state/navigation";
import navigation from '../../../client/state/navigation';
Modal.setAppElement("#root");
Modal.setAppElement('#root');
function RawModal({
className,
overlayClassName,
isOpen,
size,
onAfterOpen,
onAfterClose,
onRequestClose,
closeFromOutside,
children,
className, overlayClassName,
isOpen, size, onAfterOpen, onAfterClose,
onRequestClose, closeFromOutside, children,
}) {
let modalClass = className !== null ? `${className} ` : "";
let modalClass = (className !== null) ? `${className} ` : '';
switch (size) {
case "large":
modalClass += "raw-modal__large ";
case 'large':
modalClass += 'raw-modal__large ';
break;
case "medium":
modalClass += "raw-modal__medium ";
case 'medium':
modalClass += 'raw-modal__medium ';
break;
case "small":
case 'small':
default:
modalClass += "raw-modal__small ";
modalClass += 'raw-modal__small ';
}
useEffect(() => {
navigation.setIsRawModalVisible(isOpen);
}, [isOpen]);
const modalOverlayClass =
overlayClassName !== null ? `${overlayClassName} ` : "";
const modalOverlayClass = (overlayClassName !== null) ? `${overlayClassName} ` : '';
return (
<Modal
className={`${modalClass}raw-modal`}
@ -58,7 +51,7 @@ function RawModal({
RawModal.defaultProps = {
className: null,
overlayClassName: null,
size: "small",
size: 'small',
onAfterOpen: null,
onAfterClose: null,
onRequestClose: null,
@ -69,7 +62,7 @@ RawModal.propTypes = {
className: PropTypes.string,
overlayClassName: PropTypes.string,
isOpen: PropTypes.bool.isRequired,
size: PropTypes.oneOf(["large", "medium", "small"]),
size: PropTypes.oneOf(['large', 'medium', 'small']),
onAfterOpen: PropTypes.func,
onAfterClose: PropTypes.func,
onRequestClose: PropTypes.func,

View file

@ -49,7 +49,7 @@
@keyframes raw-modal--content {
0% {
transform: translateY(100px);
opacity: 0.5;
opacity: .5;
}
100% {
transform: translateY(0);

View file

@ -1,25 +1,21 @@
import React from "react";
import PropTypes from "prop-types";
import "./ScrollView.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './ScrollView.scss';
const ScrollView = React.forwardRef(
({ horizontal, vertical, autoHide, invisible, onScroll, children }, ref) => {
let scrollbarClasses = "";
if (horizontal) scrollbarClasses += " scrollbar__h";
if (vertical) scrollbarClasses += " scrollbar__v";
if (autoHide) scrollbarClasses += " scrollbar--auto-hide";
if (invisible) scrollbarClasses += " scrollbar--invisible";
const ScrollView = React.forwardRef(({
horizontal, vertical, autoHide, invisible, onScroll, children,
}, ref) => {
let scrollbarClasses = '';
if (horizontal) scrollbarClasses += ' scrollbar__h';
if (vertical) scrollbarClasses += ' scrollbar__v';
if (autoHide) scrollbarClasses += ' scrollbar--auto-hide';
if (invisible) scrollbarClasses += ' scrollbar--invisible';
return (
<div
onScroll={onScroll}
ref={ref}
className={`scrollbar${scrollbarClasses}`}
>
<div onScroll={onScroll} ref={ref} className={`scrollbar${scrollbarClasses}`}>
{children}
</div>
);
}
);
});
ScrollView.defaultProps = {
horizontal: false,

View file

@ -1,8 +1,8 @@
@use "../../partials/dir";
@use "_scrollbar";
@use '../../partials/dir';
@use '_scrollbar';
@mixin paddingForSafari($padding) {
@media not all and (min-resolution: 0.001dpcm) {
@media not all and (min-resolution:.001dpcm) {
@include dir.side(padding, 0, $padding);
}
}

View file

@ -1,13 +1,15 @@
import React, { useState, useEffect } from "react";
import PropTypes from "prop-types";
import "./SegmentedControls.scss";
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import './SegmentedControls.scss';
import { blurOnBubbling } from "../button/script";
import { blurOnBubbling } from '../button/script';
import Text from "../text/Text";
import RawIcon from "../system-icons/RawIcon";
import Text from '../text/Text';
import RawIcon from '../system-icons/RawIcon';
function SegmentedControls({ selected, segments, onSelect }) {
function SegmentedControls({
selected, segments, onSelect,
}) {
const [select, setSelect] = useState(selected);
function selectSegment(segmentIndex) {
@ -21,34 +23,32 @@ function SegmentedControls({ selected, segments, onSelect }) {
return (
<div className="segmented-controls">
{segments.map((segment, index) => (
{
segments.map((segment, index) => (
<button
key={Math.random().toString(20).substr(2, 6)}
className={`segment-btn${
select === index ? " segment-btn--active" : ""
}`}
className={`segment-btn${select === index ? ' segment-btn--active' : ''}`}
type="button"
onClick={() => selectSegment(index)}
onMouseUp={(e) => blurOnBubbling(e, ".segment-btn")}
onMouseUp={(e) => blurOnBubbling(e, '.segment-btn')}
>
<div className="segment-btn__base">
{segment.iconSrc && <RawIcon size="small" src={segment.iconSrc} />}
{segment.text && <Text variant="b2">{segment.text}</Text>}
</div>
</button>
))}
))
}
</div>
);
}
SegmentedControls.propTypes = {
selected: PropTypes.number.isRequired,
segments: PropTypes.arrayOf(
PropTypes.shape({
segments: PropTypes.arrayOf(PropTypes.shape({
iconSrc: PropTypes.string,
text: PropTypes.string,
})
).isRequired,
})).isRequired,
onSelect: PropTypes.func.isRequired,
};

View file

@ -1,5 +1,5 @@
@use "../button/state";
@use "../../partials/dir";
@use '../button/state';
@use '../../partials/dir';
.segmented-controls {
background-color: var(--bg-surface-low);
@ -40,22 +40,18 @@
& + .segment-btn .segment-btn__base {
border: none;
}
&:first-child {
&:first-child{
border-left: none;
}
&:last-child {
border-right: none;
}
[dir="rtl"] & {
[dir=rtl] & {
border-left: 1px solid var(--bg-surface-border);
border-right: 1px solid var(--bg-surface-border);
&:first-child {
border-right: none;
}
&:last-child {
border-left: none;
}
&:first-child { border-right: none;}
&:last-child { border-left: none;}
}
}
}

View file

@ -1,17 +1,19 @@
import React from "react";
import PropTypes from "prop-types";
import "./Spinner.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Spinner.scss';
function Spinner({ size }) {
return <div className={`donut-spinner donut-spinner--${size}`}> </div>;
return (
<div className={`donut-spinner donut-spinner--${size}`}> </div>
);
}
Spinner.defaultProps = {
size: "normal",
size: 'normal',
};
Spinner.propTypes = {
size: PropTypes.oneOf(["normal", "small"]),
size: PropTypes.oneOf(['normal', 'small']),
};
export default Spinner;

View file

@ -1,30 +1,32 @@
import React from "react";
import PropTypes from "prop-types";
import "./RawIcon.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './RawIcon.scss';
function RawIcon({ color, size, src, isImage }) {
function RawIcon({
color, size, src, isImage,
}) {
const style = {};
if (color !== null) style.backgroundColor = color;
if (isImage) {
style.backgroundColor = "transparent";
style.backgroundImage = `url("${src}")`;
style.backgroundColor = 'transparent';
style.backgroundImage = `url(${src})`;
} else {
style.WebkitMaskImage = `url("${src}")`;
style.maskImage = `url("${src}")`;
style.WebkitMaskImage = `url(${src})`;
style.maskImage = `url(${src})`;
}
return <span className={`ic-raw ic-raw-${size}`} style={style} />;
return <span className={`ic-raw ic-raw-${size}`} style={style}> </span>;
}
RawIcon.defaultProps = {
color: null,
size: "normal",
size: 'normal',
isImage: false,
};
RawIcon.propTypes = {
color: PropTypes.string,
size: PropTypes.oneOf(["large", "normal", "small", "extra-small"]),
size: PropTypes.oneOf(['large', 'normal', 'small', 'extra-small']),
src: PropTypes.string.isRequired,
isImage: PropTypes.bool,
};

View file

@ -1,12 +1,15 @@
import React, { useState } from "react";
import PropTypes from "prop-types";
import "./Tabs.scss";
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import './Tabs.scss';
import Button from "../button/Button";
import ScrollView from "../scroll/ScrollView";
import Button from '../button/Button';
import ScrollView from '../scroll/ScrollView';
function TabItem({ selected, iconSrc, onClick, children, disabled }) {
const isSelected = selected ? "tab-item--selected" : "";
function TabItem({
selected, iconSrc,
onClick, children, disabled,
}) {
const isSelected = selected ? 'tab-item--selected' : '';
return (
<Button
@ -75,7 +78,7 @@ Tabs.propTypes = {
iconSrc: PropTypes.string,
text: PropTypes.string,
disabled: PropTypes.bool,
})
}),
).isRequired,
defaultSelected: PropTypes.number,
onSelect: PropTypes.func.isRequired,

View file

@ -1,4 +1,4 @@
@use "../../partials/dir";
@use '../../partials/dir';
.tabs {
height: var(--header-height);

View file

@ -1,51 +1,30 @@
import React from "react";
import PropTypes from "prop-types";
import "./Text.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Text.scss';
function Text({ className, style, variant, weight, primary, span, children }) {
function Text({
className, style, variant, weight,
primary, span, children,
}) {
const classes = [];
if (className) classes.push(className);
classes.push(`text text-${variant} text-${weight}`);
if (primary) classes.push("font-primary");
if (primary) classes.push('font-primary');
const textClass = classes.join(" ");
if (span)
return (
<span className={textClass} style={style}>
{children}
</span>
);
if (variant === "h1")
return (
<h1 className={textClass} style={style}>
{children}
</h1>
);
if (variant === "h2")
return (
<h2 className={textClass} style={style}>
{children}
</h2>
);
if (variant === "s1")
return (
<h4 className={textClass} style={style}>
{children}
</h4>
);
return (
<p className={textClass} style={style}>
{children}
</p>
);
const textClass = classes.join(' ');
if (span) return <span className={textClass} style={style}>{ children }</span>;
if (variant === 'h1') return <h1 className={textClass} style={style}>{ children }</h1>;
if (variant === 'h2') return <h2 className={textClass} style={style}>{ children }</h2>;
if (variant === 's1') return <h4 className={textClass} style={style}>{ children }</h4>;
return <p className={textClass} style={style}>{ children }</p>;
}
Text.defaultProps = {
className: null,
style: null,
variant: "b1",
weight: "normal",
variant: 'b1',
weight: 'normal',
primary: false,
span: false,
};
@ -53,8 +32,8 @@ Text.defaultProps = {
Text.propTypes = {
className: PropTypes.string,
style: PropTypes.shape({}),
variant: PropTypes.oneOf(["h1", "h2", "s1", "b1", "b2", "b3"]),
weight: PropTypes.oneOf(["light", "normal", "medium", "bold"]),
variant: PropTypes.oneOf(['h1', 'h2', 's1', 'b1', 'b2', 'b3']),
weight: PropTypes.oneOf(['light', 'normal', 'medium', 'bold']),
primary: PropTypes.bool,
span: PropTypes.bool,
children: PropTypes.node.isRequired,

View file

@ -5,7 +5,7 @@
& img.emoji,
& img[data-mx-emoticon] {
height: calc(var(--lh-#{$type}) - 0.25rem);
height: calc(var(--lh-#{$type}) - .25rem);
}
}
@ -20,7 +20,7 @@
margin-right: 2px !important;
padding: 0 !important;
position: relative;
top: -0.1rem;
top: -.1rem;
vertical-align: middle;
}
}

View file

@ -0,0 +1,44 @@
import React from 'react';
import PropTypes from 'prop-types';
import dateFormat from 'dateformat';
import { isInSameDay } from '../../../util/common';
function Time({ timestamp, fullTime }) {
const date = new Date(timestamp);
const formattedFullTime = dateFormat(date, 'dd mmmm yyyy, hh:MM TT');
let formattedDate = formattedFullTime;
if (!fullTime) {
const compareDate = new Date();
const isToday = isInSameDay(date, compareDate);
compareDate.setDate(compareDate.getDate() - 1);
const isYesterday = isInSameDay(date, compareDate);
formattedDate = dateFormat(date, isToday || isYesterday ? 'hh:MM TT' : 'dd/mm/yyyy');
if (isYesterday) {
formattedDate = `Yesterday, ${formattedDate}`;
}
}
return (
<time
dateTime={date.toISOString()}
title={formattedFullTime}
>
{formattedDate}
</time>
);
}
Time.defaultProps = {
fullTime: false,
};
Time.propTypes = {
timestamp: PropTypes.number.isRequired,
fullTime: PropTypes.bool,
};
export default Time;

View file

@ -1,46 +0,0 @@
import React from "react";
import dateFormat from "dateformat";
import { isInSameDay } from "../../../util/common";
export interface TimeProps {
timestamp: number;
fullTime?: boolean;
}
function Time({ timestamp, fullTime }: TimeProps) {
const date = new Date(timestamp);
const formattedFullTime = dateFormat(date, "dd mmmm yyyy, hh:MM TT");
let formattedDateTime = formattedFullTime;
if (!fullTime) {
const compareDate = new Date();
const isToday = isInSameDay(date, compareDate);
compareDate.setDate(compareDate.getDate() - 1);
const isYesterday = isInSameDay(date, compareDate);
const dtf = new Intl.DateTimeFormat();
const formattedDate = dtf.format(date);
formattedDateTime = dateFormat(
date,
isToday || isYesterday ? "hh:MM TT" : formattedDate
);
if (isYesterday) {
formattedDateTime = `Yesterday, ${formattedDateTime}`;
}
}
return (
<time dateTime={date.toISOString()} title={formattedFullTime}>
{formattedDateTime}
</time>
);
}
Time.defaultProps = {
fullTime: false,
};
export default Time;

View file

@ -1,9 +1,11 @@
import React from "react";
import PropTypes from "prop-types";
import "./Tooltip.scss";
import Tippy from "@tippyjs/react";
import React from 'react';
import PropTypes from 'prop-types';
import './Tooltip.scss';
import Tippy from '@tippyjs/react';
function Tooltip({ className, placement, content, delay, children }) {
function Tooltip({
className, placement, content, delay, children,
}) {
return (
<Tippy
content={content}
@ -21,8 +23,8 @@ function Tooltip({ className, placement, content, delay, children }) {
}
Tooltip.defaultProps = {
placement: "top",
className: "",
placement: 'top',
className: '',
delay: [200, 0],
};

View file

@ -1,7 +1,7 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from "react";
import { useState, useEffect } from 'react';
import initMatrix from "../../client/initMatrix";
import initMatrix from '../../client/initMatrix';
export function useAccountData(eventType) {
const mx = initMatrix.matrixClient;
@ -12,9 +12,9 @@ export function useAccountData(eventType) {
if (mEvent.getType() !== eventType) return;
setEvent(mEvent);
};
mx.on("accountData", handleChange);
mx.on('accountData', handleChange);
return () => {
mx.removeListener("accountData", handleChange);
mx.removeListener('accountData', handleChange);
};
}, [eventType]);

View file

@ -1,27 +1,22 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from "react";
import { useState, useEffect } from 'react';
import initMatrix from "../../client/initMatrix";
import cons from "../../client/state/cons";
import initMatrix from '../../client/initMatrix';
import cons from '../../client/state/cons';
export function useCategorizedSpaces() {
const { accountData } = initMatrix;
const [categorizedSpaces, setCategorizedSpaces] = useState([
...accountData.categorizedSpaces,
]);
const [categorizedSpaces, setCategorizedSpaces] = useState([...accountData.categorizedSpaces]);
useEffect(() => {
const handleCategorizedSpaces = () => {
setCategorizedSpaces([...accountData.categorizedSpaces]);
};
accountData.on(
cons.events.accountData.CATEGORIZE_SPACE_UPDATED,
handleCategorizedSpaces
);
accountData.on(cons.events.accountData.CATEGORIZE_SPACE_UPDATED, handleCategorizedSpaces);
return () => {
accountData.removeListener(
cons.events.accountData.CATEGORIZE_SPACE_UPDATED,
handleCategorizedSpaces
handleCategorizedSpaces,
);
};
}, []);

View file

@ -1,8 +1,8 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from "react";
import { useState, useEffect } from 'react';
import initMatrix from "../../client/initMatrix";
import { hasCrossSigningAccountData } from "../../util/matrixUtil";
import initMatrix from '../../client/initMatrix';
import { hasCrossSigningAccountData } from '../../util/matrixUtil';
export function useCrossSigningStatus() {
const mx = initMatrix.matrixClient;
@ -11,14 +11,14 @@ export function useCrossSigningStatus() {
useEffect(() => {
if (isCSEnabled) return null;
const handleAccountData = (event) => {
if (event.getType() === "m.cross_signing.master") {
if (event.getType() === 'm.cross_signing.master') {
setIsCSEnabled(true);
}
};
mx.on("accountData", handleAccountData);
mx.on('accountData', handleAccountData);
return () => {
mx.removeListener("accountData", handleAccountData);
mx.removeListener('accountData', handleAccountData);
};
}, [isCSEnabled === false]);
return isCSEnabled;

View file

@ -1,7 +1,7 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from "react";
import { useState, useEffect } from 'react';
import initMatrix from "../../client/initMatrix";
import initMatrix from '../../client/initMatrix';
export function useDeviceList() {
const mx = initMatrix.matrixClient;
@ -10,8 +10,7 @@ export function useDeviceList() {
useEffect(() => {
let isMounted = true;
const updateDevices = () =>
mx.getDevices().then((data) => {
const updateDevices = () => mx.getDevices().then((data) => {
if (!isMounted) return;
setDeviceList(data.devices || []);
});
@ -23,9 +22,9 @@ export function useDeviceList() {
}
};
mx.on("crypto.devicesUpdated", handleDevicesUpdate);
mx.on('crypto.devicesUpdated', handleDevicesUpdate);
return () => {
mx.removeListener("crypto.devicesUpdated", handleDevicesUpdate);
mx.removeListener('crypto.devicesUpdated', handleDevicesUpdate);
isMounted = false;
};
}, []);

View file

@ -1,13 +1,10 @@
/* eslint-disable import/prefer-default-export */
import { useState } from "react";
import { useState } from 'react';
export function useForceUpdate() {
const [data, setData] = useState(null);
return [
data,
function forceUpdateHook() {
return [data, function forceUpdateHook() {
setData({});
},
];
}];
}

View file

@ -1,6 +1,6 @@
/* eslint-disable import/prefer-default-export */
import { useEffect, useState } from "react";
import { useEffect, useState } from 'react';
export function usePermission(name, initial) {
const [state, setState] = useState(initial);
@ -15,12 +15,12 @@ export function usePermission(name, initial) {
descriptor = _descriptor;
update();
descriptor.addEventListener("change", update);
descriptor.addEventListener('change', update);
});
}
return () => {
if (descriptor) descriptor.removeEventListener("change", update);
if (descriptor) descriptor.removeEventListener('change', update);
};
}, []);

View file

@ -1,8 +1,8 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from "react";
import { useState, useEffect } from 'react';
import cons from "../../client/state/cons";
import navigation from "../../client/state/navigation";
import cons from '../../client/state/cons';
import navigation from '../../client/state/navigation';
export function useSelectedSpace() {
const [spaceId, setSpaceId] = useState(navigation.selectedSpaceId);
@ -13,10 +13,7 @@ export function useSelectedSpace() {
};
navigation.on(cons.events.navigation.SPACE_SELECTED, onSpaceSelected);
return () => {
navigation.removeListener(
cons.events.navigation.SPACE_SELECTED,
onSpaceSelected
);
navigation.removeListener(cons.events.navigation.SPACE_SELECTED, onSpaceSelected);
};
}, []);

View file

@ -1,8 +1,8 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from "react";
import { useState, useEffect } from 'react';
import cons from "../../client/state/cons";
import navigation from "../../client/state/navigation";
import cons from '../../client/state/cons';
import navigation from '../../client/state/navigation';
export function useSelectedTab() {
const [selectedTab, setSelectedTab] = useState(navigation.selectedTab);
@ -13,10 +13,7 @@ export function useSelectedTab() {
};
navigation.on(cons.events.navigation.TAB_SELECTED, onTabSelected);
return () => {
navigation.removeListener(
cons.events.navigation.TAB_SELECTED,
onTabSelected
);
navigation.removeListener(cons.events.navigation.TAB_SELECTED, onTabSelected);
};
}, []);

View file

@ -1,27 +1,22 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from "react";
import { useState, useEffect } from 'react';
import initMatrix from "../../client/initMatrix";
import cons from "../../client/state/cons";
import initMatrix from '../../client/initMatrix';
import cons from '../../client/state/cons';
export function useSpaceShortcut() {
const { accountData } = initMatrix;
const [spaceShortcut, setSpaceShortcut] = useState([
...accountData.spaceShortcut,
]);
const [spaceShortcut, setSpaceShortcut] = useState([...accountData.spaceShortcut]);
useEffect(() => {
const onSpaceShortcutUpdated = () => {
setSpaceShortcut([...accountData.spaceShortcut]);
};
accountData.on(
cons.events.accountData.SPACE_SHORTCUT_UPDATED,
onSpaceShortcutUpdated
);
accountData.on(cons.events.accountData.SPACE_SHORTCUT_UPDATED, onSpaceShortcutUpdated);
return () => {
accountData.removeListener(
cons.events.accountData.SPACE_SHORTCUT_UPDATED,
onSpaceShortcutUpdated
onSpaceShortcutUpdated,
);
};
}, []);

View file

@ -1,5 +1,5 @@
/* eslint-disable import/prefer-default-export */
import { useEffect, useRef } from "react";
import { useEffect, useRef } from 'react';
export function useStore(...args) {
const itemRef = useRef(null);

View file

@ -1,20 +1,20 @@
import React from "react";
import PropTypes from "prop-types";
import "./ConfirmDialog.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './ConfirmDialog.scss';
import { openReusableDialog } from "../../../client/action/navigation";
import { openReusableDialog } from '../../../client/action/navigation';
import Text from "../../atoms/text/Text";
import Button from "../../atoms/button/Button";
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
function ConfirmDialog({ desc, actionTitle, actionType, onComplete }) {
function ConfirmDialog({
desc, actionTitle, actionType, onComplete,
}) {
return (
<div className="confirm-dialog">
<Text>{desc}</Text>
<div className="confirm-dialog__btn">
<Button variant={actionType} onClick={() => onComplete(true)}>
{actionTitle}
</Button>
<Button variant={actionType} onClick={() => onComplete(true)}>{actionTitle}</Button>
<Button onClick={() => onComplete(false)}>Cancel</Button>
</div>
</div>
@ -23,8 +23,7 @@ function ConfirmDialog({ desc, actionTitle, actionType, onComplete }) {
ConfirmDialog.propTypes = {
desc: PropTypes.string.isRequired,
actionTitle: PropTypes.string.isRequired,
actionType: PropTypes.oneOf(["primary", "positive", "danger", "caution"])
.isRequired,
actionType: PropTypes.oneOf(['primary', 'positive', 'danger', 'caution']).isRequired,
onComplete: PropTypes.func.isRequired,
};
@ -36,18 +35,10 @@ ConfirmDialog.propTypes = {
* @return {Promise<boolean>} does it get's confirmed or not
*/
// eslint-disable-next-line import/prefer-default-export
export const confirmDialog = (
title,
desc,
actionTitle,
actionType = "primary"
) =>
new Promise((resolve) => {
export const confirmDialog = (title, desc, actionTitle, actionType = 'primary') => new Promise((resolve) => {
let isCompleted = false;
openReusableDialog(
<Text variant="s1" weight="medium">
{title}
</Text>,
<Text variant="s1" weight="medium">{title}</Text>,
(requestClose) => (
<ConfirmDialog
desc={desc}
@ -62,6 +53,6 @@ export const confirmDialog = (
),
() => {
if (!isCompleted) resolve(false);
}
},
);
});
});

View file

@ -1,29 +1,22 @@
import React from "react";
import PropTypes from "prop-types";
import "./Dialog.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './Dialog.scss';
import { twemojify } from "../../../util/twemojify";
import { twemojify } from '../../../util/twemojify';
import Text from "../../atoms/text/Text";
import Header, { TitleWrapper } from "../../atoms/header/Header";
import ScrollView from "../../atoms/scroll/ScrollView";
import RawModal from "../../atoms/modal/RawModal";
import Text from '../../atoms/text/Text';
import Header, { TitleWrapper } from '../../atoms/header/Header';
import ScrollView from '../../atoms/scroll/ScrollView';
import RawModal from '../../atoms/modal/RawModal';
function Dialog({
className,
isOpen,
title,
onAfterOpen,
onAfterClose,
contentOptions,
onRequestClose,
closeFromOutside,
children,
className, isOpen, title, onAfterOpen, onAfterClose,
contentOptions, onRequestClose, closeFromOutside, children,
invisibleScroll,
}) {
return (
<RawModal
className={`${className === null ? "" : `${className} `}dialog-modal`}
className={`${className === null ? '' : `${className} `}dialog-modal`}
isOpen={isOpen}
onAfterOpen={onAfterOpen}
onAfterClose={onAfterClose}
@ -35,19 +28,19 @@ function Dialog({
<div className="dialog__content">
<Header>
<TitleWrapper>
{typeof title === "string" ? (
<Text variant="h2" weight="medium" primary>
{twemojify(title)}
</Text>
) : (
title
)}
{
typeof title === 'string'
? <Text variant="h2" weight="medium" primary>{twemojify(title)}</Text>
: title
}
</TitleWrapper>
{contentOptions}
</Header>
<div className="dialog__content__wrapper">
<ScrollView autoHide={!invisibleScroll} invisible={invisibleScroll}>
<div className="dialog__content-container">{children}</div>
<div className="dialog__content-container">
{children}
</div>
</ScrollView>
</div>
</div>

View file

@ -1,12 +1,12 @@
import React, { useState, useEffect } from "react";
import React, { useState, useEffect } from 'react';
import cons from "../../../client/state/cons";
import cons from '../../../client/state/cons';
import navigation from "../../../client/state/navigation";
import IconButton from "../../atoms/button/IconButton";
import Dialog from "./Dialog";
import navigation from '../../../client/state/navigation';
import IconButton from '../../atoms/button/IconButton';
import Dialog from './Dialog';
import CrossIC from "../../../../public/res/ic/outlined/cross.svg";
import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
function ReusableDialog() {
const [isOpen, setIsOpen] = useState(false);
@ -19,10 +19,7 @@ function ReusableDialog() {
};
navigation.on(cons.events.navigation.REUSABLE_DIALOG_OPENED, handleOpen);
return () => {
navigation.removeListener(
cons.events.navigation.REUSABLE_DIALOG_OPENED,
handleOpen
);
navigation.removeListener(cons.events.navigation.REUSABLE_DIALOG_OPENED, handleOpen);
};
}, []);
@ -38,16 +35,10 @@ function ReusableDialog() {
return (
<Dialog
isOpen={isOpen}
title={data?.title || ""}
title={data?.title || ''}
onAfterClose={handleAfterClose}
onRequestClose={handleRequestClose}
contentOptions={
<IconButton
src={CrossIC}
onClick={handleRequestClose}
tooltip="Close"
/>
}
contentOptions={<IconButton src={CrossIC} onClick={handleRequestClose} tooltip="Close" />}
invisibleScroll
>
{data?.render(handleRequestClose) || <div />}

View file

@ -1,17 +1,17 @@
/* eslint-disable react/prop-types */
import React, { useState, useEffect } from "react";
import PropTypes from "prop-types";
import "./FollowingMembers.scss";
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import './FollowingMembers.scss';
import initMatrix from "../../../client/initMatrix";
import cons from "../../../client/state/cons";
import { openReadReceipts } from "../../../client/action/navigation";
import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import { openReadReceipts } from '../../../client/action/navigation';
import Text from "../../atoms/text/Text";
import RawIcon from "../../atoms/system-icons/RawIcon";
import TickMarkIC from "../../../../public/res/ic/outlined/tick-mark.svg";
import Text from '../../atoms/text/Text';
import RawIcon from '../../atoms/system-icons/RawIcon';
import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
import { getUsersActionJsx } from "../../organisms/room/common";
import { getUsersActionJsx } from '../../organisms/room/common';
function FollowingMembers({ roomTimeline }) {
const [followingMembers, setFollowingMembers] = useState([]);
@ -27,38 +27,28 @@ function FollowingMembers({ roomTimeline }) {
setFollowingMembers(roomTimeline.getLiveReaders());
};
updateFollowingMembers();
roomTimeline.on(
cons.events.roomTimeline.LIVE_RECEIPT,
updateFollowingMembers
);
roomTimeline.on(cons.events.roomTimeline.LIVE_RECEIPT, updateFollowingMembers);
roomsInput.on(cons.events.roomsInput.MESSAGE_SENT, handleOnMessageSent);
return () => {
roomTimeline.removeListener(
cons.events.roomTimeline.LIVE_RECEIPT,
updateFollowingMembers
);
roomsInput.removeListener(
cons.events.roomsInput.MESSAGE_SENT,
handleOnMessageSent
);
roomTimeline.removeListener(cons.events.roomTimeline.LIVE_RECEIPT, updateFollowingMembers);
roomsInput.removeListener(cons.events.roomsInput.MESSAGE_SENT, handleOnMessageSent);
};
}, [roomTimeline]);
const filteredM = followingMembers.filter((userId) => userId !== myUserId);
return (
filteredM.length !== 0 && (
return filteredM.length !== 0 && (
<button
className="following-members"
onClick={() => openReadReceipts(roomId, followingMembers)}
type="button"
>
<RawIcon size="extra-small" src={TickMarkIC} />
<Text variant="b2">
{getUsersActionJsx(roomId, filteredM, "following the conversation.")}
</Text>
<RawIcon
size="extra-small"
src={TickMarkIC}
/>
<Text variant="b2">{getUsersActionJsx(roomId, filteredM, 'following the conversation.')}</Text>
</button>
)
);
}

View file

@ -1,4 +1,4 @@
@use "../../partials/text";
@use '../../partials/text';
.following-members {
width: 100%;

View file

@ -1,61 +1,59 @@
import React from "react";
import React from 'react';
import initMatrix from "../../../client/initMatrix";
import { openReusableContextMenu } from "../../../client/action/navigation";
import { getEventCords } from "../../../util/common";
import initMatrix from '../../../client/initMatrix';
import { openReusableContextMenu } from '../../../client/action/navigation';
import { getEventCords } from '../../../util/common';
import Text from "../../atoms/text/Text";
import Button from "../../atoms/button/Button";
import { MenuHeader } from "../../atoms/context-menu/ContextMenu";
import SettingTile from "../setting-tile/SettingTile";
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
import SettingTile from '../setting-tile/SettingTile';
import NotificationSelector from "./NotificationSelector";
import NotificationSelector from './NotificationSelector';
import ChevronBottomIC from "../../../../public/res/ic/outlined/chevron-bottom.svg";
import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
import { useAccountData } from "../../hooks/useAccountData";
import { useAccountData } from '../../hooks/useAccountData';
export const notifType = {
ON: "on",
OFF: "off",
NOISY: "noisy",
ON: 'on',
OFF: 'off',
NOISY: 'noisy',
};
export const typeToLabel = {
[notifType.ON]: "On",
[notifType.OFF]: "Off",
[notifType.NOISY]: "Noisy",
[notifType.ON]: 'On',
[notifType.OFF]: 'Off',
[notifType.NOISY]: 'Noisy',
};
Object.freeze(notifType);
const DM = ".m.rule.room_one_to_one";
const ENC_DM = ".m.rule.encrypted_room_one_to_one";
const ROOM = ".m.rule.message";
const ENC_ROOM = ".m.rule.encrypted";
const DM = '.m.rule.room_one_to_one';
const ENC_DM = '.m.rule.encrypted_room_one_to_one';
const ROOM = '.m.rule.message';
const ENC_ROOM = '.m.rule.encrypted';
export function getActionType(rule) {
const { actions } = rule;
if (actions.find((action) => action?.set_tweak === "sound"))
return notifType.NOISY;
if (actions.find((action) => action?.set_tweak === "highlight"))
return notifType.ON;
if (actions.find((action) => action === "dont_notify")) return notifType.OFF;
if (actions.find((action) => action?.set_tweak === 'sound')) return notifType.NOISY;
if (actions.find((action) => action?.set_tweak === 'highlight')) return notifType.ON;
if (actions.find((action) => action === 'dont_notify')) return notifType.OFF;
return notifType.OFF;
}
export function getTypeActions(type, highlightValue = false) {
if (type === notifType.OFF) return ["dont_notify"];
if (type === notifType.OFF) return ['dont_notify'];
const highlight = { set_tweak: "highlight" };
if (typeof highlightValue === "boolean") highlight.value = highlightValue;
if (type === notifType.ON) return ["notify", highlight];
const highlight = { set_tweak: 'highlight' };
if (typeof highlightValue === 'boolean') highlight.value = highlightValue;
if (type === notifType.ON) return ['notify', highlight];
const sound = { set_tweak: "sound", value: "default" };
return ["notify", sound, highlight];
const sound = { set_tweak: 'sound', value: 'default' };
return ['notify', sound, highlight];
}
function useGlobalNotif() {
const mx = initMatrix.matrixClient;
const pushRules = useAccountData("m.push_rules")?.getContent();
const pushRules = useAccountData('m.push_rules')?.getContent();
const underride = pushRules?.global?.underride ?? [];
const rulesToType = {
[DM]: notifType.ON,
@ -67,14 +65,12 @@ function useGlobalNotif() {
const getRuleCondition = (rule) => {
const condition = [];
if (rule === DM || rule === ENC_DM) {
condition.push({ kind: "room_member_count", is: "2" });
condition.push({ kind: 'room_member_count', is: '2' });
}
condition.push({
kind: "event_match",
key: "type",
pattern: [ENC_DM, ENC_ROOM].includes(rule)
? "m.room.encrypted"
: "m.room.message",
kind: 'event_match',
key: 'type',
pattern: [ENC_DM, ENC_ROOM].includes(rule) ? 'm.room.encrypted' : 'm.room.message',
});
return condition;
};
@ -97,7 +93,7 @@ function useGlobalNotif() {
}
ruleContent.actions = getTypeActions(type);
mx.setAccountData("m.push_rules", content);
mx.setAccountData('m.push_rules', content);
};
const dmRule = underride.find((rule) => rule.rule_id === DM);
@ -118,8 +114,8 @@ function GlobalNotification() {
const onSelect = (evt, rule) => {
openReusableContextMenu(
"bottom",
getEventCords(evt, ".btn-surface"),
'bottom',
getEventCords(evt, '.btn-surface'),
(requestClose) => (
<NotificationSelector
value={rulesToType[rule]}
@ -128,7 +124,7 @@ function GlobalNotification() {
requestClose();
}}
/>
)
),
);
};
@ -137,67 +133,39 @@ function GlobalNotification() {
<MenuHeader>Global Notifications</MenuHeader>
<SettingTile
title="Direct messages"
options={
<Button
onClick={(evt) => onSelect(evt, DM)}
iconSrc={ChevronBottomIC}
>
{typeToLabel[rulesToType[DM]]}
options={(
<Button onClick={(evt) => onSelect(evt, DM)} iconSrc={ChevronBottomIC}>
{ typeToLabel[rulesToType[DM]] }
</Button>
}
content={
<Text variant="b3">
Default notification settings for all direct message.
</Text>
}
)}
content={<Text variant="b3">Default notification settings for all direct message.</Text>}
/>
<SettingTile
title="Encrypted direct messages"
options={
<Button
onClick={(evt) => onSelect(evt, ENC_DM)}
iconSrc={ChevronBottomIC}
>
options={(
<Button onClick={(evt) => onSelect(evt, ENC_DM)} iconSrc={ChevronBottomIC}>
{typeToLabel[rulesToType[ENC_DM]]}
</Button>
}
content={
<Text variant="b3">
Default notification settings for all encrypted direct message.
</Text>
}
)}
content={<Text variant="b3">Default notification settings for all encrypted direct message.</Text>}
/>
<SettingTile
title="Rooms messages"
options={
<Button
onClick={(evt) => onSelect(evt, ROOM)}
iconSrc={ChevronBottomIC}
>
options={(
<Button onClick={(evt) => onSelect(evt, ROOM)} iconSrc={ChevronBottomIC}>
{typeToLabel[rulesToType[ROOM]]}
</Button>
}
content={
<Text variant="b3">
Default notification settings for all room message.
</Text>
}
)}
content={<Text variant="b3">Default notification settings for all room message.</Text>}
/>
<SettingTile
title="Encrypted rooms messages"
options={
<Button
onClick={(evt) => onSelect(evt, ENC_ROOM)}
iconSrc={ChevronBottomIC}
>
options={(
<Button onClick={(evt) => onSelect(evt, ENC_ROOM)} iconSrc={ChevronBottomIC}>
{typeToLabel[rulesToType[ENC_ROOM]]}
</Button>
}
content={
<Text variant="b3">
Default notification settings for all encrypted room message.
</Text>
}
)}
content={<Text variant="b3">Default notification settings for all encrypted room message.</Text>}
/>
</div>
);

View file

@ -1,31 +1,31 @@
import React from "react";
import "./IgnoreUserList.scss";
import React from 'react';
import './IgnoreUserList.scss';
import initMatrix from "../../../client/initMatrix";
import * as roomActions from "../../../client/action/room";
import initMatrix from '../../../client/initMatrix';
import * as roomActions from '../../../client/action/room';
import Text from "../../atoms/text/Text";
import Chip from "../../atoms/chip/Chip";
import Input from "../../atoms/input/Input";
import Button from "../../atoms/button/Button";
import { MenuHeader } from "../../atoms/context-menu/ContextMenu";
import SettingTile from "../setting-tile/SettingTile";
import Text from '../../atoms/text/Text';
import Chip from '../../atoms/chip/Chip';
import Input from '../../atoms/input/Input';
import Button from '../../atoms/button/Button';
import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
import SettingTile from '../setting-tile/SettingTile';
import CrossIC from "../../../../public/res/ic/outlined/cross.svg";
import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
import { useAccountData } from "../../hooks/useAccountData";
import { useAccountData } from '../../hooks/useAccountData';
function IgnoreUserList() {
useAccountData("m.ignored_user_list");
useAccountData('m.ignored_user_list');
const ignoredUsers = initMatrix.matrixClient.getIgnoredUsers();
const handleSubmit = (evt) => {
evt.preventDefault();
const { ignoreInput } = evt.target.elements;
const value = ignoreInput.value.trim();
const userIds = value.split(" ").filter((v) => v.match(/^@\S+:\S+$/));
const userIds = value.split(' ').filter((v) => v.match(/^@\S+:\S+$/));
if (userIds.length === 0) return;
ignoreInput.value = "";
ignoreInput.value = '';
roomActions.ignore(userIds);
};
@ -34,17 +34,12 @@ function IgnoreUserList() {
<MenuHeader>Ignored users</MenuHeader>
<SettingTile
title="Ignore user"
content={
content={(
<div className="ignore-user-list__users">
<Text variant="b3">
Ignore userId if you do not want to receive their messages or
invites.
</Text>
<Text variant="b3">Ignore userId if you do not want to receive their messages or invites.</Text>
<form onSubmit={handleSubmit}>
<Input name="ignoreInput" required />
<Button variant="primary" type="submit">
Ignore
</Button>
<Button variant="primary" type="submit">Ignore</Button>
</form>
{ignoredUsers.length > 0 && (
<div>
@ -60,7 +55,7 @@ function IgnoreUserList() {
</div>
)}
</div>
}
)}
/>
</div>
);

View file

@ -1,38 +1,35 @@
import React from "react";
import "./KeywordNotification.scss";
import React from 'react';
import './KeywordNotification.scss';
import initMatrix from "../../../client/initMatrix";
import { openReusableContextMenu } from "../../../client/action/navigation";
import { getEventCords } from "../../../util/common";
import initMatrix from '../../../client/initMatrix';
import { openReusableContextMenu } from '../../../client/action/navigation';
import { getEventCords } from '../../../util/common';
import Text from "../../atoms/text/Text";
import Chip from "../../atoms/chip/Chip";
import Input from "../../atoms/input/Input";
import Button from "../../atoms/button/Button";
import { MenuHeader } from "../../atoms/context-menu/ContextMenu";
import SettingTile from "../setting-tile/SettingTile";
import Text from '../../atoms/text/Text';
import Chip from '../../atoms/chip/Chip';
import Input from '../../atoms/input/Input';
import Button from '../../atoms/button/Button';
import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
import SettingTile from '../setting-tile/SettingTile';
import NotificationSelector from "./NotificationSelector";
import NotificationSelector from './NotificationSelector';
import ChevronBottomIC from "../../../../public/res/ic/outlined/chevron-bottom.svg";
import CrossIC from "../../../../public/res/ic/outlined/cross.svg";
import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
import { useAccountData } from "../../hooks/useAccountData";
import { useAccountData } from '../../hooks/useAccountData';
import {
notifType,
typeToLabel,
getActionType,
getTypeActions,
} from "./GlobalNotification";
notifType, typeToLabel, getActionType, getTypeActions,
} from './GlobalNotification';
const DISPLAY_NAME = ".m.rule.contains_display_name";
const ROOM_PING = ".m.rule.roomnotif";
const USERNAME = ".m.rule.contains_user_name";
const KEYWORD = "keyword";
const DISPLAY_NAME = '.m.rule.contains_display_name';
const ROOM_PING = '.m.rule.roomnotif';
const USERNAME = '.m.rule.contains_user_name';
const KEYWORD = 'keyword';
function useKeywordNotif() {
const mx = initMatrix.matrixClient;
const pushRules = useAccountData("m.push_rules")?.getContent();
const pushRules = useAccountData('m.push_rules')?.getContent();
const override = pushRules?.global?.override ?? [];
const content = pushRules?.global?.content ?? [];
@ -63,12 +60,12 @@ function useKeywordNotif() {
or.push(orRule);
}
if (rule === DISPLAY_NAME) {
orRule.conditions = [{ kind: "contains_display_name" }];
orRule.conditions = [{ kind: 'contains_display_name' }];
orRule.actions = getTypeActions(type, true);
} else {
orRule.conditions = [
{ kind: "event_match", key: "content.body", pattern: "@room" },
{ kind: "sender_notification_permission", key: "room" },
{ kind: 'event_match', key: 'content.body', pattern: '@room' },
{ kind: 'sender_notification_permission', key: 'room' },
];
orRule.actions = getTypeActions(type, true);
}
@ -95,7 +92,7 @@ function useKeywordNotif() {
});
}
mx.setAccountData("m.push_rules", evtContent);
mx.setAccountData('m.push_rules', evtContent);
};
const addKeyword = (keyword) => {
@ -107,13 +104,11 @@ function useKeywordNotif() {
default: false,
actions: getTypeActions(rulesToType[KEYWORD] ?? notifType.NOISY, true),
});
mx.setAccountData("m.push_rules", pushRules);
mx.setAccountData('m.push_rules', pushRules);
};
const removeKeyword = (rule) => {
pushRules.global.content = content.filter(
(r) => r.rule_id !== rule.rule_id
);
mx.setAccountData("m.push_rules", pushRules);
pushRules.global.content = content.filter((r) => r.rule_id !== rule.rule_id);
mx.setAccountData('m.push_rules', pushRules);
};
const dsRule = override.find((rule) => rule.rule_id === DISPLAY_NAME);
@ -136,16 +131,20 @@ function useKeywordNotif() {
}
function GlobalNotification() {
const { rulesToType, pushRules, setRule, addKeyword, removeKeyword } =
useKeywordNotif();
const {
rulesToType,
pushRules,
setRule,
addKeyword,
removeKeyword,
} = useKeywordNotif();
const keywordRules =
pushRules?.global?.content.filter((r) => r.rule_id !== USERNAME) ?? [];
const keywordRules = pushRules?.global?.content.filter((r) => r.rule_id !== USERNAME) ?? [];
const onSelect = (evt, rule) => {
openReusableContextMenu(
"bottom",
getEventCords(evt, ".btn-surface"),
'bottom',
getEventCords(evt, '.btn-surface'),
(requestClose) => (
<NotificationSelector
value={rulesToType[rule]}
@ -154,7 +153,7 @@ function GlobalNotification() {
requestClose();
}}
/>
)
),
);
};
@ -162,9 +161,9 @@ function GlobalNotification() {
evt.preventDefault();
const { keywordInput } = evt.target.elements;
const value = keywordInput.value.trim();
if (value === "") return;
if (value === '') return;
addKeyword(value);
keywordInput.value = "";
keywordInput.value = '';
};
return (
@ -172,84 +171,50 @@ function GlobalNotification() {
<MenuHeader>Mentions & keywords</MenuHeader>
<SettingTile
title="Message containing my display name"
options={
<Button
onClick={(evt) => onSelect(evt, DISPLAY_NAME)}
iconSrc={ChevronBottomIC}
>
{typeToLabel[rulesToType[DISPLAY_NAME]]}
options={(
<Button onClick={(evt) => onSelect(evt, DISPLAY_NAME)} iconSrc={ChevronBottomIC}>
{ typeToLabel[rulesToType[DISPLAY_NAME]] }
</Button>
}
content={
<Text variant="b3">
Default notification settings for all message containing your
display name.
</Text>
}
)}
content={<Text variant="b3">Default notification settings for all message containing your display name.</Text>}
/>
<SettingTile
title="Message containing my username"
options={
<Button
onClick={(evt) => onSelect(evt, USERNAME)}
iconSrc={ChevronBottomIC}
>
{typeToLabel[rulesToType[USERNAME]]}
options={(
<Button onClick={(evt) => onSelect(evt, USERNAME)} iconSrc={ChevronBottomIC}>
{ typeToLabel[rulesToType[USERNAME]] }
</Button>
}
content={
<Text variant="b3">
Default notification settings for all message containing your
username.
</Text>
}
)}
content={<Text variant="b3">Default notification settings for all message containing your username.</Text>}
/>
<SettingTile
title="Message containing @room"
options={
<Button
onClick={(evt) => onSelect(evt, ROOM_PING)}
iconSrc={ChevronBottomIC}
>
options={(
<Button onClick={(evt) => onSelect(evt, ROOM_PING)} iconSrc={ChevronBottomIC}>
{typeToLabel[rulesToType[ROOM_PING]]}
</Button>
}
content={
<Text variant="b3">
Default notification settings for all messages containing @room.
</Text>
}
)}
content={<Text variant="b3">Default notification settings for all messages containing @room.</Text>}
/>
{rulesToType[KEYWORD] && (
{ rulesToType[KEYWORD] && (
<SettingTile
title="Message containing keywords"
options={
<Button
onClick={(evt) => onSelect(evt, KEYWORD)}
iconSrc={ChevronBottomIC}
>
options={(
<Button onClick={(evt) => onSelect(evt, KEYWORD)} iconSrc={ChevronBottomIC}>
{typeToLabel[rulesToType[KEYWORD]]}
</Button>
}
content={
<Text variant="b3">
Default notification settings for all message containing keywords.
</Text>
}
)}
content={<Text variant="b3">Default notification settings for all message containing keywords.</Text>}
/>
)}
<SettingTile
title="Keywords"
content={
content={(
<div className="keyword-notification__keyword">
<Text variant="b3">
Get notification when a message contains keyword.
</Text>
<Text variant="b3">Get notification when a message contains keyword.</Text>
<form onSubmit={handleSubmit}>
<Input name="keywordInput" required />
<Button variant="primary" type="submit">
Add
</Button>
<Button variant="primary" type="submit">Add</Button>
</form>
{keywordRules.length > 0 && (
<div>
@ -265,7 +230,7 @@ function GlobalNotification() {
</div>
)}
</div>
}
)}
/>
</div>
);

View file

@ -1,41 +1,25 @@
import React from "react";
import PropTypes from "prop-types";
import React from 'react';
import PropTypes from 'prop-types';
import { MenuHeader, MenuItem } from "../../atoms/context-menu/ContextMenu";
import { MenuHeader, MenuItem } from '../../atoms/context-menu/ContextMenu';
import CheckIC from "../../../../public/res/ic/outlined/check.svg";
import CheckIC from '../../../../public/res/ic/outlined/check.svg';
function NotificationSelector({ value, onSelect }) {
function NotificationSelector({
value, onSelect,
}) {
return (
<div>
<MenuHeader>Notification</MenuHeader>
<MenuItem
iconSrc={value === "off" ? CheckIC : null}
variant={value === "off" ? "positive" : "surface"}
onClick={() => onSelect("off")}
>
Off
</MenuItem>
<MenuItem
iconSrc={value === "on" ? CheckIC : null}
variant={value === "on" ? "positive" : "surface"}
onClick={() => onSelect("on")}
>
On
</MenuItem>
<MenuItem
iconSrc={value === "noisy" ? CheckIC : null}
variant={value === "noisy" ? "positive" : "surface"}
onClick={() => onSelect("noisy")}
>
Noisy
</MenuItem>
<MenuItem iconSrc={value === 'off' ? CheckIC : null} variant={value === 'off' ? 'positive' : 'surface'} onClick={() => onSelect('off')}>Off</MenuItem>
<MenuItem iconSrc={value === 'on' ? CheckIC : null} variant={value === 'on' ? 'positive' : 'surface'} onClick={() => onSelect('on')}>On</MenuItem>
<MenuItem iconSrc={value === 'noisy' ? CheckIC : null} variant={value === 'noisy' ? 'positive' : 'surface'} onClick={() => onSelect('noisy')}>Noisy</MenuItem>
</div>
);
}
NotificationSelector.propTypes = {
value: PropTypes.oneOf(["off", "on", "noisy"]).isRequired,
value: PropTypes.oneOf(['off', 'on', 'noisy']).isRequired,
onSelect: PropTypes.func.isRequired,
};

View file

@ -1,16 +1,18 @@
import React from "react";
import PropTypes from "prop-types";
import "./ImageLightbox.scss";
import FileSaver from "file-saver";
import React from 'react';
import PropTypes from 'prop-types';
import './ImageLightbox.scss';
import FileSaver from 'file-saver';
import Text from "../../atoms/text/Text";
import RawModal from "../../atoms/modal/RawModal";
import IconButton from "../../atoms/button/IconButton";
import Text from '../../atoms/text/Text';
import RawModal from '../../atoms/modal/RawModal';
import IconButton from '../../atoms/button/IconButton';
import DownloadSVG from "../../../../public/res/ic/outlined/download.svg";
import ExternalSVG from "../../../../public/res/ic/outlined/external.svg";
import DownloadSVG from '../../../../public/res/ic/outlined/download.svg';
import ExternalSVG from '../../../../public/res/ic/outlined/external.svg';
function ImageLightbox({ url, alt, isOpen, onRequestClose }) {
function ImageLightbox({
url, alt, isOpen, onRequestClose,
}) {
const handleDownload = () => {
FileSaver.saveAs(url, alt);
};
@ -24,14 +26,8 @@ function ImageLightbox({ url, alt, isOpen, onRequestClose }) {
size="large"
>
<div className="image-lightbox__header">
<Text variant="b2" weight="medium">
{alt}
</Text>
<IconButton
onClick={() => window.open(url)}
size="small"
src={ExternalSVG}
/>
<Text variant="b2" weight="medium">{alt}</Text>
<IconButton onClick={() => window.open(url)} size="small" src={ExternalSVG} />
<IconButton onClick={handleDownload} size="small" src={DownloadSVG} />
</div>
<div className="image-lightbox__content">

View file

@ -1,5 +1,5 @@
@use "../../partials/flex";
@use "../../partials/text";
@use '../../partials/flex';
@use '../../partials/text';
.image-lightbox__modal {
box-shadow: none;
@ -21,6 +21,7 @@
background-color: var(--bg-overlay-low);
}
.image-lightbox__header > *,
.image-lightbox__content > * {
pointer-events: all;

View file

@ -1,38 +1,37 @@
import React, { useState, useMemo, useReducer, useEffect } from "react";
import PropTypes from "prop-types";
import "./ImagePack.scss";
import React, {
useState, useMemo, useReducer, useEffect,
} from 'react';
import PropTypes from 'prop-types';
import './ImagePack.scss';
import initMatrix from "../../../client/initMatrix";
import { openReusableDialog } from "../../../client/action/navigation";
import { suffixRename } from "../../../util/common";
import initMatrix from '../../../client/initMatrix';
import { openReusableDialog } from '../../../client/action/navigation';
import { suffixRename } from '../../../util/common';
import Button from "../../atoms/button/Button";
import Text from "../../atoms/text/Text";
import Input from "../../atoms/input/Input";
import Checkbox from "../../atoms/button/Checkbox";
import { MenuHeader } from "../../atoms/context-menu/ContextMenu";
import Button from '../../atoms/button/Button';
import Text from '../../atoms/text/Text';
import Input from '../../atoms/input/Input';
import Checkbox from '../../atoms/button/Checkbox';
import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
import { ImagePack as ImagePackBuilder } from "../../organisms/emoji-board/custom-emoji";
import { confirmDialog } from "../confirm-dialog/ConfirmDialog";
import ImagePackProfile from "./ImagePackProfile";
import ImagePackItem from "./ImagePackItem";
import ImagePackUpload from "./ImagePackUpload";
import { ImagePack as ImagePackBuilder } from '../../organisms/emoji-board/custom-emoji';
import { confirmDialog } from '../confirm-dialog/ConfirmDialog';
import ImagePackProfile from './ImagePackProfile';
import ImagePackItem from './ImagePackItem';
import ImagePackUpload from './ImagePackUpload';
const renameImagePackItem = (shortcode) =>
new Promise((resolve) => {
const renameImagePackItem = (shortcode) => new Promise((resolve) => {
let isCompleted = false;
openReusableDialog(
<Text variant="s1" weight="medium">
Rename
</Text>,
<Text variant="s1" weight="medium">Rename</Text>,
(requestClose) => (
<div style={{ padding: "var(--sp-normal)" }}>
<div style={{ padding: 'var(--sp-normal)' }}>
<form
onSubmit={(e) => {
e.preventDefault();
const sc = e.target.shortcode.value;
if (sc.trim() === "") return;
if (sc.trim() === '') return;
isCompleted = true;
resolve(sc.trim());
requestClose();
@ -45,36 +44,32 @@ const renameImagePackItem = (shortcode) =>
autoFocus
required
/>
<div style={{ height: "var(--sp-normal)" }} />
<Button variant="primary" type="submit">
Rename
</Button>
<div style={{ height: 'var(--sp-normal)' }} />
<Button variant="primary" type="submit">Rename</Button>
</form>
</div>
),
() => {
if (!isCompleted) resolve(null);
}
},
);
});
});
function getUsage(usage) {
if (usage.includes("emoticon") && usage.includes("sticker")) return "both";
if (usage.includes("emoticon")) return "emoticon";
if (usage.includes("sticker")) return "sticker";
if (usage.includes('emoticon') && usage.includes('sticker')) return 'both';
if (usage.includes('emoticon')) return 'emoticon';
if (usage.includes('sticker')) return 'sticker';
return "both";
return 'both';
}
function isGlobalPack(roomId, stateKey) {
const mx = initMatrix.matrixClient;
const globalContent = mx
.getAccountData("im.ponies.emote_rooms")
?.getContent();
if (typeof globalContent !== "object") return false;
const globalContent = mx.getAccountData('im.ponies.emote_rooms')?.getContent();
if (typeof globalContent !== 'object') return false;
const { rooms } = globalContent;
if (typeof rooms !== "object") return false;
if (typeof rooms !== 'object') return false;
return rooms[roomId]?.[stateKey] !== undefined;
}
@ -83,17 +78,13 @@ function useRoomImagePack(roomId, stateKey) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const packEvent = room.currentState.getStateEvents(
"im.ponies.room_emotes",
stateKey
);
const pack = useMemo(
() => ImagePackBuilder.parsePack(packEvent.getId(), packEvent.getContent()),
[room, stateKey]
);
const packEvent = room.currentState.getStateEvents('im.ponies.room_emotes', stateKey);
const pack = useMemo(() => (
ImagePackBuilder.parsePack(packEvent.getId(), packEvent.getContent())
), [room, stateKey]);
const sendPackContent = (content) => {
mx.sendStateEvent(roomId, "im.ponies.room_emotes", content, stateKey);
mx.sendStateEvent(roomId, 'im.ponies.room_emotes', content, stateKey);
};
return {
@ -104,21 +95,16 @@ function useRoomImagePack(roomId, stateKey) {
function useUserImagePack() {
const mx = initMatrix.matrixClient;
const packEvent = mx.getAccountData("im.ponies.user_emotes");
const pack = useMemo(
() =>
ImagePackBuilder.parsePack(
mx.getUserId(),
packEvent?.getContent() ?? {
pack: { display_name: "Personal" },
const packEvent = mx.getAccountData('im.ponies.user_emotes');
const pack = useMemo(() => (
ImagePackBuilder.parsePack(mx.getUserId(), packEvent?.getContent() ?? {
pack: { display_name: 'Personal' },
images: {},
}
),
[]
);
})
), []);
const sendPackContent = (content) => {
mx.setAccountData("im.ponies.user_emotes", content);
mx.setAccountData('im.ponies.user_emotes', content);
};
return {
@ -131,11 +117,12 @@ function useImagePackHandles(pack, sendPackContent) {
const [, forceUpdate] = useReducer((count) => count + 1, 0);
const getNewKey = (key) => {
if (typeof key !== "string") return undefined;
let newKey = key?.replace(/\s/g, "_");
if (typeof key !== 'string') return undefined;
let newKey = key?.replace(/\s/g, '_');
if (pack.getImages().get(newKey)) {
newKey = suffixRename(newKey, (suffixedKey) =>
pack.getImages().get(suffixedKey)
newKey = suffixRename(
newKey,
(suffixedKey) => pack.getImages().get(suffixedKey),
);
}
return newKey;
@ -154,12 +141,10 @@ function useImagePackHandles(pack, sendPackContent) {
};
const handleUsageChange = (newUsage) => {
const usage = [];
if (newUsage === "emoticon" || newUsage === "both") usage.push("emoticon");
if (newUsage === "sticker" || newUsage === "both") usage.push("sticker");
if (newUsage === 'emoticon' || newUsage === 'both') usage.push('emoticon');
if (newUsage === 'sticker' || newUsage === 'both') usage.push('sticker');
pack.setUsage(usage);
pack
.getImages()
.forEach((img) => pack.setImageUsage(img.shortcode, undefined));
pack.getImages().forEach((img) => pack.setImageUsage(img.shortcode, undefined));
sendPackContent(pack.getContent());
forceUpdate();
@ -176,10 +161,10 @@ function useImagePackHandles(pack, sendPackContent) {
};
const handleDeleteItem = async (key) => {
const isConfirmed = await confirmDialog(
"Delete",
'Delete',
`Are you sure that you want to delete "${key}"?`,
"Delete",
"danger"
'Delete',
'danger',
);
if (!isConfirmed) return;
pack.removeImage(key);
@ -189,8 +174,8 @@ function useImagePackHandles(pack, sendPackContent) {
};
const handleUsageItem = (key, newUsage) => {
const usage = [];
if (newUsage === "emoticon" || newUsage === "both") usage.push("emoticon");
if (newUsage === "sticker" || newUsage === "both") usage.push("sticker");
if (newUsage === 'emoticon' || newUsage === 'both') usage.push('emoticon');
if (newUsage === 'sticker' || newUsage === 'both') usage.push('sticker');
pack.setImageUsage(key, usage);
sendPackContent(pack.getContent());
@ -220,23 +205,21 @@ function useImagePackHandles(pack, sendPackContent) {
}
function addGlobalImagePack(mx, roomId, stateKey) {
const content =
mx.getAccountData("im.ponies.emote_rooms")?.getContent() ?? {};
const content = mx.getAccountData('im.ponies.emote_rooms')?.getContent() ?? {};
if (!content.rooms) content.rooms = {};
if (!content.rooms[roomId]) content.rooms[roomId] = {};
content.rooms[roomId][stateKey] = {};
return mx.setAccountData("im.ponies.emote_rooms", content);
return mx.setAccountData('im.ponies.emote_rooms', content);
}
function removeGlobalImagePack(mx, roomId, stateKey) {
const content =
mx.getAccountData("im.ponies.emote_rooms")?.getContent() ?? {};
const content = mx.getAccountData('im.ponies.emote_rooms')?.getContent() ?? {};
if (!content.rooms) return Promise.resolve();
if (!content.rooms[roomId]) return Promise.resolve();
delete content.rooms[roomId][stateKey];
if (Object.keys(content.rooms[roomId]).length === 0) {
delete content.rooms[roomId];
}
return mx.setAccountData("im.ponies.emote_rooms", content);
return mx.setAccountData('im.ponies.emote_rooms', content);
}
function ImagePack({ roomId, stateKey, handlePackDelete }) {
@ -264,17 +247,14 @@ function ImagePack({ roomId, stateKey, handlePackDelete }) {
};
const myPowerlevel = room.getMember(mx.getUserId())?.powerLevel || 0;
const canChange = room.currentState.hasSufficientPowerLevelFor(
"state_default",
myPowerlevel
);
const canChange = room.currentState.hasSufficientPowerLevelFor('state_default', myPowerlevel);
const handleDeletePack = async () => {
const isConfirmed = await confirmDialog(
"Delete Pack",
'Delete Pack',
`Are you sure that you want to delete "${pack.displayName}"?`,
"Delete",
"danger"
'Delete',
'danger',
);
if (!isConfirmed) return;
handlePackDelete(stateKey);
@ -285,20 +265,18 @@ function ImagePack({ roomId, stateKey, handlePackDelete }) {
return (
<div className="image-pack">
<ImagePackProfile
avatarUrl={
pack.avatarUrl
? mx.mxcUrlToHttp(pack.avatarUrl, 42, 42, "crop")
: null
}
displayName={pack.displayName ?? "Unknown"}
avatarUrl={pack.avatarUrl ? mx.mxcUrlToHttp(pack.avatarUrl, 42, 42, 'crop') : null}
displayName={pack.displayName ?? 'Unknown'}
attribution={pack.attribution}
usage={getUsage(pack.usage)}
onUsageChange={canChange ? handleUsageChange : null}
onAvatarChange={canChange ? handleAvatarChange : null}
onEditProfile={canChange ? handleEditProfile : null}
/>
{canChange && <ImagePackUpload onUpload={handleAddItem} />}
{images.length === 0 ? null : (
{ canChange && (
<ImagePackUpload onUpload={handleAddItem} />
)}
{ images.length === 0 ? null : (
<div>
<div className="image-pack__header">
<Text variant="b3">Image</Text>
@ -322,27 +300,21 @@ function ImagePack({ roomId, stateKey, handlePackDelete }) {
<div className="image-pack__footer">
{pack.images.size > 2 && (
<Button onClick={() => setViewMore(!viewMore)}>
{viewMore ? "View less" : `View ${pack.images.size - 2} more`}
</Button>
)}
{handlePackDelete && (
<Button variant="danger" onClick={handleDeletePack}>
Delete Pack
{
viewMore
? 'View less'
: `View ${pack.images.size - 2} more`
}
</Button>
)}
{ handlePackDelete && <Button variant="danger" onClick={handleDeletePack}>Delete Pack</Button>}
</div>
)}
<div className="image-pack__global">
<Checkbox
variant="positive"
onToggle={handleGlobalChange}
isActive={isGlobal}
/>
<Checkbox variant="positive" onToggle={handleGlobalChange} isActive={isGlobal} />
<div>
<Text variant="b2">Use globally</Text>
<Text variant="b3">
Add this pack to your account to use in all rooms.
</Text>
<Text variant="b3">Add this pack to your account to use in all rooms.</Text>
</div>
</div>
</div>
@ -379,12 +351,8 @@ function ImagePackUser() {
return (
<div className="image-pack">
<ImagePackProfile
avatarUrl={
pack.avatarUrl
? mx.mxcUrlToHttp(pack.avatarUrl, 42, 42, "crop")
: null
}
displayName={pack.displayName ?? "Personal"}
avatarUrl={pack.avatarUrl ? mx.mxcUrlToHttp(pack.avatarUrl, 42, 42, 'crop') : null}
displayName={pack.displayName ?? 'Personal'}
attribution={pack.attribution}
usage={getUsage(pack.usage)}
onUsageChange={handleUsageChange}
@ -392,7 +360,7 @@ function ImagePackUser() {
onEditProfile={handleEditProfile}
/>
<ImagePackUpload onUpload={handleAddItem} />
{images.length === 0 ? null : (
{ images.length === 0 ? null : (
<div>
<div className="image-pack__header">
<Text variant="b3">Image</Text>
@ -412,10 +380,14 @@ function ImagePackUser() {
))}
</div>
)}
{pack.images.size > 2 && (
{(pack.images.size > 2) && (
<div className="image-pack__footer">
<Button onClick={() => setViewMore(!viewMore)}>
{viewMore ? "View less" : `View ${pack.images.size - 2} more`}
{
viewMore
? 'View less'
: `View ${pack.images.size - 2} more`
}
</Button>
</div>
)}
@ -428,13 +400,11 @@ function useGlobalImagePack() {
const mx = initMatrix.matrixClient;
const roomIdToStateKeys = new Map();
const globalContent = mx
.getAccountData("im.ponies.emote_rooms")
?.getContent() ?? { rooms: {} };
const globalContent = mx.getAccountData('im.ponies.emote_rooms')?.getContent() ?? { rooms: {} };
const { rooms } = globalContent;
Object.keys(rooms).forEach((roomId) => {
if (typeof rooms[roomId] !== "object") return;
if (typeof rooms[roomId] !== 'object') return;
const room = mx.getRoom(roomId);
const stateKeys = Object.keys(rooms[roomId]);
if (!room || stateKeys.length === 0) return;
@ -443,11 +413,11 @@ function useGlobalImagePack() {
useEffect(() => {
const handleEvent = (event) => {
if (event.getType() === "im.ponies.emote_rooms") forceUpdate();
if (event.getType() === 'im.ponies.emote_rooms') forceUpdate();
};
mx.addListener("accountData", handleEvent);
mx.addListener('accountData', handleEvent);
return () => {
mx.removeListener("accountData", handleEvent);
mx.removeListener('accountData', handleEvent);
};
}, []);
@ -466,39 +436,29 @@ function ImagePackGlobal() {
<div className="image-pack-global">
<MenuHeader>Global packs</MenuHeader>
<div>
{roomIdToStateKeys.size > 0 ? (
[...roomIdToStateKeys].map(([roomId, stateKeys]) => {
{
roomIdToStateKeys.size > 0
? [...roomIdToStateKeys].map(([roomId, stateKeys]) => {
const room = mx.getRoom(roomId);
return stateKeys.map((stateKey) => {
const data = room.currentState.getStateEvents(
"im.ponies.room_emotes",
stateKey
);
const pack = ImagePackBuilder.parsePack(
data?.getId(),
data?.getContent()
);
return (
stateKeys.map((stateKey) => {
const data = room.currentState.getStateEvents('im.ponies.room_emotes', stateKey);
const pack = ImagePackBuilder.parsePack(data?.getId(), data?.getContent());
if (!pack) return null;
return (
<div className="image-pack__global" key={pack.id}>
<Checkbox
variant="positive"
onToggle={() => handleChange(roomId, stateKey)}
isActive
/>
<Checkbox variant="positive" onToggle={() => handleChange(roomId, stateKey)} isActive />
<div>
<Text variant="b2">{pack.displayName ?? "Unknown"}</Text>
<Text variant="b2">{pack.displayName ?? 'Unknown'}</Text>
<Text variant="b3">{room.name}</Text>
</div>
</div>
);
});
})
) : (
<div className="image-pack-global__empty">
<Text>No global packs</Text>
</div>
)}
);
})
: <div className="image-pack-global__empty"><Text>No global packs</Text></div>
}
</div>
</div>
);

View file

@ -1,4 +1,4 @@
@use "../../partials/flex";
@use '../../partials/flex';
.image-pack {
&-item {

View file

@ -1,33 +1,28 @@
import React from "react";
import PropTypes from "prop-types";
import "./ImagePackItem.scss";
import React from 'react';
import PropTypes from 'prop-types';
import './ImagePackItem.scss';
import { openReusableContextMenu } from "../../../client/action/navigation";
import { getEventCords } from "../../../util/common";
import { openReusableContextMenu } from '../../../client/action/navigation';
import { getEventCords } from '../../../util/common';
import Avatar from "../../atoms/avatar/Avatar";
import Text from "../../atoms/text/Text";
import Button from "../../atoms/button/Button";
import RawIcon from "../../atoms/system-icons/RawIcon";
import IconButton from "../../atoms/button/IconButton";
import ImagePackUsageSelector from "./ImagePackUsageSelector";
import Avatar from '../../atoms/avatar/Avatar';
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
import RawIcon from '../../atoms/system-icons/RawIcon';
import IconButton from '../../atoms/button/IconButton';
import ImagePackUsageSelector from './ImagePackUsageSelector';
import ChevronBottomIC from "../../../../public/res/ic/outlined/chevron-bottom.svg";
import PencilIC from "../../../../public/res/ic/outlined/pencil.svg";
import BinIC from "../../../../public/res/ic/outlined/bin.svg";
import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
import PencilIC from '../../../../public/res/ic/outlined/pencil.svg';
import BinIC from '../../../../public/res/ic/outlined/bin.svg';
function ImagePackItem({
url,
shortcode,
usage,
onUsageChange,
onDelete,
onRename,
url, shortcode, usage, onUsageChange, onDelete, onRename,
}) {
const handleUsageSelect = (event) => {
openReusableContextMenu(
"bottom",
getEventCords(event, ".btn-surface"),
'bottom',
getEventCords(event, '.btn-surface'),
(closeMenu) => (
<ImagePackUsageSelector
usage={usage}
@ -36,48 +31,27 @@ function ImagePackItem({
closeMenu();
}}
/>
)
),
);
};
return (
<div className="image-pack-item">
<Avatar
imageSrc={url}
size="extra-small"
text={shortcode}
bgColor="black"
/>
<Avatar imageSrc={url} size="extra-small" text={shortcode} bgColor="black" />
<div className="image-pack-item__content">
<Text>{shortcode}</Text>
</div>
<div className="image-pack-item__usage">
<div className="image-pack-item__btn">
{onRename && (
<IconButton
tooltip="Rename"
size="extra-small"
src={PencilIC}
onClick={() => onRename(shortcode)}
/>
)}
{onDelete && (
<IconButton
tooltip="Delete"
size="extra-small"
src={BinIC}
onClick={() => onDelete(shortcode)}
/>
)}
{onRename && <IconButton tooltip="Rename" size="extra-small" src={PencilIC} onClick={() => onRename(shortcode)} />}
{onDelete && <IconButton tooltip="Delete" size="extra-small" src={BinIC} onClick={() => onDelete(shortcode)} />}
</div>
<Button onClick={onUsageChange ? handleUsageSelect : undefined}>
{onUsageChange && (
<RawIcon src={ChevronBottomIC} size="extra-small" />
)}
{onUsageChange && <RawIcon src={ChevronBottomIC} size="extra-small" />}
<Text variant="b2">
{usage === "emoticon" && "Emoji"}
{usage === "sticker" && "Sticker"}
{usage === "both" && "Both"}
{usage === 'emoticon' && 'Emoji'}
{usage === 'sticker' && 'Sticker'}
{usage === 'both' && 'Both'}
</Text>
</Button>
</div>
@ -93,7 +67,7 @@ ImagePackItem.defaultProps = {
ImagePackItem.propTypes = {
url: PropTypes.string.isRequired,
shortcode: PropTypes.string.isRequired,
usage: PropTypes.oneOf(["emoticon", "sticker", "both"]).isRequired,
usage: PropTypes.oneOf(['emoticon', 'sticker', 'both']).isRequired,
onUsageChange: PropTypes.func,
onDelete: PropTypes.func,
onRename: PropTypes.func,

View file

@ -1,5 +1,5 @@
@use "../../partials/flex";
@use "../../partials/dir";
@use '../../partials/flex';
@use '../../partials/dir';
.image-pack-item {
margin: 0 var(--sp-normal);

View file

@ -1,29 +1,24 @@
import React, { useState } from "react";
import PropTypes from "prop-types";
import "./ImagePackProfile.scss";
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import './ImagePackProfile.scss';
import { openReusableContextMenu } from "../../../client/action/navigation";
import { getEventCords } from "../../../util/common";
import { openReusableContextMenu } from '../../../client/action/navigation';
import { getEventCords } from '../../../util/common';
import Text from "../../atoms/text/Text";
import Avatar from "../../atoms/avatar/Avatar";
import Button from "../../atoms/button/Button";
import IconButton from "../../atoms/button/IconButton";
import Input from "../../atoms/input/Input";
import ImageUpload from "../image-upload/ImageUpload";
import ImagePackUsageSelector from "./ImagePackUsageSelector";
import Text from '../../atoms/text/Text';
import Avatar from '../../atoms/avatar/Avatar';
import Button from '../../atoms/button/Button';
import IconButton from '../../atoms/button/IconButton';
import Input from '../../atoms/input/Input';
import ImageUpload from '../image-upload/ImageUpload';
import ImagePackUsageSelector from './ImagePackUsageSelector';
import ChevronBottomIC from "../../../../public/res/ic/outlined/chevron-bottom.svg";
import PencilIC from "../../../../public/res/ic/outlined/pencil.svg";
import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
import PencilIC from '../../../../public/res/ic/outlined/pencil.svg';
function ImagePackProfile({
avatarUrl,
displayName,
attribution,
usage,
onUsageChange,
onAvatarChange,
onEditProfile,
avatarUrl, displayName, attribution, usage,
onUsageChange, onAvatarChange, onEditProfile,
}) {
const [isEdit, setIsEdit] = useState(false);
@ -40,8 +35,8 @@ function ImagePackProfile({
const handleUsageSelect = (event) => {
openReusableContextMenu(
"bottom",
getEventCords(event, ".btn-surface"),
'bottom',
getEventCords(event, '.btn-surface'),
(closeMenu) => (
<ImagePackUsageSelector
usage={usage}
@ -50,13 +45,15 @@ function ImagePackProfile({
closeMenu();
}}
/>
)
),
);
};
return (
<div className="image-pack-profile">
{onAvatarChange ? (
{
onAvatarChange
? (
<ImageUpload
bgColor="#555"
text={displayName}
@ -65,28 +62,18 @@ function ImagePackProfile({
onUpload={onAvatarChange}
onRequestRemove={() => onAvatarChange(undefined)}
/>
) : (
<Avatar
bgColor="#555"
text={displayName}
imageSrc={avatarUrl}
size="normal"
/>
)}
)
: <Avatar bgColor="#555" text={displayName} imageSrc={avatarUrl} size="normal" />
}
<div className="image-pack-profile__content">
{isEdit ? (
{
isEdit
? (
<form onSubmit={handleSubmit}>
<Input name="nameInput" label="Name" value={displayName} required />
<Input
name="attributionInput"
label="Attribution"
value={attribution}
resizable
/>
<Input name="attributionInput" label="Attribution" value={attribution} resizable />
<div>
<Button variant="primary" type="submit">
Save
</Button>
<Button variant="primary" type="submit">Save</Button>
<Button onClick={() => setIsEdit(false)}>Cancel</Button>
</div>
</form>
@ -94,18 +81,12 @@ function ImagePackProfile({
<>
<div>
<Text>{displayName}</Text>
{onEditProfile && (
<IconButton
size="extra-small"
onClick={() => setIsEdit(true)}
src={PencilIC}
tooltip="Edit"
/>
)}
{onEditProfile && <IconButton size="extra-small" onClick={() => setIsEdit(true)} src={PencilIC} tooltip="Edit" />}
</div>
{attribution && <Text variant="b3">{attribution}</Text>}
</>
)}
)
}
</div>
<div className="image-pack-profile__usage">
<Text variant="b3">Pack usage</Text>
@ -114,9 +95,9 @@ function ImagePackProfile({
iconSrc={onUsageChange ? ChevronBottomIC : null}
>
<Text>
{usage === "emoticon" && "Emoji"}
{usage === "sticker" && "Sticker"}
{usage === "both" && "Both"}
{usage === 'emoticon' && 'Emoji'}
{usage === 'sticker' && 'Sticker'}
{usage === 'both' && 'Both'}
</Text>
</Button>
</div>
@ -135,7 +116,7 @@ ImagePackProfile.propTypes = {
avatarUrl: PropTypes.string,
displayName: PropTypes.string.isRequired,
attribution: PropTypes.string,
usage: PropTypes.oneOf(["emoticon", "sticker", "both"]).isRequired,
usage: PropTypes.oneOf(['emoticon', 'sticker', 'both']).isRequired,
onUsageChange: PropTypes.func,
onAvatarChange: PropTypes.func,
onEditProfile: PropTypes.func,

View file

@ -1,4 +1,4 @@
@use "../../partials/flex";
@use '../../partials/flex';
.image-pack-profile {
padding: var(--sp-normal);

View file

@ -1,15 +1,15 @@
import React, { useState, useRef } from "react";
import PropTypes from "prop-types";
import "./ImagePackUpload.scss";
import React, { useState, useRef } from 'react';
import PropTypes from 'prop-types';
import './ImagePackUpload.scss';
import initMatrix from "../../../client/initMatrix";
import { scaleDownImage } from "../../../util/common";
import initMatrix from '../../../client/initMatrix';
import { scaleDownImage } from '../../../util/common';
import Text from "../../atoms/text/Text";
import Button from "../../atoms/button/Button";
import Input from "../../atoms/input/Input";
import IconButton from "../../atoms/button/IconButton";
import CirclePlusIC from "../../../../public/res/ic/outlined/circle-plus.svg";
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
import Input from '../../atoms/input/Input';
import IconButton from '../../atoms/button/IconButton';
import CirclePlusIC from '../../../../public/res/ic/outlined/circle-plus.svg';
function ImagePackUpload({ onUpload }) {
const mx = initMatrix.matrixClient;
@ -23,7 +23,7 @@ function ImagePackUpload({ onUpload }) {
if (!imgFile) return;
const { shortcodeInput } = evt.target;
const shortcode = shortcodeInput.value.trim();
if (shortcode === "") return;
if (shortcode === '') return;
setProgress(true);
const image = await scaleDownImage(imgFile, 512, 512);
@ -32,53 +32,37 @@ function ImagePackUpload({ onUpload }) {
onUpload(shortcode, url);
setProgress(false);
setImgFile(null);
shortcodeRef.current.value = "";
shortcodeRef.current.value = '';
};
const handleFileChange = (evt) => {
const img = evt.target.files[0];
if (!img) return;
setImgFile(img);
shortcodeRef.current.value = img.name.slice(0, img.name.indexOf("."));
shortcodeRef.current.value = img.name.slice(0, img.name.indexOf('.'));
shortcodeRef.current.focus();
};
const handleRemove = () => {
setImgFile(null);
inputRef.current.value = null;
shortcodeRef.current.value = "";
shortcodeRef.current.value = '';
};
return (
<form onSubmit={handleSubmit} className="image-pack-upload">
<input
ref={inputRef}
onChange={handleFileChange}
style={{ display: "none" }}
type="file"
accept=".png, .gif, .webp"
required
/>
{imgFile ? (
<input ref={inputRef} onChange={handleFileChange} style={{ display: 'none' }} type="file" accept=".png, .gif, .webp" required />
{
imgFile
? (
<div className="image-pack-upload__file">
<IconButton
onClick={handleRemove}
src={CirclePlusIC}
tooltip="Remove file"
/>
<IconButton onClick={handleRemove} src={CirclePlusIC} tooltip="Remove file" />
<Text>{imgFile.name}</Text>
</div>
) : (
<Button onClick={() => inputRef.current.click()}>Import image</Button>
)}
<Input
forwardRef={shortcodeRef}
name="shortcodeInput"
placeholder="shortcode"
required
/>
<Button disabled={progress} variant="primary" type="submit">
{progress ? "Uploading..." : "Upload"}
</Button>
)
: <Button onClick={() => inputRef.current.click()}>Import image</Button>
}
<Input forwardRef={shortcodeRef} name="shortcodeInput" placeholder="shortcode" required />
<Button disabled={progress} variant="primary" type="submit">{progress ? 'Uploading...' : 'Upload'}</Button>
</form>
);
}

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