Compare commits
25 Commits
Author | SHA1 | Date | |
---|---|---|---|
c96385edd5 | |||
cd1a477324 | |||
b5089f7f0b | |||
67a1699102 | |||
e8a9ce4e69 | |||
8f5bc2fe21 | |||
109da1be71 | |||
1ea78821b0 | |||
12ceefd650 | |||
734357b396 | |||
ccaf5234ed | |||
5d350e8db9 | |||
cd164538de | |||
d51de554d6 | |||
a068d31d14 | |||
3d185bf044 | |||
6cfee0f6a3 | |||
66f3e0475f | |||
dee8cc2c41 | |||
91a87199c4 | |||
38e227a9d4 | |||
c4bb7c9b17 | |||
88f1cedcdc | |||
c75dc80f82 | |||
351834633f |
@ -1,2 +1 @@
|
|||||||
ARG VARIANT="16"
|
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:18
|
||||||
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
|
|
||||||
|
@ -10,8 +10,6 @@
|
|||||||
"editorconfig.editorconfig",
|
"editorconfig.editorconfig",
|
||||||
"esbenp.prettier-vscode",
|
"esbenp.prettier-vscode",
|
||||||
"dbaeumer.vscode-eslint",
|
"dbaeumer.vscode-eslint",
|
||||||
"divlo.vscode-styled-jsx-syntax",
|
|
||||||
"divlo.vscode-styled-jsx-languageserver",
|
|
||||||
"bradlc.vscode-tailwindcss",
|
"bradlc.vscode-tailwindcss",
|
||||||
"mikestead.dotenv",
|
"mikestead.dotenv",
|
||||||
"davidanson.vscode-markdownlint",
|
"davidanson.vscode-markdownlint",
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
.vscode
|
.*
|
||||||
.git
|
!.npmrc
|
||||||
.env
|
|
||||||
build
|
build
|
||||||
.next
|
|
||||||
coverage
|
coverage
|
||||||
node_modules
|
node_modules
|
||||||
tmp
|
|
||||||
temp
|
|
||||||
.DS_Store
|
|
||||||
.lighthouseci
|
|
||||||
.vercel
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
COMPOSE_PROJECT_NAME=thream-website
|
COMPOSE_PROJECT_NAME=thream-website
|
||||||
NEXT_PUBLIC_API_URL=http://localhost:8080
|
NEXT_PUBLIC_API_URL=http://127.0.0.1:8080
|
||||||
PORT=3000
|
PORT=3000
|
||||||
|
6
.github/workflows/analyze.yml
vendored
6
.github/workflows/analyze.yml
vendored
@ -16,12 +16,12 @@ jobs:
|
|||||||
language: ['javascript']
|
language: ['javascript']
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.3.0'
|
||||||
|
|
||||||
- name: 'Initialize CodeQL'
|
- name: 'Initialize CodeQL'
|
||||||
uses: 'github/codeql-action/init@v1'
|
uses: 'github/codeql-action/init@v2'
|
||||||
with:
|
with:
|
||||||
languages: ${{ matrix.language }}
|
languages: ${{ matrix.language }}
|
||||||
|
|
||||||
- name: 'Perform CodeQL Analysis'
|
- name: 'Perform CodeQL Analysis'
|
||||||
uses: 'github/codeql-action/analyze@v1'
|
uses: 'github/codeql-action/analyze@v2'
|
||||||
|
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@ -10,12 +10,12 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.3.0'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Use Node.js'
|
||||||
uses: 'actions/setup-node@v3.0.0'
|
uses: 'actions/setup-node@v3.6.0'
|
||||||
with:
|
with:
|
||||||
node-version: '16.x'
|
node-version: '18.x'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|
||||||
- name: 'Install'
|
- name: 'Install'
|
||||||
|
15
.github/workflows/lint.yml
vendored
15
.github/workflows/lint.yml
vendored
@ -10,12 +10,12 @@ jobs:
|
|||||||
lint:
|
lint:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.3.0'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Use Node.js'
|
||||||
uses: 'actions/setup-node@v3.0.0'
|
uses: 'actions/setup-node@v3.6.0'
|
||||||
with:
|
with:
|
||||||
node-version: '16.x'
|
node-version: '18.x'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|
||||||
- name: 'Install'
|
- name: 'Install'
|
||||||
@ -30,8 +30,8 @@ jobs:
|
|||||||
- name: 'lint:markdown'
|
- name: 'lint:markdown'
|
||||||
run: 'npm run lint:markdown'
|
run: 'npm run lint:markdown'
|
||||||
|
|
||||||
- name: 'lint:typescript'
|
- name: 'lint:eslint'
|
||||||
run: 'npm run lint:typescript'
|
run: 'npm run lint:eslint'
|
||||||
|
|
||||||
- name: 'lint:prettier'
|
- name: 'lint:prettier'
|
||||||
run: 'npm run lint:prettier'
|
run: 'npm run lint:prettier'
|
||||||
@ -40,8 +40,3 @@ jobs:
|
|||||||
uses: 'dotenv-linter/action-dotenv-linter@v2'
|
uses: 'dotenv-linter/action-dotenv-linter@v2'
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.github_token }}
|
github_token: ${{ secrets.github_token }}
|
||||||
|
|
||||||
- name: 'lint:docker'
|
|
||||||
uses: 'hadolint/hadolint-action@v1.6.0'
|
|
||||||
with:
|
|
||||||
dockerfile: './Dockerfile'
|
|
||||||
|
6
.github/workflows/release.yml
vendored
6
.github/workflows/release.yml
vendored
@ -8,7 +8,7 @@ jobs:
|
|||||||
release:
|
release:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.3.0'
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
@ -21,9 +21,9 @@ jobs:
|
|||||||
git_commit_gpgsign: true
|
git_commit_gpgsign: true
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Use Node.js'
|
||||||
uses: 'actions/setup-node@v2.4.0'
|
uses: 'actions/setup-node@v3.6.0'
|
||||||
with:
|
with:
|
||||||
node-version: '16.x'
|
node-version: '18.x'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|
||||||
- name: 'Install'
|
- name: 'Install'
|
||||||
|
18
.github/workflows/test.yml
vendored
18
.github/workflows/test.yml
vendored
@ -10,12 +10,12 @@ jobs:
|
|||||||
test-unit:
|
test-unit:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.3.0'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Use Node.js'
|
||||||
uses: 'actions/setup-node@v3.0.0'
|
uses: 'actions/setup-node@v3.6.0'
|
||||||
with:
|
with:
|
||||||
node-version: '16.x'
|
node-version: '18.x'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|
||||||
- name: 'Install'
|
- name: 'Install'
|
||||||
@ -27,12 +27,12 @@ jobs:
|
|||||||
test-lighthouse:
|
test-lighthouse:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.3.0'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Use Node.js'
|
||||||
uses: 'actions/setup-node@v3.0.0'
|
uses: 'actions/setup-node@v3.6.0'
|
||||||
with:
|
with:
|
||||||
node-version: '16.x'
|
node-version: '18.x'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|
||||||
- name: 'Install'
|
- name: 'Install'
|
||||||
@ -52,12 +52,12 @@ jobs:
|
|||||||
test-e2e:
|
test-e2e:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.3.0'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Use Node.js'
|
||||||
uses: 'actions/setup-node@v3.0.0'
|
uses: 'actions/setup-node@v3.6.0'
|
||||||
with:
|
with:
|
||||||
node-version: '16.x'
|
node-version: '18.x'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|
||||||
- name: 'Install'
|
- name: 'Install'
|
||||||
|
5
.gitignore
vendored
5
.gitignore
vendored
@ -49,3 +49,8 @@ npm-debug.log*
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
.lighthouseci
|
.lighthouseci
|
||||||
.vercel
|
.vercel
|
||||||
|
*.hbs
|
||||||
|
|
||||||
|
# typescript
|
||||||
|
*.tsbuildinfo
|
||||||
|
next-env.d.ts
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"urls": [
|
"urls": [
|
||||||
"http://localhost:3000/",
|
"http://127.0.0.1:3000/",
|
||||||
"http://localhost:3000/authentication/forgot-password",
|
"http://127.0.0.1:3000/authentication/forgot-password",
|
||||||
"http://localhost:3000/authentication/reset-password",
|
"http://127.0.0.1:3000/authentication/reset-password",
|
||||||
"http://localhost:3000/authentication/signin",
|
"http://127.0.0.1:3000/authentication/signin",
|
||||||
"http://localhost:3000/authentication/signup"
|
"http://127.0.0.1:3000/authentication/signup"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
"startServerReadyPattern": "ready on",
|
"startServerReadyPattern": "ready on",
|
||||||
"startServerReadyTimeout": 20000,
|
"startServerReadyTimeout": 20000,
|
||||||
"url": [
|
"url": [
|
||||||
"http://localhost:3000/",
|
"http://127.0.0.1:3000/",
|
||||||
"http://localhost:3000/authentication/forgot-password",
|
"http://127.0.0.1:3000/authentication/forgot-password",
|
||||||
"http://localhost:3000/authentication/reset-password",
|
"http://127.0.0.1:3000/authentication/reset-password",
|
||||||
"http://localhost:3000/authentication/signin",
|
"http://127.0.0.1:3000/authentication/signin",
|
||||||
"http://localhost:3000/authentication/signup"
|
"http://127.0.0.1:3000/authentication/signup"
|
||||||
],
|
],
|
||||||
"numberOfRuns": 1
|
"numberOfRuns": 1
|
||||||
},
|
},
|
||||||
|
@ -1,11 +1,5 @@
|
|||||||
{
|
{
|
||||||
"config": {
|
|
||||||
"default": true,
|
|
||||||
"MD013": false,
|
|
||||||
"MD024": false,
|
|
||||||
"MD033": false,
|
|
||||||
"MD041": false
|
|
||||||
},
|
|
||||||
"globs": ["**/*.{md,mdx}"],
|
"globs": ["**/*.{md,mdx}"],
|
||||||
"ignores": ["**/node_modules"]
|
"ignores": ["**/node_modules"],
|
||||||
|
"customRules": ["markdownlint-rule-relative-links"]
|
||||||
}
|
}
|
||||||
|
7
.markdownlint.json
Normal file
7
.markdownlint.json
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"default": true,
|
||||||
|
"relative-links": true,
|
||||||
|
"extends": "markdownlint/style/prettier",
|
||||||
|
"MD033": false,
|
||||||
|
"MD041": false
|
||||||
|
}
|
@ -1,7 +0,0 @@
|
|||||||
.next
|
|
||||||
.lighthouseci
|
|
||||||
coverage
|
|
||||||
node_modules
|
|
||||||
**/workbox-*.js
|
|
||||||
**/sw.js
|
|
||||||
*.hbs
|
|
2
.vscode/extensions.json
vendored
2
.vscode/extensions.json
vendored
@ -3,8 +3,6 @@
|
|||||||
"editorconfig.editorconfig",
|
"editorconfig.editorconfig",
|
||||||
"esbenp.prettier-vscode",
|
"esbenp.prettier-vscode",
|
||||||
"dbaeumer.vscode-eslint",
|
"dbaeumer.vscode-eslint",
|
||||||
"divlo.vscode-styled-jsx-syntax",
|
|
||||||
"divlo.vscode-styled-jsx-languageserver",
|
|
||||||
"bradlc.vscode-tailwindcss",
|
"bradlc.vscode-tailwindcss",
|
||||||
"mikestead.dotenv",
|
"mikestead.dotenv",
|
||||||
"davidanson.vscode-markdownlint",
|
"davidanson.vscode-markdownlint",
|
||||||
|
@ -16,6 +16,7 @@ All work on **Thream/website** happens directly on [GitHub](https://github.com/T
|
|||||||
- Suggest a new feature idea.
|
- Suggest a new feature idea.
|
||||||
- Correct spelling errors, improvements or additions to documentation files.
|
- Correct spelling errors, improvements or additions to documentation files.
|
||||||
- Improve structure/format/performance/refactor/tests of the code.
|
- Improve structure/format/performance/refactor/tests of the code.
|
||||||
|
- [Add translations](#add-a-translation).
|
||||||
|
|
||||||
## Pull Requests
|
## Pull Requests
|
||||||
|
|
||||||
@ -61,3 +62,15 @@ Scopes define what part of the code changed.
|
|||||||
git commit -m "feat(components): add Button"
|
git commit -m "feat(components): add Button"
|
||||||
git commit -m "docs(readme): update installation process"
|
git commit -m "docs(readme): update installation process"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Add a translation
|
||||||
|
|
||||||
|
[Reference issue](https://github.com/Thream/website/issues/24)
|
||||||
|
|
||||||
|
Feel free to contribute to Thream and add new languages, we would appreciate your help!
|
||||||
|
|
||||||
|
To add a new language:
|
||||||
|
|
||||||
|
- `npm install`
|
||||||
|
- `npm run generate`
|
||||||
|
- Start editing JSON files with the translation in `locales/{{locale}}` (e.g: `locales/en`)
|
||||||
|
30
Dockerfile
30
Dockerfile
@ -1,23 +1,21 @@
|
|||||||
FROM node:16.17.0 AS dependencies
|
FROM node:18.13.0 AS builder-dependencies
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/application
|
||||||
COPY ./package*.json ./
|
COPY ./package*.json ./
|
||||||
RUN npm install
|
RUN npm install
|
||||||
|
|
||||||
FROM node:16.17.0 AS builder
|
FROM node:18.13.0 AS builder
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/application
|
||||||
|
COPY --from=builder-dependencies /usr/src/application/node_modules ./node_modules
|
||||||
COPY ./ ./
|
COPY ./ ./
|
||||||
COPY --from=dependencies /usr/src/app/node_modules ./node_modules
|
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM node:16.17.0 AS runner
|
FROM gcr.io/distroless/nodejs18-debian11:latest AS runner
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/application
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
COPY --from=builder /usr/src/app/next.config.js ./next.config.js
|
ENV NEXT_TELEMETRY_DISABLED=1
|
||||||
COPY --from=builder /usr/src/app/public ./public
|
COPY --from=builder /usr/src/application/.next/standalone ./
|
||||||
COPY --from=builder /usr/src/app/.next ./.next
|
COPY --from=builder /usr/src/application/.next/static ./.next/static
|
||||||
COPY --from=builder /usr/src/app/i18n.json ./i18n.json
|
COPY --from=builder /usr/src/application/public ./public
|
||||||
COPY --from=builder /usr/src/app/locales ./locales
|
COPY --from=builder /usr/src/application/locales ./locales
|
||||||
COPY --from=builder /usr/src/app/pages ./pages
|
COPY --from=builder /usr/src/application/next.config.js ./next.config.js
|
||||||
COPY --from=builder /usr/src/app/node_modules ./node_modules
|
CMD ["./server.js"]
|
||||||
RUN npx next telemetry disable
|
|
||||||
CMD ["node_modules/.bin/next", "start", "--port", "${PORT}"]
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
Thream's website to stay close with your friends and communities.
|
Thream's website to stay close with your friends and communities.
|
||||||
|
|
||||||
It uses [Thream/api](https://github.com/Thream/api) [v1.1.0](https://github.com/Thream/api/releases/tag/v1.1.0).
|
It uses [Thream/api](https://github.com/Thream/api) [v1.2.4](https://github.com/Thream/api/releases/tag/v1.2.4).
|
||||||
|
|
||||||
## ⚙️ Getting Started
|
## ⚙️ Getting Started
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ docker compose up --build
|
|||||||
|
|
||||||
#### Services started
|
#### Services started
|
||||||
|
|
||||||
- website : `http://localhost:3000`
|
- website : `http://127.0.0.1:3000`
|
||||||
|
|
||||||
## 💡 Contributing
|
## 💡 Contributing
|
||||||
|
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import { useState, useEffect } from 'react'
|
import { useState, useEffect } from 'react'
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import { PlusIcon, MenuIcon, UsersIcon, XIcon } from '@heroicons/react/solid'
|
import { PlusIcon, MenuIcon, UsersIcon, XIcon } from '@heroicons/react/solid'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
import { useMediaQuery } from 'react-responsive'
|
import { useMediaQuery } from 'react-responsive'
|
||||||
import { useSwipeable } from 'react-swipeable'
|
import { useSwipeable } from 'react-swipeable'
|
||||||
|
|
||||||
import { Sidebar, DirectionSidebar } from './Sidebar'
|
import type { DirectionSidebar } from './Sidebar'
|
||||||
|
import { Sidebar } from './Sidebar'
|
||||||
import { IconButton } from '../design/IconButton'
|
import { IconButton } from '../design/IconButton'
|
||||||
import { IconLink } from '../design/IconLink'
|
import { IconLink } from '../design/IconLink'
|
||||||
import { Guilds } from './Guilds/Guilds'
|
import { Guilds } from './Guilds/Guilds'
|
||||||
@ -148,7 +149,9 @@ export const Application: React.FC<
|
|||||||
<header className='z-50 flex h-16 items-center justify-between bg-gray-200 px-2 py-3 shadow-lg dark:bg-gray-800'>
|
<header className='z-50 flex h-16 items-center justify-between bg-gray-200 px-2 py-3 shadow-lg dark:bg-gray-800'>
|
||||||
<IconButton
|
<IconButton
|
||||||
className='h-10 w-10 p-2'
|
className='h-10 w-10 p-2'
|
||||||
onClick={() => handleToggleSidebars('left')}
|
onClick={() => {
|
||||||
|
return handleToggleSidebars('left')
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{!visibleSidebars.left ? <MenuIcon /> : <XIcon />}
|
{!visibleSidebars.left ? <MenuIcon /> : <XIcon />}
|
||||||
</IconButton>
|
</IconButton>
|
||||||
@ -163,7 +166,9 @@ export const Application: React.FC<
|
|||||||
<IconButton
|
<IconButton
|
||||||
data-cy='icon-button-right-sidebar-members'
|
data-cy='icon-button-right-sidebar-members'
|
||||||
className='h-10 w-10 p-2'
|
className='h-10 w-10 p-2'
|
||||||
onClick={() => handleToggleSidebars('right')}
|
onClick={() => {
|
||||||
|
return handleToggleSidebars('right')
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{!visibleSidebars.right ? <UsersIcon /> : <XIcon />}
|
{!visibleSidebars.right ? <UsersIcon /> : <XIcon />}
|
||||||
</IconButton>
|
</IconButton>
|
||||||
|
@ -1,22 +1,27 @@
|
|||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { Form } from 'react-component-form'
|
import { Form, useForm } from 'react-component-form'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
import type { HandleUseFormCallback } from 'react-component-form'
|
||||||
|
|
||||||
import { HandleSubmitCallback, useForm } from '../../../hooks/useForm'
|
|
||||||
import { FormState } from '../../design/FormState'
|
import { FormState } from '../../design/FormState'
|
||||||
import { useGuildMember } from '../../../contexts/GuildMember'
|
import { useGuildMember } from '../../../contexts/GuildMember'
|
||||||
import { Input } from '../../design/Input'
|
import { Input } from '../../design/Input'
|
||||||
import { Button } from '../../design/Button'
|
import { Button } from '../../design/Button'
|
||||||
import { useAuthentication } from '../../../tools/authentication'
|
import { useAuthentication } from '../../../tools/authentication'
|
||||||
import {
|
import type {
|
||||||
Channel,
|
Channel,
|
||||||
channelSchema,
|
|
||||||
ChannelWithDefaultChannelId
|
ChannelWithDefaultChannelId
|
||||||
} from '../../../models/Channel'
|
} from '../../../models/Channel'
|
||||||
|
import { channelSchema } from '../../../models/Channel'
|
||||||
import { ConfirmPopup } from '../ConfirmPopup'
|
import { ConfirmPopup } from '../ConfirmPopup'
|
||||||
|
import { useFormTranslation } from '../../../hooks/useFormTranslation'
|
||||||
|
|
||||||
|
const schema = {
|
||||||
|
name: channelSchema.name
|
||||||
|
}
|
||||||
|
|
||||||
export interface ChannelSettingsProps {
|
export interface ChannelSettingsProps {
|
||||||
channel: Channel
|
channel: Channel
|
||||||
@ -41,25 +46,19 @@ export const ChannelSettings: React.FC<ChannelSettingsProps> = (props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const {
|
const {
|
||||||
|
handleUseForm,
|
||||||
fetchState,
|
fetchState,
|
||||||
message,
|
message,
|
||||||
errors,
|
errors,
|
||||||
getErrorTranslation,
|
|
||||||
handleSubmit,
|
|
||||||
setFetchState,
|
setFetchState,
|
||||||
setMessageTranslationKey
|
setMessage
|
||||||
} = useForm({
|
} = useForm(schema)
|
||||||
validateSchema: {
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
name: channelSchema.name
|
|
||||||
},
|
|
||||||
replaceEmptyStringToNull: true,
|
|
||||||
resetOnSuccess: false
|
|
||||||
})
|
|
||||||
|
|
||||||
const onSubmit: HandleSubmitCallback = async (formData) => {
|
const onSubmit: HandleUseFormCallback<typeof schema> = async (formData) => {
|
||||||
try {
|
try {
|
||||||
await authentication.api.put(`/channels/${channel.id}`, formData)
|
await authentication.api.put(`/channels/${channel.id}`, formData)
|
||||||
setInputValues(formData as any)
|
setInputValues(formData)
|
||||||
await router.push(`/application/${guild.id}/${channel.id}`)
|
await router.push(`/application/${guild.id}/${channel.id}`)
|
||||||
return null
|
return null
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@ -91,9 +90,9 @@ export const ChannelSettings: React.FC<ChannelSettingsProps> = (props) => {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
setFetchState('error')
|
setFetchState('error')
|
||||||
if (axios.isAxiosError(error) && error.response?.status === 400) {
|
if (axios.isAxiosError(error) && error.response?.status === 400) {
|
||||||
setMessageTranslationKey('application:delete-channel-only-one')
|
setMessage('application:delete-channel-only-one')
|
||||||
} else {
|
} else {
|
||||||
setMessageTranslationKey('errors:server-error')
|
setMessage('errors:server-error')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -101,7 +100,7 @@ export const ChannelSettings: React.FC<ChannelSettingsProps> = (props) => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Form
|
<Form
|
||||||
onSubmit={handleSubmit(onSubmit)}
|
onSubmit={handleUseForm(onSubmit)}
|
||||||
className='my-auto flex flex-col items-center justify-center py-12'
|
className='my-auto flex flex-col items-center justify-center py-12'
|
||||||
>
|
>
|
||||||
<div className='flex w-full flex-col items-center justify-center sm:w-fit lg:flex-row'>
|
<div className='flex w-full flex-col items-center justify-center sm:w-fit lg:flex-row'>
|
||||||
@ -114,7 +113,7 @@ export const ChannelSettings: React.FC<ChannelSettingsProps> = (props) => {
|
|||||||
className='!mt-0'
|
className='!mt-0'
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
value={inputValues.name}
|
value={inputValues.name}
|
||||||
error={getErrorTranslation(errors.name)}
|
error={getFirstErrorTranslation(errors.name)}
|
||||||
data-cy='channel-name-input'
|
data-cy='channel-name-input'
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
import classNames from 'classnames'
|
import { memo } from 'react'
|
||||||
|
import classNames from 'clsx'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
import { CogIcon } from '@heroicons/react/solid'
|
import { CogIcon } from '@heroicons/react/solid'
|
||||||
|
|
||||||
import { GuildsChannelsPath } from '../Application'
|
import type { GuildsChannelsPath } from '../Application'
|
||||||
import { Channel as ChannelType } from '../../../models/Channel'
|
import type { Channel as ChannelType } from '../../../models/Channel'
|
||||||
import { useGuildMember } from '../../../contexts/GuildMember'
|
import { useGuildMember } from '../../../contexts/GuildMember'
|
||||||
import { IconButton } from '../../design/IconButton'
|
import { IconButton } from '../../design/IconButton'
|
||||||
|
|
||||||
@ -14,15 +15,15 @@ export interface ChannelProps {
|
|||||||
selected?: boolean
|
selected?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Channel: React.FC<ChannelProps> = (props) => {
|
const ChannelMemo: React.FC<ChannelProps> = (props) => {
|
||||||
const { channel, path, selected = false } = props
|
const { channel, path, selected = false } = props
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const { member } = useGuildMember()
|
const { member } = useGuildMember()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Link href={`/application/${path.guildId}/${channel.id}`}>
|
<Link
|
||||||
<a
|
href={`/application/${path.guildId}/${channel.id}`}
|
||||||
className={classNames(
|
className={classNames(
|
||||||
'group relative my-3 mx-3 flex items-center justify-between overflow-hidden rounded-lg py-2 text-sm transition-all duration-200 hover:bg-gray-100 dark:hover:bg-gray-600',
|
'group relative my-3 mx-3 flex items-center justify-between overflow-hidden rounded-lg py-2 text-sm transition-all duration-200 hover:bg-gray-100 dark:hover:bg-gray-600',
|
||||||
{
|
{
|
||||||
@ -30,10 +31,7 @@ export const Channel: React.FC<ChannelProps> = (props) => {
|
|||||||
}
|
}
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<span
|
<span className='max-[315px] ml-2 mr-4 break-all' data-cy='channel-name'>
|
||||||
className='max-[315px] ml-2 mr-4 break-all'
|
|
||||||
data-cy='channel-name'
|
|
||||||
>
|
|
||||||
# {channel.name}
|
# {channel.name}
|
||||||
</span>
|
</span>
|
||||||
{member.isOwner && (
|
{member.isOwner && (
|
||||||
@ -49,7 +47,8 @@ export const Channel: React.FC<ChannelProps> = (props) => {
|
|||||||
<CogIcon height={20} width={20} />
|
<CogIcon height={20} width={20} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
)}
|
)}
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const Channel = memo(ChannelMemo)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import InfiniteScroll from 'react-infinite-scroll-component'
|
import InfiniteScroll from 'react-infinite-scroll-component'
|
||||||
|
|
||||||
import { useChannels } from '../../../contexts/Channels'
|
import { useChannels } from '../../../contexts/Channels'
|
||||||
import { GuildsChannelsPath } from '../Application'
|
import type { GuildsChannelsPath } from '../Application'
|
||||||
import { Loader } from '../../design/Loader'
|
import { Loader } from '../../design/Loader'
|
||||||
import { Channel } from './Channel'
|
import { Channel } from './Channel'
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
import { Loader } from '../../design/Loader'
|
import { Loader } from '../../design/Loader'
|
||||||
|
|
||||||
@ -17,7 +17,9 @@ export const ConfirmPopup: React.FC<ConfirmPopupProps> = ({ ...props }) => {
|
|||||||
const [isLoading, setIsLoading] = useState(false)
|
const [isLoading, setIsLoading] = useState(false)
|
||||||
|
|
||||||
const handleYesLoading = async (): Promise<void> => {
|
const handleYesLoading = async (): Promise<void> => {
|
||||||
setIsLoading((isLoading) => !isLoading)
|
setIsLoading((isLoading) => {
|
||||||
|
return !isLoading
|
||||||
|
})
|
||||||
await props.handleYes()
|
await props.handleYes()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,32 +1,33 @@
|
|||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import { Form } from 'react-component-form'
|
import { Form, useForm } from 'react-component-form'
|
||||||
|
import type { HandleUseFormCallback } from 'react-component-form'
|
||||||
|
|
||||||
import { useAuthentication } from '../../../tools/authentication'
|
import { useAuthentication } from '../../../tools/authentication'
|
||||||
import { HandleSubmitCallback, useForm } from '../../../hooks/useForm'
|
|
||||||
import { Input } from '../../design/Input'
|
import { Input } from '../../design/Input'
|
||||||
import { Main } from '../../design/Main'
|
import { Main } from '../../design/Main'
|
||||||
import { Button } from '../../design/Button'
|
import { Button } from '../../design/Button'
|
||||||
import { FormState } from '../../design/FormState'
|
import { FormState } from '../../design/FormState'
|
||||||
import { Channel, channelSchema } from '../../../models/Channel'
|
import type { Channel } from '../../../models/Channel'
|
||||||
|
import { channelSchema } from '../../../models/Channel'
|
||||||
import { useGuildMember } from '../../../contexts/GuildMember'
|
import { useGuildMember } from '../../../contexts/GuildMember'
|
||||||
|
import { useFormTranslation } from '../../../hooks/useFormTranslation'
|
||||||
|
|
||||||
|
const schema = {
|
||||||
|
name: channelSchema.name
|
||||||
|
}
|
||||||
|
|
||||||
export const CreateChannel: React.FC = () => {
|
export const CreateChannel: React.FC = () => {
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const { guild } = useGuildMember()
|
const { guild } = useGuildMember()
|
||||||
|
|
||||||
const { fetchState, message, errors, getErrorTranslation, handleSubmit } =
|
const { handleUseForm, fetchState, message, errors } = useForm(schema)
|
||||||
useForm({
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
validateSchema: {
|
|
||||||
name: channelSchema.name
|
|
||||||
},
|
|
||||||
resetOnSuccess: true
|
|
||||||
})
|
|
||||||
|
|
||||||
const { authentication } = useAuthentication()
|
const { authentication } = useAuthentication()
|
||||||
|
|
||||||
const onSubmit: HandleSubmitCallback = async (formData) => {
|
const onSubmit: HandleUseFormCallback<typeof schema> = async (formData) => {
|
||||||
try {
|
try {
|
||||||
const { data: channel } = await authentication.api.post<Channel>(
|
const { data: channel } = await authentication.api.post<Channel>(
|
||||||
`/guilds/${guild.id}/channels`,
|
`/guilds/${guild.id}/channels`,
|
||||||
@ -44,13 +45,13 @@ export const CreateChannel: React.FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Main>
|
<Main>
|
||||||
<Form className='w-4/6 max-w-xs' onSubmit={handleSubmit(onSubmit)}>
|
<Form className='w-4/6 max-w-xs' onSubmit={handleUseForm(onSubmit)}>
|
||||||
<Input
|
<Input
|
||||||
type='text'
|
type='text'
|
||||||
placeholder={t('common:name')}
|
placeholder={t('common:name')}
|
||||||
name='name'
|
name='name'
|
||||||
label={t('common:name')}
|
label={t('common:name')}
|
||||||
error={getErrorTranslation(errors.name)}
|
error={getFirstErrorTranslation(errors.name)}
|
||||||
data-cy='channel-name-input'
|
data-cy='channel-name-input'
|
||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
|
@ -1,40 +1,45 @@
|
|||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import { Form } from 'react-component-form'
|
import { Form, useForm } from 'react-component-form'
|
||||||
import { AxiosResponse } from 'axios'
|
import type { AxiosResponse } from 'axios'
|
||||||
|
import type { HandleUseFormCallback } from 'react-component-form'
|
||||||
|
|
||||||
import { useAuthentication } from '../../../tools/authentication'
|
import { useAuthentication } from '../../../tools/authentication'
|
||||||
import { HandleSubmitCallback, useForm } from '../../../hooks/useForm'
|
import type { GuildComplete } from '../../../models/Guild'
|
||||||
import { GuildComplete, guildSchema } from '../../../models/Guild'
|
import { guildSchema } from '../../../models/Guild'
|
||||||
import { Input } from '../../design/Input'
|
import { Input } from '../../design/Input'
|
||||||
import { Main } from '../../design/Main'
|
import { Main } from '../../design/Main'
|
||||||
import { Button } from '../../design/Button'
|
import { Button } from '../../design/Button'
|
||||||
import { FormState } from '../../design/FormState'
|
import { FormState } from '../../design/FormState'
|
||||||
import { Textarea } from '../../design/Textarea'
|
import { Textarea } from '../../design/Textarea'
|
||||||
|
import { useFormTranslation } from '../../../hooks/useFormTranslation'
|
||||||
|
|
||||||
|
const schema = {
|
||||||
|
name: guildSchema.name,
|
||||||
|
description: guildSchema.description
|
||||||
|
}
|
||||||
|
|
||||||
export const CreateGuild: React.FC = () => {
|
export const CreateGuild: React.FC = () => {
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const { fetchState, message, errors, getErrorTranslation, handleSubmit } =
|
const { handleUseForm, fetchState, message, errors } = useForm(schema)
|
||||||
useForm({
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
validateSchema: {
|
|
||||||
name: guildSchema.name,
|
|
||||||
description: guildSchema.description
|
|
||||||
},
|
|
||||||
resetOnSuccess: true
|
|
||||||
})
|
|
||||||
|
|
||||||
const { authentication } = useAuthentication()
|
const { authentication } = useAuthentication()
|
||||||
|
|
||||||
const onSubmit: HandleSubmitCallback = async (formData) => {
|
const onSubmit: HandleUseFormCallback<typeof schema> = async (formData) => {
|
||||||
try {
|
try {
|
||||||
const { data } = await authentication.api.post<
|
const { data } = await authentication.api.post<
|
||||||
any,
|
any,
|
||||||
AxiosResponse<{ guild: GuildComplete }>
|
AxiosResponse<{ guild: GuildComplete }>
|
||||||
>('/guilds', { name: formData.name, description: formData.description })
|
>('/guilds', { name: formData.name, description: formData.description })
|
||||||
const guildId = data.guild.id
|
const guildId = data.guild.id
|
||||||
const channelId = data.guild.channels[0].id
|
const channel = data.guild.channels[0]
|
||||||
|
if (channel == null) {
|
||||||
|
throw new Error('No channel found')
|
||||||
|
}
|
||||||
|
const channelId = channel.id
|
||||||
await router.push(`/application/${guildId}/${channelId}`)
|
await router.push(`/application/${guildId}/${channelId}`)
|
||||||
return null
|
return null
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@ -47,13 +52,13 @@ export const CreateGuild: React.FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Main>
|
<Main>
|
||||||
<Form className='w-4/6 max-w-xs' onSubmit={handleSubmit(onSubmit)}>
|
<Form className='w-4/6 max-w-xs' onSubmit={handleUseForm(onSubmit)}>
|
||||||
<Input
|
<Input
|
||||||
type='text'
|
type='text'
|
||||||
placeholder={t('common:name')}
|
placeholder={t('common:name')}
|
||||||
name='name'
|
name='name'
|
||||||
label={t('common:name')}
|
label={t('common:name')}
|
||||||
error={getErrorTranslation(errors.name)}
|
error={getFirstErrorTranslation(errors.name)}
|
||||||
/>
|
/>
|
||||||
<Textarea
|
<Textarea
|
||||||
label='Description'
|
label='Description'
|
||||||
@ -64,7 +69,11 @@ export const CreateGuild: React.FC = () => {
|
|||||||
{t('application:create')}
|
{t('application:create')}
|
||||||
</Button>
|
</Button>
|
||||||
</Form>
|
</Form>
|
||||||
<FormState id='message' state={fetchState} message={message} />
|
<FormState
|
||||||
|
id='message'
|
||||||
|
state={fetchState}
|
||||||
|
message={message != null ? t(message) : undefined}
|
||||||
|
/>
|
||||||
</Main>
|
</Main>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@ import { useGuildMember } from '../../../contexts/GuildMember'
|
|||||||
import { Divider } from '../../design/Divider'
|
import { Divider } from '../../design/Divider'
|
||||||
import { Channels } from '../Channels'
|
import { Channels } from '../Channels'
|
||||||
import { IconButton } from '../../design/IconButton'
|
import { IconButton } from '../../design/IconButton'
|
||||||
import { GuildsChannelsPath } from '..'
|
import type { GuildsChannelsPath } from '..'
|
||||||
|
|
||||||
export interface GuildLeftSidebarProps {
|
export interface GuildLeftSidebarProps {
|
||||||
path: GuildsChannelsPath
|
path: GuildsChannelsPath
|
||||||
@ -28,20 +28,24 @@ export const GuildLeftSidebar: React.FC<GuildLeftSidebarProps> = (props) => {
|
|||||||
<Divider />
|
<Divider />
|
||||||
<div className='mb-1 flex items-center justify-center space-x-6 p-2'>
|
<div className='mb-1 flex items-center justify-center space-x-6 p-2'>
|
||||||
{member.isOwner && (
|
{member.isOwner && (
|
||||||
<Link href={`/application/${path.guildId}/channels/create`} passHref>
|
<Link
|
||||||
<a data-cy='link-add-channel'>
|
href={`/application/${path.guildId}/channels/create`}
|
||||||
|
passHref
|
||||||
|
data-cy='link-add-channel'
|
||||||
|
>
|
||||||
<IconButton className='h-10 w-10' title='Add a Channel'>
|
<IconButton className='h-10 w-10' title='Add a Channel'>
|
||||||
<PlusIcon />
|
<PlusIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
<Link href={`/application/${path.guildId}/settings`} passHref>
|
<Link
|
||||||
<a data-cy='link-settings-guild'>
|
href={`/application/${path.guildId}/settings`}
|
||||||
|
passHref
|
||||||
|
data-cy='link-settings-guild'
|
||||||
|
>
|
||||||
<IconButton className='h-7 w-7' title='Settings'>
|
<IconButton className='h-7 w-7' title='Settings'>
|
||||||
<CogIcon />
|
<CogIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -3,11 +3,11 @@ import { useRouter } from 'next/router'
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { Type } from '@sinclair/typebox'
|
import { Type } from '@sinclair/typebox'
|
||||||
import { PhotographIcon } from '@heroicons/react/solid'
|
import { PhotographIcon } from '@heroicons/react/solid'
|
||||||
import { Form } from 'react-component-form'
|
import { Form, useForm } from 'react-component-form'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
import type { HandleUseFormCallback } from 'react-component-form'
|
||||||
|
|
||||||
import { HandleSubmitCallback, useForm } from '../../../hooks/useForm'
|
|
||||||
import { guildSchema } from '../../../models/Guild'
|
import { guildSchema } from '../../../models/Guild'
|
||||||
import { FormState } from '../../design/FormState'
|
import { FormState } from '../../design/FormState'
|
||||||
import { useGuildMember } from '../../../contexts/GuildMember'
|
import { useGuildMember } from '../../../contexts/GuildMember'
|
||||||
@ -16,6 +16,12 @@ import { Input } from '../../design/Input'
|
|||||||
import { Button } from '../../design/Button'
|
import { Button } from '../../design/Button'
|
||||||
import { useAuthentication } from '../../../tools/authentication'
|
import { useAuthentication } from '../../../tools/authentication'
|
||||||
import { ConfirmPopup } from '../ConfirmPopup'
|
import { ConfirmPopup } from '../ConfirmPopup'
|
||||||
|
import { useFormTranslation } from '../../../hooks/useFormTranslation'
|
||||||
|
|
||||||
|
const schema = {
|
||||||
|
name: guildSchema.name,
|
||||||
|
description: Type.Optional(guildSchema.description)
|
||||||
|
}
|
||||||
|
|
||||||
export const GuildSettings: React.FC = () => {
|
export const GuildSettings: React.FC = () => {
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
@ -35,26 +41,19 @@ export const GuildSettings: React.FC = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const {
|
const {
|
||||||
|
handleUseForm,
|
||||||
fetchState,
|
fetchState,
|
||||||
message,
|
message,
|
||||||
errors,
|
errors,
|
||||||
getErrorTranslation,
|
|
||||||
handleSubmit,
|
|
||||||
setFetchState,
|
setFetchState,
|
||||||
setMessageTranslationKey
|
setMessage
|
||||||
} = useForm({
|
} = useForm(schema)
|
||||||
validateSchema: {
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
name: guildSchema.name,
|
|
||||||
description: Type.Optional(guildSchema.description)
|
|
||||||
},
|
|
||||||
replaceEmptyStringToNull: true,
|
|
||||||
resetOnSuccess: false
|
|
||||||
})
|
|
||||||
|
|
||||||
const onSubmit: HandleSubmitCallback = async (formData) => {
|
const onSubmit: HandleUseFormCallback<typeof schema> = async (formData) => {
|
||||||
try {
|
try {
|
||||||
await authentication.api.put(`/guilds/${guild.id}`, formData)
|
await authentication.api.put(`/guilds/${guild.id}`, formData)
|
||||||
setInputValues(formData as any)
|
setInputValues(formData as unknown as any)
|
||||||
return {
|
return {
|
||||||
type: 'success',
|
type: 'success',
|
||||||
value: 'application:saved-information'
|
value: 'application:saved-information'
|
||||||
@ -83,7 +82,7 @@ export const GuildSettings: React.FC = () => {
|
|||||||
) => {
|
) => {
|
||||||
setFetchState('loading')
|
setFetchState('loading')
|
||||||
const files = event?.target?.files
|
const files = event?.target?.files
|
||||||
if (files != null && files.length === 1) {
|
if (files != null && files.length === 1 && files[0] != null) {
|
||||||
const file = files[0]
|
const file = files[0]
|
||||||
const formData = new FormData()
|
const formData = new FormData()
|
||||||
formData.append('icon', file)
|
formData.append('icon', file)
|
||||||
@ -92,7 +91,7 @@ export const GuildSettings: React.FC = () => {
|
|||||||
setFetchState('idle')
|
setFetchState('idle')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setFetchState('error')
|
setFetchState('error')
|
||||||
setMessageTranslationKey('errors:server-error')
|
setMessage('errors:server-error')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -102,7 +101,7 @@ export const GuildSettings: React.FC = () => {
|
|||||||
await authentication.api.delete(`/guilds/${guild.id}`)
|
await authentication.api.delete(`/guilds/${guild.id}`)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setFetchState('error')
|
setFetchState('error')
|
||||||
setMessageTranslationKey('errors:server-error')
|
setMessage('errors:server-error')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,14 +111,14 @@ export const GuildSettings: React.FC = () => {
|
|||||||
await router.push('/application')
|
await router.push('/application')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setFetchState('error')
|
setFetchState('error')
|
||||||
setMessageTranslationKey('errors:server-error')
|
setMessage('errors:server-error')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Form
|
<Form
|
||||||
onSubmit={handleSubmit(onSubmit)}
|
onSubmit={handleUseForm(onSubmit)}
|
||||||
className='my-auto flex flex-col items-center justify-center py-12'
|
className='my-auto flex flex-col items-center justify-center py-12'
|
||||||
>
|
>
|
||||||
{member.isOwner && (
|
{member.isOwner && (
|
||||||
@ -160,7 +159,7 @@ export const GuildSettings: React.FC = () => {
|
|||||||
className='!mt-0'
|
className='!mt-0'
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
value={inputValues.name}
|
value={inputValues.name}
|
||||||
error={getErrorTranslation(errors.name)}
|
error={getFirstErrorTranslation(errors.name)}
|
||||||
data-cy='guild-name-input'
|
data-cy='guild-name-input'
|
||||||
/>
|
/>
|
||||||
<Textarea
|
<Textarea
|
||||||
@ -204,7 +203,11 @@ export const GuildSettings: React.FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
<FormState
|
<FormState
|
||||||
state={fetchState}
|
state={fetchState}
|
||||||
message={getErrorTranslation(errors.description) ?? message}
|
message={
|
||||||
|
message != null
|
||||||
|
? t(message)
|
||||||
|
: getFirstErrorTranslation(errors.name)
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
|
import { memo } from 'react'
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
|
|
||||||
import { GuildWithDefaultChannelId } from '../../../models/Guild'
|
import type { GuildWithDefaultChannelId } from '../../../models/Guild'
|
||||||
import { IconLink } from '../../design/IconLink'
|
import { IconLink } from '../../design/IconLink'
|
||||||
|
|
||||||
export interface GuildProps {
|
export interface GuildProps {
|
||||||
@ -8,7 +9,7 @@ export interface GuildProps {
|
|||||||
selected?: boolean
|
selected?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Guild: React.FC<GuildProps> = (props) => {
|
const GuildMemo: React.FC<GuildProps> = (props) => {
|
||||||
const { guild, selected } = props
|
const { guild, selected } = props
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -34,3 +35,5 @@ export const Guild: React.FC<GuildProps> = (props) => {
|
|||||||
</IconLink>
|
</IconLink>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const Guild = memo(GuildMemo)
|
||||||
|
@ -2,7 +2,7 @@ import InfiniteScroll from 'react-infinite-scroll-component'
|
|||||||
|
|
||||||
import { Loader } from '../../design/Loader'
|
import { Loader } from '../../design/Loader'
|
||||||
import { useGuilds } from '../../../contexts/Guilds'
|
import { useGuilds } from '../../../contexts/Guilds'
|
||||||
import { GuildsPath } from '..'
|
import type { GuildsPath } from '..'
|
||||||
import { Guild } from './Guild'
|
import { Guild } from './Guild'
|
||||||
|
|
||||||
export interface GuildsProps {
|
export interface GuildsProps {
|
||||||
|
@ -2,12 +2,12 @@ import Image from 'next/image'
|
|||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
|
||||||
import { Emoji } from '../../Emoji'
|
import { Emoji } from '../../Emoji'
|
||||||
import { ConfirmPopup } from '../ConfirmPopup'
|
import { ConfirmPopup } from '../ConfirmPopup'
|
||||||
import {
|
import type {
|
||||||
GuildPublic as GuildPublicType,
|
GuildPublic as GuildPublicType,
|
||||||
GuildWithDefaultChannelId
|
GuildWithDefaultChannelId
|
||||||
} from '../../../models/Guild'
|
} from '../../../models/Guild'
|
||||||
@ -25,7 +25,9 @@ export const GuildPublic: React.FC<GuildPublicProps> = (props) => {
|
|||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
|
|
||||||
const handleIsConfirmed = (): void => {
|
const handleIsConfirmed = (): void => {
|
||||||
setIsConfirmed((isConfirmed) => !isConfirmed)
|
setIsConfirmed((isConfirmed) => {
|
||||||
|
return !isConfirmed
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleYes = async (): Promise<void> => {
|
const handleYes = async (): Promise<void> => {
|
||||||
|
@ -3,11 +3,12 @@ import { useEffect, useState } from 'react'
|
|||||||
import InfiniteScroll from 'react-infinite-scroll-component'
|
import InfiniteScroll from 'react-infinite-scroll-component'
|
||||||
|
|
||||||
import { useAuthentication } from '../../../tools/authentication'
|
import { useAuthentication } from '../../../tools/authentication'
|
||||||
import { GuildPublic as GuildPublicType } from '../../../models/Guild'
|
import type { GuildPublic as GuildPublicType } from '../../../models/Guild'
|
||||||
import { Loader } from '../../design/Loader'
|
import { Loader } from '../../design/Loader'
|
||||||
import { GuildPublic } from './GuildPublic'
|
import { GuildPublic } from './GuildPublic'
|
||||||
import { usePagination } from '../../../hooks/usePagination'
|
import { usePagination } from '../../../hooks/usePagination'
|
||||||
import { SocketData, handleSocketData } from '../../../tools/handleSocketData'
|
import type { SocketData } from '../../../tools/handleSocketData'
|
||||||
|
import { handleSocketData } from '../../../tools/handleSocketData'
|
||||||
|
|
||||||
export const JoinGuildsPublic: React.FC = () => {
|
export const JoinGuildsPublic: React.FC = () => {
|
||||||
const [search, setSearch] = useState('')
|
const [search, setSearch] = useState('')
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
|
import { memo } from 'react'
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
|
||||||
import { MemberWithPublicUser } from '../../../models/Member'
|
import type { MemberWithPublicUser } from '../../../models/Member'
|
||||||
import { Emoji } from '../../Emoji'
|
import { Emoji } from '../../Emoji'
|
||||||
|
|
||||||
export interface MemberProps {
|
export interface MemberProps {
|
||||||
member: MemberWithPublicUser
|
member: MemberWithPublicUser
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Member: React.FC<MemberProps> = (props) => {
|
const MemberMemo: React.FC<MemberProps> = (props) => {
|
||||||
const { member } = props
|
const { member } = props
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Link href={`/application/users/${member.user.id}`}>
|
<Link href={`/application/users/${member.user.id}`}>
|
||||||
<a>
|
|
||||||
<div className='flex cursor-pointer items-center overflow-hidden py-2 px-6 pr-10 hover:bg-gray-300 dark:hover:bg-gray-900'>
|
<div className='flex cursor-pointer items-center overflow-hidden py-2 px-6 pr-10 hover:bg-gray-300 dark:hover:bg-gray-900'>
|
||||||
<div className='flex min-w-[50px] rounded-full'>
|
<div className='flex min-w-[50px] rounded-full'>
|
||||||
<Image
|
<Image
|
||||||
@ -41,7 +41,8 @@ export const Member: React.FC<MemberProps> = (props) => {
|
|||||||
{member.user.status != null && member.user.status}
|
{member.user.status != null && member.user.status}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const Member = memo(MemberMemo)
|
||||||
|
@ -0,0 +1,48 @@
|
|||||||
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
|
import TextareaAutosize from 'react-textarea-autosize'
|
||||||
|
|
||||||
|
import type { MessageProps } from '../Message'
|
||||||
|
|
||||||
|
export interface EditMessageProps extends MessageProps {
|
||||||
|
handleEdit: () => Promise<void>
|
||||||
|
handleKeyDown: React.KeyboardEventHandler<HTMLFormElement>
|
||||||
|
textareaRef: React.RefObject<HTMLTextAreaElement>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const EditMessage: React.FC<
|
||||||
|
React.PropsWithChildren<EditMessageProps>
|
||||||
|
> = ({ handleEdit, handleKeyDown, textareaRef, message }) => {
|
||||||
|
const { t } = useTranslation()
|
||||||
|
|
||||||
|
const handleEditSubmit: React.FormEventHandler<HTMLFormElement> = async (
|
||||||
|
event
|
||||||
|
) => {
|
||||||
|
event.preventDefault()
|
||||||
|
await handleEdit()
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form
|
||||||
|
className='flex h-full w-full items-center'
|
||||||
|
onSubmit={handleEditSubmit}
|
||||||
|
onKeyDown={handleKeyDown}
|
||||||
|
>
|
||||||
|
<TextareaAutosize
|
||||||
|
className='scrollbar-firefox-support w-full resize-none bg-transparent p-2 tracking-wide outline-none'
|
||||||
|
placeholder={t('application:write-a-message')}
|
||||||
|
wrap='soft'
|
||||||
|
maxRows={6}
|
||||||
|
name='message'
|
||||||
|
defaultValue={message.value}
|
||||||
|
ref={textareaRef}
|
||||||
|
autoFocus
|
||||||
|
onFocus={(event) => {
|
||||||
|
event.currentTarget.setSelectionRange(
|
||||||
|
event.currentTarget.value.length,
|
||||||
|
event.currentTarget.value.length
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</form>
|
||||||
|
)
|
||||||
|
}
|
@ -0,0 +1 @@
|
|||||||
|
export * from './EditMessage'
|
@ -1,11 +1,15 @@
|
|||||||
|
import { useState, useRef } from 'react'
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import date from 'date-and-time'
|
import date from 'date-and-time'
|
||||||
|
|
||||||
import { MessageWithMember } from '../../../../models/Message'
|
import type { MessageWithMember } from '../../../../models/Message'
|
||||||
import { MessageText } from './MessageText'
|
import { MessageText } from './MessageText'
|
||||||
import { Loader } from '../../../design/Loader'
|
import { Loader } from '../../../design/Loader'
|
||||||
import { MessageFile } from './MessageFile'
|
import { MessageFile } from './MessageFile'
|
||||||
|
import { useAuthentication } from '../../../../tools/authentication'
|
||||||
|
import { MessageOptions } from './MessageOptions'
|
||||||
|
import { EditMessage } from './EditMessage'
|
||||||
|
|
||||||
export interface MessageProps {
|
export interface MessageProps {
|
||||||
message: MessageWithMember
|
message: MessageWithMember
|
||||||
@ -14,13 +18,49 @@ export interface MessageProps {
|
|||||||
export const Message: React.FC<MessageProps> = (props) => {
|
export const Message: React.FC<MessageProps> = (props) => {
|
||||||
const { message } = props
|
const { message } = props
|
||||||
|
|
||||||
|
const textareaReference = useRef<HTMLTextAreaElement>(null)
|
||||||
|
const [isEditing, setIsEditing] = useState(false)
|
||||||
|
const { authentication, user } = useAuthentication()
|
||||||
|
|
||||||
|
const handleTextareaKeyDown: React.KeyboardEventHandler<HTMLFormElement> = (
|
||||||
|
event
|
||||||
|
) => {
|
||||||
|
if (event.key === 'Enter' && !event.shiftKey) {
|
||||||
|
event.preventDefault()
|
||||||
|
event.currentTarget.dispatchEvent(
|
||||||
|
new Event('submit', { cancelable: true, bubbles: true })
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleEdit = async (): Promise<void> => {
|
||||||
|
const newMessage = textareaReference.current?.value ?? message.value
|
||||||
|
if (
|
||||||
|
typeof newMessage === 'string' &&
|
||||||
|
newMessage.length > 0 &&
|
||||||
|
newMessage !== message.value
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
await authentication.api.put(`/messages/${message.id}`, {
|
||||||
|
value: newMessage
|
||||||
|
})
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
handleEditMode()
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleEditMode = (): void => {
|
||||||
|
setIsEditing((oldIsEditing) => {
|
||||||
|
return !oldIsEditing
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className='flex p-4 transition hover:bg-gray-200 dark:hover:bg-gray-900'
|
|
||||||
data-cy={`message-${message.id}`}
|
data-cy={`message-${message.id}`}
|
||||||
|
className='group flex w-full p-4 transition hover:bg-gray-200 dark:hover:bg-gray-900'
|
||||||
>
|
>
|
||||||
<Link href={`/application/users/${message.member.user.id}`}>
|
<Link href={`/application/users/${message.member.user.id}`}>
|
||||||
<a>
|
|
||||||
<div className='mr-4 flex h-12 w-12 flex-shrink-0 items-center justify-center'>
|
<div className='mr-4 flex h-12 w-12 flex-shrink-0 items-center justify-center'>
|
||||||
<div className='h-10 w-10 drop-shadow-md'>
|
<div className='h-10 w-10 drop-shadow-md'>
|
||||||
<Image
|
<Image
|
||||||
@ -38,19 +78,16 @@ export const Message: React.FC<MessageProps> = (props) => {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
<div className='w-full'>
|
<div className='relative w-full whitespace-pre-wrap break-words break-all'>
|
||||||
<div className='flex w-max items-center'>
|
<div className='flex w-max items-center'>
|
||||||
<Link href={`/application/users/${message.member.user.id}`}>
|
<Link href={`/application/users/${message.member.user.id}`}>
|
||||||
<a>
|
|
||||||
<span
|
<span
|
||||||
data-cy='message-member-user-name'
|
data-cy='message-member-user-name'
|
||||||
className='font-bold text-gray-900 dark:text-gray-200'
|
className='font-bold text-gray-900 dark:text-gray-200'
|
||||||
>
|
>
|
||||||
{message.member.user.name}
|
{message.member.user.name}
|
||||||
</span>
|
</span>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
<span
|
<span
|
||||||
data-cy='message-date'
|
data-cy='message-date'
|
||||||
@ -59,8 +96,28 @@ export const Message: React.FC<MessageProps> = (props) => {
|
|||||||
{date.format(new Date(message.createdAt), 'DD/MM/YYYY - HH:mm:ss')}
|
{date.format(new Date(message.createdAt), 'DD/MM/YYYY - HH:mm:ss')}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{message.member.userId === user.id && (
|
||||||
|
<MessageOptions
|
||||||
|
message={message}
|
||||||
|
editMode={isEditing ? ':white_check_mark:' : ':pencil2:'}
|
||||||
|
handleEdit={isEditing ? handleEdit : handleEditMode}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
{message.type === 'text' ? (
|
{message.type === 'text' ? (
|
||||||
|
<>
|
||||||
|
{isEditing ? (
|
||||||
|
<EditMessage
|
||||||
|
message={message}
|
||||||
|
textareaRef={textareaReference}
|
||||||
|
handleEdit={handleEdit}
|
||||||
|
handleKeyDown={handleTextareaKeyDown}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
<MessageText message={message} />
|
<MessageText message={message} />
|
||||||
|
)}
|
||||||
|
</>
|
||||||
) : message.type === 'file' ? (
|
) : message.type === 'file' ? (
|
||||||
<MessageFile message={message} />
|
<MessageFile message={message} />
|
||||||
) : (
|
) : (
|
||||||
|
@ -3,7 +3,7 @@ import axios from 'axios'
|
|||||||
import prettyBytes from 'pretty-bytes'
|
import prettyBytes from 'pretty-bytes'
|
||||||
import { DownloadIcon } from '@heroicons/react/solid'
|
import { DownloadIcon } from '@heroicons/react/solid'
|
||||||
|
|
||||||
import { MessageWithMember } from '../../../../../models/Message'
|
import type { MessageWithMember } from '../../../../../models/Message'
|
||||||
import { Loader } from '../../../../design/Loader'
|
import { Loader } from '../../../../design/Loader'
|
||||||
import { FileIcon } from './FileIcon'
|
import { FileIcon } from './FileIcon'
|
||||||
import { api } from '../../../../../tools/api'
|
import { api } from '../../../../../tools/api'
|
||||||
|
@ -0,0 +1,44 @@
|
|||||||
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
|
|
||||||
|
import { useAuthentication } from '../../../../../tools/authentication'
|
||||||
|
import { Emoji } from '../../../../Emoji'
|
||||||
|
import type { MessageProps } from '../Message'
|
||||||
|
|
||||||
|
interface MessageOptionsProps extends MessageProps {
|
||||||
|
handleEdit: () => void
|
||||||
|
editMode: ':white_check_mark:' | ':pencil2:'
|
||||||
|
}
|
||||||
|
|
||||||
|
export const MessageOptions: React.FC<
|
||||||
|
React.PropsWithChildren<MessageOptionsProps>
|
||||||
|
> = ({ handleEdit, editMode, message }) => {
|
||||||
|
const { t } = useTranslation()
|
||||||
|
const { authentication } = useAuthentication()
|
||||||
|
|
||||||
|
const handleDeleteMessage = async (): Promise<void> => {
|
||||||
|
try {
|
||||||
|
await authentication.api.delete(`/messages/${message.id}`)
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className='absolute right-6 -top-8 flex opacity-0 transition-opacity group-hover:opacity-100'>
|
||||||
|
{message.type === 'text' && (
|
||||||
|
<div
|
||||||
|
className='message-options rounded-l-lg border-l-slate-600'
|
||||||
|
title={t('application:edit')}
|
||||||
|
onClick={handleEdit}
|
||||||
|
>
|
||||||
|
<Emoji value={editMode} size={18} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div
|
||||||
|
className='message-options rounded-r-lg border-r-slate-600'
|
||||||
|
title={t('application:delete')}
|
||||||
|
onClick={handleDeleteMessage}
|
||||||
|
>
|
||||||
|
<Emoji value=':wastebasket:' size={18} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
@ -0,0 +1 @@
|
|||||||
|
export * from './MessageOptions'
|
@ -10,7 +10,7 @@ import { vscDarkPlus } from 'react-syntax-highlighter/dist/cjs/styles/prism'
|
|||||||
import 'katex/dist/katex.min.css'
|
import 'katex/dist/katex.min.css'
|
||||||
|
|
||||||
import { Emoji, emojiPlugin, isStringWithOnlyOneEmoji } from '../../../../Emoji'
|
import { Emoji, emojiPlugin, isStringWithOnlyOneEmoji } from '../../../../Emoji'
|
||||||
import { MessageWithMember } from '../../../../../models/Message'
|
import type { MessageWithMember } from '../../../../../models/Message'
|
||||||
|
|
||||||
export interface MessageContentProps {
|
export interface MessageContentProps {
|
||||||
message: MessageWithMember
|
message: MessageWithMember
|
||||||
@ -27,7 +27,7 @@ export const MessageText: React.FC<MessageContentProps> = (props) => {
|
|||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<p>
|
<p>
|
||||||
<Emoji value={message.value} size={40} />
|
<Emoji value={message.value} size={40} tooltip />
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
@ -50,7 +50,7 @@ export const MessageText: React.FC<MessageContentProps> = (props) => {
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
emoji: (props) => {
|
emoji: (props) => {
|
||||||
return <Emoji value={props.value} size={20} />
|
return <Emoji value={props.value} size={20} tooltip />
|
||||||
},
|
},
|
||||||
code: (properties) => {
|
code: (properties) => {
|
||||||
const { inline, className, children, ...props } = properties
|
const { inline, className, children, ...props } = properties
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import { PlusSmIcon, ArrowDownIcon } from '@heroicons/react/solid'
|
import { PlusSmIcon, ArrowDownIcon } from '@heroicons/react/solid'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
|
|
||||||
import { PopupGuildCard } from './PopupGuildCard'
|
import { PopupGuildCard } from './PopupGuildCard'
|
||||||
|
@ -23,11 +23,12 @@ export const PopupGuildCard: React.FC<PopupGuildCardProps> = (props) => {
|
|||||||
<p className='mt-6 px-8 text-center text-sm text-gray-200'>
|
<p className='mt-6 px-8 text-center text-sm text-gray-200'>
|
||||||
{description}
|
{description}
|
||||||
</p>
|
</p>
|
||||||
<Link href={link.href}>
|
<Link
|
||||||
<a className='mb-6 flex h-10 w-4/5 items-center justify-center self-center rounded-2xl bg-green-400 font-bold tracking-wide text-white transition duration-200 ease-in-out hover:bg-green-600'>
|
href={link.href}
|
||||||
|
className='mb-6 flex h-10 w-4/5 items-center justify-center self-center rounded-2xl bg-green-400 font-bold tracking-wide text-white transition duration-200 ease-in-out hover:bg-green-600'
|
||||||
|
>
|
||||||
{link.icon}
|
{link.icon}
|
||||||
{link.text}
|
{link.text}
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import { useState, useRef } from 'react'
|
import { useState, useRef } from 'react'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import TextareaAutosize from 'react-textarea-autosize'
|
import TextareaAutosize from 'react-textarea-autosize'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
import { GuildsChannelsPath } from '..'
|
import type { GuildsChannelsPath } from '..'
|
||||||
import { useAuthentication } from '../../../tools/authentication'
|
import { useAuthentication } from '../../../tools/authentication'
|
||||||
import { EmojiPicker, EmojiPickerOnClick } from '../../Emoji'
|
import type { EmojiPickerOnClick } from '../../Emoji'
|
||||||
|
import { EmojiPicker } from '../../Emoji'
|
||||||
|
|
||||||
export interface SendMessageProps {
|
export interface SendMessageProps {
|
||||||
path: GuildsChannelsPath
|
path: GuildsChannelsPath
|
||||||
@ -53,7 +54,7 @@ export const SendMessage: React.FC<SendMessageProps> = (props) => {
|
|||||||
event
|
event
|
||||||
) => {
|
) => {
|
||||||
const files = event?.target?.files
|
const files = event?.target?.files
|
||||||
if (files != null && files.length === 1) {
|
if (files != null && files.length === 1 && files[0] != null) {
|
||||||
const file = files[0]
|
const file = files[0]
|
||||||
const formData = new FormData()
|
const formData = new FormData()
|
||||||
formData.append('file', file)
|
formData.append('file', file)
|
||||||
@ -65,7 +66,9 @@ export const SendMessage: React.FC<SendMessageProps> = (props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const handleVisibleEmojiPicker = (): void => {
|
const handleVisibleEmojiPicker = (): void => {
|
||||||
setIsVisibleEmojiPicker((isVisible) => !isVisible)
|
setIsVisibleEmojiPicker((isVisible) => {
|
||||||
|
return !isVisible
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleEmojiPicker: EmojiPickerOnClick = (emoji) => {
|
const handleEmojiPicker: EmojiPickerOnClick = (emoji) => {
|
||||||
@ -96,7 +99,7 @@ export const SendMessage: React.FC<SendMessageProps> = (props) => {
|
|||||||
onKeyDown={handleTextareaKeyDown}
|
onKeyDown={handleTextareaKeyDown}
|
||||||
>
|
>
|
||||||
<TextareaAutosize
|
<TextareaAutosize
|
||||||
className='scrollbar-firefox-support my-2 w-full resize-none bg-transparent p-2 px-6 font-paragraph tracking-wide outline-none'
|
className='scrollbar-firefox-support my-2 w-full resize-none bg-transparent p-2 px-6 tracking-wide outline-none'
|
||||||
placeholder={t('application:write-a-message')}
|
placeholder={t('application:write-a-message')}
|
||||||
wrap='soft'
|
wrap='soft'
|
||||||
maxRows={6}
|
maxRows={6}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
import { ApplicationProps } from '..'
|
import type { ApplicationProps } from '..'
|
||||||
|
|
||||||
export type DirectionSidebar = 'left' | 'right'
|
export type DirectionSidebar = 'left' | 'right'
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@ import Image from 'next/image'
|
|||||||
import date from 'date-and-time'
|
import date from 'date-and-time'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
|
|
||||||
import { UserPublic } from '../../../models/User'
|
import type { UserPublic } from '../../../models/User'
|
||||||
import { Guild } from '../../../models/Guild'
|
import type { Guild } from '../../../models/Guild'
|
||||||
|
|
||||||
export interface UserProfileProps {
|
export interface UserProfileProps {
|
||||||
className?: string
|
className?: string
|
||||||
@ -16,7 +16,6 @@ export const UserProfile: React.FC<UserProfileProps> = (props) => {
|
|||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<div className='relative flex h-full flex-col items-center justify-center'>
|
<div className='relative flex h-full flex-col items-center justify-center'>
|
||||||
<div className='transition'>
|
<div className='transition'>
|
||||||
<div className='max-w-[1000px] px-12'>
|
<div className='max-w-[1000px] px-12'>
|
||||||
@ -100,12 +99,5 @@ export const UserProfile: React.FC<UserProfileProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style jsx global>{`
|
|
||||||
#application-page-content {
|
|
||||||
overflow-x: hidden;
|
|
||||||
}
|
|
||||||
`}</style>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import { useState, useMemo } from 'react'
|
import { useState, useMemo } from 'react'
|
||||||
import { Form } from 'react-component-form'
|
import { Form, useForm } from 'react-component-form'
|
||||||
import { EyeIcon, PhotographIcon } from '@heroicons/react/solid'
|
import { EyeIcon, PhotographIcon } from '@heroicons/react/solid'
|
||||||
import { Type } from '@sinclair/typebox'
|
import { Type } from '@sinclair/typebox'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
import type { HandleUseFormCallback } from 'react-component-form'
|
||||||
|
|
||||||
import { Input } from '../../design/Input'
|
import { Input } from '../../design/Input'
|
||||||
import { Checkbox } from '../../design/Checkbox'
|
import { Checkbox } from '../../design/Checkbox'
|
||||||
@ -16,10 +17,21 @@ import { Language } from '../../Header/Language'
|
|||||||
import { useAuthentication } from '../../../tools/authentication'
|
import { useAuthentication } from '../../../tools/authentication'
|
||||||
import { Button } from '../../design/Button'
|
import { Button } from '../../design/Button'
|
||||||
import { FormState } from '../../design/FormState'
|
import { FormState } from '../../design/FormState'
|
||||||
import { useForm, HandleSubmitCallback } from '../../../hooks/useForm'
|
|
||||||
import { userSchema } from '../../../models/User'
|
import { userSchema } from '../../../models/User'
|
||||||
import { userSettingsSchema } from '../../../models/UserSettings'
|
import { userSettingsSchema } from '../../../models/UserSettings'
|
||||||
import { ProviderOAuth, providers } from '../../../models/OAuth'
|
import type { ProviderOAuth } from '../../../models/OAuth'
|
||||||
|
import { providers } from '../../../models/OAuth'
|
||||||
|
import { useFormTranslation } from '../../../hooks/useFormTranslation'
|
||||||
|
|
||||||
|
const schema = {
|
||||||
|
name: userSchema.name,
|
||||||
|
status: Type.Optional(userSchema.status),
|
||||||
|
email: Type.Optional(Type.Union([userSchema.email, Type.Null()])),
|
||||||
|
website: Type.Optional(userSchema.website),
|
||||||
|
biography: Type.Optional(userSchema.biography),
|
||||||
|
isPublicGuilds: userSettingsSchema.isPublicGuilds,
|
||||||
|
isPublicEmail: userSettingsSchema.isPublicEmail
|
||||||
|
}
|
||||||
|
|
||||||
export const UserSettings: React.FC = () => {
|
export const UserSettings: React.FC = () => {
|
||||||
const { user, setUser, authentication } = useAuthentication()
|
const { user, setUser, authentication } = useAuthentication()
|
||||||
@ -35,32 +47,22 @@ export const UserSettings: React.FC = () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const {
|
const {
|
||||||
|
handleUseForm,
|
||||||
fetchState,
|
fetchState,
|
||||||
setFetchState,
|
setFetchState,
|
||||||
message,
|
message,
|
||||||
setMessageTranslationKey,
|
setMessage,
|
||||||
errors,
|
errors
|
||||||
getErrorTranslation,
|
} = useForm(schema)
|
||||||
handleSubmit
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
} = useForm({
|
|
||||||
validateSchema: {
|
|
||||||
name: userSchema.name,
|
|
||||||
status: Type.Optional(userSchema.status),
|
|
||||||
email: Type.Optional(Type.Union([userSchema.email, Type.Null()])),
|
|
||||||
website: Type.Optional(userSchema.website),
|
|
||||||
biography: Type.Optional(userSchema.biography),
|
|
||||||
isPublicGuilds: userSettingsSchema.isPublicGuilds,
|
|
||||||
isPublicEmail: userSettingsSchema.isPublicEmail
|
|
||||||
},
|
|
||||||
replaceEmptyStringToNull: true,
|
|
||||||
resetOnSuccess: false
|
|
||||||
})
|
|
||||||
|
|
||||||
const hasAllProviders = useMemo(() => {
|
const hasAllProviders = useMemo(() => {
|
||||||
return providers.every((provider) => user.strategies.includes(provider))
|
return providers.every((provider) => {
|
||||||
|
return user.strategies.includes(provider)
|
||||||
|
})
|
||||||
}, [user.strategies])
|
}, [user.strategies])
|
||||||
|
|
||||||
const onSubmit: HandleSubmitCallback = async (formData) => {
|
const onSubmit: HandleUseFormCallback<typeof schema> = async (formData) => {
|
||||||
try {
|
try {
|
||||||
const { isPublicGuilds, isPublicEmail, ...userData } = formData
|
const { isPublicGuilds, isPublicEmail, ...userData } = formData
|
||||||
const userSettings = { isPublicEmail, isPublicGuilds }
|
const userSettings = { isPublicEmail, isPublicGuilds }
|
||||||
@ -68,7 +70,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
`/users/current?redirectURI=${window.location.origin}/authentication/signin`,
|
`/users/current?redirectURI=${window.location.origin}/authentication/signin`,
|
||||||
userData
|
userData
|
||||||
)
|
)
|
||||||
setInputValues(formData as any)
|
setInputValues(formData as unknown as any)
|
||||||
const hasEmailChanged = user.email !== userCurrentData.user.email
|
const hasEmailChanged = user.email !== userCurrentData.user.email
|
||||||
if (hasEmailChanged) {
|
if (hasEmailChanged) {
|
||||||
return {
|
return {
|
||||||
@ -147,7 +149,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
) => {
|
) => {
|
||||||
setFetchState('loading')
|
setFetchState('loading')
|
||||||
const files = event?.target?.files
|
const files = event?.target?.files
|
||||||
if (files != null && files.length === 1) {
|
if (files != null && files.length === 1 && files[0] != null) {
|
||||||
const file = files[0]
|
const file = files[0]
|
||||||
const formData = new FormData()
|
const formData = new FormData()
|
||||||
formData.append('logo', file)
|
formData.append('logo', file)
|
||||||
@ -165,19 +167,19 @@ export const UserSettings: React.FC = () => {
|
|||||||
setFetchState('idle')
|
setFetchState('idle')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setFetchState('error')
|
setFetchState('error')
|
||||||
setMessageTranslationKey('errors:server-error')
|
setMessage('errors:server-error')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleSignout = async (): Promise<void> => {
|
const handleSignout = async (): Promise<void> => {
|
||||||
try {
|
|
||||||
setFetchState('loading')
|
setFetchState('loading')
|
||||||
await authentication.signoutServerSide()
|
await authentication.signoutServerSide()
|
||||||
} catch (error) {
|
|
||||||
setFetchState('error')
|
|
||||||
setMessageTranslationKey('errors:server-error')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleSignoutAllDevices = async (): Promise<void> => {
|
||||||
|
setFetchState('loading')
|
||||||
|
await authentication.signoutAllDevicesServerSide()
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleDeletionProvider = (
|
const handleDeletionProvider = (
|
||||||
@ -190,15 +192,15 @@ export const UserSettings: React.FC = () => {
|
|||||||
setUser((oldUser) => {
|
setUser((oldUser) => {
|
||||||
return {
|
return {
|
||||||
...oldUser,
|
...oldUser,
|
||||||
strategies: oldUser.strategies.filter(
|
strategies: oldUser.strategies.filter((strategy) => {
|
||||||
(strategy) => strategy !== provider
|
return strategy !== provider
|
||||||
)
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
setMessageTranslationKey('application:success-deleted-provider')
|
setMessage('application:success-deleted-provider')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setFetchState('error')
|
setFetchState('error')
|
||||||
setMessageTranslationKey('errors:server-error')
|
setMessage('errors:server-error')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -217,7 +219,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Form
|
<Form
|
||||||
onSubmit={handleSubmit(onSubmit)}
|
onSubmit={handleUseForm(onSubmit)}
|
||||||
className='my-auto flex flex-col items-center justify-center py-12 lg:min-w-[875px]'
|
className='my-auto flex flex-col items-center justify-center py-12 lg:min-w-[875px]'
|
||||||
>
|
>
|
||||||
<div className='flex w-full flex-col items-center justify-center sm:w-fit lg:flex-row'>
|
<div className='flex w-full flex-col items-center justify-center sm:w-fit lg:flex-row'>
|
||||||
@ -257,7 +259,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
className='!mt-0'
|
className='!mt-0'
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
value={inputValues.name ?? ''}
|
value={inputValues.name ?? ''}
|
||||||
error={getErrorTranslation(errors.name)}
|
error={getFirstErrorTranslation(errors.name)}
|
||||||
/>
|
/>
|
||||||
<Input
|
<Input
|
||||||
name='status'
|
name='status'
|
||||||
@ -266,7 +268,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
className='!mt-4'
|
className='!mt-4'
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
value={inputValues.status ?? ''}
|
value={inputValues.status ?? ''}
|
||||||
error={getErrorTranslation(errors.status)}
|
error={getFirstErrorTranslation(errors.status)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -279,7 +281,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
placeholder='Email'
|
placeholder='Email'
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
value={inputValues.email ?? ''}
|
value={inputValues.email ?? ''}
|
||||||
error={getErrorTranslation(errors.email)}
|
error={getFirstErrorTranslation(errors.email)}
|
||||||
/>
|
/>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
name='isPublicEmail'
|
name='isPublicEmail'
|
||||||
@ -294,7 +296,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
placeholder={t('application:website')}
|
placeholder={t('application:website')}
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
value={inputValues.website ?? ''}
|
value={inputValues.website ?? ''}
|
||||||
error={getErrorTranslation(errors.website)}
|
error={getFirstErrorTranslation(errors.website)}
|
||||||
/>
|
/>
|
||||||
<Textarea
|
<Textarea
|
||||||
name='biography'
|
name='biography'
|
||||||
@ -310,8 +312,8 @@ export const UserSettings: React.FC = () => {
|
|||||||
<Language className='!top-12' />
|
<Language className='!top-12' />
|
||||||
<div className='ml-auto flex'>
|
<div className='ml-auto flex'>
|
||||||
<SwitchTheme />
|
<SwitchTheme />
|
||||||
<Link href={`/application/users/${user.id}`}>
|
<Link
|
||||||
<a
|
href={`/application/users/${user.id}`}
|
||||||
className='group ml-3 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-slate-200 transition-colors hover:bg-slate-300 dark:bg-slate-700 hover:dark:bg-slate-800'
|
className='group ml-3 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-slate-200 transition-colors hover:bg-slate-300 dark:bg-slate-700 hover:dark:bg-slate-800'
|
||||||
title='Preview Public Profile'
|
title='Preview Public Profile'
|
||||||
>
|
>
|
||||||
@ -319,7 +321,6 @@ export const UserSettings: React.FC = () => {
|
|||||||
height={20}
|
height={20}
|
||||||
className='opacity-50 transition-opacity group-hover:opacity-100'
|
className='opacity-50 transition-opacity group-hover:opacity-100'
|
||||||
/>
|
/>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -376,7 +377,15 @@ export const UserSettings: React.FC = () => {
|
|||||||
{t('application:signout')}
|
{t('application:signout')}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<FormState state={fetchState} message={message} />
|
<div className='mt-4'>
|
||||||
|
<Button type='button' color='red' onClick={handleSignoutAllDevices}>
|
||||||
|
{t('application:signout-all-devices')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<FormState
|
||||||
|
state={fetchState}
|
||||||
|
message={message != null ? t(message) : undefined}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
)
|
)
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
|
import { useMemo } from 'react'
|
||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import { useTheme } from 'next-themes'
|
import { useTheme } from 'next-themes'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
import { useForm } from 'react-component-form'
|
||||||
|
import type { HandleUseFormCallback } from 'react-component-form'
|
||||||
|
|
||||||
import { Main } from '../design/Main'
|
import { Main } from '../design/Main'
|
||||||
import { Input } from '../design/Input'
|
import { Input } from '../design/Input'
|
||||||
@ -11,12 +14,10 @@ import { FormState } from '../design/FormState'
|
|||||||
import { AuthenticationForm } from '.'
|
import { AuthenticationForm } from '.'
|
||||||
import { userSchema } from '../../models/User'
|
import { userSchema } from '../../models/User'
|
||||||
import { api } from '../../tools/api'
|
import { api } from '../../tools/api'
|
||||||
import {
|
import type { Tokens } from '../../tools/authentication'
|
||||||
Tokens,
|
import { Authentication as AuthenticationClass } from '../../tools/authentication'
|
||||||
Authentication as AuthenticationClass
|
|
||||||
} from '../../tools/authentication'
|
|
||||||
import { useForm, HandleSubmitCallback } from '../../hooks/useForm'
|
|
||||||
import { AuthenticationSocialMedia } from './AuthenticationSocialMedia'
|
import { AuthenticationSocialMedia } from './AuthenticationSocialMedia'
|
||||||
|
import { useFormTranslation } from '../../hooks/useFormTranslation'
|
||||||
|
|
||||||
export interface AuthenticationProps {
|
export interface AuthenticationProps {
|
||||||
mode: 'signup' | 'signin'
|
mode: 'signup' | 'signin'
|
||||||
@ -29,23 +30,28 @@ export const Authentication: React.FC<AuthenticationProps> = (props) => {
|
|||||||
const { lang, t } = useTranslation()
|
const { lang, t } = useTranslation()
|
||||||
const { theme } = useTheme()
|
const { theme } = useTheme()
|
||||||
|
|
||||||
const { errors, fetchState, message, getErrorTranslation, handleSubmit } =
|
const schema = useMemo(() => {
|
||||||
useForm({
|
return {
|
||||||
validateSchema: {
|
|
||||||
...(mode === 'signup' && { name: userSchema.name }),
|
...(mode === 'signup' && { name: userSchema.name }),
|
||||||
email: userSchema.email,
|
email: userSchema.email,
|
||||||
password: userSchema.password
|
password: userSchema.password
|
||||||
},
|
}
|
||||||
resetOnSuccess: true
|
}, [mode])
|
||||||
})
|
|
||||||
|
|
||||||
const onSubmit: HandleSubmitCallback = async (formData) => {
|
const { handleUseForm, errors, fetchState, message } = useForm(schema)
|
||||||
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
|
|
||||||
|
const onSubmit: HandleUseFormCallback<typeof schema> = async (
|
||||||
|
formData,
|
||||||
|
formElement
|
||||||
|
) => {
|
||||||
if (mode === 'signup') {
|
if (mode === 'signup') {
|
||||||
try {
|
try {
|
||||||
await api.post(
|
await api.post(
|
||||||
`/users/signup?redirectURI=${window.location.origin}/authentication/signin`,
|
`/users/signup?redirectURI=${window.location.origin}/authentication/signin`,
|
||||||
{ ...formData, language: lang, theme }
|
{ ...formData, language: lang, theme }
|
||||||
)
|
)
|
||||||
|
formElement.reset()
|
||||||
return {
|
return {
|
||||||
type: 'success',
|
type: 'success',
|
||||||
value: 'authentication:success-signup'
|
value: 'authentication:success-signup'
|
||||||
@ -97,14 +103,14 @@ export const Authentication: React.FC<AuthenticationProps> = (props) => {
|
|||||||
<div className='pt-8 text-center font-paragraph text-lg'>
|
<div className='pt-8 text-center font-paragraph text-lg'>
|
||||||
{t('authentication:or')}
|
{t('authentication:or')}
|
||||||
</div>
|
</div>
|
||||||
<AuthenticationForm onSubmit={handleSubmit(onSubmit)}>
|
<AuthenticationForm onSubmit={handleUseForm(onSubmit)}>
|
||||||
{mode === 'signup' && (
|
{mode === 'signup' && (
|
||||||
<Input
|
<Input
|
||||||
type='text'
|
type='text'
|
||||||
placeholder={t('common:name')}
|
placeholder={t('common:name')}
|
||||||
name='name'
|
name='name'
|
||||||
label={t('common:name')}
|
label={t('common:name')}
|
||||||
error={getErrorTranslation(errors.name)}
|
error={getFirstErrorTranslation(errors.name)}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<Input
|
<Input
|
||||||
@ -112,7 +118,7 @@ export const Authentication: React.FC<AuthenticationProps> = (props) => {
|
|||||||
placeholder='Email'
|
placeholder='Email'
|
||||||
name='email'
|
name='email'
|
||||||
label='Email'
|
label='Email'
|
||||||
error={getErrorTranslation(errors.email)}
|
error={getFirstErrorTranslation(errors.email)}
|
||||||
/>
|
/>
|
||||||
<Input
|
<Input
|
||||||
type='password'
|
type='password'
|
||||||
@ -120,7 +126,7 @@ export const Authentication: React.FC<AuthenticationProps> = (props) => {
|
|||||||
name='password'
|
name='password'
|
||||||
label={t('authentication:password')}
|
label={t('authentication:password')}
|
||||||
showForgotPassword={mode === 'signin'}
|
showForgotPassword={mode === 'signin'}
|
||||||
error={getErrorTranslation(errors.password)}
|
error={getFirstErrorTranslation(errors.password)}
|
||||||
/>
|
/>
|
||||||
<Button data-cy='submit' className='mt-6 w-full' type='submit'>
|
<Button data-cy='submit' className='mt-6 w-full' type='submit'>
|
||||||
{t('authentication:submit')}
|
{t('authentication:submit')}
|
||||||
@ -133,15 +139,17 @@ export const Authentication: React.FC<AuthenticationProps> = (props) => {
|
|||||||
: '/authentication/signup'
|
: '/authentication/signup'
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<a>
|
|
||||||
{mode === 'signup'
|
{mode === 'signup'
|
||||||
? t('authentication:already-have-an-account')
|
? t('authentication:already-have-an-account')
|
||||||
: t('authentication:dont-have-an-account')}
|
: t('authentication:dont-have-an-account')}
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
</p>
|
</p>
|
||||||
</AuthenticationForm>
|
</AuthenticationForm>
|
||||||
<FormState id='message' state={fetchState} message={message} />
|
<FormState
|
||||||
|
id='message'
|
||||||
|
state={fetchState}
|
||||||
|
message={message != null ? t(message) : undefined}
|
||||||
|
/>
|
||||||
</Main>
|
</Main>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
import { Form, FormProps } from 'react-component-form'
|
import type { FormProps } from 'react-component-form'
|
||||||
|
import { Form } from 'react-component-form'
|
||||||
|
|
||||||
export const AuthenticationForm: React.FC<FormProps> = (props) => {
|
export const AuthenticationForm: React.FC<FormProps> = (props) => {
|
||||||
const { className, children, ...rest } = props
|
const { className, children, ...rest } = props
|
||||||
|
@ -3,7 +3,8 @@ import { useRouter } from 'next/router'
|
|||||||
|
|
||||||
import { api } from '../../tools/api'
|
import { api } from '../../tools/api'
|
||||||
import { Authentication, isTokens } from '../../tools/authentication'
|
import { Authentication, isTokens } from '../../tools/authentication'
|
||||||
import { SocialMediaButton, SocialMedia } from '../design/SocialMediaButton'
|
import type { SocialMedia } from '../design/SocialMediaButton'
|
||||||
|
import { SocialMediaButton } from '../design/SocialMediaButton'
|
||||||
import { providers } from '../../models/OAuth'
|
import { providers } from '../../models/OAuth'
|
||||||
|
|
||||||
export const AuthenticationSocialMedia: React.FC = () => {
|
export const AuthenticationSocialMedia: React.FC = () => {
|
||||||
|
@ -5,17 +5,18 @@ import { EMOJI_SET } from './emojiPlugin'
|
|||||||
export interface EmojiProps {
|
export interface EmojiProps {
|
||||||
value: string
|
value: string
|
||||||
size: number
|
size: number
|
||||||
|
tooltip?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Emoji: React.FC<EmojiProps> = (props) => {
|
export const Emoji: React.FC<EmojiProps> = (props) => {
|
||||||
const { value, size } = props
|
const { value, size, tooltip = false } = props
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<EmojiMart
|
<EmojiMart
|
||||||
set={EMOJI_SET}
|
set={EMOJI_SET}
|
||||||
emoji={value}
|
emoji={value}
|
||||||
size={size}
|
size={size}
|
||||||
tooltip
|
tooltip={tooltip}
|
||||||
fallback={() => {
|
fallback={() => {
|
||||||
return <>{value}</>
|
return <>{value}</>
|
||||||
}}
|
}}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import 'emoji-mart/css/emoji-mart.css'
|
import 'emoji-mart/css/emoji-mart.css'
|
||||||
import { EmojiData, Picker } from 'emoji-mart'
|
import type { EmojiData } from 'emoji-mart'
|
||||||
|
import { Picker } from 'emoji-mart'
|
||||||
import { useTheme } from 'next-themes'
|
import { useTheme } from 'next-themes'
|
||||||
|
|
||||||
import { EMOJI_SET } from '../emojiPlugin'
|
import { EMOJI_SET } from '../emojiPlugin'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { visit } from 'unist-util-visit'
|
import { visit } from 'unist-util-visit'
|
||||||
import { Plugin, Transformer } from 'unified'
|
import type { Plugin, Transformer } from 'unified'
|
||||||
import { Literal, Parent } from 'unist'
|
import type { Literal, Parent } from 'unist'
|
||||||
import type { ElementContent } from 'hast'
|
import type { ElementContent } from 'hast'
|
||||||
import type { EmojiSet } from 'emoji-mart'
|
import type { EmojiSet } from 'emoji-mart'
|
||||||
|
|
||||||
|
@ -1,17 +1,24 @@
|
|||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
|
||||||
export interface ErrorPageProps {
|
import type { FooterProps } from './Footer'
|
||||||
|
import { Footer } from './Footer'
|
||||||
|
import { Header } from './Header'
|
||||||
|
|
||||||
|
export interface ErrorPageProps extends FooterProps {
|
||||||
statusCode: number
|
statusCode: number
|
||||||
message: string
|
message: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ErrorPage: React.FC<ErrorPageProps> = (props) => {
|
export const ErrorPage: React.FC<ErrorPageProps> = (props) => {
|
||||||
const { message, statusCode } = props
|
const { message, statusCode, version } = props
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
<div className='flex h-screen flex-col pt-0'>
|
||||||
|
<Header />
|
||||||
|
<main className='flex min-w-full flex-1 flex-col items-center justify-center'>
|
||||||
<h1 className='my-6 text-4xl font-semibold'>
|
<h1 className='my-6 text-4xl font-semibold'>
|
||||||
{t('errors:error')}{' '}
|
{t('errors:error')}{' '}
|
||||||
<span
|
<span
|
||||||
@ -23,31 +30,16 @@ export const ErrorPage: React.FC<ErrorPageProps> = (props) => {
|
|||||||
</h1>
|
</h1>
|
||||||
<p className='text-center text-lg'>
|
<p className='text-center text-lg'>
|
||||||
{message}{' '}
|
{message}{' '}
|
||||||
<Link href='/'>
|
<Link
|
||||||
<a className='text-green-800 hover:underline dark:text-green-400'>
|
href='/'
|
||||||
|
className='text-green-800 hover:underline dark:text-green-400'
|
||||||
|
>
|
||||||
{t('errors:return-to-home-page')}
|
{t('errors:return-to-home-page')}
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
</p>
|
</p>
|
||||||
|
</main>
|
||||||
<style jsx global>
|
<Footer version={version} />
|
||||||
{`
|
</div>
|
||||||
main {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
min-width: 100vw;
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
#__next {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
padding-top: 0;
|
|
||||||
height: 100vh;
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -15,10 +15,11 @@ export const Footer: React.FC<FooterProps> = (props) => {
|
|||||||
return (
|
return (
|
||||||
<footer className='flex flex-col items-center justify-center border-t-2 border-gray-600 bg-white py-6 text-lg dark:border-gray-400 dark:bg-black'>
|
<footer className='flex flex-col items-center justify-center border-t-2 border-gray-600 bg-white py-6 text-lg dark:border-gray-400 dark:bg-black'>
|
||||||
<p>
|
<p>
|
||||||
<Link href='/'>
|
<Link
|
||||||
<a className='text-green-800 hover:underline dark:text-green-400'>
|
href='/'
|
||||||
|
className='text-green-800 hover:underline dark:text-green-400'
|
||||||
|
>
|
||||||
Thream
|
Thream
|
||||||
</a>
|
|
||||||
</Link>{' '}
|
</Link>{' '}
|
||||||
| {t('common:all-rights-reserved')}
|
| {t('common:all-rights-reserved')}
|
||||||
</p>
|
</p>
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
import { render } from '@testing-library/react'
|
|
||||||
|
|
||||||
import { Header } from '.'
|
|
||||||
|
|
||||||
describe('<Header />', () => {
|
|
||||||
it('should render', () => {
|
|
||||||
const { getByText } = render(<Header />)
|
|
||||||
expect(getByText('Thream')).toBeInTheDocument()
|
|
||||||
})
|
|
||||||
})
|
|
@ -9,9 +9,9 @@ export const Header: React.FC = () => {
|
|||||||
<header className='sticky top-0 z-50 flex w-full justify-center border-b-2 border-gray-600 bg-white px-6 py-2 dark:border-gray-400 dark:bg-black'>
|
<header className='sticky top-0 z-50 flex w-full justify-center border-b-2 border-gray-600 bg-white px-6 py-2 dark:border-gray-400 dark:bg-black'>
|
||||||
<div className='container flex justify-between'>
|
<div className='container flex justify-between'>
|
||||||
<Link href='/'>
|
<Link href='/'>
|
||||||
<a>
|
|
||||||
<div className='flex items-center justify-center'>
|
<div className='flex items-center justify-center'>
|
||||||
<Image
|
<Image
|
||||||
|
priority
|
||||||
quality={100}
|
quality={100}
|
||||||
width={60}
|
width={60}
|
||||||
height={60}
|
height={60}
|
||||||
@ -22,7 +22,6 @@ export const Header: React.FC = () => {
|
|||||||
Thream
|
Thream
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
<div className='flex justify-between'>
|
<div className='flex justify-between'>
|
||||||
<Language />
|
<Language />
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import { useCallback, useEffect, useState, useRef } from 'react'
|
import { useCallback, useState, useRef } from 'react'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import setLanguage from 'next-translate/setLanguage'
|
import setLanguage from 'next-translate/setLanguage'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
|
import i18n from '../../../i18n.json'
|
||||||
import { Arrow } from './Arrow'
|
import { Arrow } from './Arrow'
|
||||||
import { LanguageFlag } from './LanguageFlag'
|
import { LanguageFlag } from './LanguageFlag'
|
||||||
import i18n from '../../../i18n.json'
|
import { useClickOutsideAlerter } from '../../../hooks/useClickOutsideAlerter'
|
||||||
|
|
||||||
export interface LanguageProps {
|
export interface LanguageProps {
|
||||||
className?: string
|
className?: string
|
||||||
@ -18,34 +19,26 @@ export const Language: React.FC<LanguageProps> = (props) => {
|
|||||||
const languageClickRef = useRef<HTMLDivElement | null>(null)
|
const languageClickRef = useRef<HTMLDivElement | null>(null)
|
||||||
|
|
||||||
const handleHiddenMenu = useCallback(() => {
|
const handleHiddenMenu = useCallback(() => {
|
||||||
setHiddenMenu((oldHiddenMenu) => !oldHiddenMenu)
|
setHiddenMenu((oldHiddenMenu) => {
|
||||||
|
return !oldHiddenMenu
|
||||||
|
})
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useClickOutsideAlerter(languageClickRef, () => {
|
||||||
const handleClickEvent = (event: MouseEvent): void => {
|
return setHiddenMenu(true)
|
||||||
if (languageClickRef.current == null || event.target == null) {
|
})
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!languageClickRef.current.contains(event.target as Node)) {
|
|
||||||
setHiddenMenu(true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
window.document.addEventListener('click', handleClickEvent)
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
return window.removeEventListener('click', handleClickEvent)
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const handleLanguage = async (language: string): Promise<void> => {
|
const handleLanguage = async (language: string): Promise<void> => {
|
||||||
await setLanguage(language)
|
await setLanguage(language)
|
||||||
|
handleHiddenMenu()
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='relative flex cursor-pointer flex-col items-center justify-center'>
|
|
||||||
<div
|
<div
|
||||||
|
className='relative flex cursor-pointer flex-col items-center justify-center'
|
||||||
ref={languageClickRef}
|
ref={languageClickRef}
|
||||||
|
>
|
||||||
|
<div
|
||||||
data-cy='language-click'
|
data-cy='language-click'
|
||||||
className='mr-5 flex items-center'
|
className='mr-5 flex items-center'
|
||||||
onClick={handleHiddenMenu}
|
onClick={handleHiddenMenu}
|
||||||
@ -70,7 +63,9 @@ export const Language: React.FC<LanguageProps> = (props) => {
|
|||||||
<li
|
<li
|
||||||
key={index}
|
key={index}
|
||||||
className='flex h-12 w-full items-center justify-center pl-2 hover:bg-[#4f545c] hover:bg-opacity-20'
|
className='flex h-12 w-full items-center justify-center pl-2 hover:bg-[#4f545c] hover:bg-opacity-20'
|
||||||
onClick={async () => await handleLanguage(language)}
|
onClick={async () => {
|
||||||
|
return await handleLanguage(language)
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<LanguageFlag language={language} />
|
<LanguageFlag language={language} />
|
||||||
</li>
|
</li>
|
||||||
|
78
components/Header/SwitchTheme.tsx
Normal file
78
components/Header/SwitchTheme.tsx
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
import classNames from 'clsx'
|
||||||
|
import { useTheme } from 'next-themes'
|
||||||
|
|
||||||
|
export const SwitchTheme: React.FC = () => {
|
||||||
|
const [mounted, setMounted] = useState(false)
|
||||||
|
const { theme, setTheme } = useTheme()
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setMounted(true)
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
if (!mounted) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleClick = (): void => {
|
||||||
|
setTheme(theme === 'dark' ? 'light' : 'dark')
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className='flex items-center'
|
||||||
|
data-cy='switch-theme-click'
|
||||||
|
onClick={handleClick}
|
||||||
|
>
|
||||||
|
<div className='relative inline-block cursor-pointer touch-pan-x select-none border-0 bg-transparent p-0'>
|
||||||
|
<div className='h-[24px] w-[50px] rounded-[30px] bg-[#4d4d4d] p-0 text-white transition-all duration-200 ease-in-out'>
|
||||||
|
<div
|
||||||
|
data-cy='switch-theme-dark'
|
||||||
|
className={classNames(
|
||||||
|
'absolute top-0 bottom-0 left-[8px] mt-auto mb-auto h-[10px] w-[14px] leading-[0] transition-opacity duration-[250ms] ease-in-out',
|
||||||
|
{
|
||||||
|
'opacity-100': theme === 'dark',
|
||||||
|
'opacity-0': theme === 'light'
|
||||||
|
}
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<span className='relative flex h-[10px] w-[10px] items-center justify-center'>
|
||||||
|
🌜
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
data-cy='switch-theme-light'
|
||||||
|
className={classNames(
|
||||||
|
'absolute right-[10px] top-0 bottom-0 mt-auto mb-auto h-[10px] w-[10px] leading-[0]',
|
||||||
|
{
|
||||||
|
'opacity-100': theme === 'light',
|
||||||
|
'opacity-0': theme === 'dark'
|
||||||
|
}
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<span className='relative flex h-[10px] w-[10px] items-center justify-center'>
|
||||||
|
🌞
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
className={classNames(
|
||||||
|
'absolute top-[1px] box-border h-[22px] w-[22px] rounded-[50%] bg-[#fafafa] text-white transition-all duration-[250ms] ease-in-out',
|
||||||
|
{
|
||||||
|
'left-[27px]': theme === 'dark',
|
||||||
|
'left-0': theme === 'light'
|
||||||
|
}
|
||||||
|
)}
|
||||||
|
style={{ border: '1px solid #4d4d4d' }}
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
data-cy='switch-theme-input'
|
||||||
|
type='checkbox'
|
||||||
|
aria-label='Dark mode toggle'
|
||||||
|
className='absolute m-[-1px] h-[1px] w-[1px] overflow-hidden border-0 p-0'
|
||||||
|
defaultChecked
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
@ -1,126 +0,0 @@
|
|||||||
import { useEffect, useState } from 'react'
|
|
||||||
import { useTheme } from 'next-themes'
|
|
||||||
|
|
||||||
export const SwitchTheme: React.FC = () => {
|
|
||||||
const [mounted, setMounted] = useState(false)
|
|
||||||
const { theme, setTheme } = useTheme()
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setMounted(true)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
if (!mounted) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleClick = (): void => {
|
|
||||||
setTheme(theme === 'dark' ? 'light' : 'dark')
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<div
|
|
||||||
className='flex items-center'
|
|
||||||
data-cy='switch-theme-click'
|
|
||||||
onClick={handleClick}
|
|
||||||
>
|
|
||||||
<div className='toggle-theme-button relative inline-block cursor-pointer bg-transparent'>
|
|
||||||
<div className='toggle-track'>
|
|
||||||
<div
|
|
||||||
data-cy='switch-theme-dark'
|
|
||||||
className='toggle-track-check absolute'
|
|
||||||
>
|
|
||||||
<span className='toggle_Dark relative flex items-center justify-center'>
|
|
||||||
🌜
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
data-cy='switch-theme-light'
|
|
||||||
className='toggle-track-x absolute'
|
|
||||||
>
|
|
||||||
<span className='toggle_Light relative flex items-center justify-center'>
|
|
||||||
🌞
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className='toggle-thumb absolute' />
|
|
||||||
<input
|
|
||||||
data-cy='switch-theme-input'
|
|
||||||
type='checkbox'
|
|
||||||
aria-label='Dark mode toggle'
|
|
||||||
className='toggle-screenreader-only absolute overflow-hidden'
|
|
||||||
defaultChecked
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<style jsx>
|
|
||||||
{`
|
|
||||||
.toggle-theme-button {
|
|
||||||
touch-action: pan-x;
|
|
||||||
border: 0;
|
|
||||||
padding: 0;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
.toggle-track {
|
|
||||||
width: 50px;
|
|
||||||
height: 24px;
|
|
||||||
padding: 0;
|
|
||||||
border-radius: 30px;
|
|
||||||
background-color: #4d4d4d;
|
|
||||||
transition: all 0.2s ease;
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
.toggle-track-check {
|
|
||||||
width: 14px;
|
|
||||||
height: 10px;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
margin-top: auto;
|
|
||||||
margin-bottom: auto;
|
|
||||||
line-height: 0;
|
|
||||||
left: 8px;
|
|
||||||
opacity: ${theme === 'dark' ? 1 : 0};
|
|
||||||
transition: opacity 0.25s ease;
|
|
||||||
}
|
|
||||||
.toggle-track-x {
|
|
||||||
width: 10px;
|
|
||||||
height: 10px;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
margin-top: auto;
|
|
||||||
margin-bottom: auto;
|
|
||||||
line-height: 0;
|
|
||||||
right: 10px;
|
|
||||||
opacity: ${theme === 'dark' ? 0 : 1};
|
|
||||||
}
|
|
||||||
.toggle_Dark,
|
|
||||||
.toggle_Light {
|
|
||||||
height: 10px;
|
|
||||||
width: 10px;
|
|
||||||
}
|
|
||||||
.toggle-thumb {
|
|
||||||
left: ${theme === 'dark' ? '27px' : '0px'};
|
|
||||||
width: 22px;
|
|
||||||
height: 22px;
|
|
||||||
border: 1px solid #4d4d4d;
|
|
||||||
border-radius: 50%;
|
|
||||||
background-color: #fafafa;
|
|
||||||
box-sizing: border-box;
|
|
||||||
transition: all 0.25s ease;
|
|
||||||
top: 1px;
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
.toggle-screenreader-only {
|
|
||||||
border: 0;
|
|
||||||
clip: rect(0 0 0 0);
|
|
||||||
height: 1px;
|
|
||||||
margin: -1px;
|
|
||||||
padding: 0;
|
|
||||||
width: 1px;
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
export * from './SwitchTheme'
|
|
@ -1,20 +0,0 @@
|
|||||||
export const ScrollableBody: React.FC<React.PropsWithChildren<{}>> = (
|
|
||||||
props
|
|
||||||
) => {
|
|
||||||
const { children } = props
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{children}
|
|
||||||
<style jsx global>{`
|
|
||||||
body {
|
|
||||||
scrollbar-width: thin;
|
|
||||||
scrollbar-color: var(--scroll-bar-color) var(--scroll-bar-bg-color);
|
|
||||||
z-index: 1000;
|
|
||||||
height: calc(100vh - 64px);
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
`}</style>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
@ -1,5 +1,5 @@
|
|||||||
import { forwardRef } from 'react'
|
import { forwardRef } from 'react'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
const className =
|
const className =
|
||||||
'py-2 px-6 font-paragraph rounded-lg bg-transparent border hover:text-white dark:hover:text-black fill-current stroke-current transform transition-colors duration-300 ease-in-out focus:outline-none focus:text-white dark:focus:text-black'
|
'py-2 px-6 font-paragraph rounded-lg bg-transparent border hover:text-white dark:hover:text-black fill-current stroke-current transform transition-colors duration-300 ease-in-out focus:outline-none focus:text-white dark:focus:text-black'
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
export interface CheckboxProps extends React.ComponentPropsWithRef<'input'> {
|
export interface CheckboxProps extends React.ComponentPropsWithRef<'input'> {
|
||||||
className?: string
|
className?: string
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
|
import type { FetchState as FormStateType } from 'react-component-form'
|
||||||
|
|
||||||
import { FetchState as FormStateType } from '../../../hooks/useFetchState'
|
|
||||||
import { Loader } from '../Loader'
|
import { Loader } from '../Loader'
|
||||||
|
|
||||||
export interface FormStateProps extends React.ComponentPropsWithoutRef<'div'> {
|
export interface FormStateProps extends React.ComponentPropsWithoutRef<'div'> {
|
||||||
@ -27,7 +27,6 @@ export const FormState: React.FC<FormStateProps> = (props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<div
|
<div
|
||||||
{...rest}
|
{...rest}
|
||||||
className={classNames(
|
className={classNames(
|
||||||
@ -39,19 +38,10 @@ export const FormState: React.FC<FormStateProps> = (props) => {
|
|||||||
}
|
}
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div className='thumbnail inline bg-cover font-headline' />
|
<div className='inline bg-cover font-headline' />
|
||||||
<span id={id} className='pl-2'>
|
<span id={id} className='pl-2'>
|
||||||
<b>{t(`errors:${state}`)}:</b> {message}
|
<b>{t(`errors:${state}`)}:</b> {message}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style jsx>{`
|
|
||||||
.thumbnail {
|
|
||||||
height: 20px;
|
|
||||||
width: 20px;
|
|
||||||
background-image: url('/images/svg/icons/input/${state}.svg');
|
|
||||||
}
|
|
||||||
`}</style>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
export interface IconButtonProps
|
export interface IconButtonProps
|
||||||
extends React.ComponentPropsWithoutRef<'button'> {}
|
extends React.ComponentPropsWithoutRef<'button'> {}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
export interface IconLinkProps {
|
export interface IconLinkProps {
|
||||||
selected?: boolean
|
selected?: boolean
|
||||||
@ -14,8 +14,11 @@ export const IconLink: React.FC<React.PropsWithChildren<IconLinkProps>> = (
|
|||||||
const { children, selected, href, title, className } = props
|
const { children, selected, href, title, className } = props
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Link href={href}>
|
<Link
|
||||||
<a className='group relative flex w-full justify-center' title={title}>
|
href={href}
|
||||||
|
className='group relative flex w-full justify-center'
|
||||||
|
title={title}
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
className={classNames('group flex w-full justify-center', className)}
|
className={classNames('group flex w-full justify-center', className)}
|
||||||
>
|
>
|
||||||
@ -31,7 +34,6 @@ export const IconLink: React.FC<React.PropsWithChildren<IconLinkProps>> = (
|
|||||||
></span>
|
></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
import { FormState } from '../FormState'
|
import { FormState } from '../FormState'
|
||||||
|
|
||||||
@ -35,22 +35,18 @@ export const Input: React.FC<InputProps> = (props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<div className='flex flex-col'>
|
<div className='flex flex-col'>
|
||||||
<div
|
<div className={classNames('mt-6 mb-2 flex justify-between', className)}>
|
||||||
className={classNames('mt-6 mb-2 flex justify-between', className)}
|
|
||||||
>
|
|
||||||
<label className='pl-1' htmlFor={name}>
|
<label className='pl-1' htmlFor={name}>
|
||||||
{label}
|
{label}
|
||||||
</label>
|
</label>
|
||||||
{type === 'password' && showForgotPassword ? (
|
{type === 'password' && showForgotPassword ? (
|
||||||
<Link href='/authentication/forgot-password'>
|
<Link
|
||||||
<a
|
href='/authentication/forgot-password'
|
||||||
className='text-center font-headline text-xs text-green-800 hover:underline dark:text-green-400 sm:text-sm'
|
className='text-center font-headline text-xs text-green-800 hover:underline dark:text-green-400 sm:text-sm'
|
||||||
data-cy='forgot-password-link'
|
data-cy='forgot-password-link'
|
||||||
>
|
>
|
||||||
{t('authentication:forgot-password')}
|
{t('authentication:forgot-password')}
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
@ -67,7 +63,10 @@ export const Input: React.FC<InputProps> = (props) => {
|
|||||||
<div
|
<div
|
||||||
data-cy='password-eye'
|
data-cy='password-eye'
|
||||||
onClick={handlePassword}
|
onClick={handlePassword}
|
||||||
className='password-eye absolute cursor-pointer bg-[#f1f1f1] bg-cover'
|
style={{
|
||||||
|
backgroundImage: `url('/images/svg/icons/input/${inputType}.svg')`
|
||||||
|
}}
|
||||||
|
className='absolute top-3 right-4 z-10 h-5 w-5 cursor-pointer bg-[#f1f1f1] bg-cover'
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<FormState
|
<FormState
|
||||||
@ -77,19 +76,5 @@ export const Input: React.FC<InputProps> = (props) => {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style jsx>
|
|
||||||
{`
|
|
||||||
.password-eye {
|
|
||||||
top: 12px;
|
|
||||||
right: 16px;
|
|
||||||
z-index: 1;
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
background-image: url('/images/svg/icons/input/${inputType}.svg');
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
39
components/design/Loader/Loader.module.css
Normal file
39
components/design/Loader/Loader.module.css
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
@keyframes progressSpinnerRotate {
|
||||||
|
100% {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@keyframes progressSpinnerDash {
|
||||||
|
0% {
|
||||||
|
stroke-dasharray: 1, 200;
|
||||||
|
stroke-dashoffset: 0;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
stroke-dasharray: 89, 200;
|
||||||
|
stroke-dashoffset: -35px;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
stroke-dasharray: 89, 200;
|
||||||
|
stroke-dashoffset: -124px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.progressSpinnerSvg {
|
||||||
|
animation: progressSpinnerRotate 2s linear infinite;
|
||||||
|
height: 100%;
|
||||||
|
transform-origin: center center;
|
||||||
|
width: 100%;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
margin: auto;
|
||||||
|
}
|
||||||
|
.progressSpinnerCircle {
|
||||||
|
stroke-dasharray: 89, 200;
|
||||||
|
stroke-dashoffset: 0;
|
||||||
|
stroke: #27b05e;
|
||||||
|
animation: progressSpinnerDash 1.5s ease-in-out infinite;
|
||||||
|
stroke-linecap: round;
|
||||||
|
}
|
@ -1,3 +1,5 @@
|
|||||||
|
import styles from './Loader.module.css'
|
||||||
|
|
||||||
export interface LoaderProps {
|
export interface LoaderProps {
|
||||||
width?: number
|
width?: number
|
||||||
height?: number
|
height?: number
|
||||||
@ -9,10 +11,14 @@ export const Loader: React.FC<LoaderProps> = (props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={props.className}>
|
<div className={props.className}>
|
||||||
<div data-cy='progress-spinner' className='progress-spinner'>
|
<div
|
||||||
<svg className='progress-spinner-svg' viewBox='25 25 50 50'>
|
data-cy='progress-spinner'
|
||||||
|
className='relative my-0 mx-auto before:block before:pt-[100%] before:content-none'
|
||||||
|
style={{ width: `${width}px`, height: `${height}px` }}
|
||||||
|
>
|
||||||
|
<svg className={styles['progressSpinnerSvg']} viewBox='25 25 50 50'>
|
||||||
<circle
|
<circle
|
||||||
className='progress-spinner-circle'
|
className={styles['progressSpinnerCircle']}
|
||||||
cx='50'
|
cx='50'
|
||||||
cy='50'
|
cy='50'
|
||||||
r='20'
|
r='20'
|
||||||
@ -22,60 +28,6 @@ export const Loader: React.FC<LoaderProps> = (props) => {
|
|||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style jsx>
|
|
||||||
{`
|
|
||||||
.progress-spinner {
|
|
||||||
position: relative;
|
|
||||||
margin: 0 auto;
|
|
||||||
width: ${width}px;
|
|
||||||
height: ${height}px;
|
|
||||||
}
|
|
||||||
.progress-spinner::before {
|
|
||||||
content: '';
|
|
||||||
display: block;
|
|
||||||
padding-top: 100%;
|
|
||||||
}
|
|
||||||
.progress-spinner-svg {
|
|
||||||
animation: progress-spinner-rotate 2s linear infinite;
|
|
||||||
height: 100%;
|
|
||||||
transform-origin: center center;
|
|
||||||
width: 100%;
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
margin: auto;
|
|
||||||
}
|
|
||||||
.progress-spinner-circle {
|
|
||||||
stroke-dasharray: 89, 200;
|
|
||||||
stroke-dashoffset: 0;
|
|
||||||
stroke: #27b05e;
|
|
||||||
animation: progress-spinner-dash 1.5s ease-in-out infinite;
|
|
||||||
stroke-linecap: round;
|
|
||||||
}
|
|
||||||
@keyframes progress-spinner-rotate {
|
|
||||||
100% {
|
|
||||||
transform: rotate(360deg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@keyframes progress-spinner-dash {
|
|
||||||
0% {
|
|
||||||
stroke-dasharray: 1, 200;
|
|
||||||
stroke-dashoffset: 0;
|
|
||||||
}
|
|
||||||
50% {
|
|
||||||
stroke-dasharray: 89, 200;
|
|
||||||
stroke-dashoffset: -35px;
|
|
||||||
}
|
|
||||||
100% {
|
|
||||||
stroke-dasharray: 89, 200;
|
|
||||||
stroke-dashoffset: -124px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
export interface MainProps {
|
export interface MainProps {
|
||||||
className?: string
|
className?: string
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
.buttonGoogle {
|
||||||
|
color: #000;
|
||||||
|
border: 1px solid #000;
|
||||||
|
}
|
||||||
|
.buttonMedia {
|
||||||
|
color: #fff;
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
.button:focus {
|
||||||
|
box-shadow: 0 0 0 2px #27b05e;
|
||||||
|
}
|
@ -1,8 +1,9 @@
|
|||||||
import { useMemo } from 'react'
|
import { useMemo } from 'react'
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import classNames from 'classnames'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
import { ProviderOAuth } from '../../../models/OAuth'
|
import type { ProviderOAuth } from '../../../models/OAuth'
|
||||||
|
import styles from './SocialMediaButton.module.css'
|
||||||
|
|
||||||
export type SocialMedia = ProviderOAuth
|
export type SocialMedia = ProviderOAuth
|
||||||
|
|
||||||
@ -52,27 +53,21 @@ export const SocialMediaButton: React.FC<SocialMediaButtonProps> = (props) => {
|
|||||||
}, [socialMedia])
|
}, [socialMedia])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<button
|
<button
|
||||||
{...rest}
|
{...rest}
|
||||||
className={classNames(className, 'button', givenClassName)}
|
style={{ background: socialMediaColor }}
|
||||||
|
className={classNames(
|
||||||
|
className,
|
||||||
|
styles['button'],
|
||||||
|
{
|
||||||
|
[styles['buttonGoogle'] as string]: socialMedia === 'Google',
|
||||||
|
[styles['buttonMedia'] as string]: socialMedia !== 'Google'
|
||||||
|
},
|
||||||
|
givenClassName
|
||||||
|
)}
|
||||||
>
|
>
|
||||||
<SocialMediaChildren socialMedia={socialMedia} />
|
<SocialMediaChildren socialMedia={socialMedia} />
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<style jsx>
|
|
||||||
{`
|
|
||||||
.button {
|
|
||||||
background: ${socialMediaColor};
|
|
||||||
color: ${socialMedia === 'Google' ? '#000' : '#fff'};
|
|
||||||
border: ${socialMedia === 'Google' ? '1px solid #000' : 'none'};
|
|
||||||
}
|
|
||||||
.button:focus {
|
|
||||||
box-shadow: 0 0 0 2px #27b05e;
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -88,23 +83,20 @@ export const SocialMediaLink: React.FC<SocialMediaLinkProps> = (props) => {
|
|||||||
}, [socialMedia])
|
}, [socialMedia])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<a
|
||||||
<a {...rest} className={classNames(className, 'link', givenClassName)}>
|
{...rest}
|
||||||
|
style={{ background: socialMediaColor }}
|
||||||
|
className={classNames(
|
||||||
|
className,
|
||||||
|
styles['button'],
|
||||||
|
{
|
||||||
|
[styles['buttonGoogle'] as string]: socialMedia === 'Google',
|
||||||
|
[styles['buttonMedia'] as string]: socialMedia !== 'Google'
|
||||||
|
},
|
||||||
|
givenClassName
|
||||||
|
)}
|
||||||
|
>
|
||||||
<SocialMediaChildren socialMedia={socialMedia} />
|
<SocialMediaChildren socialMedia={socialMedia} />
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<style jsx>
|
|
||||||
{`
|
|
||||||
.link {
|
|
||||||
background: ${socialMediaColor};
|
|
||||||
color: ${socialMedia === 'Google' ? '#000' : '#fff'};
|
|
||||||
border: ${socialMedia === 'Google' ? '1px solid #000' : 'none'};
|
|
||||||
}
|
|
||||||
.link:focus {
|
|
||||||
box-shadow: 0 0 0 2px #27b05e;
|
|
||||||
}
|
|
||||||
`}
|
|
||||||
</style>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import TextareaAutosize, {
|
import type { TextareaAutosizeProps } from 'react-textarea-autosize'
|
||||||
TextareaAutosizeProps
|
import TextareaAutosize from 'react-textarea-autosize'
|
||||||
} from 'react-textarea-autosize'
|
|
||||||
|
|
||||||
export interface TextareaProps extends TextareaAutosizeProps {
|
export interface TextareaProps extends TextareaAutosizeProps {
|
||||||
label: string
|
label: string
|
||||||
|
@ -1,12 +1,15 @@
|
|||||||
import { createContext, useContext, useEffect } from 'react'
|
import { createContext, useContext, useEffect, useMemo } from 'react'
|
||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
|
|
||||||
import { NextPage, usePagination } from '../hooks/usePagination'
|
import type { NextPage } from '../hooks/usePagination'
|
||||||
|
import { usePagination } from '../hooks/usePagination'
|
||||||
import { useAuthentication } from '../tools/authentication'
|
import { useAuthentication } from '../tools/authentication'
|
||||||
import { Channel, ChannelWithDefaultChannelId } from '../models/Channel'
|
import type { Channel, ChannelWithDefaultChannelId } from '../models/Channel'
|
||||||
import { GuildsChannelsPath } from '../components/Application'
|
import type { GuildsChannelsPath } from '../components/Application'
|
||||||
import { handleSocketData, SocketData } from '../tools/handleSocketData'
|
import type { SocketData } from '../tools/handleSocketData'
|
||||||
import { CacheKey, CHANNELS_CACHE_KEY } from '../tools/cache'
|
import { handleSocketData } from '../tools/handleSocketData'
|
||||||
|
import type { CacheKey } from '../tools/cache'
|
||||||
|
import { CHANNELS_CACHE_KEY } from '../tools/cache'
|
||||||
|
|
||||||
export interface Channels {
|
export interface Channels {
|
||||||
channels: Channel[]
|
channels: Channel[]
|
||||||
@ -28,7 +31,9 @@ export const ChannelsProvider: React.FC<
|
|||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const { authentication } = useAuthentication()
|
const { authentication } = useAuthentication()
|
||||||
|
|
||||||
const cacheKey: CacheKey = `${path.guildId}-${CHANNELS_CACHE_KEY}`
|
const cacheKey = useMemo<CacheKey>(() => {
|
||||||
|
return `${path.guildId}-${CHANNELS_CACHE_KEY}`
|
||||||
|
}, [path.guildId])
|
||||||
|
|
||||||
const {
|
const {
|
||||||
items: channels,
|
items: channels,
|
||||||
@ -75,7 +80,7 @@ export const ChannelsProvider: React.FC<
|
|||||||
export const useChannels = (): Channels => {
|
export const useChannels = (): Channels => {
|
||||||
const channels = useContext(ChannelsContext)
|
const channels = useContext(ChannelsContext)
|
||||||
if (channels === defaultChannelsContext) {
|
if (channels === defaultChannelsContext) {
|
||||||
throw new Error('useChannels must be used within ChannelsProvider')
|
throw new Error('`useChannels` must be used within `ChannelsProvider`')
|
||||||
}
|
}
|
||||||
return channels
|
return channels
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,17 @@
|
|||||||
import { createContext, useContext, useEffect, useState } from 'react'
|
import { createContext, useContext, useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
|
|
||||||
import { GuildWithDefaultChannelId } from '../models/Guild'
|
import type { GuildWithDefaultChannelId } from '../models/Guild'
|
||||||
import { Member } from '../models/Member'
|
import type { Member } from '../models/Member'
|
||||||
import { useAuthentication } from '../tools/authentication'
|
import { useAuthentication } from '../tools/authentication'
|
||||||
import { SocketData } from '../tools/handleSocketData'
|
import type { SocketData } from '../tools/handleSocketData'
|
||||||
|
|
||||||
export interface GuildMember {
|
export interface GuildMember {
|
||||||
guild: GuildWithDefaultChannelId
|
guild: GuildWithDefaultChannelId
|
||||||
member: Member
|
member: Member
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface GuildMemberResult extends GuildMember {
|
export interface GuildMemberResult extends GuildMember {}
|
||||||
setGuildMember: React.Dispatch<React.SetStateAction<GuildMember>>
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface GuildMemberProps {
|
export interface GuildMemberProps {
|
||||||
guildMember: GuildMember
|
guildMember: GuildMember
|
||||||
@ -79,8 +77,7 @@ export const GuildMemberProvider: React.FC<
|
|||||||
return (
|
return (
|
||||||
<GuildMemberContext.Provider
|
<GuildMemberContext.Provider
|
||||||
value={{
|
value={{
|
||||||
...guildMember,
|
...guildMember
|
||||||
setGuildMember
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
@ -91,7 +88,9 @@ export const GuildMemberProvider: React.FC<
|
|||||||
export const useGuildMember = (): GuildMemberResult => {
|
export const useGuildMember = (): GuildMemberResult => {
|
||||||
const guildMember = useContext(GuildMemberContext)
|
const guildMember = useContext(GuildMemberContext)
|
||||||
if (guildMember === defaultGuildMemberContext) {
|
if (guildMember === defaultGuildMemberContext) {
|
||||||
throw new Error('useGuildMember must be used within GuildMemberProvider')
|
throw new Error(
|
||||||
|
'`useGuildMember` must be used within `GuildMemberProvider`'
|
||||||
|
)
|
||||||
}
|
}
|
||||||
return guildMember
|
return guildMember
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
import { createContext, useContext, useEffect } from 'react'
|
import { createContext, useContext, useEffect } from 'react'
|
||||||
|
|
||||||
import { NextPage, usePagination } from '../hooks/usePagination'
|
import type { NextPage } from '../hooks/usePagination'
|
||||||
|
import { usePagination } from '../hooks/usePagination'
|
||||||
import { useAuthentication } from '../tools/authentication'
|
import { useAuthentication } from '../tools/authentication'
|
||||||
import { GuildWithDefaultChannelId } from '../models/Guild'
|
import type { GuildWithDefaultChannelId } from '../models/Guild'
|
||||||
import { handleSocketData, SocketData } from '../tools/handleSocketData'
|
import type { SocketData } from '../tools/handleSocketData'
|
||||||
|
import { handleSocketData } from '../tools/handleSocketData'
|
||||||
import { GUILDS_CACHE_KEY } from '../tools/cache'
|
import { GUILDS_CACHE_KEY } from '../tools/cache'
|
||||||
|
|
||||||
export interface Guilds {
|
export interface Guilds {
|
||||||
@ -62,7 +64,7 @@ export const GuildsProvider: React.FC<React.PropsWithChildren<{}>> = (
|
|||||||
export const useGuilds = (): Guilds => {
|
export const useGuilds = (): Guilds => {
|
||||||
const guilds = useContext(GuildsContext)
|
const guilds = useContext(GuildsContext)
|
||||||
if (guilds === defaultGuildsContext) {
|
if (guilds === defaultGuildsContext) {
|
||||||
throw new Error('useGuilds must be used within GuildsProvider')
|
throw new Error('`useGuilds` must be used within `GuildsProvider`')
|
||||||
}
|
}
|
||||||
return guilds
|
return guilds
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,15 @@
|
|||||||
import { createContext, useContext, useEffect } from 'react'
|
import { createContext, useContext, useEffect, useMemo } from 'react'
|
||||||
|
|
||||||
import { NextPage, usePagination } from '../hooks/usePagination'
|
import type { NextPage } from '../hooks/usePagination'
|
||||||
|
import { usePagination } from '../hooks/usePagination'
|
||||||
import { useAuthentication } from '../tools/authentication'
|
import { useAuthentication } from '../tools/authentication'
|
||||||
import { MemberWithPublicUser } from '../models/Member'
|
import type { MemberWithPublicUser } from '../models/Member'
|
||||||
import { GuildsChannelsPath } from '../components/Application'
|
import type { GuildsChannelsPath } from '../components/Application'
|
||||||
import { handleSocketData, SocketData } from '../tools/handleSocketData'
|
import type { SocketData } from '../tools/handleSocketData'
|
||||||
import { User } from '../models/User'
|
import { handleSocketData } from '../tools/handleSocketData'
|
||||||
import { CacheKey, MEMBERS_CACHE_KEY } from '../tools/cache'
|
import type { User } from '../models/User'
|
||||||
|
import type { CacheKey } from '../tools/cache'
|
||||||
|
import { MEMBERS_CACHE_KEY } from '../tools/cache'
|
||||||
|
|
||||||
export interface Members {
|
export interface Members {
|
||||||
members: MemberWithPublicUser[]
|
members: MemberWithPublicUser[]
|
||||||
@ -28,7 +31,9 @@ export const MembersProviders: React.FC<
|
|||||||
|
|
||||||
const { authentication } = useAuthentication()
|
const { authentication } = useAuthentication()
|
||||||
|
|
||||||
const cacheKey: CacheKey = `${path.guildId}-${MEMBERS_CACHE_KEY}`
|
const cacheKey = useMemo<CacheKey>(() => {
|
||||||
|
return `${path.guildId}-${MEMBERS_CACHE_KEY}`
|
||||||
|
}, [path.guildId])
|
||||||
|
|
||||||
const {
|
const {
|
||||||
items: members,
|
items: members,
|
||||||
@ -89,7 +94,7 @@ export const MembersProviders: React.FC<
|
|||||||
export const useMembers = (): Members => {
|
export const useMembers = (): Members => {
|
||||||
const members = useContext(MembersContext)
|
const members = useContext(MembersContext)
|
||||||
if (members === defaultMembersContext) {
|
if (members === defaultMembersContext) {
|
||||||
throw new Error('useMembers must be used within MembersProvider')
|
throw new Error('`useMembers` must be used within `MembersProvider`')
|
||||||
}
|
}
|
||||||
return members
|
return members
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,14 @@
|
|||||||
import { createContext, useContext, useEffect } from 'react'
|
import { createContext, useContext, useEffect, useMemo } from 'react'
|
||||||
|
|
||||||
import { NextPage, usePagination } from '../hooks/usePagination'
|
import type { NextPage } from '../hooks/usePagination'
|
||||||
|
import { usePagination } from '../hooks/usePagination'
|
||||||
import { useAuthentication } from '../tools/authentication'
|
import { useAuthentication } from '../tools/authentication'
|
||||||
import { MessageWithMember } from '../models/Message'
|
import type { MessageWithMember } from '../models/Message'
|
||||||
import { GuildsChannelsPath } from '../components/Application'
|
import type { GuildsChannelsPath } from '../components/Application'
|
||||||
import { handleSocketData, SocketData } from '../tools/handleSocketData'
|
import type { SocketData } from '../tools/handleSocketData'
|
||||||
import { CacheKey, MESSAGES_CACHE_KEY } from '../tools/cache'
|
import { handleSocketData } from '../tools/handleSocketData'
|
||||||
|
import type { CacheKey } from '../tools/cache'
|
||||||
|
import { MESSAGES_CACHE_KEY } from '../tools/cache'
|
||||||
|
|
||||||
export interface Messages {
|
export interface Messages {
|
||||||
messages: MessageWithMember[]
|
messages: MessageWithMember[]
|
||||||
@ -26,7 +29,9 @@ export const MessagesProvider: React.FC<
|
|||||||
const { path, children } = props
|
const { path, children } = props
|
||||||
const { authentication, user } = useAuthentication()
|
const { authentication, user } = useAuthentication()
|
||||||
|
|
||||||
const cacheKey: CacheKey = `${path.channelId}-${MESSAGES_CACHE_KEY}`
|
const cacheKey = useMemo<CacheKey>(() => {
|
||||||
|
return `${path.channelId}-${MESSAGES_CACHE_KEY}`
|
||||||
|
}, [path.channelId])
|
||||||
|
|
||||||
const {
|
const {
|
||||||
items: messages,
|
items: messages,
|
||||||
@ -88,7 +93,7 @@ export const MessagesProvider: React.FC<
|
|||||||
export const useMessages = (): Messages => {
|
export const useMessages = (): Messages => {
|
||||||
const messages = useContext(MessagesContext)
|
const messages = useContext(MessagesContext)
|
||||||
if (messages === defaultMessagesContext) {
|
if (messages === defaultMessagesContext) {
|
||||||
throw new Error('useMessages must be used within a MessagesProvider')
|
throw new Error('`useMessages` must be used within a `MessagesProvider`')
|
||||||
}
|
}
|
||||||
return messages
|
return messages
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@ import { getLocal } from 'mockttp'
|
|||||||
import type { Mockttp } from 'mockttp'
|
import type { Mockttp } from 'mockttp'
|
||||||
|
|
||||||
import { API_DEFAULT_PORT } from './tools/api'
|
import { API_DEFAULT_PORT } from './tools/api'
|
||||||
import { Handlers, Method } from './cypress/fixtures/handler'
|
import type { Handlers, Method } from './cypress/fixtures/handler'
|
||||||
|
|
||||||
const UPLOADS_FIXTURES_DIRECTORY = path.join(
|
const UPLOADS_FIXTURES_DIRECTORY = path.join(
|
||||||
process.cwd(),
|
process.cwd(),
|
||||||
@ -19,11 +19,9 @@ let server: Mockttp | null = null
|
|||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
fixturesFolder: false,
|
fixturesFolder: false,
|
||||||
video: false,
|
video: false,
|
||||||
downloadsFolder: undefined,
|
|
||||||
screenshotOnRunFailure: false,
|
screenshotOnRunFailure: false,
|
||||||
|
|
||||||
e2e: {
|
e2e: {
|
||||||
baseUrl: 'http://localhost:3000',
|
baseUrl: 'http://127.0.0.1:3000',
|
||||||
supportFile: false,
|
supportFile: false,
|
||||||
setupNodeEvents(on, config) {
|
setupNodeEvents(on, config) {
|
||||||
on('task', {
|
on('task', {
|
||||||
@ -62,7 +60,6 @@ export default defineConfig({
|
|||||||
return config
|
return config
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
component: {
|
component: {
|
||||||
devServer: {
|
devServer: {
|
||||||
framework: 'next',
|
framework: 'next',
|
||||||
|
@ -1,71 +0,0 @@
|
|||||||
import type { ErrorObject } from 'ajv'
|
|
||||||
|
|
||||||
import { getErrorTranslationKey } from '../../../../hooks/useForm/getErrorTranslationKey'
|
|
||||||
|
|
||||||
const errorObject: ErrorObject = {
|
|
||||||
instancePath: '/path',
|
|
||||||
keyword: 'keyword',
|
|
||||||
params: {},
|
|
||||||
schemaPath: '/path'
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('hooks/useForm/getErrorTranslationKey', () => {
|
|
||||||
it('returns `errors:invalid` with unknown keyword', () => {
|
|
||||||
expect(
|
|
||||||
getErrorTranslationKey({
|
|
||||||
...errorObject,
|
|
||||||
keyword: 'unknownkeyword'
|
|
||||||
})
|
|
||||||
).equal('errors:invalid')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('returns `errors:invalid` with format != email', () => {
|
|
||||||
expect(
|
|
||||||
getErrorTranslationKey({
|
|
||||||
...errorObject,
|
|
||||||
keyword: 'format',
|
|
||||||
params: { format: 'email' }
|
|
||||||
})
|
|
||||||
).equal('errors:email')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('returns `errors:email` with format = email', () => {
|
|
||||||
expect(
|
|
||||||
getErrorTranslationKey({
|
|
||||||
...errorObject,
|
|
||||||
keyword: 'format',
|
|
||||||
params: { format: 'email' }
|
|
||||||
})
|
|
||||||
).equal('errors:email')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('returns `errors:required` with minLength and limit = 1', () => {
|
|
||||||
expect(
|
|
||||||
getErrorTranslationKey({
|
|
||||||
...errorObject,
|
|
||||||
keyword: 'minLength',
|
|
||||||
params: { limit: 1 }
|
|
||||||
})
|
|
||||||
).equal('errors:required')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('returns `errors:minLength` with minLength and limit > 1', () => {
|
|
||||||
expect(
|
|
||||||
getErrorTranslationKey({
|
|
||||||
...errorObject,
|
|
||||||
keyword: 'minLength',
|
|
||||||
params: { limit: 5 }
|
|
||||||
})
|
|
||||||
).equal('errors:minLength')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('returns `errors:maxLength` with maxLength', () => {
|
|
||||||
expect(
|
|
||||||
getErrorTranslationKey({
|
|
||||||
...errorObject,
|
|
||||||
keyword: 'maxLength',
|
|
||||||
params: { limit: 5 }
|
|
||||||
})
|
|
||||||
).equal('errors:maxLength')
|
|
||||||
})
|
|
||||||
})
|
|
@ -1,22 +0,0 @@
|
|||||||
import { Type } from '@sinclair/typebox'
|
|
||||||
|
|
||||||
import { handleCheckboxBoolean } from '../../../../hooks/useForm/handleCheckboxBoolean'
|
|
||||||
|
|
||||||
const schema = Type.Object({
|
|
||||||
myBoolean: Type.Boolean(),
|
|
||||||
myString: Type.String()
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('hooks/useForm/handleCheckboxBoolean', () => {
|
|
||||||
it('should convert all checkbox property to boolean', () => {
|
|
||||||
const object = {
|
|
||||||
myBoolean: 'on',
|
|
||||||
myString: 'on'
|
|
||||||
}
|
|
||||||
const result = handleCheckboxBoolean(object, schema)
|
|
||||||
expect(result).deep.equal({
|
|
||||||
myBoolean: true,
|
|
||||||
myString: 'on'
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
@ -1,20 +0,0 @@
|
|||||||
import { replaceEmptyStringInObjectToNull } from '../../../../hooks/useForm/replaceEmptyStringInObjectToNull'
|
|
||||||
|
|
||||||
describe('hooks/useForm/replaceEmptyStringInObjectToNull', () => {
|
|
||||||
it('should replace empty string in object to null except for required properties', () => {
|
|
||||||
expect(
|
|
||||||
replaceEmptyStringInObjectToNull(
|
|
||||||
{
|
|
||||||
foo: '',
|
|
||||||
bar: 'bar',
|
|
||||||
baz: ''
|
|
||||||
},
|
|
||||||
['baz']
|
|
||||||
)
|
|
||||||
).deep.equal({
|
|
||||||
foo: null,
|
|
||||||
bar: 'bar',
|
|
||||||
baz: ''
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
@ -1,5 +1,7 @@
|
|||||||
describe('Common > Header', () => {
|
describe('Common > Header', () => {
|
||||||
beforeEach(() => cy.visit('/'))
|
beforeEach(() => {
|
||||||
|
return cy.visit('/')
|
||||||
|
})
|
||||||
|
|
||||||
describe('Switch theme color (dark/light)', () => {
|
describe('Switch theme color (dark/light)', () => {
|
||||||
it('should switch theme from `dark` (default) to `light`', () => {
|
it('should switch theme from `dark` (default) to `light`', () => {
|
||||||
|
@ -241,8 +241,8 @@ describe('Pages > /application/[guildId]/[channelId]', () => {
|
|||||||
cy.visit('/application/abc/abc', {
|
cy.visit('/application/abc/abc', {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should redirect the user to `/404` if `guildId` doesn't exist", () => {
|
it("should redirect the user to `/404` if `guildId` doesn't exist", () => {
|
||||||
@ -253,8 +253,8 @@ describe('Pages > /application/[guildId]/[channelId]', () => {
|
|||||||
cy.visit(`/application/123/${channelExample.id}`, {
|
cy.visit(`/application/123/${channelExample.id}`, {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should redirect the user to `/404` if `channelId` doesn't exist", () => {
|
it("should redirect the user to `/404` if `channelId` doesn't exist", () => {
|
||||||
@ -263,8 +263,8 @@ describe('Pages > /application/[guildId]/[channelId]', () => {
|
|||||||
getGuildMemberWithGuildIdHandler
|
getGuildMemberWithGuildIdHandler
|
||||||
]).setCookie('refreshToken', 'refresh-token')
|
]).setCookie('refreshToken', 'refresh-token')
|
||||||
cy.visit(`/application/${guildExample.id}/123`, { failOnStatusCode: false })
|
cy.visit(`/application/${guildExample.id}/123`, { failOnStatusCode: false })
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -92,8 +92,8 @@ describe('Pages > /application/[guildId]/[channelId]/settings', () => {
|
|||||||
cy.visit(`/application/${guildExample.id}/${channelExample.id}/settings`, {
|
cy.visit(`/application/${guildExample.id}/${channelExample.id}/settings`, {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should redirect the user to `/404` if `guildId` or `channelId` are not numbers', () => {
|
it('should redirect the user to `/404` if `guildId` or `channelId` are not numbers', () => {
|
||||||
@ -104,8 +104,8 @@ describe('Pages > /application/[guildId]/[channelId]/settings', () => {
|
|||||||
cy.visit('/application/abc/abc/settings', {
|
cy.visit('/application/abc/abc/settings', {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should redirect the user to `/404` if `guildId` doesn't exist", () => {
|
it("should redirect the user to `/404` if `guildId` doesn't exist", () => {
|
||||||
@ -116,8 +116,8 @@ describe('Pages > /application/[guildId]/[channelId]/settings', () => {
|
|||||||
cy.visit(`/application/123/${channelExample.id}/settings`, {
|
cy.visit(`/application/123/${channelExample.id}/settings`, {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should redirect the user to `/404` if `channelId` doesn't exist", () => {
|
it("should redirect the user to `/404` if `channelId` doesn't exist", () => {
|
||||||
@ -128,8 +128,8 @@ describe('Pages > /application/[guildId]/[channelId]/settings', () => {
|
|||||||
cy.visit(`/application/${guildExample.id}/123/settings`, {
|
cy.visit(`/application/${guildExample.id}/123/settings`, {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -56,8 +56,8 @@ describe('Pages > /application/[guildId]/channels/create', () => {
|
|||||||
cy.visit('/application/abc/channels/create', {
|
cy.visit('/application/abc/channels/create', {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should redirect the user to `/404` if `guildId` doesn't exist", () => {
|
it("should redirect the user to `/404` if `guildId` doesn't exist", () => {
|
||||||
@ -68,8 +68,8 @@ describe('Pages > /application/[guildId]/channels/create', () => {
|
|||||||
cy.visit(`/application/123/channels/create`, {
|
cy.visit(`/application/123/channels/create`, {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -86,8 +86,8 @@ describe('Pages > /application/[guildId]/settings', () => {
|
|||||||
cy.visit('/application/abc/settings', {
|
cy.visit('/application/abc/settings', {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should redirect the user to `/404` if `guildId` doesn't exist", () => {
|
it("should redirect the user to `/404` if `guildId` doesn't exist", () => {
|
||||||
@ -98,8 +98,8 @@ describe('Pages > /application/[guildId]/settings', () => {
|
|||||||
cy.visit(`/application/123/settings`, {
|
cy.visit(`/application/123/settings`, {
|
||||||
failOnStatusCode: false
|
failOnStatusCode: false
|
||||||
})
|
})
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -29,8 +29,8 @@ describe('Pages > /application/users/[userId]', () => {
|
|||||||
'refresh-token'
|
'refresh-token'
|
||||||
)
|
)
|
||||||
cy.visit(`/application/users/123`, { failOnStatusCode: false })
|
cy.visit(`/application/users/123`, { failOnStatusCode: false })
|
||||||
.location('pathname')
|
.get('[data-cy=status-code]')
|
||||||
.should('eq', '/404')
|
.contains('404')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import { channelExample, channelExample2 } from '../channel'
|
import { channelExample, channelExample2 } from '../channel'
|
||||||
|
|
||||||
export const deleteChannelWithChannelIdHandler: Handler = {
|
export const deleteChannelWithChannelIdHandler: Handler = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import { channelExample, channelExample2 } from '../channel'
|
import { channelExample, channelExample2 } from '../channel'
|
||||||
|
|
||||||
export const getChannelWithChannelIdHandler: Handler = {
|
export const getChannelWithChannelIdHandler: Handler = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../../handler'
|
import type { Handler } from '../../../handler'
|
||||||
import {
|
import {
|
||||||
messageExampleComplete,
|
messageExampleComplete,
|
||||||
messageExampleComplete2,
|
messageExampleComplete2,
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import { channelExample, channelExample2 } from '../channel'
|
import { channelExample, channelExample2 } from '../channel'
|
||||||
|
|
||||||
export const putChannelWithChannelIdHandler: Handler = {
|
export const putChannelWithChannelIdHandler: Handler = {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { guildExample } from '../../guild'
|
import { guildExample } from '../../guild'
|
||||||
import { Handler } from '../../../handler'
|
import type { Handler } from '../../../handler'
|
||||||
import { channelExample, channelExample2 } from '../../../channels/channel'
|
import { channelExample, channelExample2 } from '../../../channels/channel'
|
||||||
|
|
||||||
export const getChannelsWithGuildIdHandler: Handler = {
|
export const getChannelsWithGuildIdHandler: Handler = {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { guildExample } from '../../guild'
|
import { guildExample } from '../../guild'
|
||||||
import { Handler } from '../../../handler'
|
import type { Handler } from '../../../handler'
|
||||||
import { channelExample, channelExample2 } from '../../../channels/channel'
|
import { channelExample, channelExample2 } from '../../../channels/channel'
|
||||||
|
|
||||||
export const postChannelsWithGuildIdHandler: Handler = {
|
export const postChannelsWithGuildIdHandler: Handler = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import { guildExample } from '../guild'
|
import { guildExample } from '../guild'
|
||||||
|
|
||||||
export const deleteGuildWithGuildIdHandler: Handler = {
|
export const deleteGuildWithGuildIdHandler: Handler = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import { guildExample } from '../guild'
|
import { guildExample } from '../guild'
|
||||||
import { memberExampleComplete } from '../../members/member'
|
import { memberExampleComplete } from '../../members/member'
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { guildExample } from '../../guild'
|
import { guildExample } from '../../guild'
|
||||||
import { Handler } from '../../../handler'
|
import type { Handler } from '../../../handler'
|
||||||
import { memberExampleComplete } from '../../../members/member'
|
import { memberExampleComplete } from '../../../members/member'
|
||||||
|
|
||||||
export const getMembersWithGuildIdHandler: Handler = {
|
export const getMembersWithGuildIdHandler: Handler = {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { guildExample } from '../../guild'
|
import { guildExample } from '../../guild'
|
||||||
import { Handler } from '../../../handler'
|
import type { Handler } from '../../../handler'
|
||||||
import { memberExampleComplete } from '../../../members/member'
|
import { memberExampleComplete } from '../../../members/member'
|
||||||
import { channelExample } from '../../../channels/channel'
|
import { channelExample } from '../../../channels/channel'
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { guildExample } from '../../guild'
|
import { guildExample } from '../../guild'
|
||||||
import { Handler } from '../../../handler'
|
import type { Handler } from '../../../handler'
|
||||||
import { memberExample } from '../../../members/member'
|
import { memberExample } from '../../../members/member'
|
||||||
|
|
||||||
export const deleteLeaveMembersWithGuildIdHandler: Handler = {
|
export const deleteLeaveMembersWithGuildIdHandler: Handler = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../handler'
|
import type { Handler } from '../handler'
|
||||||
import { guildExample, guildExample2 } from './guild'
|
import { guildExample, guildExample2 } from './guild'
|
||||||
|
|
||||||
export const getGuildsHandler: Handler = {
|
export const getGuildsHandler: Handler = {
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user