9 Commits

Author SHA1 Message Date
7f1986e765 fix: docker compose for prod
All checks were successful
Build Docker Image Front / run (pull_request) Successful in 27s
Build Docker Image Back / run (pull_request) Successful in 23s
JsDocs / coverage (pull_request) Successful in 25s
Test and coverage / coverage (pull_request) Successful in 1m37s
2024-05-21 16:14:09 +02:00
07ee4b9e57 fix tailwind merge error
All checks were successful
Build Docker Image Front / run (pull_request) Successful in 1m56s
Build Docker Image Back / run (pull_request) Successful in 24s
JsDocs / coverage (pull_request) Successful in 25s
Test and coverage / coverage (pull_request) Successful in 1m31s
2024-05-21 16:01:00 +02:00
20ebad74fb add div class to input
All checks were successful
Build Docker Image Front / run (pull_request) Successful in 1m33s
Build Docker Image Back / run (pull_request) Successful in 24s
JsDocs / coverage (pull_request) Successful in 24s
Test and coverage / coverage (pull_request) Successful in 1m44s
2024-05-21 12:24:45 +02:00
aec568d0c7 change class to div class
All checks were successful
Build Docker Image Front / run (pull_request) Successful in 1m31s
Build Docker Image Back / run (pull_request) Successful in 22s
JsDocs / coverage (pull_request) Successful in 22s
Test and coverage / coverage (pull_request) Successful in 1m40s
2024-05-21 12:24:23 +02:00
0849ffe42c fix: type issue
All checks were successful
Build Docker Image Front / run (pull_request) Successful in 1m30s
Build Docker Image Back / run (pull_request) Successful in 23s
JsDocs / coverage (pull_request) Successful in 22s
Test and coverage / coverage (pull_request) Successful in 1m31s
2024-05-21 12:13:39 +02:00
e13cb9bbb9 add imput composant
All checks were successful
Build Docker Image Front / run (pull_request) Successful in 1m34s
Build Docker Image Back / run (pull_request) Successful in 24s
JsDocs / coverage (pull_request) Successful in 23s
Test and coverage / coverage (pull_request) Successful in 1m41s
2024-05-21 11:42:42 +02:00
c348e2b2ac fix: tailwing config 2024-05-21 11:42:14 +02:00
c93141e68f fix: prod issue
All checks were successful
Build Docker Image Front / run (pull_request) Successful in 1m58s
Build Docker Image Back / run (pull_request) Successful in 23s
JsDocs / coverage (pull_request) Successful in 23s
Test and coverage / coverage (pull_request) Successful in 1m41s
2024-05-21 11:34:19 +02:00
2ecc5c86ca fix: remove ex register form 2024-05-21 11:07:36 +02:00
7 changed files with 61 additions and 50 deletions

View File

@ -18,7 +18,9 @@ services:
- public - public
front: front:
image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-1-head image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-16-head
environment:
- POCKETBASE_URL=https://${POCKET_BASE_URL}
depends_on: depends_on:
- pocketbase - pocketbase
labels: labels:
@ -30,7 +32,7 @@ services:
- public - public
back_drink: back_drink:
image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head image: git.lab-ouest.org/epitech/ratrapage_t-web_back:master
environment: environment:
- port=${BACK_BASE_PORT} - port=${BACK_BASE_PORT}
labels: labels:

View File

@ -34,7 +34,8 @@
"astro-icon": "^1.1.0", "astro-icon": "^1.1.0",
"limax": "4.1.0", "limax": "4.1.0",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"unpic": "^3.18.0" "unpic": "^3.18.0",
"tailwind-merge": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
"@astrojs/check": "^0", "@astrojs/check": "^0",
@ -68,7 +69,6 @@
"reading-time": "^1.5.0", "reading-time": "^1.5.0",
"rehype-plugin-image-native-lazy-loading": "^1.2.0", "rehype-plugin-image-native-lazy-loading": "^1.2.0",
"sharp": "0.33.3", "sharp": "0.33.3",
"tailwind-merge": "^2.3.0",
"tailwindcss": "^3.4.3", "tailwindcss": "^3.4.3",
"typescript-eslint": "^7.9.0" "typescript-eslint": "^7.9.0"
} }

View File

@ -0,0 +1,28 @@
---
import type { Input as Props } from 'types';
const { type, name, label, autocomplete, placeholder, divClass, inputClass} = Astro.props;
---
<>
{
name && (
<div class={divClass}>
{label && (
<label for={name} class="block text-sm font-medium">
{label}
</label>
)}
<input
type={type}
name={name}
id={name}
autocomplete={autocomplete}
placeholder={placeholder}
class={"py-3 px-4 block w-full text-md rounded-lg border border-gray-200 dark:border-gray-700 bg-white dark:bg-slate-900" + inputClass}
/>
</div>
)
}
</>

View File

@ -80,18 +80,4 @@ const metadata = {
]} ]}
/> />
<Oauth/> <Oauth/>
<form id="account-creation" method="post" enctype="multipart/form-data">
<input type="hidden" name="type" value="userPassword">
<input required name="name" placeholder="Prénom Nom"/>
<input required name="username" placeholder="Pseudo"/>
<input required name="email" type="email" placeholder="Renseignez votre email" />
<input required name="password" type="password" placeholder="Créez un mot de passe" />
<input required name="passwordConfirm" type="password" placeholder="Confirmer votre mot de passe" />
<button>Créer un compte</button>
</form>
<button id="OauthDiscord">connexion avec discord</button>
<form method="post" enctype="multipart/form-data">
<input type="hidden" name="type" value="discord2FA">
</form>
</Layout> </Layout>

View File

@ -1,5 +1,5 @@
import type { AstroComponentFactory } from 'astro/runtime/server/index.js' import type { AstroComponentFactory } from 'astro/runtime/server/index.js'
import type { HTMLAttributes, ImageMetadata } from 'astro/types' import type { HTMLAttributes, ImageMetadata, HTMLInputTypeAttribute } from 'astro/types'
export interface Post { export interface Post {
/** A unique ID number that identifies a post. */ /** A unique ID number that identifies a post. */
@ -26,7 +26,7 @@ export interface Post {
/** */ /** */
category?: Taxonomy category?: Taxonomy
/** */ /** */
tags?: Taxonomy[] tags?: Array<Taxonomy>
/** */ /** */
author?: string author?: string
@ -167,6 +167,8 @@ export interface Input {
label?: string label?: string
autocomplete?: string autocomplete?: string
placeholder?: string placeholder?: string
divClass?: string
inputClass?: string
} }
export interface Textarea { export interface Textarea {

View File

@ -1,5 +1,5 @@
import defaultTheme from 'tailwindcss/defaultTheme'; import defaultTheme from 'tailwindcss/defaultTheme'
import typographyPlugin from '@tailwindcss/typography'; import typographyPlugin from '@tailwindcss/typography'
module.exports = { module.exports = {
content: ['./src/**/*.{astro,html,js,jsx,json,md,mdx,svelte,ts,tsx,vue}'], content: ['./src/**/*.{astro,html,js,jsx,json,md,mdx,svelte,ts,tsx,vue}'],
@ -21,4 +21,5 @@ module.exports = {
}, },
plugins: [typographyPlugin], plugins: [typographyPlugin],
darkMode: 'class', darkMode: 'class',
}; }

View File

@ -1,8 +0,0 @@
/** @type {import('tailwindcss').Config} */
export default {
content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
theme: {
extend: {},
},
plugins: [],
}