+
+
{t('welcome')}, {coercedName}
-
- Rick Morty
-
-
- hypnos
-
+ { services?.map((service: any) => (
+
+ {service.name}
+
+ ))}
-
-
-
+
+
+
navigate(document.location.href.replace(/(map|calendar)/, 'list'))} />
navigate(document.location.href.replace(/(list|calendar)/, 'map'))} />
diff --git a/src/app/[locale]/components/client/elements/signup-view.tsx b/src/app/[locale]/components/client/elements/signup-view.tsx
index 5fdcf956..4f0d9682 100644
--- a/src/app/[locale]/components/client/elements/signup-view.tsx
+++ b/src/app/[locale]/components/client/elements/signup-view.tsx
@@ -32,14 +32,13 @@ async function doSignIn() {
}
-export const VSignUp = ({ providers, user }: VSignUpProps) => {
+export const VSignUp = ({ providers }: VSignUpProps) => {
const [csrf, setCsrf] = useState("");
const authContext = useContext(AuthContext);
const [isUserLoaded, loadUser] = ALogIn({});
const [, unloadUser] = ALogOut({});
const initd = useRef(false);
const prov = providers
- const { authd, name } = authContext;
const [email, setEmail] = useState("");
const _providers = Object.values(providers)
@@ -50,11 +49,11 @@ export const VSignUp = ({ providers, user }: VSignUpProps) => {
const t = useTranslations('SignIn');
- const callbackUrl = process.env.NEXT_PUBLIC_NEXUS_BASE_PATH || "/"
+ const callbackUrl = process.env.NEXT_PUBLIC_NEXUS_BASE_PATH || "/";
+ const { authd, user } = authContext;
- /* server/client isomorphism */
- const coercedName = name || user?.name || user?.email || "Young Padawan";
+ const coercedName = user?.name || user?.email || "Young Padawan";
useEffect(() => {
if(!csrf) {
diff --git a/src/app/[locale]/components/server/blocks/topnav.tsx b/src/app/[locale]/components/server/blocks/topnav.tsx
index 32a391c8..9c5987ff 100644
--- a/src/app/[locale]/components/server/blocks/topnav.tsx
+++ b/src/app/[locale]/components/server/blocks/topnav.tsx
@@ -1,12 +1,12 @@
// topnav.tsx
'use server';
import type { UserSchema } from '@types';
-import { getSession } from '@auth';
import { VTopNav } from '@blocks/client';
-import { cookies } from 'next/headers';
+
interface ITopNavProps {
- user?: UserSchema | undefined;
+ user?: any;
+ services?: any;
}
interface ISignInData {
@@ -21,12 +21,8 @@ interface IAuthProviders {
name?: string;
}
-export const CTopNav = async ({ user }: ITopNavProps) => {
- const cookieStore = cookies().getAll();
- const cookieStr = cookieStore.toString();
-
- const session = await getSession({ cookies: cookieStr });
+export const CTopNav = async ({ user, services }: ITopNavProps) => {
return
-
+
;
};
diff --git a/src/app/[locale]/components/server/signup-controller.tsx b/src/app/[locale]/components/server/signup-controller.tsx
index 013411ca..91f50eac 100644
--- a/src/app/[locale]/components/server/signup-controller.tsx
+++ b/src/app/[locale]/components/server/signup-controller.tsx
@@ -7,7 +7,7 @@ import { VSignUp } from '@components/client';
interface ISignInProps {
- user?: UserSchema;
+ user?: any;
}
interface ISignInData {
@@ -24,5 +24,5 @@ interface IAuthProviders {
export const CSignUp = async ({ user }: ISignInProps) => {
const csrf = await getCsrf();
- return
+ return
}
diff --git a/src/app/[locale]/dash/services/hypnos/[mode]/page.tsx b/src/app/[locale]/dash/services/dpcp-vibemodulator/[mode]/page.tsx
similarity index 100%
rename from src/app/[locale]/dash/services/hypnos/[mode]/page.tsx
rename to src/app/[locale]/dash/services/dpcp-vibemodulator/[mode]/page.tsx
diff --git a/src/app/[locale]/dash/signin/page.tsx b/src/app/[locale]/dash/signin/page.tsx
index c7614858..a3fe4b0c 100644
--- a/src/app/[locale]/dash/signin/page.tsx
+++ b/src/app/[locale]/dash/signin/page.tsx
@@ -6,6 +6,7 @@ import styles from '@styles/page.module.css';
export default async function SignUp() {
const csrf = await getCsrf();
+
return (
diff --git a/src/app/[locale]/gateway/client/actions.ts b/src/app/[locale]/gateway/client/actions.ts
index daa3a940..3b0067a8 100644
--- a/src/app/[locale]/gateway/client/actions.ts
+++ b/src/app/[locale]/gateway/client/actions.ts
@@ -7,7 +7,7 @@ export async function navigate(url: string) {
redirect(url);
}
-export async function setCookie({ name, value, secure }: { name: string; value: string, secure: boolean }) {
+export async function setCookie({ name, value, secure }: { name: string; value: string; secure: boolean }) {
const cookiesStore = cookies();
cookiesStore.set(name, value, { secure });
}
diff --git a/src/app/[locale]/gateway/index.ts b/src/app/[locale]/gateway/index.ts
index bef6d9b8..57b81cc0 100644
--- a/src/app/[locale]/gateway/index.ts
+++ b/src/app/[locale]/gateway/index.ts
@@ -10,4 +10,4 @@ export { getUser, loadChars, reloadChars, getChars, getUserLocale, setUserLocale
export { loadHypnosPublicListings } from './server/hypnos/public';
// hypnos-private
-export { addToFavorites } from './server/hypnos/private';
+export { getUserServices, getUserAbilities, addToFavorites } from './server/hypnos/private';
diff --git a/src/app/[locale]/gateway/server/hypnos/private/actions.ts b/src/app/[locale]/gateway/server/hypnos/private/actions.ts
index 0800eec7..2d97d11f 100644
--- a/src/app/[locale]/gateway/server/hypnos/private/actions.ts
+++ b/src/app/[locale]/gateway/server/hypnos/private/actions.ts
@@ -2,13 +2,26 @@
// hypnos/private/actions.ts
'use server';
// import type { UserSchema } from '@types';
-import { updateUserFavoriteListings } from '@controller';
+import { updateUserFavoriteListings, getUserHypnosServices, getUserHypnosAbilities } from '@controller';
+
export async function addToFavorites({ listings, type = 'id' }: any) {
await updateUserFavoriteListings({ listings, paramsStr: type === 'string' ? '?type=string' : '' });
return { ok: true };
}
+export async function getUserServices() {
+ const services = await getUserHypnosServices({});
+
+ return { ok: true, data: { services } };
+}
+
+export async function getUserAbilities() {
+ const abilities = await getUserHypnosAbilities({});
+
+ return { ok: true, data: { abilities } };
+}
+
export async function getUser() {
// const session = await getServerSession(finalAuth);
// const email = session?.user?.email || '';
diff --git a/src/app/[locale]/gateway/server/hypnos/public/actions.ts b/src/app/[locale]/gateway/server/hypnos/public/actions.ts
index 96b391a2..780142af 100644
--- a/src/app/[locale]/gateway/server/hypnos/public/actions.ts
+++ b/src/app/[locale]/gateway/server/hypnos/public/actions.ts
@@ -6,12 +6,14 @@ import { cookies } from 'next/headers';
import { getHypnosPublicListings } from '@controller';
import { decorateHypnosPublicListings } from '@model';
import { getSession } from '@auth';
+import { getLocale } from 'next-intl/server';
export async function loadHypnosPublicListings() {
const session = await getSession({ cookies: cookies().toString() });
const user = session?.user;
const chars = await getHypnosPublicListings({});
- const decd = await decorateHypnosPublicListings(chars, user);
+ const locale = await getLocale();
+ const decd = await decorateHypnosPublicListings(chars, user, locale);
return decd;
}
diff --git a/src/app/[locale]/globals.css b/src/app/[locale]/globals.css
index a41082c0..42a6e5ca 100644
--- a/src/app/[locale]/globals.css
+++ b/src/app/[locale]/globals.css
@@ -1,7 +1,7 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
-@import '@dreampipcom/oneiros/dist/style.css';
+@import '../../../node_modules/@dreampipcom/oneiros/dist/esm/style.css';
* {
box-sizing: border-box;
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index 9d313e5c..d6e786bf 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -1,8 +1,12 @@
import type { Metadata } from 'next';
-import { DPTopNav } from '@blocks/server';
-import { RootProviders } from '@state';
+import { cookies } from 'next/headers';
import { NextIntlClientProvider } from 'next-intl';
import { getLocale, getMessages, getTranslations } from 'next-intl/server';
+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';
export async function generateMetadata(): Promise {
@@ -22,12 +26,51 @@ export default async function RootLayout({ children, params }: { children: React
const messages = await getMessages();
const libLocale = await getLocale();
+ const coercedLocale = libLocale || locale;
+
+ const cookieStore = cookies().getAll();
+ const cookiesStr = cookieStore.reduce((str, cookie) => {
+ const next = `${str} ${cookie.name}=${cookie.value};`;
+ return next;
+ }, ``);
+
+ const session = await getSession({ cookies: cookiesStr });
+
+ const user = session?.user;
+ const _services = (await getUserServices())?.data?.services || [];
+ const _abilities = (await getUserAbilities())?.data?.abilities || [];
+
+ // to-do: IMPROVE THIS
+ // https://www.notion.so/angeloreale/Nyx-Improve-locale-parsing-for-services-d02ab83262be4c19987119c30a530480?pvs=4
+ const parseData = (dataset: any) =>
+ dataset
+ .filter((entry: any) => {
+ return !!entry.slug && !entry.slug.includes('mock');
+ })
+ .map((entry: any) => {
+ const localeSplit = coercedLocale?.split('-');
+ if (localeSplit?.length > 0) {
+ return {
+ ...entry,
+ name: entry.name[localeSplit[0]] || entry.name[localeSplit[1]],
+ };
+ } else {
+ return {
+ ...entry,
+ name: entry.name['en'],
+ };
+ }
+ });
+
+ const services = parseData(_services);
+ const abilities = parseData(_abilities);
+
return (
-
+
-
+
-
+
{children}
From 0ddd12efef20ec4b3684f078d586cebee692b175 Mon Sep 17 00:00:00 2001
From: Angelo Reale <12191809+angeloreale@users.noreply.github.com>
Date: Mon, 26 Aug 2024 03:31:47 +0100
Subject: [PATCH 21/21] fix: upgrade next from 14.2.4 to 14.2.5 (#22)
Snyk has created this PR to upgrade next from 14.2.4 to 14.2.5.
See this package in npm:
next
See this project in Snyk:
https://app.snyk.io/org/angeloreale/project/949258c7-0efa-432b-9a30-8caa85c93a4e?utm_source=github&utm_medium=referral&page=upgrade-pr
Co-authored-by: snyk-bot
---
package-lock.json | 88 +++++++++++++++++++++++------------------------
package.json | 2 +-
2 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 9d154f67..8bbdf9bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
"dependencies": {
"@dreampipcom/oneiros": "0.0.25",
"@sentry/nextjs": "7.118.0",
- "next": "14.2.4",
+ "next": "^14.2.5",
"react": "18",
"react-dom": "18"
},
@@ -1250,9 +1250,9 @@
}
},
"node_modules/@next/env": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.4.tgz",
- "integrity": "sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.5.tgz",
+ "integrity": "sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==",
"license": "MIT"
},
"node_modules/@next/eslint-plugin-next": {
@@ -1308,9 +1308,9 @@
}
},
"node_modules/@next/swc-darwin-arm64": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz",
- "integrity": "sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz",
+ "integrity": "sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==",
"cpu": [
"arm64"
],
@@ -1324,9 +1324,9 @@
}
},
"node_modules/@next/swc-darwin-x64": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz",
- "integrity": "sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz",
+ "integrity": "sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==",
"cpu": [
"x64"
],
@@ -1340,9 +1340,9 @@
}
},
"node_modules/@next/swc-linux-arm64-gnu": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz",
- "integrity": "sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz",
+ "integrity": "sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==",
"cpu": [
"arm64"
],
@@ -1356,9 +1356,9 @@
}
},
"node_modules/@next/swc-linux-arm64-musl": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz",
- "integrity": "sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz",
+ "integrity": "sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==",
"cpu": [
"arm64"
],
@@ -1372,9 +1372,9 @@
}
},
"node_modules/@next/swc-linux-x64-gnu": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz",
- "integrity": "sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.5.tgz",
+ "integrity": "sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==",
"cpu": [
"x64"
],
@@ -1388,9 +1388,9 @@
}
},
"node_modules/@next/swc-linux-x64-musl": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz",
- "integrity": "sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.5.tgz",
+ "integrity": "sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==",
"cpu": [
"x64"
],
@@ -1404,9 +1404,9 @@
}
},
"node_modules/@next/swc-win32-arm64-msvc": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz",
- "integrity": "sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz",
+ "integrity": "sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==",
"cpu": [
"arm64"
],
@@ -1420,9 +1420,9 @@
}
},
"node_modules/@next/swc-win32-ia32-msvc": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz",
- "integrity": "sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz",
+ "integrity": "sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==",
"cpu": [
"ia32"
],
@@ -1436,9 +1436,9 @@
}
},
"node_modules/@next/swc-win32-x64-msvc": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.4.tgz",
- "integrity": "sha512-tkLrjBzqFTP8DVrAAQmZelEahfR9OxWpFR++vAI9FBhCiIxtwHwBHC23SBHCTURBtwB4kc/x44imVOnkKGNVGg==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz",
+ "integrity": "sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==",
"cpu": [
"x64"
],
@@ -5543,12 +5543,12 @@
}
},
"node_modules/next": {
- "version": "14.2.4",
- "resolved": "https://registry.npmjs.org/next/-/next-14.2.4.tgz",
- "integrity": "sha512-R8/V7vugY+822rsQGQCjoLhMuC9oFj9SOi4Cl4b2wjDrseD0LRZ10W7R6Czo4w9ZznVSshKjuIomsRjvm9EKJQ==",
+ "version": "14.2.5",
+ "resolved": "https://registry.npmjs.org/next/-/next-14.2.5.tgz",
+ "integrity": "sha512-0f8aRfBVL+mpzfBjYfQuLWh2WyAwtJXCRfkPF4UJ5qd2YwrHczsrSzXU4tRMV0OAxR8ZJZWPFn6uhSC56UTsLA==",
"license": "MIT",
"dependencies": {
- "@next/env": "14.2.4",
+ "@next/env": "14.2.5",
"@swc/helpers": "0.5.5",
"busboy": "1.6.0",
"caniuse-lite": "^1.0.30001579",
@@ -5563,15 +5563,15 @@
"node": ">=18.17.0"
},
"optionalDependencies": {
- "@next/swc-darwin-arm64": "14.2.4",
- "@next/swc-darwin-x64": "14.2.4",
- "@next/swc-linux-arm64-gnu": "14.2.4",
- "@next/swc-linux-arm64-musl": "14.2.4",
- "@next/swc-linux-x64-gnu": "14.2.4",
- "@next/swc-linux-x64-musl": "14.2.4",
- "@next/swc-win32-arm64-msvc": "14.2.4",
- "@next/swc-win32-ia32-msvc": "14.2.4",
- "@next/swc-win32-x64-msvc": "14.2.4"
+ "@next/swc-darwin-arm64": "14.2.5",
+ "@next/swc-darwin-x64": "14.2.5",
+ "@next/swc-linux-arm64-gnu": "14.2.5",
+ "@next/swc-linux-arm64-musl": "14.2.5",
+ "@next/swc-linux-x64-gnu": "14.2.5",
+ "@next/swc-linux-x64-musl": "14.2.5",
+ "@next/swc-win32-arm64-msvc": "14.2.5",
+ "@next/swc-win32-ia32-msvc": "14.2.5",
+ "@next/swc-win32-x64-msvc": "14.2.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.1.0",
diff --git a/package.json b/package.json
index df102bec..32d30584 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"dependencies": {
"@dreampipcom/oneiros": "0.0.25",
"@sentry/nextjs": "7.118.0",
- "next": "14.2.4",
+ "next": "14.2.5",
"react": "18",
"react-dom": "18"
},