Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
41c2d95dde
|
|||
2a6e3eca84
|
|||
84662c7765
|
|||
7e76598f7f | |||
fd138caa4b | |||
fa7b155ea4 | |||
d210800855 | |||
07c574cb4a | |||
ae953d6c1a | |||
c96385edd5 | |||
cd1a477324 | |||
b5089f7f0b | |||
67a1699102 | |||
e8a9ce4e69 | |||
8f5bc2fe21 | |||
109da1be71 | |||
1ea78821b0 | |||
12ceefd650 | |||
734357b396 | |||
ccaf5234ed | |||
5d350e8db9 | |||
cd164538de |
@ -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}
|
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
"dockerComposeFile": "./docker-compose.yml",
|
"dockerComposeFile": "./docker-compose.yml",
|
||||||
"service": "workspace",
|
"service": "workspace",
|
||||||
"workspaceFolder": "/workspace",
|
"workspaceFolder": "/workspace",
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
"settings": {
|
"settings": {
|
||||||
"remote.autoForwardPorts": false
|
"remote.autoForwardPorts": false
|
||||||
},
|
},
|
||||||
@ -10,13 +12,13 @@
|
|||||||
"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",
|
||||||
"ms-azuretools.vscode-docker"
|
"ms-azuretools.vscode-docker"
|
||||||
],
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
"forwardPorts": [3000],
|
"forwardPorts": [3000],
|
||||||
"postAttachCommand": ["npm", "install"],
|
"postAttachCommand": ["npm", "install"],
|
||||||
"remoteUser": "node"
|
"remoteUser": "node"
|
||||||
|
@ -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
|
||||||
|
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,6 +1,6 @@
|
|||||||
<!-- Please first discuss the change you wish to make via issue before making a change. It might avoid a waste of your time. -->
|
<!-- Please first discuss the change you wish to make via issue before making a change. It might avoid a waste of your time. -->
|
||||||
|
|
||||||
## What changes this PR introduce?
|
# What changes this PR introduce?
|
||||||
|
|
||||||
## List any relevant issue numbers
|
## List any relevant issue numbers
|
||||||
|
|
||||||
|
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.5.3'
|
||||||
|
|
||||||
- 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'
|
||||||
|
12
.github/workflows/build.yml
vendored
12
.github/workflows/build.yml
vendored
@ -10,16 +10,16 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.5.3'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Setup 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 dependencies'
|
||||||
run: 'npm install'
|
run: 'npm clean-install'
|
||||||
|
|
||||||
- name: 'Build'
|
- name: 'Build'
|
||||||
run: 'npm run build'
|
run: 'npm run build'
|
||||||
|
21
.github/workflows/lint.yml
vendored
21
.github/workflows/lint.yml
vendored
@ -10,16 +10,16 @@ jobs:
|
|||||||
lint:
|
lint:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.5.3'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Setup 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 dependencies'
|
||||||
run: 'npm install'
|
run: 'npm clean-install'
|
||||||
|
|
||||||
- name: 'lint:commit'
|
- name: 'lint:commit'
|
||||||
run: 'npm run lint:commit -- --to "${{ github.sha }}"'
|
run: 'npm run lint:commit -- --to "${{ github.sha }}"'
|
||||||
@ -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'
|
|
||||||
|
14
.github/workflows/release.yml
vendored
14
.github/workflows/release.yml
vendored
@ -8,26 +8,26 @@ jobs:
|
|||||||
release:
|
release:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.5.3'
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: 'Import GPG key'
|
- name: 'Import GPG key'
|
||||||
uses: 'crazy-max/ghaction-import-gpg@v4'
|
uses: 'crazy-max/ghaction-import-gpg@v5.3.0'
|
||||||
with:
|
with:
|
||||||
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
|
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||||
git_user_signingkey: true
|
git_user_signingkey: true
|
||||||
git_commit_gpgsign: true
|
git_commit_gpgsign: true
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Setup 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 dependencies'
|
||||||
run: 'npm install'
|
run: 'npm clean-install'
|
||||||
|
|
||||||
- name: 'Release'
|
- name: 'Release'
|
||||||
run: 'npm run release'
|
run: 'npm run release'
|
||||||
|
48
.github/workflows/test.yml
vendored
48
.github/workflows/test.yml
vendored
@ -10,33 +10,33 @@ 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.5.3'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Setup 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 dependencies'
|
||||||
run: 'npm install'
|
run: 'npm clean-install'
|
||||||
|
|
||||||
- name: 'Unit Test'
|
- name: 'Unit Test'
|
||||||
run: 'npm run test:unit'
|
run: 'npm run test:unit'
|
||||||
|
|
||||||
test-lighthouse:
|
test-e2e:
|
||||||
runs-on: 'ubuntu-latest'
|
runs-on: 'ubuntu-latest'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
- uses: 'actions/checkout@v3.5.3'
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
- name: 'Setup 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 dependencies'
|
||||||
run: 'npm install'
|
run: 'npm clean-install'
|
||||||
|
|
||||||
- name: 'Build'
|
- name: 'Build'
|
||||||
run: 'npm run build'
|
run: 'npm run build'
|
||||||
@ -44,27 +44,5 @@ jobs:
|
|||||||
- name: 'html-w3c-validator'
|
- name: 'html-w3c-validator'
|
||||||
run: 'npm run test:html-w3c-validator'
|
run: 'npm run test:html-w3c-validator'
|
||||||
|
|
||||||
- name: 'Lighthouse'
|
|
||||||
run: 'npm run test:lighthouse'
|
|
||||||
env:
|
|
||||||
LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
|
|
||||||
|
|
||||||
test-e2e:
|
|
||||||
runs-on: 'ubuntu-latest'
|
|
||||||
steps:
|
|
||||||
- uses: 'actions/checkout@v3.0.0'
|
|
||||||
|
|
||||||
- name: 'Use Node.js'
|
|
||||||
uses: 'actions/setup-node@v3.0.0'
|
|
||||||
with:
|
|
||||||
node-version: '16.x'
|
|
||||||
cache: 'npm'
|
|
||||||
|
|
||||||
- name: 'Install'
|
|
||||||
run: 'npm install'
|
|
||||||
|
|
||||||
- name: 'Build'
|
|
||||||
run: 'npm run build'
|
|
||||||
|
|
||||||
- name: 'End To End (e2e) Test'
|
- name: 'End To End (e2e) Test'
|
||||||
run: 'npm run test:e2e'
|
run: 'npm run test:e2e'
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -50,3 +50,7 @@ npm-debug.log*
|
|||||||
.lighthouseci
|
.lighthouseci
|
||||||
.vercel
|
.vercel
|
||||||
*.hbs
|
*.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"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
{
|
|
||||||
"ci": {
|
|
||||||
"collect": {
|
|
||||||
"startServerCommand": "npm run start",
|
|
||||||
"startServerReadyPattern": "ready on",
|
|
||||||
"startServerReadyTimeout": 20000,
|
|
||||||
"url": [
|
|
||||||
"http://localhost:3000/",
|
|
||||||
"http://localhost:3000/authentication/forgot-password",
|
|
||||||
"http://localhost:3000/authentication/reset-password",
|
|
||||||
"http://localhost:3000/authentication/signin",
|
|
||||||
"http://localhost:3000/authentication/signup"
|
|
||||||
],
|
|
||||||
"numberOfRuns": 1
|
|
||||||
},
|
|
||||||
"assert": {
|
|
||||||
"preset": "lighthouse:recommended",
|
|
||||||
"assertions": {
|
|
||||||
"image-size-responsive": "warning",
|
|
||||||
"unsized-images": "warning",
|
|
||||||
"csp-xss": "warning",
|
|
||||||
"non-composited-animations": "warning",
|
|
||||||
"unused-javascript": "warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"upload": {
|
|
||||||
"target": "temporary-public-storage"
|
|
||||||
},
|
|
||||||
"server": {}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"config": {
|
"config": {
|
||||||
|
"extends": "markdownlint/style/prettier",
|
||||||
|
"relative-links": true,
|
||||||
"default": true,
|
"default": true,
|
||||||
"MD013": false,
|
"MD033": false
|
||||||
"MD024": false,
|
|
||||||
"MD033": false,
|
|
||||||
"MD041": false
|
|
||||||
},
|
},
|
||||||
"globs": ["**/*.{md,mdx}"],
|
"globs": ["**/*.{md,mdx}"],
|
||||||
"ignores": ["**/node_modules"]
|
"ignores": ["**/node_modules"],
|
||||||
|
"customRules": ["markdownlint-rule-relative-links"]
|
||||||
}
|
}
|
||||||
|
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",
|
||||||
|
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
@ -6,5 +6,9 @@
|
|||||||
"editor.formatOnSave": true,
|
"editor.formatOnSave": true,
|
||||||
"editor.codeActionsOnSave": {
|
"editor.codeActionsOnSave": {
|
||||||
"source.fixAll": true
|
"source.fixAll": true
|
||||||
}
|
},
|
||||||
|
"eslint.options": {
|
||||||
|
"ignorePath": ".gitignore"
|
||||||
|
},
|
||||||
|
"prettier.ignorePath": ".gitignore"
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ representative at an online or offline event.
|
|||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||||
reported to the community leaders responsible for enforcement at
|
reported to the community leaders responsible for enforcement at
|
||||||
contact@divlo.fr.
|
<contact@theoludwig.fr>.
|
||||||
All complaints will be reviewed and investigated promptly and fairly.
|
All complaints will be reviewed and investigated promptly and fairly.
|
||||||
|
|
||||||
All community leaders are obligated to respect the privacy and security of the
|
All community leaders are obligated to respect the privacy and security of the
|
||||||
|
@ -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
|
||||||
|
|
||||||
@ -29,31 +30,7 @@ If you're adding new features to **Thream/website**, please include tests.
|
|||||||
|
|
||||||
## Commits
|
## Commits
|
||||||
|
|
||||||
The commit message guidelines respect
|
The commit message guidelines adheres to [Conventional Commits](https://www.conventionalcommits.org/) and [Semantic Versioning](https://semver.org/) for releases.
|
||||||
[@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional)
|
|
||||||
and [Semantic Versioning](https://semver.org/) for releases.
|
|
||||||
|
|
||||||
### Types
|
|
||||||
|
|
||||||
Types define which kind of changes you made to the project.
|
|
||||||
|
|
||||||
| Types | Description |
|
|
||||||
| -------- | ------------------------------------------------------------------------------------------------------------ |
|
|
||||||
| feat | A new feature. |
|
|
||||||
| fix | A bug fix. |
|
|
||||||
| docs | Documentation only changes. |
|
|
||||||
| style | Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc). |
|
|
||||||
| refactor | A code change that neither fixes a bug nor adds a feature. |
|
|
||||||
| perf | A code change that improves performance. |
|
|
||||||
| test | Adding missing tests or correcting existing tests. |
|
|
||||||
| build | Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm). |
|
|
||||||
| ci | Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs). |
|
|
||||||
| chore | Other changes that don't modify src or test files. |
|
|
||||||
| revert | Reverts a previous commit. |
|
|
||||||
|
|
||||||
### Scopes
|
|
||||||
|
|
||||||
Scopes define what part of the code changed.
|
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@ -61,3 +38,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.16.1 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.16.1 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.2.0](https://github.com/Thream/api/releases/tag/v1.2.0).
|
It uses [Thream/api](https://github.com/Thream/api) [v1.2.7](https://github.com/Thream/api/releases/tag/v1.2.7).
|
||||||
|
|
||||||
## ⚙️ Getting Started
|
## ⚙️ Getting Started
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ It uses [Thream/api](https://github.com/Thream/api) [v1.2.0](https://github.com/
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
# Clone the repository
|
# Clone the repository
|
||||||
git clone https://github.com/Thream/website.git
|
git clone git@github.com:Thream/website.git
|
||||||
|
|
||||||
# Go to the project root
|
# Go to the project root
|
||||||
cd website
|
cd website
|
||||||
@ -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
|
||||||
|
|
||||||
|
@ -5,7 +5,8 @@ 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>
|
||||||
@ -180,7 +185,7 @@ export const Application: React.FC<
|
|||||||
visible={visibleSidebars.left}
|
visible={visibleSidebars.left}
|
||||||
isMobile={isMobile}
|
isMobile={isMobile}
|
||||||
>
|
>
|
||||||
<div className='top-0 left-0 z-50 flex min-w-[92px] flex-col space-y-4 border-r-2 border-gray-500 bg-gray-200 py-2 dark:border-white/20 dark:bg-gray-800'>
|
<div className='left-0 top-0 z-50 flex min-w-[92px] flex-col space-y-4 border-r-2 border-gray-500 bg-gray-200 py-2 dark:border-white/20 dark:bg-gray-800'>
|
||||||
<IconLink
|
<IconLink
|
||||||
href={`/application/users/settings`}
|
href={`/application/users/settings`}
|
||||||
selected={path === `/application/users/settings`}
|
selected={path === `/application/users/settings`}
|
||||||
|
@ -11,11 +11,11 @@ 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'
|
import { useFormTranslation } from '../../../hooks/useFormTranslation'
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ export const ChannelSettings: React.FC<ChannelSettingsProps> = (props) => {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,8 +4,8 @@ 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'
|
||||||
|
|
||||||
@ -22,19 +22,16 @@ const ChannelMemo: React.FC<ChannelProps> = (props) => {
|
|||||||
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 mx-3 my-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',
|
||||||
{
|
{
|
||||||
'font-semibold text-green-800 dark:text-green-400': selected
|
'font-semibold text-green-800 dark:text-green-400': selected
|
||||||
}
|
}
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<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 && (
|
||||||
@ -50,7 +47,6 @@ const ChannelMemo: React.FC<ChannelProps> = (props) => {
|
|||||||
<CogIcon height={20} width={20} />
|
<CogIcon height={20} width={20} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
)}
|
)}
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -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'
|
||||||
|
|
||||||
|
@ -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()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -25,7 +27,7 @@ export const ConfirmPopup: React.FC<ConfirmPopupProps> = ({ ...props }) => {
|
|||||||
<div className={props.className}>
|
<div className={props.className}>
|
||||||
<Loader
|
<Loader
|
||||||
className={classNames(
|
className={classNames(
|
||||||
'absolute top-1/2 left-1/2 scale-0 transition-all',
|
'absolute left-1/2 top-1/2 scale-0 transition-all',
|
||||||
{
|
{
|
||||||
'scale-100': isLoading
|
'scale-100': isLoading
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,8 @@ 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'
|
import { useFormTranslation } from '../../../hooks/useFormTranslation'
|
||||||
|
|
||||||
@ -37,7 +38,7 @@ export const CreateChannel: React.FC = () => {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
import useTranslation from 'next-translate/useTranslation'
|
||||||
import { Form, useForm } 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 type { HandleUseFormCallback } from 'react-component-form'
|
||||||
|
|
||||||
import { useAuthentication } from '../../../tools/authentication'
|
import { useAuthentication } from '../../../tools/authentication'
|
||||||
import { GuildComplete, guildSchema } from '../../../models/Guild'
|
import type { GuildComplete } 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'
|
||||||
@ -22,25 +23,29 @@ export const CreateGuild: React.FC = () => {
|
|||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const { handleUseForm, fetchState, message, errors } = useForm(schema as any)
|
const { handleUseForm, fetchState, message, errors } = useForm(schema)
|
||||||
const { getFirstErrorTranslation } = useFormTranslation()
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
|
|
||||||
const { authentication } = useAuthentication()
|
const { authentication } = useAuthentication()
|
||||||
|
|
||||||
const onSubmit: HandleUseFormCallback<any> = 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) {
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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>
|
||||||
|
@ -47,21 +47,21 @@ export const GuildSettings: React.FC = () => {
|
|||||||
errors,
|
errors,
|
||||||
setFetchState,
|
setFetchState,
|
||||||
setMessage
|
setMessage
|
||||||
} = useForm(schema as any)
|
} = useForm(schema)
|
||||||
const { getFirstErrorTranslation } = useFormTranslation()
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
|
|
||||||
const onSubmit: HandleUseFormCallback<any> = 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 unknown as any)
|
setInputValues(formData as unknown as any)
|
||||||
return {
|
return {
|
||||||
type: 'success',
|
type: 'success',
|
||||||
value: 'application:saved-information'
|
message: 'application:saved-information'
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -82,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)
|
||||||
@ -206,7 +206,7 @@ export const GuildSettings: React.FC = () => {
|
|||||||
message={
|
message={
|
||||||
message != null
|
message != null
|
||||||
? t(message)
|
? t(message)
|
||||||
: getFirstErrorTranslation(errors.email)
|
: getFirstErrorTranslation(errors.name)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { memo } from 'react'
|
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 {
|
||||||
|
@ -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 {
|
||||||
|
@ -7,7 +7,7 @@ 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> => {
|
||||||
@ -94,7 +96,7 @@ export const GuildPublic: React.FC<GuildPublicProps> = (props) => {
|
|||||||
<ConfirmPopup
|
<ConfirmPopup
|
||||||
title={`${t('application:join-the-guild')} ?`}
|
title={`${t('application:join-the-guild')} ?`}
|
||||||
className={classNames(
|
className={classNames(
|
||||||
'w-ful h-ful translate-x- absolute top-1/2 left-full flex h-full w-full -translate-y-1/2 flex-col items-center justify-center rounded-2xl transition-all',
|
'w-ful h-ful translate-x- absolute left-full top-1/2 flex h-full w-full -translate-y-1/2 flex-col items-center justify-center rounded-2xl transition-all',
|
||||||
{
|
{
|
||||||
'!left-0': isConfirmed
|
'!left-0': isConfirmed
|
||||||
}
|
}
|
||||||
|
@ -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('')
|
||||||
@ -48,7 +49,7 @@ export const JoinGuildsPublic: React.FC = () => {
|
|||||||
<input
|
<input
|
||||||
data-cy='search-guild-input'
|
data-cy='search-guild-input'
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
className='my-6 mx-auto mt-16 w-10/12 rounded-md border border-gray-500 bg-white p-3 dark:border-gray-700 dark:bg-[#3B3B3B] sm:w-8/12 md:w-6/12 lg:w-5/12'
|
className='mx-auto my-6 mt-16 w-10/12 rounded-md border border-gray-500 bg-white p-3 dark:border-gray-700 dark:bg-[#3B3B3B] sm:w-8/12 md:w-6/12 lg:w-5/12'
|
||||||
type='search'
|
type='search'
|
||||||
name='search-guild'
|
name='search-guild'
|
||||||
placeholder={`🔎 ${t('application:search')}...`}
|
placeholder={`🔎 ${t('application:search')}...`}
|
||||||
|
@ -2,7 +2,7 @@ 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 {
|
||||||
@ -14,8 +14,7 @@ const MemberMemo: React.FC<MemberProps> = (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 px-6 py-2 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
|
||||||
src={
|
src={
|
||||||
@ -42,7 +41,6 @@ const MemberMemo: 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>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -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'
|
@ -2,15 +2,14 @@ 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 TextareaAutosize from 'react-textarea-autosize'
|
|
||||||
import useTranslation from 'next-translate/useTranslation'
|
|
||||||
|
|
||||||
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 { Emoji } from '../../../Emoji'
|
|
||||||
import { useAuthentication } from '../../../../tools/authentication'
|
import { useAuthentication } from '../../../../tools/authentication'
|
||||||
|
import { MessageOptions } from './MessageOptions'
|
||||||
|
import { EditMessage } from './EditMessage'
|
||||||
|
|
||||||
export interface MessageProps {
|
export interface MessageProps {
|
||||||
message: MessageWithMember
|
message: MessageWithMember
|
||||||
@ -21,15 +20,8 @@ export const Message: React.FC<MessageProps> = (props) => {
|
|||||||
|
|
||||||
const textareaReference = useRef<HTMLTextAreaElement>(null)
|
const textareaReference = useRef<HTMLTextAreaElement>(null)
|
||||||
const [isEditing, setIsEditing] = useState(false)
|
const [isEditing, setIsEditing] = useState(false)
|
||||||
const { t } = useTranslation()
|
|
||||||
const { authentication, user } = useAuthentication()
|
const { authentication, user } = useAuthentication()
|
||||||
|
|
||||||
const handleDeleteMessage = async (): Promise<void> => {
|
|
||||||
try {
|
|
||||||
await authentication.api.delete(`/messages/${message.id}`)
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleTextareaKeyDown: React.KeyboardEventHandler<HTMLFormElement> = (
|
const handleTextareaKeyDown: React.KeyboardEventHandler<HTMLFormElement> = (
|
||||||
event
|
event
|
||||||
) => {
|
) => {
|
||||||
@ -57,13 +49,6 @@ export const Message: React.FC<MessageProps> = (props) => {
|
|||||||
handleEditMode()
|
handleEditMode()
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleEditSubmit: React.FormEventHandler<HTMLFormElement> = async (
|
|
||||||
event
|
|
||||||
) => {
|
|
||||||
event.preventDefault()
|
|
||||||
await handleEdit()
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleEditMode = (): void => {
|
const handleEditMode = (): void => {
|
||||||
setIsEditing((oldIsEditing) => {
|
setIsEditing((oldIsEditing) => {
|
||||||
return !oldIsEditing
|
return !oldIsEditing
|
||||||
@ -72,11 +57,10 @@ export const Message: React.FC<MessageProps> = (props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className='group flex w-full 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
|
||||||
@ -94,19 +78,16 @@ export const Message: React.FC<MessageProps> = (props) => {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
<div className='relative w-full whitespace-pre-wrap break-words break-all'>
|
<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'
|
||||||
@ -115,54 +96,24 @@ 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 ? (
|
|
||||||
<div className='absolute right-6 -top-8 flex opacity-0 transition-opacity group-hover:opacity-100'>
|
{message.member.userId === user.id && (
|
||||||
{message.type === 'text' ? (
|
<MessageOptions
|
||||||
<div
|
message={message}
|
||||||
className='message-options rounded-l-lg border-l-slate-600'
|
editMode={isEditing ? ':white_check_mark:' : ':pencil2:'}
|
||||||
title={t('application:edit')}
|
handleEdit={isEditing ? handleEdit : handleEditMode}
|
||||||
onClick={isEditing ? handleEdit : handleEditMode}
|
|
||||||
>
|
|
||||||
<Emoji
|
|
||||||
value={isEditing ? ':white_check_mark:' : ':pencil2:'}
|
|
||||||
size={18}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
)}
|
||||||
) : null}
|
|
||||||
<div
|
|
||||||
className='message-options rounded-r-lg border-r-slate-600'
|
|
||||||
title={t('application:delete')}
|
|
||||||
onClick={handleDeleteMessage}
|
|
||||||
>
|
|
||||||
<Emoji value=':wastebasket:' size={18} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : null}
|
|
||||||
{message.type === 'text' ? (
|
{message.type === 'text' ? (
|
||||||
<>
|
<>
|
||||||
{isEditing ? (
|
{isEditing ? (
|
||||||
<form
|
<EditMessage
|
||||||
className='flex h-full w-full items-center'
|
message={message}
|
||||||
onSubmit={handleEditSubmit}
|
textareaRef={textareaReference}
|
||||||
onKeyDown={handleTextareaKeyDown}
|
handleEdit={handleEdit}
|
||||||
>
|
handleKeyDown={handleTextareaKeyDown}
|
||||||
<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={textareaReference}
|
|
||||||
autoFocus
|
|
||||||
onFocus={(event) => {
|
|
||||||
event.currentTarget.setSelectionRange(
|
|
||||||
event.currentTarget.value.length,
|
|
||||||
event.currentTarget.value.length
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
</form>
|
|
||||||
) : (
|
) : (
|
||||||
<MessageText message={message} />
|
<MessageText 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 -top-8 right-6 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
|
||||||
|
@ -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>
|
||||||
|
@ -3,9 +3,10 @@ import useTranslation from 'next-translate/useTranslation'
|
|||||||
import TextareaAutosize from 'react-textarea-autosize'
|
import TextareaAutosize from 'react-textarea-autosize'
|
||||||
import classNames from 'clsx'
|
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) => {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import classNames from 'clsx'
|
import classNames from 'clsx'
|
||||||
|
|
||||||
import { ApplicationProps } from '..'
|
import type { ApplicationProps } from '..'
|
||||||
|
|
||||||
export type DirectionSidebar = 'left' | 'right'
|
export type DirectionSidebar = 'left' | 'right'
|
||||||
|
|
||||||
@ -21,13 +21,13 @@ export const Sidebar: React.FC<React.PropsWithChildren<SidebarProps>> = (
|
|||||||
className={classNames(
|
className={classNames(
|
||||||
'h-full-without-header visible z-50 flex bg-gray-200 drop-shadow-2xl transition-all dark:bg-gray-800',
|
'h-full-without-header visible z-50 flex bg-gray-200 drop-shadow-2xl transition-all dark:bg-gray-800',
|
||||||
{
|
{
|
||||||
'scrollbar-firefox-support top-0 right-0 flex-col space-y-1 overflow-y-auto':
|
'scrollbar-firefox-support right-0 top-0 flex-col space-y-1 overflow-y-auto':
|
||||||
direction === 'right',
|
direction === 'right',
|
||||||
'w-72': direction === 'right' && visible,
|
'w-72': direction === 'right' && visible,
|
||||||
'invisible w-0 opacity-0': !visible,
|
'invisible w-0 opacity-0': !visible,
|
||||||
'w-80': direction === 'left' && visible,
|
'w-80': direction === 'left' && visible,
|
||||||
'max-w-max': typeof path !== 'string' && direction === 'left',
|
'max-w-max': typeof path !== 'string' && direction === 'left',
|
||||||
'top-0 right-0': direction === 'right' && isMobile,
|
'right-0 top-0': direction === 'right' && isMobile,
|
||||||
absolute: isMobile
|
absolute: isMobile
|
||||||
}
|
}
|
||||||
)}
|
)}
|
||||||
|
@ -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'>
|
||||||
@ -59,7 +58,7 @@ export const UserProfile: React.FC<UserProfileProps> = (props) => {
|
|||||||
<a
|
<a
|
||||||
href={`mailto:${user.email}`}
|
href={`mailto:${user.email}`}
|
||||||
target='_blank'
|
target='_blank'
|
||||||
className='relative ml-2 font-normal tracking-wide no-underline opacity-80 transition-all after:absolute after:left-0 after:bottom-[-1px] after:h-[1px] after:w-0 after:bg-black after:transition-all hover:opacity-100 hover:after:w-full dark:after:bg-white'
|
className='relative ml-2 font-normal tracking-wide no-underline opacity-80 transition-all after:absolute after:bottom-[-1px] after:left-0 after:h-[1px] after:w-0 after:bg-black after:transition-all hover:opacity-100 hover:after:w-full dark:after:bg-white'
|
||||||
rel='noreferrer'
|
rel='noreferrer'
|
||||||
data-cy='user-email'
|
data-cy='user-email'
|
||||||
>
|
>
|
||||||
@ -74,7 +73,7 @@ export const UserProfile: React.FC<UserProfileProps> = (props) => {
|
|||||||
target='_blank'
|
target='_blank'
|
||||||
rel='noreferrer'
|
rel='noreferrer'
|
||||||
href={user.website}
|
href={user.website}
|
||||||
className='relative ml-2 font-normal tracking-wide no-underline opacity-80 transition-all after:absolute after:left-0 after:bottom-[-2px] after:h-[1px] after:w-0 after:bg-black after:transition-all hover:opacity-100 hover:after:w-full dark:after:bg-white'
|
className='relative ml-2 font-normal tracking-wide no-underline opacity-80 transition-all after:absolute after:bottom-[-2px] after:left-0 after:h-[1px] after:w-0 after:bg-black after:transition-all hover:opacity-100 hover:after:w-full dark:after:bg-white'
|
||||||
>
|
>
|
||||||
{user.website}
|
{user.website}
|
||||||
</a>
|
</a>
|
||||||
@ -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>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,8 @@ import { Button } from '../../design/Button'
|
|||||||
import { FormState } from '../../design/FormState'
|
import { FormState } from '../../design/FormState'
|
||||||
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'
|
import { useFormTranslation } from '../../../hooks/useFormTranslation'
|
||||||
|
|
||||||
const schema = {
|
const schema = {
|
||||||
@ -56,7 +57,9 @@ export const UserSettings: React.FC = () => {
|
|||||||
const { getFirstErrorTranslation } = useFormTranslation()
|
const { getFirstErrorTranslation } = useFormTranslation()
|
||||||
|
|
||||||
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: HandleUseFormCallback<typeof schema> = async (formData) => {
|
const onSubmit: HandleUseFormCallback<typeof schema> = async (formData) => {
|
||||||
@ -72,7 +75,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
if (hasEmailChanged) {
|
if (hasEmailChanged) {
|
||||||
return {
|
return {
|
||||||
type: 'success',
|
type: 'success',
|
||||||
value: 'application:success-email-changed'
|
message: 'application:success-email-changed'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const { data: userCurrentSettings } = await authentication.api.put(
|
const { data: userCurrentSettings } = await authentication.api.put(
|
||||||
@ -91,7 +94,7 @@ export const UserSettings: React.FC = () => {
|
|||||||
})
|
})
|
||||||
return {
|
return {
|
||||||
type: 'success',
|
type: 'success',
|
||||||
value: 'application:saved-information'
|
message: 'application:saved-information'
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (axios.isAxiosError(error) && error.response?.status === 400) {
|
if (axios.isAxiosError(error) && error.response?.status === 400) {
|
||||||
@ -99,22 +102,22 @@ export const UserSettings: React.FC = () => {
|
|||||||
if (message.endsWith('already taken.')) {
|
if (message.endsWith('already taken.')) {
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'authentication:already-used'
|
message: 'authentication:already-used'
|
||||||
}
|
}
|
||||||
} else if (message.endsWith('email to sign in.')) {
|
} else if (message.endsWith('email to sign in.')) {
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'authentication:email-required-to-sign-in'
|
message: 'authentication:email-required-to-sign-in'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -146,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)
|
||||||
@ -189,9 +192,9 @@ 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
|
||||||
)
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
setMessage('application:success-deleted-provider')
|
setMessage('application:success-deleted-provider')
|
||||||
@ -309,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'
|
||||||
>
|
>
|
||||||
@ -318,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>
|
||||||
|
@ -14,10 +14,8 @@ 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 { AuthenticationSocialMedia } from './AuthenticationSocialMedia'
|
import { AuthenticationSocialMedia } from './AuthenticationSocialMedia'
|
||||||
import { useFormTranslation } from '../../hooks/useFormTranslation'
|
import { useFormTranslation } from '../../hooks/useFormTranslation'
|
||||||
|
|
||||||
@ -56,7 +54,7 @@ export const Authentication: React.FC<AuthenticationProps> = (props) => {
|
|||||||
formElement.reset()
|
formElement.reset()
|
||||||
return {
|
return {
|
||||||
type: 'success',
|
type: 'success',
|
||||||
value: 'authentication:success-signup'
|
message: 'authentication:success-signup'
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (axios.isAxiosError(error) && error.response?.status === 400) {
|
if (axios.isAxiosError(error) && error.response?.status === 400) {
|
||||||
@ -64,17 +62,17 @@ export const Authentication: React.FC<AuthenticationProps> = (props) => {
|
|||||||
if (message.endsWith('already taken.')) {
|
if (message.endsWith('already taken.')) {
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'authentication:already-used'
|
message: 'authentication:already-used'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -88,12 +86,12 @@ export const Authentication: React.FC<AuthenticationProps> = (props) => {
|
|||||||
if (axios.isAxiosError(error) && error.response?.status === 400) {
|
if (axios.isAxiosError(error) && error.response?.status === 400) {
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'authentication:wrong-credentials'
|
message: 'authentication:wrong-credentials'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
value: 'errors:server-error'
|
message: 'errors:server-error'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -141,11 +139,9 @@ 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>
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import classNames from 'clsx'
|
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 = () => {
|
||||||
|
@ -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>
|
||||||
|
@ -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 />
|
||||||
|
@ -19,10 +19,14 @@ 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
|
||||||
|
})
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useClickOutsideAlerter(languageClickRef, () => setHiddenMenu(true))
|
useClickOutsideAlerter(languageClickRef, () => {
|
||||||
|
return setHiddenMenu(true)
|
||||||
|
})
|
||||||
|
|
||||||
const handleLanguage = async (language: string): Promise<void> => {
|
const handleLanguage = async (language: string): Promise<void> => {
|
||||||
await setLanguage(language)
|
await setLanguage(language)
|
||||||
@ -59,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 bottom-0 left-[8px] top-0 mb-auto mt-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 bottom-0 right-[10px] top-0 mb-auto mt-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>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
@ -13,7 +13,7 @@ export const Checkbox: React.FC<CheckboxProps> = (props) => {
|
|||||||
{...props}
|
{...props}
|
||||||
type='checkbox'
|
type='checkbox'
|
||||||
id={id}
|
id={id}
|
||||||
className='relative mr-3 min-h-[25px] min-w-[25px] cursor-pointer appearance-none rounded-md bg-gradient-to-t from-[#bcc7d4] to-[#d3dfed] transition-all before:absolute before:top-[50%] before:left-[59%] before:h-[12px] before:w-[2px] before:translate-x-[-59%] before:translate-y-[-50%] before:rotate-[40deg] before:scale-0 before:bg-black before:transition-all after:absolute after:top-[62.5%] after:left-[36%] after:h-[7px] after:w-[2px] after:translate-x-[-35%] after:translate-y-[-62.5%] after:rotate-[-50deg] after:scale-0 after:bg-black after:transition-all after:duration-200 checked:before:scale-100 checked:after:scale-100 dark:from-[#1f2937] dark:to-[#273547] dark:before:bg-white dark:after:bg-white'
|
className='relative mr-3 min-h-[25px] min-w-[25px] cursor-pointer appearance-none rounded-md bg-gradient-to-t from-[#bcc7d4] to-[#d3dfed] transition-all before:absolute before:left-[59%] before:top-[50%] before:h-[12px] before:w-[2px] before:translate-x-[-59%] before:translate-y-[-50%] before:rotate-[40deg] before:scale-0 before:bg-black before:transition-all after:absolute after:left-[36%] after:top-[62.5%] after:h-[7px] after:w-[2px] after:translate-x-[-35%] after:translate-y-[-62.5%] after:rotate-[-50deg] after:scale-0 after:bg-black after:transition-all after:duration-200 checked:before:scale-100 checked:after:scale-100 dark:from-[#1f2937] dark:to-[#273547] dark:before:bg-white dark:after:bg-white'
|
||||||
/>
|
/>
|
||||||
<label
|
<label
|
||||||
className='duration-400 cursor-pointer select-none opacity-80 transition hover:opacity-100 '
|
className='duration-400 cursor-pointer select-none opacity-80 transition hover:opacity-100 '
|
||||||
|
@ -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>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -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('mb-2 mt-6 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 right-4 top-3 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 mx-auto my-0 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>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
|
}
|
@ -2,7 +2,8 @@ import { useMemo } from 'react'
|
|||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import classNames from 'clsx'
|
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
|
||||||
@ -11,7 +10,7 @@ export const Textarea: React.FC<TextareaProps> = (props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='flex flex-col'>
|
<div className='flex flex-col'>
|
||||||
<div className='mt-6 mb-2 flex justify-between'>
|
<div className='mb-2 mt-6 flex justify-between'>
|
||||||
<label className='pl-1' htmlFor={id}>
|
<label className='pl-1' htmlFor={id}>
|
||||||
{label}
|
{label}
|
||||||
</label>
|
</label>
|
||||||
|
@ -1,12 +1,15 @@
|
|||||||
import { createContext, useContext, useEffect, useMemo } 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[]
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
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
|
||||||
|
@ -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 {
|
||||||
@ -15,9 +17,7 @@ export interface Guilds {
|
|||||||
const defaultGuildsContext = {} as any
|
const defaultGuildsContext = {} as any
|
||||||
const GuildsContext = createContext<Guilds>(defaultGuildsContext)
|
const GuildsContext = createContext<Guilds>(defaultGuildsContext)
|
||||||
|
|
||||||
export const GuildsProvider: React.FC<React.PropsWithChildren<{}>> = (
|
export const GuildsProvider: React.FC<React.PropsWithChildren> = (props) => {
|
||||||
props
|
|
||||||
) => {
|
|
||||||
const { children } = props
|
const { children } = props
|
||||||
|
|
||||||
const { authentication } = useAuthentication()
|
const { authentication } = useAuthentication()
|
||||||
|
@ -1,12 +1,15 @@
|
|||||||
import { createContext, useContext, useEffect, useMemo } 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[]
|
||||||
|
@ -1,11 +1,14 @@
|
|||||||
import { createContext, useContext, useEffect, useMemo } 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[]
|
||||||
|
@ -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 } from './cypress/fixtures/handler'
|
||||||
|
|
||||||
const UPLOADS_FIXTURES_DIRECTORY = path.join(
|
const UPLOADS_FIXTURES_DIRECTORY = path.join(
|
||||||
process.cwd(),
|
process.cwd(),
|
||||||
@ -19,34 +19,45 @@ 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', {
|
||||||
async startMockServer(handlers: Handlers): Promise<null> {
|
async startMockServer(handlers: Handlers): Promise<null> {
|
||||||
server = getLocal({
|
server = getLocal({ cors: true })
|
||||||
cors: true
|
|
||||||
})
|
|
||||||
await server.start(API_DEFAULT_PORT)
|
await server.start(API_DEFAULT_PORT)
|
||||||
for (const handler of handlers) {
|
for (const handler of handlers) {
|
||||||
const { isFile = false } = handler.response
|
const { isFile = false } = handler.response
|
||||||
const method = handler.method.toLowerCase() as Lowercase<Method>
|
let requestBuilder = server.forGet(handler.url)
|
||||||
|
switch (handler.method) {
|
||||||
|
case 'GET':
|
||||||
|
requestBuilder = server.forGet(handler.url)
|
||||||
|
break
|
||||||
|
case 'POST':
|
||||||
|
requestBuilder = server.forPost(handler.url)
|
||||||
|
break
|
||||||
|
case 'PUT':
|
||||||
|
requestBuilder = server.forPut(handler.url)
|
||||||
|
break
|
||||||
|
case 'DELETE':
|
||||||
|
requestBuilder = server.forDelete(handler.url)
|
||||||
|
break
|
||||||
|
}
|
||||||
if (isFile) {
|
if (isFile) {
|
||||||
await server[method](handler.url).thenFromFile(
|
await requestBuilder.thenFromFile(
|
||||||
handler.response.statusCode,
|
handler.response.statusCode,
|
||||||
path.join(UPLOADS_FIXTURES_DIRECTORY, ...handler.response.body)
|
path.join(UPLOADS_FIXTURES_DIRECTORY, ...handler.response.body)
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
await server[method](handler.url).thenJson(
|
await requestBuilder.thenJson(
|
||||||
handler.response.statusCode,
|
handler.response.statusCode,
|
||||||
handler.response.body
|
handler.response.body
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null
|
return null
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -62,7 +73,6 @@ export default defineConfig({
|
|||||||
return config
|
return config
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
component: {
|
component: {
|
||||||
devServer: {
|
devServer: {
|
||||||
framework: 'next',
|
framework: 'next',
|
||||||
|
@ -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`', () => {
|
||||||
|
@ -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 = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Guild } from '../../../models/Guild'
|
import type { Guild } from '../../../models/Guild'
|
||||||
|
|
||||||
export const guildExample: Guild = {
|
export const guildExample: Guild = {
|
||||||
id: 1,
|
id: 1,
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../handler'
|
import type { Handler } from '../handler'
|
||||||
import { guildExample } from './guild'
|
import { guildExample } from './guild'
|
||||||
import { channelExample } from '../channels/channel'
|
import { channelExample } from '../channels/channel'
|
||||||
import { memberExampleComplete } from '../members/member'
|
import { memberExampleComplete } from '../members/member'
|
||||||
|
@ -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 getGuildsPublicEmptyHandler: Handler = {
|
export const getGuildsPublicEmptyHandler: Handler = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import {
|
import {
|
||||||
messageExampleComplete6,
|
messageExampleComplete6,
|
||||||
messageExampleComplete7,
|
messageExampleComplete7,
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import { userExample, userSettingsExample } from '../user'
|
import { userExample, userSettingsExample } from '../user'
|
||||||
|
|
||||||
export const getUserByIdHandler: Handler = {
|
export const getUserByIdHandler: Handler = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import { userExample, userSettingsExample } from '../user'
|
import { userExample, userSettingsExample } from '../user'
|
||||||
|
|
||||||
export const getUsersCurrentHandler: Handler = {
|
export const getUsersCurrentHandler: Handler = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
|
|
||||||
export const postUsersRefreshTokenHandler: Handler = {
|
export const postUsersRefreshTokenHandler: Handler = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
|
|
||||||
export const postUsersResetPasswordHandler: Handler = {
|
export const postUsersResetPasswordHandler: Handler = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
|
|
||||||
export const putUsersResetPasswordHandler: Handler = {
|
export const putUsersResetPasswordHandler: Handler = {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
|
|
||||||
export const postUsersSigninHandler: Handler = {
|
export const postUsersSigninHandler: Handler = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Handler } from '../../handler'
|
import type { Handler } from '../../handler'
|
||||||
import { userExample, userSettingsExample } from '../user'
|
import { userExample, userSettingsExample } from '../user'
|
||||||
|
|
||||||
export const postUsersSignupHandler: Handler = {
|
export const postUsersSignupHandler: Handler = {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { UserSettings } from '../../../models/UserSettings'
|
import type { UserSettings } from '../../../models/UserSettings'
|
||||||
import { User } from '../../../models/User'
|
import type { User } from '../../../models/User'
|
||||||
|
|
||||||
export const userExample: User = {
|
export const userExample: User = {
|
||||||
id: 1,
|
id: 1,
|
||||||
|
@ -5,7 +5,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: './'
|
context: './'
|
||||||
ports:
|
ports:
|
||||||
- '${PORT}:${PORT}'
|
- '${PORT-3000}:${PORT-3000}'
|
||||||
environment:
|
environment:
|
||||||
PORT: ${PORT}
|
PORT: ${PORT-3000}
|
||||||
env_file: './.env'
|
env_file: '.env'
|
||||||
|
@ -4,7 +4,7 @@ export interface {{ properCase name }}Props {
|
|||||||
className?: string
|
className?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export const {{ properCase name }}: React.FC<React.PropsWithChildren{{ properCase name }}Props>> = (props) => {
|
export const {{ properCase name }}: React.FC<React.PropsWithChildren<{{ properCase name }}Props>> = (props) => {
|
||||||
const { children, className } = props
|
const { children, className } = props
|
||||||
|
|
||||||
return <main className={classNames(className, '')}>{children}</main>
|
return <main className={classNames(className, '')}>{children}</main>
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user