fix: env var and conf file

docker-compose.yml

@@ -18,7 +18,9 @@ services:
       - public
 
   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:
       - pocketbase
     labels:
@@ -30,7 +32,7 @@ services:
       - public
 
   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:
       - port=${BACK_BASE_PORT}
     labels:

front/astro.config.mjs

@@ -26,7 +26,8 @@ const whenExternalScripts = (items = []) =>
   hasExternalScripts ? (Array.isArray(items) ? items.map((item) => item()) : [items()]) : [];
 
 export default defineConfig({
-
+  
+  output: 'server',
   compressHTML: true,
 	build: {
 		assets: 'assets',
@@ -37,7 +38,6 @@ export default defineConfig({
 		port: 3000
 	},
 	trailingSlash: 'never',
-	output: 'server',
 	adapter: node({
 		mode: 'standalone'
 	}),

front/package.json

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

front/src/components/Input.astro

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

front/src/config.yaml

@@ -1,6 +1,6 @@
 site:
-  name: AstroWind
+  name: EpicRoadTrip
-  site: 'https://astrowind.vercel.app'
+  site: 'https://front-tweb.cb85.fr'
   base: '/'
   trailingSlash: false
 

front/src/env.d.ts

@@ -6,10 +6,10 @@
 
 import PocketBase from 'pocketbase'
 export interface ImportMetaEnv {
-    NODE_ENV: string
+  NODE_ENV: string
-    APP_URL: string
+  APP_URL: string
 
-    POCKETBASE_URL: string
+  POCKETBASE_URL: string
 
 	GOOGLE_API_KEY: string
 }

front/src/pages/account/register.astro

@@ -80,18 +80,4 @@ const metadata = {
     ]}
   />
   <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>

front/src/types.d.ts

@@ -1,5 +1,5 @@
 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 {
   /** A unique ID number that identifies a post. */
@@ -26,7 +26,7 @@ export interface Post {
   /**  */
   category?: Taxonomy
   /**  */
-  tags?: Taxonomy[]
+  tags?: Array<Taxonomy>
   /**  */
   author?: string
 
@@ -167,6 +167,8 @@ export interface Input {
   label?: string
   autocomplete?: string
   placeholder?: string
+  divClass?: string
+  inputClass?: string
 }
 
 export interface Textarea {

front/tailwind.config.cjs

@@ -1,24 +1,25 @@
-import defaultTheme from 'tailwindcss/defaultTheme';
+import defaultTheme from 'tailwindcss/defaultTheme'
-import typographyPlugin from '@tailwindcss/typography';
+import typographyPlugin from '@tailwindcss/typography'
 
 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}'],
-  theme: {
+	theme: {
-    extend: {
+		extend: {
-      colors: {
+			colors: {
-        primary: 'var(--aw-color-primary)',
+				primary: 'var(--aw-color-primary)',
-        secondary: 'var(--aw-color-secondary)',
+				secondary: 'var(--aw-color-secondary)',
-        accent: 'var(--aw-color-accent)',
+				accent: 'var(--aw-color-accent)',
-        default: 'var(--aw-color-text-default)',
+				default: 'var(--aw-color-text-default)',
-        muted: 'var(--aw-color-text-muted)',
+				muted: 'var(--aw-color-text-muted)',
-      },
+			},
-      fontFamily: {
+			fontFamily: {
-        sans: ['var(--aw-font-sans, ui-sans-serif)', ...defaultTheme.fontFamily.sans],
+				sans: ['var(--aw-font-sans, ui-sans-serif)', ...defaultTheme.fontFamily.sans],
-        serif: ['var(--aw-font-serif, ui-serif)', ...defaultTheme.fontFamily.serif],
+				serif: ['var(--aw-font-serif, ui-serif)', ...defaultTheme.fontFamily.serif],
-        heading: ['var(--aw-font-heading, ui-sans-serif)', ...defaultTheme.fontFamily.sans],
+				heading: ['var(--aw-font-heading, ui-sans-serif)', ...defaultTheme.fontFamily.sans],
-      },
+			},
-    },
+		},
-  },
+	},
-  plugins: [typographyPlugin],
+	plugins: [typographyPlugin],
-  darkMode: 'class',
+	darkMode: 'class',
-};
+}
+

front/tailwind.config.mjs

@@ -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: [],
-}