diye gösterilebilir
diff --git a/ServicesApi/src/auth/select/select.service.ts b/ServicesApi/src/auth/select/select.service.ts
index f0c31ab..6187ab2 100644
--- a/ServicesApi/src/auth/select/select.service.ts
+++ b/ServicesApi/src/auth/select/select.service.ts
@@ -1,9 +1,124 @@
-import { Injectable } from '@nestjs/common';
+import {
+ Injectable,
+ BadRequestException,
+ UnauthorizedException,
+ NotAcceptableException,
+} from '@nestjs/common';
import { userSelectValidator } from '@/src/auth/select/dtoValidator';
+import { RedisHandlers } from '@/src/utils/auth/redis_handlers';
+import {
+ EmployeeTokenSchema,
+ OccupantTokenSchema,
+ TokenDictInterface,
+ UserType,
+} from '@/src/types/auth/token';
+import { PrismaService } from '@/src/prisma.service';
@Injectable()
export class SelectService {
- async run(dto: userSelectValidator) {
- return dto;
+ constructor(
+ private readonly redis: RedisHandlers,
+ private readonly prisma: PrismaService,
+ ) {}
+ async run(dto: userSelectValidator, req: Request) {
+ const accessObject = await this.redis.getLoginFromRedis(req);
+ if (!accessObject) {
+ throw new UnauthorizedException(
+ 'Authorization failed. Please login to continue',
+ );
+ }
+ const accessToken = accessObject.key.split(':')[1];
+ console.log('accessToken', accessToken);
+
+ const userType = accessObject.value.users.user_type;
+ if (userType === 'employee') {
+ const employee = await this.prisma.employees.findFirstOrThrow({
+ where: { uu_id: dto.selected_uu_id },
+ });
+ const staff = await this.prisma.staff.findFirstOrThrow({
+ where: { id: employee.staff_id },
+ });
+ const duties = await this.prisma.duties.findFirstOrThrow({
+ where: { id: staff.duties_id },
+ });
+ const department = await this.prisma.departments.findFirstOrThrow({
+ where: { id: duties.department_id },
+ });
+ const duty = await this.prisma.duty.findFirstOrThrow({
+ where: { id: duties.duties_id },
+ });
+ const company = await this.prisma.companies.findFirstOrThrow({
+ where: { id: duties.company_id },
+ });
+
+ const employeeToken = EmployeeTokenSchema.parse({
+ company: company,
+ department: department,
+ duty: duty,
+ employee: employee,
+ staff: staff,
+ menu: null,
+ pages: null,
+ config: null,
+ caches: null,
+ selection: null,
+ functionsRetriever: staff.function_retriever,
+ kind: UserType.employee,
+ });
+
+ const tokenSelect = await this.redis.setSelectToRedis(
+ accessToken,
+ employeeToken,
+ accessObject.value.users.uu_id,
+ dto.selected_uu_id,
+ );
+
+ return {
+ message: 'Select successful',
+ token: tokenSelect,
+ };
+ } else if (userType === 'occupant') {
+ const livingSpace = await this.prisma.build_living_space.findFirstOrThrow(
+ { where: { uu_id: dto.selected_uu_id } },
+ );
+ const occupantType = await this.prisma.occupant_types.findFirstOrThrow({
+ where: { id: livingSpace.occupant_type_id },
+ });
+ const part = await this.prisma.build_parts.findFirstOrThrow({
+ where: { id: livingSpace.build_parts_id },
+ });
+ const build = await this.prisma.build.findFirstOrThrow({
+ where: { id: part.build_id },
+ });
+ const company = await this.prisma.companies.findFirstOrThrow({
+ where: { uu_id: accessObject.value.users.related_company },
+ });
+ const occupantToken = OccupantTokenSchema.parse({
+ livingSpace: livingSpace,
+ occupant: occupantType,
+ build: build,
+ part: part,
+ company: company,
+ menu: null,
+ pages: null,
+ config: null,
+ caches: null,
+ selection: null,
+ functionsRetriever: occupantType.function_retriever,
+ kind: UserType.occupant,
+ });
+ const tokenSelect = await this.redis.setSelectToRedis(
+ accessToken,
+ occupantToken,
+ accessObject.value.users.uu_id,
+ dto.selected_uu_id,
+ );
+ return {
+ message: 'Select successful',
+ token: tokenSelect,
+ };
+ } else {
+ throw new NotAcceptableException('Invalid user type');
+ }
}
}
diff --git a/ServicesApi/src/middleware/access-control.guard.ts b/ServicesApi/src/middleware/access-control.guard.ts
index 0cce8ba..44ea175 100644
--- a/ServicesApi/src/middleware/access-control.guard.ts
+++ b/ServicesApi/src/middleware/access-control.guard.ts
@@ -14,14 +14,6 @@ export class AuthControlGuard implements CanActivate {
const req = context.switchToHttp().getRequest();
const accessToken = this.cacheService.mergeLoginKey(req);
console.log('AuthControlGuard', accessToken);
- // const hasAccess = accessObject.permissions?.some(
- // (p: any) => p.method === method && p.url === path,
- // );
-
- // if (!hasAccess) {
- // throw new ForbiddenException('Access denied to this route');
- // }
-
return true;
}
}
@@ -32,18 +24,11 @@ export class EndpointControlGuard implements CanActivate {
async canActivate(context: ExecutionContext): Promise
+
+ );
+}
diff --git a/ServicesFrontEnd/frontend/src/app/[locale]/(auth)/login/fromFigma.tsx b/ServicesFrontEnd/frontend/src/app/[locale]/(auth)/login/fromFigma.tsx
new file mode 100644
index 0000000..3182315
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/[locale]/(auth)/login/fromFigma.tsx
@@ -0,0 +1,77 @@
+"use client";
+
+export default function FromFigma() {
+ return (
+
+ {/* Recent logins accordion */}
+ {/*
+
+
*/}
+
+
+
+ setIsAccordionOpen(!isAccordionOpen)}
+ >
+
+
+ {isAccordionOpen && (
+
+
+
+
+
+
+
+
+
+ {t('recentLogins')}
+
+
+ )}
+ {t('clickPictureOrAdd')}
+
+
+
+
+
+ +
+
+
+ {t('addAccount')}
+
+
+ {/* Left side - Login form (now takes full width) */}
+
+
+
+
+
+
+
+
+
+ {t('copyright')}
+
+
+ );
+}
\ No newline at end of file
diff --git a/ServicesFrontEnd/frontend/src/app/[locale]/(auth)/login/page.tsx b/ServicesFrontEnd/frontend/src/app/[locale]/(auth)/login/page.tsx
new file mode 100644
index 0000000..a13a157
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/[locale]/(auth)/login/page.tsx
@@ -0,0 +1,21 @@
+'use server';
+import LocaleSwitcherServer from '@/components/LocaleSwitcherServer';
+import LoginPage from './LoginPage';
+import FromFigma from './fromFigma';
+
+type Props = {
+ params: Promise<{ locale: string }>;
+};
+
+export default async function PageLogin({ params }: Props) {
+ const { locale } = await params;
+ return (
+
+
+ {/* Footer */}
+
+
+ {/* Left: Recent logins */}
+
+
+
+
+ {/* Right: Login form */}
+ Recent logins
+Click your picture or add an account
+
+ {/* User card */}
+
+
+
+ {/* Add account card */}
+
+ 
+
+
+
+
+ Mika Lee
+
+
+
+ ＋
+
+ Add an account
+
+
+
+
+
+
+
+
+ );
+}
\ No newline at end of file
diff --git a/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/layout.tsx b/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/layout.tsx
index 53ddf8f..fedfbbc 100644
--- a/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/layout.tsx
+++ b/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/layout.tsx
@@ -1,5 +1,33 @@
import { ReactNode } from 'react';
+import { headers } from 'next/headers';
+import { removeLocaleFromPath } from '@/lib/helpers';
-export default function ProtectedLayout({ children }: { children: ReactNode }) {
+function removeSubStringFromPath(headersList: Headers) {
+ const host = headersList.get('host') || '';
+ const referer = headersList.get('referer') || '';
+ let currentRoute = '';
+ if (referer) {
+ const hostPart = `http://${host}`;
+ if (referer.startsWith(hostPart)) {
+ currentRoute = referer.substring(hostPart.length);
+ } else {
+ const secureHostPart = `https://${host}`;
+ if (referer.startsWith(secureHostPart)) {
+ currentRoute = referer.substring(secureHostPart.length);
+ }
+ }
+ }
+ return removeLocaleFromPath(currentRoute);
+}
+
+export default async function ProtectedLayout({
+ children,
+}: {
+ children: ReactNode,
+}) {
+ // Server component approach to get URL
+ const headersList = await headers();
+ const removedLocaleRoute = removeSubStringFromPath(headersList);
+ console.log('Removed locale route:', removedLocaleRoute);
return <>{children};
}
diff --git a/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/office/trial/page.tsx b/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/office/trial/page.tsx
new file mode 100644
index 0000000..a7c5adb
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/office/trial/page.tsx
@@ -0,0 +1,3 @@
+export default function TrialPage() {
+ return
+
+ TrialPage
;
+}
\ No newline at end of file
diff --git a/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/venue/trial/page.tsx b/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/venue/trial/page.tsx
new file mode 100644
index 0000000..937bba1
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/[locale]/(protected)/venue/trial/page.tsx
@@ -0,0 +1,279 @@
+'use client';
+
+import { z } from 'zod';
+import { usePathname } from "next/navigation";
+import { castTextToTypeGiven, removeLocaleFromPath } from "@/lib/helpers";
+import { useState } from 'react';
+import { buildCacheKey } from "@/lib/helpers";
+import { apiPostFetcher } from '@/lib/fetcher';
+
+const createFormSchema = z.object({
+ inputSelectName: z.string().min(1, "Name is required"),
+ inputSelectNumber: z.string().refine((val: string) => !isNaN(Number(val)), {
+ message: "Number must be a valid number",
+ }),
+});
+
+const selectFormSchema = z.object({
+ inputSelectName: z.string().min(1, "Name is required"),
+ inputSelectNumber: z.string().refine((val: string) => !isNaN(Number(val)), {
+ message: "Number must be a valid number",
+ }),
+});
+
+const searchFormSchema = z.object({
+ inputSearchName: z.string().min(1, "Name is required"),
+ inputSearchNumber: z.string().refine((val: string) => !isNaN(Number(val)), {
+ message: "Number must be a valid number",
+ }),
+});
+
+type SelectFormData = z.infer
+
;
+}
\ No newline at end of file
diff --git a/ServicesFrontEnd/frontend/src/app/[locale]/(public)/home/page.tsx b/ServicesFrontEnd/frontend/src/app/[locale]/(public)/home/page.tsx
index fc5fd4a..89776be 100644
--- a/ServicesFrontEnd/frontend/src/app/[locale]/(public)/home/page.tsx
+++ b/ServicesFrontEnd/frontend/src/app/[locale]/(public)/home/page.tsx
@@ -1,19 +1,14 @@
-// Server Component
+import LocaleSwitcherServer from '@/components/LocaleSwitcherServer';
import { getTranslations } from 'next-intl/server';
import { Link } from '@/i18n/navigation';
import { Locale } from '@/i18n/locales';
-import LocaleSwitcherServer from '@/components/LocaleSwitcherServer';
-// Define the props type to get the locale parameter
type Props = {
params: Promise<{ locale: string }>;
};
export default async function HomePage({ params }: Props) {
- // Get the locale from params
const { locale } = await params;
-
- // Get translations with the correct locale
const t = await getTranslations({ locale: locale as Locale, namespace: 'Index' });
return (
diff --git a/ServicesFrontEnd/frontend/src/app/api/a.txt b/ServicesFrontEnd/frontend/src/app/api/a.txt
new file mode 100644
index 0000000..e69de29
diff --git a/ServicesFrontEnd/frontend/src/app/api/cache/delete/route.ts b/ServicesFrontEnd/frontend/src/app/api/cache/delete/route.ts
new file mode 100644
index 0000000..72aaddc
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/api/cache/delete/route.ts
@@ -0,0 +1,8 @@
+import { NextRequest, NextResponse } from "next/server";
+import { deleteKey } from "@/libss/redisService";
+
+export async function POST(req: NextRequest) {
+ const { key } = await req.json();
+ await deleteKey({ key });
+ return NextResponse.json({ status: "ok", message: `Deleted "${key}"` });
+}
diff --git a/ServicesFrontEnd/frontend/src/app/api/cache/exists/route.ts b/ServicesFrontEnd/frontend/src/app/api/cache/exists/route.ts
new file mode 100644
index 0000000..38b7ff4
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/api/cache/exists/route.ts
@@ -0,0 +1,8 @@
+import { NextRequest, NextResponse } from "next/server";
+import { exists } from "@/libss/redisService";
+
+export async function POST(req: NextRequest) {
+ const { key } = await req.json();
+ const result = await exists({ key });
+ return NextResponse.json({ status: "ok", exists: result });
+}
diff --git a/ServicesFrontEnd/frontend/src/app/api/cache/get/route.ts b/ServicesFrontEnd/frontend/src/app/api/cache/get/route.ts
new file mode 100644
index 0000000..4d7dcad
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/api/cache/get/route.ts
@@ -0,0 +1,11 @@
+import { NextRequest, NextResponse } from "next/server";
+import { getJSON } from "@/libss/redisService";
+
+export async function POST(req: NextRequest) {
+ const { key } = await req.json();
+ const result = await getJSON({ key });
+
+ return result
+ ? NextResponse.json({ status: "ok", data: result })
+ : NextResponse.json({ status: "not_found" }, { status: 404 });
+}
diff --git a/ServicesFrontEnd/frontend/src/app/api/cache/renew/route.ts b/ServicesFrontEnd/frontend/src/app/api/cache/renew/route.ts
new file mode 100644
index 0000000..f61c16b
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/api/cache/renew/route.ts
@@ -0,0 +1,12 @@
+import { NextRequest, NextResponse } from "next/server";
+import { updateField } from "@/libss/redisService";
+
+export async function POST(req: NextRequest) {
+ try {
+ const { key, field, value } = await req.json();
+ await updateField({ key, field, value });
+ return NextResponse.json({ status: "ok", message: `Updated "${key}"` });
+ } catch (err: any) {
+ return NextResponse.json({ error: err.message }, { status: 500 });
+ }
+}
diff --git a/ServicesFrontEnd/frontend/src/app/api/cache/route.ts b/ServicesFrontEnd/frontend/src/app/api/cache/route.ts
new file mode 100644
index 0000000..a5390a4
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/api/cache/route.ts
@@ -0,0 +1,45 @@
+import { NextRequest, NextResponse } from "next/server";
+import {
+ setJSON,
+ getJSON,
+ updateJSON,
+ deleteKey,
+ exists,
+} from "@/libss/redisService";
+
+export async function POST(req: NextRequest) {
+ try {
+ const { action, key, value, ttlSeconds } = await req.json();
+
+ switch (action) {
+ case "set":
+ await setJSON({ key, value, ttlSeconds });
+ return NextResponse.json({ status: "ok", message: `Set ${key}` });
+
+ case "get": {
+ const result = await getJSON({ key });
+ return result
+ ? NextResponse.json({ status: "ok", data: result })
+ : NextResponse.json({ status: "not_found" }, { status: 404 });
+ }
+
+ case "update":
+ await updateJSON({ key, value });
+ return NextResponse.json({ status: "ok", message: `Updated ${key}` });
+
+ case "delete":
+ await deleteKey({ key });
+ return NextResponse.json({ status: "ok", message: `Deleted ${key}` });
+
+ case "exists":
+ const doesExist = await exists({ key });
+ return NextResponse.json({ status: "ok", exists: doesExist });
+
+ default:
+ return NextResponse.json({ error: "Invalid action" }, { status: 400 });
+ }
+ } catch (e: any) {
+ console.error("[redis-api] error:", e.message);
+ return NextResponse.json({ error: e.message }, { status: 500 });
+ }
+}
diff --git a/ServicesFrontEnd/frontend/src/app/api/cache/set/route.ts b/ServicesFrontEnd/frontend/src/app/api/cache/set/route.ts
new file mode 100644
index 0000000..eca69bf
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/api/cache/set/route.ts
@@ -0,0 +1,8 @@
+import { NextRequest, NextResponse } from "next/server";
+import { setJSON } from "@/libss/redisService";
+
+export async function POST(req: NextRequest) {
+ const { key, value, ttlSeconds } = await req.json();
+ await setJSON({ key, value, ttlSeconds });
+ return NextResponse.json({ status: "ok", message: `Set "${key}"` });
+}
diff --git a/ServicesFrontEnd/frontend/src/app/api/cache/update/route.ts b/ServicesFrontEnd/frontend/src/app/api/cache/update/route.ts
new file mode 100644
index 0000000..eb25214
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/app/api/cache/update/route.ts
@@ -0,0 +1,12 @@
+import { NextRequest, NextResponse } from "next/server";
+import { updateJSON } from "@/libss/redisService";
+
+export async function POST(req: NextRequest) {
+ try {
+ const { key, value } = await req.json();
+ await updateJSON({ key, value });
+ return NextResponse.json({ status: "ok", message: `Updated "${key}"` });
+ } catch (err: any) {
+ return NextResponse.json({ error: err.message }, { status: 500 });
+ }
+}
diff --git a/ServicesFrontEnd/frontend/src/app/globals.css b/ServicesFrontEnd/frontend/src/app/globals.css
index a2dc41e..fa4f694 100644
--- a/ServicesFrontEnd/frontend/src/app/globals.css
+++ b/ServicesFrontEnd/frontend/src/app/globals.css
@@ -1,4 +1,10 @@
@import "tailwindcss";
+@import "tailwindcss";
+@plugin "daisyui";
+
+/* @plugin "daisyui" {
+ themes: all;
+} */
:root {
--background: #ffffff;
diff --git a/ServicesFrontEnd/frontend/src/i18n/en.json b/ServicesFrontEnd/frontend/src/i18n/en.json
index 759c293..7525bfb 100644
--- a/ServicesFrontEnd/frontend/src/i18n/en.json
+++ b/ServicesFrontEnd/frontend/src/i18n/en.json
@@ -17,5 +17,30 @@
},
"LocaleLayout": {
"title": "My Application"
+ },
+ "Login": {
+ "title": "Login",
+ "description": "Login to your account",
+ "email": "Your email",
+ "password": "Your password",
+ "login": "Log in",
+ "register": "Register",
+ "createAccount": "Create an account",
+ "forgotPassword": "Forgot your password?",
+ "recentLogins": "Recent logins",
+ "clickPictureOrAdd": "Click your picture or add an account",
+ "addAccount": "Add an account",
+ "show": "Show",
+ "hide": "Hide",
+ "signInWithGoogle": "Sign in with Google",
+ "signInWithFacebook": "Sign in with Facebook",
+ "enterCredentials": "Enter your credentials to continue",
+ "rememberMe": "Remember me",
+ "orContinueWith": "or continue with",
+ "noAccount": "Don't have an account?",
+ "signUp": "Sign up",
+ "copyright": "© 2023 Your Company. All rights reserved.",
+ "welcomeBack": "Welcome Back",
+ "continueJourney": "Sign in to continue your journey with us"
}
}
diff --git a/ServicesFrontEnd/frontend/src/i18n/tr.json b/ServicesFrontEnd/frontend/src/i18n/tr.json
index 4c0aa9a..2e63bcf 100644
--- a/ServicesFrontEnd/frontend/src/i18n/tr.json
+++ b/ServicesFrontEnd/frontend/src/i18n/tr.json
@@ -17,5 +17,30 @@
},
"LocaleLayout": {
"title": "Uygulamam"
+ },
+ "Login": {
+ "title": "Giriş Yap",
+ "description": "Hesabınıza giriş yap",
+ "email": "E-posta adresiniz",
+ "password": "Parolanız",
+ "login": "Giriş yap",
+ "register": "Kayıt Ol",
+ "createAccount": "Hesap oluştur",
+ "forgotPassword": "Parolanızı mı unuttunuz?",
+ "recentLogins": "Son girişler",
+ "clickPictureOrAdd": "Resminize tıklayın veya hesap ekleyin",
+ "addAccount": "Hesap ekle",
+ "show": "Göster",
+ "hide": "Gizle",
+ "signInWithGoogle": "Google ile giriş yap",
+ "signInWithFacebook": "Facebook ile giriş yap",
+ "enterCredentials": "Devam etmek için bilgilerinizi girin",
+ "rememberMe": "Beni hatırla",
+ "orContinueWith": "veya şununla devam et",
+ "noAccount": "Hesabınız yok mu?",
+ "signUp": "Kayıt ol",
+ "copyright": "© 2023 Şirketiniz. Tüm hakları saklıdır.",
+ "welcomeBack": "Tekrar Hoşgeldiniz",
+ "continueJourney": "Yolculuğunuza devam etmek için giriş yapın"
}
}
diff --git a/ServicesFrontEnd/frontend/src/lib/fetcher.tsx b/ServicesFrontEnd/frontend/src/lib/fetcher.tsx
new file mode 100644
index 0000000..016e285
--- /dev/null
+++ b/ServicesFrontEnd/frontend/src/lib/fetcher.tsx
@@ -0,0 +1,140 @@
+interface FetcherRequest {
+ url: string;
+ isNoCache: boolean;
+}
+
+interface PostFetcherRequest
+
+ Form Keys
+
+
+
+ {/* Create a simple Form */}
+
+
+ CreateForm: {cacheKeyCreateForm}
+ SelectForm: {cacheKeySelectForm}
+ SearchForm: {cacheKeySearchForm}
+
+
+ {/* Select a simple Form */}
+
+ {/* Search a simple Form */}
+
+
+