diff --git a/package-lock.json b/package-lock.json index ed1d7c39..0e33a749 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "HPL3-ECO-AND-ANC", "dependencies": { - "@dreampipcom/oneiros": "0.0.29", + "@dreampipcom/oneiros": "0.0.41", "@sentry/nextjs": "7.118.0", "next": "14.2.15", "react": "18", @@ -377,9 +377,9 @@ } }, "node_modules/@dreampipcom/oneiros": { - "version": "0.0.29", - "resolved": "https://npm.pkg.github.com/download/@dreampipcom/oneiros/0.0.29/1602df14b814f41c6924eb933c08585cc70f01fc", - "integrity": "sha512-hgl+awGxQUpaQ/cG8mCeeUbjNxSh2MqogclYKPk8Na2KT8jCbQpJNBTXEGoO/V0Oyenr8ckwNdPNwdLIXJeZdw==", + "version": "0.0.41", + "resolved": "https://npm.pkg.github.com/download/@dreampipcom/oneiros/0.0.41/6ef50fdfba8b0fdb428248ba47311217f3714f20", + "integrity": "sha512-DfqCAk5Ryh8tbRrQPwNC9cctogyGuU/nGdVKQM1U8Ci8lDoKIpOpMpCHhJPgPQtxILdfwPGp0ZrO/44+H7WUFA==", "license": "HPL3-ECO-AND-ANC", "optionalDependencies": { "@rollup/rollup-linux-x64-gnu": "4.9.5" diff --git a/package.json b/package.json index e9e639d9..9a65bf1e 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "prepare": "husky" }, "dependencies": { - "@dreampipcom/oneiros": "0.0.29", + "@dreampipcom/oneiros": "0.0.41", "@sentry/nextjs": "7.118.0", "next": "14.2.15", "react": "18", diff --git a/src/app/[locale]/components/client/blocks/topnav-view.tsx b/src/app/[locale]/components/client/blocks/topnav-view.tsx index a3f110d6..42916040 100644 --- a/src/app/[locale]/components/client/blocks/topnav-view.tsx +++ b/src/app/[locale]/components/client/blocks/topnav-view.tsx @@ -6,10 +6,11 @@ import { useContext, useRef, useEffect, useState, useMemo } from 'react'; import { AuthContext, GlobalContext } from '@state'; import { ASwitchThemes, ALogIn } from '@actions'; import { navigate } from '@gateway'; -import { AudioPlayer, Button as DPButton, EGridVariant, Grid as DPGrid, EBleedVariant, Typography as DPTypo, TypographyVariant, ESystemIcon } from "@dreampipcom/oneiros"; +import { Nav, Grid, EGridVariant, EBleedVariant } from "@dreampipcom/oneiros"; import { VSignIn, InternalLink } from '@elements/client'; import { useTranslations, useLocale } from 'next-intl'; +import "@dreampipcom/oneiros/styles" interface IAuthProvider { id?: string; @@ -71,28 +72,13 @@ export const VTopNav = ({ user, services }: VTopNavProps) => { }); } - return ( - -
- - {t('welcome')}, {coercedName} - - { services?.map((service: any) => ( - - {service.name} - - ))} + return (
+ {/* temp hack please fix sticky */} +{/*
+
*/} +
+
- - -
- - navigate(document.location.href.replace(/(map|calendar)/, 'list'))} /> - navigate(document.location.href.replace(/(list|calendar)/, 'map'))} /> - navigate(document.location.href.replace(/(list|map)/, 'calendar'))} /> - -
-
- - ); +
); }; diff --git a/src/app/[locale]/components/client/elements/signup-view.tsx b/src/app/[locale]/components/client/elements/signup-view.tsx index 4f0d9682..18d65244 100644 --- a/src/app/[locale]/components/client/elements/signup-view.tsx +++ b/src/app/[locale]/components/client/elements/signup-view.tsx @@ -7,7 +7,7 @@ import { signIn, signOut, getCsrf, getSession } from "@auth"; import { AuthContext } from '@state'; import { ALogIn, ALogOut } from '@actions'; import { navigate, setCookie, getCookie } from '@gateway'; -import { Button, TextInput, Logo, Typography } from "@dreampipcom/oneiros"; +import { Grid, EGridVariant, EBleedVariant, Button, TextInput, Logo, Typography } from "@dreampipcom/oneiros"; interface IAuthProvider { id?: string; @@ -96,55 +96,60 @@ export const VSignUp = ({ providers }: VSignUpProps) => { if (user || authd) { return
- {t('welcome')}, {coercedName}. {t('i hope you make yourself at home')}. + {t('welcome')}, {coercedName}. {t('i hope you make yourself at home')}.
} if (!Object.keys(prov).length) return - return
-
-
- + return
+ +
+
+
+
+ + +
+ setEmail(e)} + label={t("your email")} + className="pb-a1" + placeholder="jack@doe.com" + /> +
+ +
+
+ {providers.map((provider) => ( +
+ {(provider.type === "oauth" || provider.type === "oidc") && ( +
+ + {callbackUrl && ( + + )} + +
+ )} +
+ ))}
-
- - - setEmail(e)} - label={t("your email")} - className="pb-a1" - placeholder="jack@doe.com" - /> - - -
- {providers.map((provider) => ( -
- {(provider.type === "oauth" || provider.type === "oidc") && ( -
- - {callbackUrl && ( - - )} - -
- )}
- ))} +
} diff --git a/src/app/[locale]/dash/signin/page.tsx b/src/app/[locale]/dash/signin/page.tsx index a3fe4b0c..4a830af6 100644 --- a/src/app/[locale]/dash/signin/page.tsx +++ b/src/app/[locale]/dash/signin/page.tsx @@ -2,13 +2,12 @@ 'use server'; import { providers, getCsrf } from '@auth'; import { VSignUp } from '@components/client'; -import styles from '@styles/page.module.css'; export default async function SignUp() { const csrf = await getCsrf(); return ( -
+
diff --git a/src/app/[locale]/globals.css b/src/app/[locale]/globals.css index 42a6e5ca..982ce774 100644 --- a/src/app/[locale]/globals.css +++ b/src/app/[locale]/globals.css @@ -1,31 +1,7 @@ @tailwind base; -@tailwind components; -@tailwind utilities; +/* nyx is a hydration enginge. we don't style here. +that's why just the base. +but oneiros is a public component library, and tailwind, +being peer dependant, allow for better branding flexibility. +that's why we need tailwind in this repo. */ @import '../../../node_modules/@dreampipcom/oneiros/dist/esm/style.css'; - -* { - box-sizing: border-box; - padding: 0; - margin: 0; -} - -html, -body { - max-width: 100vw; - overflow-x: hidden; -} - -body { - background: var(--background-color) !important; -} - -a { - color: inherit; - text-decoration: none; -} - -@media (prefers-color-scheme: dark) { - html { - color-scheme: dark; - } -} diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx index 51643379..4172c727 100644 --- a/src/app/[locale]/layout.tsx +++ b/src/app/[locale]/layout.tsx @@ -6,8 +6,8 @@ import { getSession } from '@auth'; import { DPTopNav } from '@blocks/server'; import { RootProviders } from '@state'; import { getUserServices, getUserAbilities } from '@gateway'; -// import "@dreampipcom/oneiros/styles" import './globals.css'; +import '@dreampipcom/oneiros/styles'; export async function generateMetadata(): Promise { // fetch data diff --git a/tailwind.config.js b/tailwind.config.js index 86ce10ad..fe0f57ef 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,7 +1,7 @@ /** @type {import('tailwindcss').Config} */ module.exports = { content: ['./src/**/*.{js,ts,jsx,tsx}', 'node_modules/@dreampipcom/oneiros/dist/*.{js,ts,jsx,tsx,mdx}'], - safelist: ['bg-inverse-light', 'bg-inverse-dark', 'min-h-screen'], + safelist: ['block', 'hidden', 'bg-inverse-light', 'bg-inverse-dark', 'min-h-screen'], darkMode: ['variant', '.dark &:not(.dark .light *, .light .light *)', ''], presets: [require('@dreampipcom/oneiros/dist/tailwind.config.js')], theme: {