11 Commits

71 changed files with 3181 additions and 21004 deletions

View File

@ -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}

View File

@ -10,8 +10,6 @@
"editorconfig.editorconfig", "editorconfig.editorconfig",
"esbenp.prettier-vscode", "esbenp.prettier-vscode",
"dbaeumer.vscode-eslint", "dbaeumer.vscode-eslint",
"divlo.vscode-styled-jsx-syntax",
"divlo.vscode-styled-jsx-languageserver",
"bradlc.vscode-tailwindcss", "bradlc.vscode-tailwindcss",
"mikestead.dotenv", "mikestead.dotenv",
"davidanson.vscode-markdownlint", "davidanson.vscode-markdownlint",

View File

@ -1,12 +1,5 @@
.vscode .*
.git !.npmrc
.env
build build
.next
coverage coverage
node_modules node_modules
tmp
temp
.DS_Store
.lighthouseci
.vercel

View File

@ -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

View File

@ -16,12 +16,12 @@ jobs:
language: ['javascript'] language: ['javascript']
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.3.0'
- name: 'Initialize CodeQL' - name: 'Initialize CodeQL'
uses: 'github/codeql-action/init@v1' uses: 'github/codeql-action/init@v2'
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
- name: 'Perform CodeQL Analysis' - name: 'Perform CodeQL Analysis'
uses: 'github/codeql-action/analyze@v1' uses: 'github/codeql-action/analyze@v2'

View File

@ -10,12 +10,12 @@ jobs:
build: build:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.3.0'
- name: 'Use Node.js' - name: 'Use Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install'

View File

@ -10,12 +10,12 @@ jobs:
lint: lint:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.3.0'
- name: 'Use Node.js' - name: 'Use Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install'
@ -30,8 +30,8 @@ jobs:
- name: 'lint:markdown' - name: 'lint:markdown'
run: 'npm run lint:markdown' run: 'npm run lint:markdown'
- name: 'lint:typescript' - name: 'lint:eslint'
run: 'npm run lint:typescript' run: 'npm run lint:eslint'
- name: 'lint:prettier' - name: 'lint:prettier'
run: 'npm run lint:prettier' run: 'npm run lint:prettier'
@ -40,8 +40,3 @@ jobs:
uses: 'dotenv-linter/action-dotenv-linter@v2' uses: 'dotenv-linter/action-dotenv-linter@v2'
with: with:
github_token: ${{ secrets.github_token }} github_token: ${{ secrets.github_token }}
- name: 'lint:docker'
uses: 'hadolint/hadolint-action@v1.6.0'
with:
dockerfile: './Dockerfile'

View File

@ -8,7 +8,7 @@ jobs:
release: release:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.3.0'
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false persist-credentials: false
@ -21,9 +21,9 @@ jobs:
git_commit_gpgsign: true git_commit_gpgsign: true
- name: 'Use Node.js' - name: 'Use Node.js'
uses: 'actions/setup-node@v2.4.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install'

View File

@ -10,12 +10,12 @@ jobs:
test-unit: test-unit:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.3.0'
- name: 'Use Node.js' - name: 'Use Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install'
@ -27,12 +27,12 @@ jobs:
test-lighthouse: test-lighthouse:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.3.0'
- name: 'Use Node.js' - name: 'Use Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install'
@ -52,12 +52,12 @@ jobs:
test-e2e: test-e2e:
runs-on: 'ubuntu-latest' runs-on: 'ubuntu-latest'
steps: steps:
- uses: 'actions/checkout@v3.0.0' - uses: 'actions/checkout@v3.3.0'
- name: 'Use Node.js' - name: 'Use Node.js'
uses: 'actions/setup-node@v3.0.0' uses: 'actions/setup-node@v3.6.0'
with: with:
node-version: '16.x' node-version: '18.x'
cache: 'npm' cache: 'npm'
- name: 'Install' - name: 'Install'

4
.gitignore vendored
View File

@ -50,3 +50,7 @@ npm-debug.log*
.lighthouseci .lighthouseci
.vercel .vercel
*.hbs *.hbs
# typescript
*.tsbuildinfo
next-env.d.ts

View File

@ -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"
] ]
} }

View File

@ -5,11 +5,11 @@
"startServerReadyPattern": "ready on", "startServerReadyPattern": "ready on",
"startServerReadyTimeout": 20000, "startServerReadyTimeout": 20000,
"url": [ "url": [
"http://localhost:3000/", "http://127.0.0.1:3000/",
"http://localhost:3000/authentication/forgot-password", "http://127.0.0.1:3000/authentication/forgot-password",
"http://localhost:3000/authentication/reset-password", "http://127.0.0.1:3000/authentication/reset-password",
"http://localhost:3000/authentication/signin", "http://127.0.0.1:3000/authentication/signin",
"http://localhost:3000/authentication/signup" "http://127.0.0.1:3000/authentication/signup"
], ],
"numberOfRuns": 1 "numberOfRuns": 1
}, },

View File

@ -1,11 +1,5 @@
{ {
"config": {
"default": true,
"MD013": false,
"MD024": false,
"MD033": false,
"MD041": false
},
"globs": ["**/*.{md,mdx}"], "globs": ["**/*.{md,mdx}"],
"ignores": ["**/node_modules"] "ignores": ["**/node_modules"],
"customRules": ["markdownlint-rule-relative-links"]
} }

7
.markdownlint.json Normal file
View File

@ -0,0 +1,7 @@
{
"default": true,
"relative-links": true,
"extends": "markdownlint/style/prettier",
"MD033": false,
"MD041": false
}

View File

@ -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",

View File

@ -16,6 +16,7 @@ All work on **Thream/website** happens directly on [GitHub](https://github.com/T
- Suggest a new feature idea. - Suggest a new feature idea.
- Correct spelling errors, improvements or additions to documentation files. - Correct spelling errors, improvements or additions to documentation files.
- Improve structure/format/performance/refactor/tests of the code. - Improve structure/format/performance/refactor/tests of the code.
- [Add translations](#add-a-translation).
## Pull Requests ## Pull Requests
@ -61,3 +62,15 @@ Scopes define what part of the code changed.
git commit -m "feat(components): add Button" git commit -m "feat(components): add Button"
git commit -m "docs(readme): update installation process" git commit -m "docs(readme): update installation process"
``` ```
## Add a translation
[Reference issue](https://github.com/Thream/website/issues/24)
Feel free to contribute to Thream and add new languages, we would appreciate your help!
To add a new language:
- `npm install`
- `npm run generate`
- Start editing JSON files with the translation in `locales/{{locale}}` (e.g: `locales/en`)

View File

@ -1,23 +1,21 @@
FROM node:16.17.0 AS dependencies FROM node:18.13.0 AS builder-dependencies
WORKDIR /usr/src/app WORKDIR /usr/src/application
COPY ./package*.json ./ COPY ./package*.json ./
RUN npm install RUN npm install
FROM node:16.17.0 AS builder FROM node:18.13.0 AS builder
WORKDIR /usr/src/app WORKDIR /usr/src/application
COPY --from=builder-dependencies /usr/src/application/node_modules ./node_modules
COPY ./ ./ COPY ./ ./
COPY --from=dependencies /usr/src/app/node_modules ./node_modules
RUN npm run build RUN npm run build
FROM node:16.17.0 AS runner FROM gcr.io/distroless/nodejs18-debian11:latest AS runner
WORKDIR /usr/src/app WORKDIR /usr/src/application
ENV NODE_ENV=production ENV NODE_ENV=production
COPY --from=builder /usr/src/app/next.config.js ./next.config.js ENV NEXT_TELEMETRY_DISABLED=1
COPY --from=builder /usr/src/app/public ./public COPY --from=builder /usr/src/application/.next/standalone ./
COPY --from=builder /usr/src/app/.next ./.next COPY --from=builder /usr/src/application/.next/static ./.next/static
COPY --from=builder /usr/src/app/i18n.json ./i18n.json COPY --from=builder /usr/src/application/public ./public
COPY --from=builder /usr/src/app/locales ./locales COPY --from=builder /usr/src/application/locales ./locales
COPY --from=builder /usr/src/app/pages ./pages COPY --from=builder /usr/src/application/next.config.js ./next.config.js
COPY --from=builder /usr/src/app/node_modules ./node_modules CMD ["./server.js"]
RUN npx next telemetry disable
CMD ["node_modules/.bin/next", "start", "--port", "${PORT}"]

View File

@ -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.4](https://github.com/Thream/api/releases/tag/v1.2.4).
## ⚙️ Getting Started ## ⚙️ Getting Started
@ -61,7 +61,7 @@ docker compose up --build
#### Services started #### Services started
- website : `http://localhost:3000` - website : `http://127.0.0.1:3000`
## 💡 Contributing ## 💡 Contributing

View File

@ -22,35 +22,31 @@ 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 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',
{ {
'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' # {channel.name}
data-cy='channel-name' </span>
{member.isOwner && (
<IconButton
onClick={async () => {
await router.push(
`/application/${channel.guildId}/${channel.id}/settings`
)
}}
className='bg-unherit absolute -right-10 h-full w-8 transition-all group-hover:right-0 group-hover:shadow-lg dark:group-hover:bg-gray-600'
title='Settings'
> >
# {channel.name} <CogIcon height={20} width={20} />
</span> </IconButton>
{member.isOwner && ( )}
<IconButton
onClick={async () => {
await router.push(
`/application/${channel.guildId}/${channel.id}/settings`
)
}}
className='bg-unherit absolute -right-10 h-full w-8 transition-all group-hover:right-0 group-hover:shadow-lg dark:group-hover:bg-gray-600'
title='Settings'
>
<CogIcon height={20} width={20} />
</IconButton>
)}
</a>
</Link> </Link>
) )
} }

View File

@ -23,19 +23,23 @@ 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) {

View File

@ -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`}
<IconButton className='h-10 w-10' title='Add a Channel'> passHref
<PlusIcon /> data-cy='link-add-channel'
</IconButton> >
</a> <IconButton className='h-10 w-10' title='Add a Channel'>
<PlusIcon />
</IconButton>
</Link> </Link>
)} )}
<Link href={`/application/${path.guildId}/settings`} passHref> <Link
<a data-cy='link-settings-guild'> href={`/application/${path.guildId}/settings`}
<IconButton className='h-7 w-7' title='Settings'> passHref
<CogIcon /> data-cy='link-settings-guild'
</IconButton> >
</a> <IconButton className='h-7 w-7' title='Settings'>
<CogIcon />
</IconButton>
</Link> </Link>
</div> </div>
</div> </div>

View File

@ -47,10 +47,10 @@ 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)
@ -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>

View File

@ -14,35 +14,33 @@ 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 py-2 px-6 pr-10 hover:bg-gray-300 dark:hover:bg-gray-900'>
<div className='flex cursor-pointer items-center overflow-hidden py-2 px-6 pr-10 hover:bg-gray-300 dark:hover:bg-gray-900'> <div className='flex min-w-[50px] rounded-full'>
<div className='flex min-w-[50px] rounded-full'> <Image
<Image src={
src={ member.user.logo == null
member.user.logo == null ? '/images/data/user-default.png'
? '/images/data/user-default.png' : member.user.logo
: member.user.logo }
} alt={"Users's profil picture"}
alt={"Users's profil picture"} height={50}
height={50} width={50}
width={50} draggable={false}
draggable={false} className='rounded-full'
className='rounded-full' />
/>
</div>
<div className='ml-5'>
<p data-cy='member-user-name' className='flex truncate font-bold'>
{member.user.name}
{member.isOwner && (
<span className='ml-4'>
<Emoji value=':crown:' size={18} />
</span>
)}
</p>
{member.user.status != null && member.user.status}
</div>
</div> </div>
</a> <div className='ml-5'>
<p data-cy='member-user-name' className='flex truncate font-bold'>
{member.user.name}
{member.isOwner && (
<span className='ml-4'>
<Emoji value=':crown:' size={18} />
</span>
)}
</p>
{member.user.status != null && member.user.status}
</div>
</div>
</Link> </Link>
) )
} }

View File

@ -2,8 +2,6 @@ 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 type { MotionProps } from 'framer-motion'
import { motion } from 'framer-motion'
import type { MessageWithMember } from '../../../../models/Message' import type { MessageWithMember } from '../../../../models/Message'
import { MessageText } from './MessageText' import { MessageText } from './MessageText'
@ -13,7 +11,7 @@ import { useAuthentication } from '../../../../tools/authentication'
import { MessageOptions } from './MessageOptions' import { MessageOptions } from './MessageOptions'
import { EditMessage } from './EditMessage' import { EditMessage } from './EditMessage'
export interface MessageProps extends MotionProps { export interface MessageProps {
message: MessageWithMember message: MessageWithMember
} }
@ -58,52 +56,38 @@ export const Message: React.FC<MessageProps> = (props) => {
} }
return ( return (
<motion.div <div
layout
initial='initial'
animate='animate'
exit='exit'
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' className='group flex w-full p-4 transition hover:bg-gray-200 dark:hover:bg-gray-900'
transition={{ type: 'spring', stiffness: 500, damping: 60 }}
variants={{
initial: { x: -100, opacity: 0 },
animate: { x: 0, opacity: 1 },
exit: { opacity: 0 }
}}
> >
<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 quality={100}
quality={100} className='rounded-full'
className='rounded-full' src={
src={ message.member.user.logo == null
message.member.user.logo == null ? '/images/data/user-default.png'
? '/images/data/user-default.png' : message.member.user.logo
: message.member.user.logo }
} alt={"Users's profil picture"}
alt={"Users's profil picture"} width={50}
width={50} height={50}
height={50} draggable={false}
draggable={false} />
/>
</div>
</div> </div>
</a> </div>
</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'
@ -140,6 +124,6 @@ export const Message: React.FC<MessageProps> = (props) => {
<Loader /> <Loader />
)} )}
</div> </div>
</motion.div> </div>
) )
} }

View File

@ -1,6 +1,5 @@
import useTranslation from 'next-translate/useTranslation' import useTranslation from 'next-translate/useTranslation'
import InfiniteScroll from 'react-infinite-scroll-component' import InfiniteScroll from 'react-infinite-scroll-component'
import { AnimatePresence } from 'framer-motion'
import { Loader } from '../../design/Loader' import { Loader } from '../../design/Loader'
import { Message } from './Message' import { Message } from './Message'
@ -30,21 +29,19 @@ export const Messages: React.FC = () => {
id='messages' id='messages'
className='scrollbar-firefox-support flex w-full flex-1 flex-col-reverse overflow-y-auto transition-all' className='scrollbar-firefox-support flex w-full flex-1 flex-col-reverse overflow-y-auto transition-all'
> >
<AnimatePresence> <InfiniteScroll
<InfiniteScroll scrollableTarget='messages'
scrollableTarget='messages' className='messages-list !overflow-x-hidden'
className='messages-list !overflow-x-hidden' dataLength={messages.length}
dataLength={messages.length} next={nextPage}
next={nextPage} inverse
inverse hasMore={hasMore}
hasMore={hasMore} loader={<Loader />}
loader={<Loader />} >
> {messages.map((message) => {
{messages.map((message) => { return <Message key={message.id} message={message} />
return <Message key={message.id} message={message} /> })}
})} </InfiniteScroll>
</InfiniteScroll>
</AnimatePresence>
</div> </div>
) )
} }

View File

@ -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}
{link.icon} 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.text} >
</a> {link.icon}
{link.text}
</Link> </Link>
</div> </div>
</div> </div>

View File

@ -54,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)

View File

@ -16,96 +16,88 @@ 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'> <div className='flex items-center justify-between'>
<div className='flex items-center justify-between'> <div className='flex w-max flex-col items-center gap-7 md:flex-row'>
<div className='flex w-max flex-col items-center gap-7 md:flex-row'> <div className='relative flex items-center justify-center overflow-hidden rounded-full shadow-lg transition-all'>
<div className='relative flex items-center justify-center overflow-hidden rounded-full shadow-lg transition-all'> <Image
<Image quality={100}
quality={100} className='rounded-full'
className='rounded-full' src={
src={ user.logo != null
user.logo != null ? user.logo
? user.logo : '/images/data/user-default.png'
: '/images/data/user-default.png' }
} alt='Profil Picture'
alt='Profil Picture' draggable='false'
draggable='false' height={125}
height={125} width={125}
width={125} />
/> </div>
<div className='ml-10 flex flex-col'>
<div className='mb-2 flex items-center'>
<p
className='space text-dark text-3xl font-bold tracking-wide dark:text-white'
data-cy='user-name'
>
{user.name}
</p>
<p
className='ml-8 select-none text-sm tracking-widest text-white opacity-40'
data-cy='user-createdAt'
>
{date.format(new Date(user.createdAt), 'DD/MM/YYYY')}
</p>
</div> </div>
<div className='ml-10 flex flex-col'> <div className='my-2 text-left'>
<div className='mb-2 flex items-center'> {user.email != null && (
<p <p className='font-bold'>
className='space text-dark text-3xl font-bold tracking-wide dark:text-white' Email:{' '}
data-cy='user-name' <a
> href={`mailto:${user.email}`}
{user.name} 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'
rel='noreferrer'
data-cy='user-email'
>
{user.email}
</a>
</p> </p>
<p )}
className='ml-8 select-none text-sm tracking-widest text-white opacity-40' {user.website != null && (
data-cy='user-createdAt' <p className='font-bold'>
> {t('application:website')}:{' '}
{date.format(new Date(user.createdAt), 'DD/MM/YYYY')} <a
target='_blank'
rel='noreferrer'
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'
>
{user.website}
</a>
</p> </p>
</div> )}
<div className='my-2 text-left'> {user.status != null && (
{user.email != null && ( <p className='flex font-bold'>
<p className='font-bold'> {t('application:status')}:{' '}
Email:{' '} <span className='ml-2 font-normal tracking-wide'>
<a {user.status}
href={`mailto:${user.email}`} </span>
target='_blank' </p>
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' )}
rel='noreferrer'
data-cy='user-email'
>
{user.email}
</a>
</p>
)}
{user.website != null && (
<p className='font-bold'>
{t('application:website')}:{' '}
<a
target='_blank'
rel='noreferrer'
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'
>
{user.website}
</a>
</p>
)}
{user.status != null && (
<p className='flex font-bold'>
{t('application:status')}:{' '}
<span className='ml-2 font-normal tracking-wide'>
{user.status}
</span>
</p>
)}
</div>
</div> </div>
</div> </div>
</div> </div>
{user.biography != null && (
<div className='mt-7 text-center'>
<p>{user.biography}</p>
</div>
)}
</div> </div>
{user.biography != null && (
<div className='mt-7 text-center'>
<p>{user.biography}</p>
</div>
)}
</div> </div>
</div> </div>
</div>
<style jsx global>{`
#application-page-content {
overflow-x: hidden;
}
`}</style>
</>
) )
} }

View File

@ -149,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)
@ -312,16 +312,15 @@ 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'
> >
<EyeIcon <EyeIcon
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>

View File

@ -139,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>

View File

@ -1,53 +1,45 @@
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 (
<> <>
<h1 className='my-6 text-4xl font-semibold'> <div className='flex h-screen flex-col pt-0'>
{t('errors:error')}{' '} <Header />
<span <main className='flex min-w-full flex-1 flex-col items-center justify-center'>
className='text-green-800 dark:text-green-400' <h1 className='my-6 text-4xl font-semibold'>
data-cy='status-code' {t('errors:error')}{' '}
> <span
{statusCode} className='text-green-800 dark:text-green-400'
</span> data-cy='status-code'
</h1> >
<p className='text-center text-lg'> {statusCode}
{message}{' '} </span>
<Link href='/'> </h1>
<a className='text-green-800 hover:underline dark:text-green-400'> <p className='text-center text-lg'>
{t('errors:return-to-home-page')} {message}{' '}
</a> <Link
</Link> href='/'
</p> className='text-green-800 hover:underline dark:text-green-400'
>
<style jsx global> {t('errors:return-to-home-page')}
{` </Link>
main { </p>
display: flex; </main>
flex-direction: column; <Footer version={version} />
justify-content: center; </div>
align-items: center;
min-width: 100vw;
flex: 1;
}
#__next {
display: flex;
flex-direction: column;
padding-top: 0;
height: 100vh;
}
`}
</style>
</> </>
) )
} }

View File

@ -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='/'
Thream className='text-green-800 hover:underline dark:text-green-400'
</a> >
Thream
</Link>{' '} </Link>{' '}
| {t('common:all-rights-reserved')} | {t('common:all-rights-reserved')}
</p> </p>

View File

@ -9,20 +9,19 @@ 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}
src='/images/icons/Thream.png' src='/images/icons/Thream.png'
alt='Thream' alt='Thream'
/> />
<span className='ml-1 hidden font-headline font-medium text-green-800 dark:text-green-400 xs:block'> <span className='ml-1 hidden font-headline font-medium text-green-800 dark:text-green-400 xs:block'>
Thream Thream
</span> </span>
</div> </div>
</a>
</Link> </Link>
<div className='flex justify-between'> <div className='flex justify-between'>
<Language /> <Language />

View File

@ -0,0 +1,78 @@
import { useEffect, useState } from 'react'
import classNames from 'clsx'
import { useTheme } from 'next-themes'
export const SwitchTheme: React.FC = () => {
const [mounted, setMounted] = useState(false)
const { theme, setTheme } = useTheme()
useEffect(() => {
setMounted(true)
}, [])
if (!mounted) {
return null
}
const handleClick = (): void => {
setTheme(theme === 'dark' ? 'light' : 'dark')
}
return (
<div
className='flex items-center'
data-cy='switch-theme-click'
onClick={handleClick}
>
<div className='relative inline-block cursor-pointer touch-pan-x select-none border-0 bg-transparent p-0'>
<div className='h-[24px] w-[50px] rounded-[30px] bg-[#4d4d4d] p-0 text-white transition-all duration-200 ease-in-out'>
<div
data-cy='switch-theme-dark'
className={classNames(
'absolute top-0 bottom-0 left-[8px] mt-auto mb-auto h-[10px] w-[14px] leading-[0] transition-opacity duration-[250ms] ease-in-out',
{
'opacity-100': theme === 'dark',
'opacity-0': theme === 'light'
}
)}
>
<span className='relative flex h-[10px] w-[10px] items-center justify-center'>
🌜
</span>
</div>
<div
data-cy='switch-theme-light'
className={classNames(
'absolute right-[10px] top-0 bottom-0 mt-auto mb-auto h-[10px] w-[10px] leading-[0]',
{
'opacity-100': theme === 'light',
'opacity-0': theme === 'dark'
}
)}
>
<span className='relative flex h-[10px] w-[10px] items-center justify-center'>
🌞
</span>
</div>
</div>
<div
className={classNames(
'absolute top-[1px] box-border h-[22px] w-[22px] rounded-[50%] bg-[#fafafa] text-white transition-all duration-[250ms] ease-in-out',
{
'left-[27px]': theme === 'dark',
'left-0': theme === 'light'
}
)}
style={{ border: '1px solid #4d4d4d' }}
/>
<input
data-cy='switch-theme-input'
type='checkbox'
aria-label='Dark mode toggle'
className='absolute m-[-1px] h-[1px] w-[1px] overflow-hidden border-0 p-0'
defaultChecked
/>
</div>
</div>
)
}

View File

@ -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>
</>
)
}

View File

@ -1 +0,0 @@
export * from './SwitchTheme'

View File

@ -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>
</>
)
}

View File

@ -14,24 +14,26 @@ 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}
<div className='group relative flex w-full justify-center'
className={classNames('group flex w-full justify-center', className)} title={title}
> >
{children} <div
<div className='absolute left-0 flex h-12 w-3 items-center'> className={classNames('group flex w-full justify-center', className)}
<span >
className={classNames( {children}
'absolute w-4/12 rounded-r-lg bg-green-700 group-hover:h-5', <div className='absolute left-0 flex h-12 w-3 items-center'>
{ <span
'h-full': selected className={classNames(
} 'absolute w-4/12 rounded-r-lg bg-green-700 group-hover:h-5',
)} {
></span> 'h-full': selected
</div> }
)}
></span>
</div> </div>
</a> </div>
</Link> </Link>
) )
} }

View File

@ -35,61 +35,46 @@ export const Input: React.FC<InputProps> = (props) => {
} }
return ( return (
<> <div className='flex flex-col'>
<div className='flex flex-col'> <div className={classNames('mt-6 mb-2 flex justify-between', className)}>
<div <label className='pl-1' htmlFor={name}>
className={classNames('mt-6 mb-2 flex justify-between', className)} {label}
> </label>
<label className='pl-1' htmlFor={name}> {type === 'password' && showForgotPassword ? (
{label} <Link
</label> href='/authentication/forgot-password'
{type === 'password' && showForgotPassword ? ( className='text-center font-headline text-xs text-green-800 hover:underline dark:text-green-400 sm:text-sm'
<Link href='/authentication/forgot-password'> data-cy='forgot-password-link'
<a >
className='text-center font-headline text-xs text-green-800 hover:underline dark:text-green-400 sm:text-sm' {t('authentication:forgot-password')}
data-cy='forgot-password-link' </Link>
> ) : null}
{t('authentication:forgot-password')}
</a>
</Link>
) : null}
</div>
<div className='relative mt-0'>
<input
data-cy={`input-${name ?? 'name'}`}
className='h-11 w-full rounded-lg border border-transparent bg-[#f1f1f1] px-3 font-paragraph leading-10 text-[#2a2a2a] caret-green-600 focus:border focus:shadow-green focus:outline-none'
{...rest}
id={name}
name={name}
type={inputType}
/>
{type === 'password' && (
<div
data-cy='password-eye'
onClick={handlePassword}
className='password-eye absolute cursor-pointer bg-[#f1f1f1] bg-cover'
/>
)}
<FormState
id={`error-${name ?? 'input'}`}
state={error == null ? 'idle' : 'error'}
message={error}
/>
</div>
</div> </div>
<div className='relative mt-0'>
<style jsx> <input
{` data-cy={`input-${name ?? 'name'}`}
.password-eye { className='h-11 w-full rounded-lg border border-transparent bg-[#f1f1f1] px-3 font-paragraph leading-10 text-[#2a2a2a] caret-green-600 focus:border focus:shadow-green focus:outline-none'
top: 12px; {...rest}
right: 16px; id={name}
z-index: 1; name={name}
width: 20px; type={inputType}
height: 20px; />
background-image: url('/images/svg/icons/input/${inputType}.svg'); {type === 'password' && (
} <div
`} data-cy='password-eye'
</style> onClick={handlePassword}
</> style={{
backgroundImage: `url('/images/svg/icons/input/${inputType}.svg')`
}}
className='absolute top-3 right-4 z-10 h-5 w-5 cursor-pointer bg-[#f1f1f1] bg-cover'
/>
)}
<FormState
id={`error-${name ?? 'input'}`}
state={error == null ? 'idle' : 'error'}
message={error}
/>
</div>
</div>
) )
} }

View 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;
}

View File

@ -1,3 +1,5 @@
import styles from './Loader.module.css'
export interface LoaderProps { export interface LoaderProps {
width?: number width?: number
height?: number height?: number
@ -9,10 +11,14 @@ export const Loader: React.FC<LoaderProps> = (props) => {
return ( return (
<div className={props.className}> <div className={props.className}>
<div data-cy='progress-spinner' className='progress-spinner'> <div
<svg className='progress-spinner-svg' viewBox='25 25 50 50'> data-cy='progress-spinner'
className='relative my-0 mx-auto before:block before:pt-[100%] before:content-none'
style={{ width: `${width}px`, height: `${height}px` }}
>
<svg className={styles['progressSpinnerSvg']} viewBox='25 25 50 50'>
<circle <circle
className='progress-spinner-circle' className={styles['progressSpinnerCircle']}
cx='50' cx='50'
cy='50' cy='50'
r='20' r='20'
@ -22,60 +28,6 @@ export const Loader: React.FC<LoaderProps> = (props) => {
/> />
</svg> </svg>
</div> </div>
<style jsx>
{`
.progress-spinner {
position: relative;
margin: 0 auto;
width: ${width}px;
height: ${height}px;
}
.progress-spinner::before {
content: '';
display: block;
padding-top: 100%;
}
.progress-spinner-svg {
animation: progress-spinner-rotate 2s linear infinite;
height: 100%;
transform-origin: center center;
width: 100%;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
margin: auto;
}
.progress-spinner-circle {
stroke-dasharray: 89, 200;
stroke-dashoffset: 0;
stroke: #27b05e;
animation: progress-spinner-dash 1.5s ease-in-out infinite;
stroke-linecap: round;
}
@keyframes progress-spinner-rotate {
100% {
transform: rotate(360deg);
}
}
@keyframes progress-spinner-dash {
0% {
stroke-dasharray: 1, 200;
stroke-dashoffset: 0;
}
50% {
stroke-dasharray: 89, 200;
stroke-dashoffset: -35px;
}
100% {
stroke-dasharray: 89, 200;
stroke-dashoffset: -124px;
}
}
`}
</style>
</div> </div>
) )
} }

View File

@ -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;
}

View File

@ -3,6 +3,7 @@ import Image from 'next/image'
import classNames from 'clsx' import classNames from 'clsx'
import type { 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} style={{ background: socialMediaColor }}
className={classNames(className, 'button', givenClassName)} className={classNames(
> className,
<SocialMediaChildren socialMedia={socialMedia} /> styles['button'],
</button> {
[styles['buttonGoogle'] as string]: socialMedia === 'Google',
<style jsx> [styles['buttonMedia'] as string]: socialMedia !== 'Google'
{` },
.button { givenClassName
background: ${socialMediaColor}; )}
color: ${socialMedia === 'Google' ? '#000' : '#fff'}; >
border: ${socialMedia === 'Google' ? '1px solid #000' : 'none'}; <SocialMediaChildren socialMedia={socialMedia} />
} </button>
.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}
<SocialMediaChildren socialMedia={socialMedia} /> style={{ background: socialMediaColor }}
</a> className={classNames(
className,
<style jsx> styles['button'],
{` {
.link { [styles['buttonGoogle'] as string]: socialMedia === 'Google',
background: ${socialMediaColor}; [styles['buttonMedia'] as string]: socialMedia !== 'Google'
color: ${socialMedia === 'Google' ? '#000' : '#fff'}; },
border: ${socialMedia === 'Google' ? '1px solid #000' : 'none'}; givenClassName
} )}
.link:focus { >
box-shadow: 0 0 0 2px #27b05e; <SocialMediaChildren socialMedia={socialMedia} />
} </a>
`}
</style>
</>
) )
} }

View File

@ -19,11 +19,9 @@ let server: Mockttp | null = null
export default defineConfig({ export default defineConfig({
fixturesFolder: false, fixturesFolder: false,
video: false, video: false,
downloadsFolder: undefined,
screenshotOnRunFailure: false, screenshotOnRunFailure: false,
e2e: { e2e: {
baseUrl: 'http://localhost:3000', baseUrl: 'http://127.0.0.1:3000',
supportFile: false, supportFile: false,
setupNodeEvents(on, config) { setupNodeEvents(on, config) {
on('task', { on('task', {
@ -62,7 +60,6 @@ export default defineConfig({
return config return config
} }
}, },
component: { component: {
devServer: { devServer: {
framework: 'next', framework: 'next',

View File

@ -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'

View File

@ -13,7 +13,7 @@ const getErrorTranslationKey = (error: Error): string => {
return 'errors:required' return 'errors:required'
} }
if (error.keyword === 'format') { if (error.keyword === 'format') {
if (error.params.format === 'email') { if (error.params['format'] === 'email') {
return 'errors:invalid-email' return 'errors:invalid-email'
} }
return 'errors:invalid' return 'errors:invalid'
@ -43,7 +43,7 @@ export const useFormTranslation = (): UseFormTranslationResult => {
if (error != null) { if (error != null) {
return t(getErrorTranslationKey(error)).replace( return t(getErrorTranslationKey(error)).replace(
'{expected}', '{expected}',
error?.params?.limit error?.params?.['limit']
) )
} }
return undefined return undefined

View File

@ -57,10 +57,13 @@ export const usePagination = <T extends PaginationItem>(
`${url}?${searchParameters.toString()}` `${url}?${searchParameters.toString()}`
) )
if (!inverse) { if (!inverse) {
const endIndex = newItems.length - 1
const lastItem = newItems[endIndex]
afterId.current = afterId.current =
newItems.length > 0 ? newItems[newItems.length - 1].id : null newItems.length > 0 && lastItem != null ? lastItem.id : null
} else { } else {
afterId.current = newItems.length > 0 ? newItems[0].id : null afterId.current =
newItems.length > 0 && newItems[0] != null ? newItems[0].id : null
} }
setItems((oldItems) => { setItems((oldItems) => {
const updatedItems = inverse const updatedItems = inverse
@ -110,10 +113,13 @@ export const usePagination = <T extends PaginationItem>(
const newItems = getPaginationCache<T>(cacheKey) const newItems = getPaginationCache<T>(cacheKey)
setItems(newItems) setItems(newItems)
if (!inverse) { if (!inverse) {
const endIndex = newItems.length - 1
const lastItem = newItems[endIndex]
afterId.current = afterId.current =
newItems.length > 0 ? newItems[newItems.length - 1].id : null newItems.length > 0 && lastItem != null ? lastItem.id : null
} else { } else {
afterId.current = newItems.length > 0 ? newItems[0].id : null afterId.current =
newItems.length > 0 && newItems[0] != null ? newItems[0].id : null
} }
fetchState.current = 'idle' fetchState.current = 'idle'
} }

View File

@ -12,8 +12,8 @@ export const providersTypebox = providers.map((provider) => {
return Type.Literal(provider) return Type.Literal(provider)
}) })
export type ProviderOAuth = typeof providers[number] export type ProviderOAuth = (typeof providers)[number]
export type AuthenticationStrategy = typeof strategies[number] export type AuthenticationStrategy = (typeof strategies)[number]
export const oauthSchema = { export const oauthSchema = {
id, id,

5
next-env.d.ts vendored
View File

@ -1,5 +0,0 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.

View File

@ -5,16 +5,16 @@ const nextPWA = require('next-pwa')({
const nextTranslate = require('next-translate') const nextTranslate = require('next-translate')
/** @type {import("next").NextConfig} */ /** @type {import("next").NextConfig} */
module.exports = nextTranslate( const nextConfig = {
nextPWA({ reactStrictMode: false,
reactStrictMode: false, output: 'standalone',
images: { images: {
domains: [ domains: [
'api.thream.divlo.fr', 'api.thream.divlo.fr',
'thream-api.herokuapp.com', 'file-uploads-api.thream.divlo.fr',
'file-uploads-api.thream.divlo.fr', ...(process.env.NODE_ENV !== 'production' ? ['127.0.0.1'] : [])
...(process.env.NODE_ENV !== 'production' ? ['localhost'] : []) ]
] }
} }
})
) module.exports = nextTranslate(nextPWA(nextConfig))

22648
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@thream/website", "name": "@thream/website",
"version": "1.3.0", "version": "1.3.2",
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",
@ -19,95 +19,95 @@
"lint:commit": "commitlint", "lint:commit": "commitlint",
"lint:editorconfig": "editorconfig-checker", "lint:editorconfig": "editorconfig-checker",
"lint:markdown": "markdownlint-cli2", "lint:markdown": "markdownlint-cli2",
"lint:typescript": "eslint \"**/*.{js,jsx,ts,tsx}\" --ignore-path \".gitignore\"", "lint:eslint": "eslint \"**/*.{js,jsx,ts,tsx}\" --ignore-path \".gitignore\"",
"lint:prettier": "prettier \".\" --check --ignore-path \".gitignore\"", "lint:prettier": "prettier \".\" --check --ignore-path \".gitignore\"",
"lint:staged": "lint-staged", "lint:staged": "lint-staged",
"test:unit": "cypress run --component", "test:unit": "cypress run --component",
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://localhost:3000\" \"html-w3c-validator\"", "test:html-w3c-validator": "start-server-and-test \"start\" \"http://127.0.0.1:3000\" \"html-w3c-validator\"",
"test:lighthouse": "lhci autorun", "test:lighthouse": "lhci autorun",
"test:e2e": "start-server-and-test \"start\" \"http://localhost:3000\" \"cypress run\"", "test:e2e": "start-server-and-test \"start\" \"http://127.0.0.1:3000\" \"cypress run\"",
"test:dev": "start-server-and-test \"dev\" \"http://localhost:3000\" \"cypress open\"", "test:dev": "start-server-and-test \"dev\" \"http://127.0.0.1:3000\" \"cypress open\"",
"release": "semantic-release", "release": "semantic-release",
"deploy": "vercel", "deploy": "vercel",
"postinstall": "husky install" "postinstall": "husky install"
}, },
"dependencies": { "dependencies": {
"@fontsource/montserrat": "4.5.12", "@fontsource/montserrat": "4.5.13",
"@fontsource/roboto": "4.5.8", "@fontsource/roboto": "4.5.8",
"@heroicons/react": "1.0.6", "@heroicons/react": "1.0.6",
"@sinclair/typebox": "0.24.34", "@sinclair/typebox": "0.25.20",
"axios": "0.26.1", "axios": "1.2.1",
"clsx": "1.2.1", "clsx": "1.2.1",
"date-and-time": "2.4.1", "date-and-time": "2.4.1",
"emoji-mart": "3.0.1", "emoji-mart": "3.0.1",
"framer-motion": "7.2.1", "katex": "0.16.4",
"katex": "0.16.2", "next": "13.1.1",
"next": "12.2.5",
"next-pwa": "5.6.0", "next-pwa": "5.6.0",
"next-themes": "0.2.0", "next-themes": "0.2.1",
"next-translate": "1.5.0", "next-translate": "1.6.0",
"pretty-bytes": "6.0.0", "pretty-bytes": "6.0.0",
"react": "18.2.0", "react": "18.2.0",
"react-component-form": "3.1.0", "react-component-form": "3.1.2",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-infinite-scroll-component": "6.1.0", "react-infinite-scroll-component": "6.1.0",
"react-markdown": "8.0.3", "react-markdown": "8.0.4",
"react-responsive": "8.2.0", "react-responsive": "9.0.2",
"react-swipeable": "7.0.0", "react-swipeable": "7.0.0",
"react-syntax-highlighter": "15.5.0", "react-syntax-highlighter": "15.5.0",
"react-textarea-autosize": "8.3.4", "react-textarea-autosize": "8.4.0",
"read-pkg": "7.1.0", "read-pkg": "7.1.0",
"rehype-katex": "6.0.2", "rehype-katex": "6.0.2",
"remark-breaks": "3.0.2", "remark-breaks": "3.0.2",
"remark-gfm": "3.0.1", "remark-gfm": "3.0.1",
"remark-math": "5.1.1", "remark-math": "5.1.1",
"sharp": "0.30.7", "sharp": "0.31.3",
"socket.io-client": "4.5.1", "socket.io-client": "4.5.4",
"unified": "10.1.2", "unified": "10.1.2",
"unist-util-visit": "4.1.1", "unist-util-visit": "4.1.1",
"universal-cookie": "4.0.4" "universal-cookie": "4.0.4"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "17.1.2", "@commitlint/cli": "17.4.1",
"@commitlint/config-conventional": "17.1.0", "@commitlint/config-conventional": "17.4.0",
"@lhci/cli": "0.9.0", "@lhci/cli": "0.10.0",
"@saithodev/semantic-release-backmerge": "2.1.2", "@saithodev/semantic-release-backmerge": "2.1.2",
"@semantic-release/git": "10.0.1", "@semantic-release/git": "10.0.1",
"@tsconfig/strictest": "1.0.2",
"@types/emoji-mart": "3.0.9", "@types/emoji-mart": "3.0.9",
"@types/hast": "2.3.4", "@types/hast": "2.3.4",
"@types/katex": "0.14.0", "@types/katex": "0.16.0",
"@types/node": "18.7.14", "@types/node": "18.11.18",
"@types/react": "18.0.18", "@types/react": "18.0.26",
"@types/react-responsive": "8.0.5", "@types/react-responsive": "8.0.5",
"@types/react-syntax-highlighter": "15.5.5", "@types/react-syntax-highlighter": "15.5.6",
"@types/unist": "2.0.6", "@types/unist": "2.0.6",
"@typescript-eslint/eslint-plugin": "5.36.1", "@typescript-eslint/eslint-plugin": "5.48.1",
"@typescript-eslint/parser": "5.36.1", "@typescript-eslint/parser": "5.48.1",
"autoprefixer": "10.4.8", "autoprefixer": "10.4.13",
"cypress": "10.7.0", "cypress": "12.3.0",
"editorconfig-checker": "4.0.2", "editorconfig-checker": "4.0.2",
"eslint": "8.23.0", "eslint": "8.31.0",
"eslint-config-conventions": "4.0.0", "eslint-config-conventions": "6.0.0",
"eslint-config-next": "12.2.5", "eslint-config-next": "13.1.1",
"eslint-config-prettier": "8.5.0", "eslint-config-prettier": "8.6.0",
"eslint-plugin-import": "2.26.0", "eslint-plugin-import": "2.26.0",
"eslint-plugin-prettier": "4.2.1", "eslint-plugin-prettier": "4.2.1",
"eslint-plugin-promise": "6.0.1", "eslint-plugin-promise": "6.1.1",
"eslint-plugin-unicorn": "43.0.2", "eslint-plugin-unicorn": "45.0.2",
"html-w3c-validator": "1.2.0", "html-w3c-validator": "1.2.2",
"husky": "8.0.1", "husky": "8.0.3",
"lint-staged": "13.0.3", "lint-staged": "13.1.0",
"markdownlint-cli2": "0.5.1", "markdownlint-cli2": "0.6.0",
"markdownlint-rule-relative-links": "1.1.1",
"mockttp": "2.7.0", "mockttp": "2.7.0",
"plop": "3.1.1", "plop": "3.1.1",
"postcss": "8.4.16", "postcss": "8.4.21",
"prettier": "2.7.1", "prettier": "2.8.2",
"prettier-plugin-tailwindcss": "0.1.13", "prettier-plugin-tailwindcss": "0.2.1",
"semantic-release": "19.0.5", "semantic-release": "19.0.5",
"serve": "14.0.1", "start-server-and-test": "1.15.2",
"start-server-and-test": "1.14.0", "tailwindcss": "3.2.4",
"tailwindcss": "3.1.8", "typescript": "4.9.4",
"typescript": "4.8.2", "vercel": "28.11.0"
"vercel": "28.2.0"
} }
} }

View File

@ -3,9 +3,7 @@ import useTranslation from 'next-translate/useTranslation'
import { ErrorPage } from '../components/ErrorPage' import { ErrorPage } from '../components/ErrorPage'
import { Head } from '../components/Head' import { Head } from '../components/Head'
import { Header } from '../components/Header'
import type { FooterProps } from '../components/Footer' import type { FooterProps } from '../components/Footer'
import { Footer } from '../components/Footer'
const Error404: NextPage<FooterProps> = (props) => { const Error404: NextPage<FooterProps> = (props) => {
const { t } = useTranslation() const { t } = useTranslation()
@ -14,12 +12,11 @@ const Error404: NextPage<FooterProps> = (props) => {
return ( return (
<> <>
<Head title='Thream | 404' /> <Head title='Thream | 404' />
<ErrorPage
<Header /> statusCode={404}
<main className='flex flex-col md:mx-auto md:max-w-4xl lg:max-w-7xl'> message={t('errors:page-not-found')}
<ErrorPage statusCode={404} message={t('errors:page-not-found')} /> version={version}
</main> />
<Footer version={version} />
</> </>
) )
} }

View File

@ -5,7 +5,6 @@ import { ErrorPage } from '../components/ErrorPage'
import { Head } from '../components/Head' import { Head } from '../components/Head'
import { Header } from '../components/Header' import { Header } from '../components/Header'
import type { FooterProps } from '../components/Footer' import type { FooterProps } from '../components/Footer'
import { Footer } from '../components/Footer'
const Error500: NextPage<FooterProps> = (props) => { const Error500: NextPage<FooterProps> = (props) => {
const { t } = useTranslation() const { t } = useTranslation()
@ -16,10 +15,11 @@ const Error500: NextPage<FooterProps> = (props) => {
<Head title='Thream | 500' /> <Head title='Thream | 500' />
<Header /> <Header />
<main className='flex flex-col md:mx-auto md:max-w-4xl lg:max-w-7xl'> <ErrorPage
<ErrorPage statusCode={500} message={t('errors:server-error')} /> statusCode={500}
</main> message={t('errors:server-error')}
<Footer version={version} /> version={version}
/>
</> </>
) )
} }

View File

@ -1,5 +1,5 @@
import { useEffect } from 'react' import { useEffect } from 'react'
import type { AppProps } from 'next/app' import type { AppType } from 'next/app'
import { ThemeProvider } from 'next-themes' import { ThemeProvider } from 'next-themes'
import useTranslation from 'next-translate/useTranslation' import useTranslation from 'next-translate/useTranslation'
@ -15,7 +15,7 @@ import '@fontsource/roboto/700.css'
import { cookies } from '../tools/cookies' import { cookies } from '../tools/cookies'
const Application = ({ Component, pageProps }: AppProps): JSX.Element => { const Application: AppType = ({ Component, pageProps }) => {
const { lang } = useTranslation() const { lang } = useTranslation()
useEffect(() => { useEffect(() => {

View File

@ -62,8 +62,8 @@ const ChannelPage: NextPage<ChannelPageProps> = (props) => {
export const getServerSideProps = authenticationFromServerSide({ export const getServerSideProps = authenticationFromServerSide({
shouldBeAuthenticated: true, shouldBeAuthenticated: true,
fetchData: async (context, api) => { fetchData: async (context, api) => {
const channelId = Number(context?.params?.channelId) const channelId = Number(context?.params?.['channelId'])
const guildId = Number(context?.params?.guildId) const guildId = Number(context?.params?.['guildId'])
if (isNaN(channelId) || isNaN(guildId)) { if (isNaN(channelId) || isNaN(guildId)) {
return { return {
notFound: true notFound: true

View File

@ -57,8 +57,8 @@ const ChannelSettingsPage: NextPage<ChannelSettingsPageProps> = (props) => {
export const getServerSideProps = authenticationFromServerSide({ export const getServerSideProps = authenticationFromServerSide({
shouldBeAuthenticated: true, shouldBeAuthenticated: true,
fetchData: async (context, api) => { fetchData: async (context, api) => {
const channelId = Number(context?.params?.channelId) const channelId = Number(context?.params?.['channelId'])
const guildId = Number(context?.params?.guildId) const guildId = Number(context?.params?.['guildId'])
if (isNaN(channelId) || isNaN(guildId)) { if (isNaN(channelId) || isNaN(guildId)) {
return { return {
notFound: true notFound: true

View File

@ -44,7 +44,7 @@ const CreateChannelPage: NextPage<CreateChannelPageProps> = (props) => {
export const getServerSideProps = authenticationFromServerSide({ export const getServerSideProps = authenticationFromServerSide({
shouldBeAuthenticated: true, shouldBeAuthenticated: true,
fetchData: async (context, api) => { fetchData: async (context, api) => {
const guildId = Number(context?.params?.guildId) const guildId = Number(context?.params?.['guildId'])
if (isNaN(guildId)) { if (isNaN(guildId)) {
return { return {
notFound: true notFound: true

View File

@ -41,7 +41,7 @@ const GuildSettingsPage: NextPage<GuildSettingsPageProps> = (props) => {
export const getServerSideProps = authenticationFromServerSide({ export const getServerSideProps = authenticationFromServerSide({
shouldBeAuthenticated: true, shouldBeAuthenticated: true,
fetchData: async (context, api) => { fetchData: async (context, api) => {
const guildId = Number(context?.params?.guildId) const guildId = Number(context?.params?.['guildId'])
if (isNaN(guildId)) { if (isNaN(guildId)) {
return { return {
notFound: true notFound: true

View File

@ -35,7 +35,7 @@ const UserProfilePage: NextPage<UserProfilePageProps> = (props) => {
export const getServerSideProps = authenticationFromServerSide({ export const getServerSideProps = authenticationFromServerSide({
shouldBeAuthenticated: true, shouldBeAuthenticated: true,
fetchData: async (context, api) => { fetchData: async (context, api) => {
const userId = Number(context?.params?.userId) const userId = Number(context?.params?.['userId'])
if (isNaN(userId)) { if (isNaN(userId)) {
return { return {
notFound: true notFound: true

View File

@ -15,7 +15,6 @@ import { Input } from '../../components/design/Input'
import { Button } from '../../components/design/Button' import { Button } from '../../components/design/Button'
import { FormState } from '../../components/design/FormState' import { FormState } from '../../components/design/FormState'
import { authenticationFromServerSide } from '../../tools/authentication' import { authenticationFromServerSide } from '../../tools/authentication'
import { ScrollableBody } from '../../components/ScrollableBody'
import { userSchema } from '../../models/User' import { userSchema } from '../../models/User'
import { api } from '../../tools/api' import { api } from '../../tools/api'
import { useFormTranslation } from '../../hooks/useFormTranslation' import { useFormTranslation } from '../../hooks/useFormTranslation'
@ -60,7 +59,7 @@ const ForgotPassword: NextPage<FooterProps> = (props) => {
} }
return ( return (
<ScrollableBody> <>
<Head title={`Thream | ${t('authentication:forgot-password')}`} /> <Head title={`Thream | ${t('authentication:forgot-password')}`} />
<Header /> <Header />
<Main> <Main>
@ -71,7 +70,7 @@ const ForgotPassword: NextPage<FooterProps> = (props) => {
</Button> </Button>
<p className='mt-3 font-headline text-sm text-green-800 hover:underline dark:text-green-400'> <p className='mt-3 font-headline text-sm text-green-800 hover:underline dark:text-green-400'>
<Link href='/authentication/signin'> <Link href='/authentication/signin'>
<a>{t('authentication:already-know-password')}</a> {t('authentication:already-know-password')}
</Link> </Link>
</p> </p>
</AuthenticationForm> </AuthenticationForm>
@ -86,7 +85,7 @@ const ForgotPassword: NextPage<FooterProps> = (props) => {
/> />
</Main> </Main>
<Footer version={version} /> <Footer version={version} />
</ScrollableBody> </>
) )
} }

View File

@ -15,7 +15,6 @@ import { Input } from '../../components/design/Input'
import { Button } from '../../components/design/Button' import { Button } from '../../components/design/Button'
import { authenticationFromServerSide } from '../../tools/authentication' import { authenticationFromServerSide } from '../../tools/authentication'
import { AuthenticationForm } from '../../components/Authentication' import { AuthenticationForm } from '../../components/Authentication'
import { ScrollableBody } from '../../components/ScrollableBody'
import { api } from '../../tools/api' import { api } from '../../tools/api'
import { userSchema } from '../../models/User' import { userSchema } from '../../models/User'
import { useFormTranslation } from '../../hooks/useFormTranslation' import { useFormTranslation } from '../../hooks/useFormTranslation'
@ -36,7 +35,7 @@ const ResetPassword: NextPage<FooterProps> = (props) => {
try { try {
await api.put(`/users/reset-password`, { await api.put(`/users/reset-password`, {
...formData, ...formData,
temporaryToken: router.query.temporaryToken temporaryToken: router.query['temporaryToken']
}) })
await router.push('/authentication/signin') await router.push('/authentication/signin')
return null return null
@ -55,7 +54,7 @@ const ResetPassword: NextPage<FooterProps> = (props) => {
} }
return ( return (
<ScrollableBody> <>
<Head title={`Thream | ${t('authentication:reset-password')}`} /> <Head title={`Thream | ${t('authentication:reset-password')}`} />
<Header /> <Header />
<Main> <Main>
@ -81,7 +80,7 @@ const ResetPassword: NextPage<FooterProps> = (props) => {
/> />
</Main> </Main>
<Footer version={version} /> <Footer version={version} />
</ScrollableBody> </>
) )
} }

View File

@ -7,19 +7,18 @@ import { Header } from '../../components/Header'
import type { FooterProps } from '../../components/Footer' import type { FooterProps } from '../../components/Footer'
import { Footer } from '../../components/Footer' import { Footer } from '../../components/Footer'
import { authenticationFromServerSide } from '../../tools/authentication' import { authenticationFromServerSide } from '../../tools/authentication'
import { ScrollableBody } from '../../components/ScrollableBody'
const Signin: NextPage<FooterProps> = (props) => { const Signin: NextPage<FooterProps> = (props) => {
const { version } = props const { version } = props
const { t } = useTranslation() const { t } = useTranslation()
return ( return (
<ScrollableBody> <>
<Head title={`Thream | ${t('authentication:signin')}`} /> <Head title={`Thream | ${t('authentication:signin')}`} />
<Header /> <Header />
<Authentication mode='signin' /> <Authentication mode='signin' />
<Footer version={version} /> <Footer version={version} />
</ScrollableBody> </>
) )
} }

View File

@ -7,19 +7,18 @@ import { Header } from '../../components/Header'
import type { FooterProps } from '../../components/Footer' import type { FooterProps } from '../../components/Footer'
import { Footer } from '../../components/Footer' import { Footer } from '../../components/Footer'
import { authenticationFromServerSide } from '../../tools/authentication' import { authenticationFromServerSide } from '../../tools/authentication'
import { ScrollableBody } from '../../components/ScrollableBody'
const Signup: NextPage<FooterProps> = (props) => { const Signup: NextPage<FooterProps> = (props) => {
const { version } = props const { version } = props
const { t } = useTranslation() const { t } = useTranslation()
return ( return (
<ScrollableBody> <>
<Head title={`Thream | ${t('authentication:signup')}`} /> <Head title={`Thream | ${t('authentication:signup')}`} />
<Header /> <Header />
<Authentication mode='signup' /> <Authentication mode='signup' />
<Footer version={version} /> <Footer version={version} />
</ScrollableBody> </>
) )
} }

View File

@ -11,29 +11,27 @@ import type { FooterProps } from '../components/Footer'
import { Footer } from '../components/Footer' import { Footer } from '../components/Footer'
import { SocialMediaLink } from '../components/design/SocialMediaButton' import { SocialMediaLink } from '../components/design/SocialMediaButton'
import { ButtonLink } from '../components/design/Button' import { ButtonLink } from '../components/design/Button'
import { ScrollableBody } from '../components/ScrollableBody'
const Home: NextPage<FooterProps> = (props) => { const Home: NextPage<FooterProps> = (props) => {
const { t } = useTranslation() const { t } = useTranslation()
const { version } = props const { version } = props
return ( return (
<ScrollableBody> <>
<Head /> <Head />
<Header /> <Header />
<Main> <Main>
<div className='flex w-4/5 flex-col items-center'> <div className='flex w-4/5 flex-col items-center'>
<div className='max-w-xs'> <div className='max-w-xs'>
<Link href='/authentication/signup'> <Link href='/authentication/signup'>
<a> <Image
<Image quality={100}
quality={100} width={351}
width={351} height={341}
height={341} src='/images/svg/design/home.svg'
src='/images/svg/design/home.svg' alt={"Thream's chat app"}
alt={"Thream's chat app"} priority
/> />
</a>
</Link> </Link>
</div> </div>
<div className='text-center'> <div className='text-center'>
@ -55,7 +53,7 @@ const Home: NextPage<FooterProps> = (props) => {
/> />
</div> </div>
<div className='mt-8 flex items-center justify-center space-x-4 text-center'> <div className='mt-8 flex items-center justify-center space-x-4 text-center'>
<Link href='/authentication/signup' passHref> <Link href='/authentication/signup' passHref legacyBehavior>
<ButtonLink data-cy='get-started'> <ButtonLink data-cy='get-started'>
{t('home:get-started')} {t('home:get-started')}
</ButtonLink> </ButtonLink>
@ -72,7 +70,7 @@ const Home: NextPage<FooterProps> = (props) => {
</div> </div>
</Main> </Main>
<Footer version={version} /> <Footer version={version} />
</ScrollableBody> </>
) )
} }

View File

@ -12,9 +12,18 @@
@apply flex h-screen flex-col; @apply flex h-screen flex-col;
} }
#application-page-content {
overflow-x: hidden;
}
body { body {
@apply bg-white font-headline text-black dark:bg-black dark:text-white; @apply bg-white font-headline text-black dark:bg-black dark:text-white;
overflow: hidden; overflow: hidden;
scrollbar-width: thin;
scrollbar-color: var(--scroll-bar-color) var(--scroll-bar-bg-color);
z-index: 1000;
height: calc(100vh - 64px);
overflow-y: auto;
} }
.h-full-without-header { .h-full-without-header {

View File

@ -1,4 +1,5 @@
module.exports = { /** @type {import('tailwindcss').Config} */
const tailwindConfig = {
content: [ content: [
'./pages/**/*.{js,ts,jsx,tsx}', './pages/**/*.{js,ts,jsx,tsx}',
'./components/**/*.{js,ts,jsx,tsx}' './components/**/*.{js,ts,jsx,tsx}'
@ -31,3 +32,5 @@ module.exports = {
}, },
plugins: [] plugins: []
} }
module.exports = tailwindConfig

View File

@ -1,13 +1,13 @@
import axios from 'axios' import axios from 'axios'
export const API_VERSION = '1.2.0' export const API_VERSION = '1.2.4'
export const API_DEFAULT_PORT = 8080 export const API_DEFAULT_PORT = 8080
export const API_URL = export const API_URL =
process.env.NEXT_PUBLIC_API_URL != null process.env['NEXT_PUBLIC_API_URL'] != null
? process.env.NEXT_PUBLIC_API_URL ? process.env['NEXT_PUBLIC_API_URL']
: `http://localhost:${API_DEFAULT_PORT}` : `http://127.0.0.1:${API_DEFAULT_PORT}`
export const api = axios.create({ export const api = axios.create({
baseURL: API_URL, baseURL: API_URL,

View File

@ -59,7 +59,9 @@ export class Authentication {
this.setAccessToken(accessToken) this.setAccessToken(accessToken)
} }
config.headers = config.headers == null ? {} : config.headers config.headers = config.headers == null ? {} : config.headers
config.headers.Authorization = `${this.tokens.type} ${this.tokens.accessToken}` config.headers[
'Authorization'
] = `${this.tokens.type} ${this.tokens.accessToken}`
return config return config
}, },
async (error) => { async (error) => {
@ -96,7 +98,7 @@ export class Authentication {
this.accessTokenAge = Date.now() this.accessTokenAge = Date.now()
const token = `${this.tokens.type} ${this.tokens.accessToken}` const token = `${this.tokens.type} ${this.tokens.accessToken}`
if (typeof this?.socket?.auth !== 'function' && this.socket != null) { if (typeof this?.socket?.auth !== 'function' && this.socket != null) {
this.socket.auth.token = token this.socket.auth['token'] = token
} }
} }

View File

@ -1,23 +1,20 @@
{ {
"extends": "@tsconfig/strictest/tsconfig.json",
"compilerOptions": { "compilerOptions": {
"target": "ESNext", "target": "ESNext",
"module": "ESNext", "module": "ESNext",
"moduleResolution": "node", "moduleResolution": "node",
"allowJs": true, "allowJs": true,
"checkJs": true,
"jsx": "preserve", "jsx": "preserve",
"sourceMap": true, "sourceMap": true,
"removeComments": true, "removeComments": true,
"noEmit": true, "noEmit": true,
"strict": true,
"types": ["cypress"], "types": ["cypress"],
"esModuleInterop": true, "lib": ["dom", "dom.iterable", "ESNext"],
"forceConsistentCasingInFileNames": true,
"lib": ["dom", "dom.iterable", "esnext"],
"skipLibCheck": true,
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"incremental": true "incremental": true,
"exactOptionalPropertyTypes": false
}, },
"exclude": ["dist", ".next", "out", "next.config.js"], "exclude": ["dist", ".next", "out", "next.config.js"],
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"] "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]

View File

@ -1,4 +1,5 @@
{ {
"$schema": "https://openapi.vercel.sh/vercel.json",
"github": { "github": {
"enabled": false "enabled": false
} }