Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
588737a
Upgrade strapi
idormenco Aug 7, 2025
8025c91
upgrade strapi
idormenco Aug 27, 2025
bced9b7
update strapi
idormenco Sep 11, 2025
e9f7704
add config to sync folder
idormenco Sep 11, 2025
6380f14
Update admin-role.strapi-author.json
idormenco Sep 11, 2025
4412d6e
Update admin-role.strapi-editor.json
idormenco Sep 11, 2025
d285233
Update admin-role.strapi-super-admin.json
idormenco Sep 11, 2025
6980e6f
Update core-store.core_admin_auth.json
idormenco Sep 11, 2025
5348cb2
Update core-store.plugin_content_manager_configuration_components##ev…
idormenco Sep 11, 2025
7ac0cdb
Update core-store.plugin_content_manager_configuration_components##ev…
idormenco Sep 11, 2025
fd97e8a
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
561b9cc
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
ba2204c
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
c25a2c9
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
05b5d32
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
919bf64
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
2dc8410
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
b928411
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
dd963ce
Update core-store.plugin_content_manager_configuration_content_types#…
idormenco Sep 11, 2025
4c98731
add sync config
idormenco Sep 11, 2025
12ddcbf
update cfgs
idormenco Sep 11, 2025
6bf3843
clean
idormenco Sep 11, 2025
537330f
reexport
idormenco Sep 11, 2025
ea67beb
more cleanup
idormenco Sep 11, 2025
5bf33df
Add client 2 with upgraded packages
idormenco Sep 12, 2025
f7c143b
add tanstack router + query
idormenco Sep 12, 2025
011e6f9
add routes
idormenco Sep 13, 2025
1399e04
clean reset password
idormenco Sep 13, 2025
95999c8
fix login
idormenco Sep 13, 2025
fe96300
fix reset password
idormenco Sep 13, 2025
737ddf9
rework register
idormenco Sep 14, 2025
09f2cc2
fix register + logo
idormenco Sep 14, 2025
96403d1
fix styling
idormenco Sep 14, 2025
29adad9
fix persoane resurse
idormenco Sep 15, 2025
7d2e794
cleanup
idormenco Sep 15, 2025
3c0913a
rework program edit
idormenco Sep 17, 2025
e5417b2
fix export
idormenco Sep 17, 2025
fbaad0b
rework persoane resursa
idormenco Sep 17, 2025
b4bbc0e
rework create user
idormenco Sep 18, 2025
c940b2f
cleanup
idormenco Sep 18, 2025
f6d07d5
fix create program
idormenco Sep 18, 2025
8e565fc
fix api responses types
idormenco Sep 18, 2025
bf70410
fix a bunch of stuff
idormenco Sep 19, 2025
0a3bf82
Fix evaluation
idormenco Sep 22, 2025
6763b34
fix dashboard
idormenco Sep 22, 2025
9ba2ff4
add spinners
idormenco Sep 22, 2025
ee538d6
Update index.tsx
idormenco Sep 22, 2025
5020461
Update request.http
idormenco Sep 22, 2025
9c5f3d7
cleanup
idormenco Sep 22, 2025
25c4dc8
fix matrix ,remove redux
idormenco Sep 23, 2025
7f42fe3
fix confirm account
idormenco Sep 23, 2025
dc11d0b
rework profile edit and view
idormenco Sep 24, 2025
ef31585
Update index.tsx
idormenco Sep 24, 2025
91b3ef4
fix mentor activities list
idormenco Sep 25, 2025
6ba00b7
Update index.tsx
idormenco Sep 25, 2025
4ebdcd8
cleanup
idormenco Sep 25, 2025
327748c
rework auth role check
idormenco Sep 25, 2025
a9adde3
fix
idormenco Sep 25, 2025
063f9c5
final migrations
idormenco Sep 26, 2025
207c2ac
fix stuff
idormenco Sep 26, 2025
fe86dd2
- Refactor `Login` and `AuthContext` for improved error handling and …
cristian-ist Oct 2, 2025
372d5cf
Merge pull request #136 from cristian-ist/feature/upgrade-strapi
idormenco Oct 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"@types/node": "^20.8.7",
"@types/react": "^18.0.27",
"@types/react-dom": "^18.0.10",
"@types/qs": "^6.14.0",
"@vitejs/plugin-react-swc": "^3.0.0",
"autoprefixer": "^10.4.13",
"dotenv": "^16.3.1",
Expand Down
5 changes: 4 additions & 1 deletion client/src/redux/api/userApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ export const userApi = createApi({
transformResponse: (result: User) => ({
...result,
reports: result.reports?.sort((a: Report, b: Report) => {
return new Date(b?.createdAt) - new Date(a?.createdAt);
return (
new Date(b?.createdAt ?? 0).getTime() -
new Date(a?.createdAt ?? 0).getTime()
);
}),
}),
providesTags: ["Report"],
Expand Down
5 changes: 5 additions & 0 deletions client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==

"@types/qs@^6.14.0":
version "6.14.0"
resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.14.0.tgz#d8b60cecf62f2db0fb68e5e006077b9178b85de5"
integrity sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==

"@types/react-dom@^18.0.10":
version "18.0.11"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.11.tgz#321351c1459bc9ca3d216aefc8a167beec334e33"
Expand Down
2 changes: 2 additions & 0 deletions client2/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VITE_SERVER_ENDPOINT=http://127.0.0.1:1337
NODE_ENV=development
82 changes: 82 additions & 0 deletions client2/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# Include your project-specific ignores in this file
# Read about how to use .gitignore: https://help.github.com/articles/ignoring-files

# Compiled output
**/dist/
**/*.tsbuildinfo

# Bun package manager
# https://bun.sh/docs/install/lockfile
node_modules/

# Logs
*.log

# Cache
/.cache
/*/.swc/
.eslintcache

# Testing
/coverage
*.lcov

# Environment variables
.env

# Visual Studio Code
# https://github.com/github/gitignore/blob/master/Global/VisualStudioCode.gitignore
.vscode/*
!.vscode/extensions.json
!.vscode/launch.json
!.vscode/mcp.json
!.vscode/settings.json
!.vscode/tasks.json

# WebStorm
.idea

# Wrangler CLI
# https://developers.cloudflare.com/workers/wrangler/
.wrangler/

# Terraform
# https://github.com/github/gitignore/blob/main/Terraform.gitignore
*.tfstate
*.tfstate.*
.terraform/
.terraform.lock.hcl
*.tfvars
*.tfvars.json
override.tf
override.tf.json
*_override.tf
*_override.tf.json
.terraformrc
terraform.rc

# Astro
.astro/

# TanStack Router
# Generated route tree files should not be committed
*/lib/routeTree.gen.ts
*/.tanstack/

# VitePress
docs/.vitepress/cache
docs/.vitepress/dist

# React Email
# Generated preview build and runtime files
.react-email/

# Local development files
*.local.md
*.local.json
*.local.jsonc

# macOS
# https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
.DS_Store

Empty file added client2/README.md
Empty file.
9 changes: 9 additions & 0 deletions client2/TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- change react-circle-chart
- check in prod user permissions for me
- fix password input icon
- check in prod user permissions for role >find
- rework tables to from shadcn ui + paginations
- allow auth user to list domains ?
- check in prod user permissions for program >findOne
- check program update by fdsc
- rework program list
23 changes: 23 additions & 0 deletions client2/components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "new-york",
"rsc": false,
"tsx": true,
"tailwind": {
"config": "",
"css": "src/globals.css",
"baseColor": "neutral",
"cssVariables": true,
"prefix": ""
},
"iconLibrary": "lucide",
"aliases": {
"components": "@/components",
"utils": "@/lib/utils",
"ui": "@/components/ui",
"lib": "@/lib",
"hoks": "@/hooks",
"types": "@/types"
},
"registries": {}
}
27 changes: 27 additions & 0 deletions client2/global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/* SPDX-FileCopyrightText: 2014-present Kriasoft */
/* SPDX-License-Identifier: MIT */

import * as React from "react";
import "vite/client";

interface Window {
dataLayer: unknown[];
}

interface ImportMetaEnv {
readonly VITE_SERVER_ENDPOINT: string;
readonly NODE_ENV: string;
}

declare module "relay-runtime" {
interface PayloadError {
errors?: Record<string, string[] | undefined>;
}
}

declare module "*.css";

declare module "*.svg" {
const content: React.FC<React.SVGProps<SVGElement>>;
export default content;
}
60 changes: 60 additions & 0 deletions client2/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Evaluare ONG | Creștem.ONG</title>
<meta name="apple-mobile-web-app-title" content="Creștem.ONG" />
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="manifest" href="/site.webmanifest" />
</head>

<body>
<div id="root"></div>
<div id="fb-root"></div>
<script type="module" src="/src/index.tsx"></script>

<!-- Your Chat Plugin code -->
<div id="fb-customer-chat" class="fb-customerchat"></div>

<script>
var chatbox = document.getElementById("fb-customer-chat");
chatbox.setAttribute("page_id", "158962987472579");
chatbox.setAttribute("attribution", "biz_inbox");
</script>

<!-- Your SDK code -->
<!-- <script>-->
<!-- window.fbAsyncInit = function () {-->
<!-- FB.init({-->
<!-- xfbml: true,-->
<!-- version: "v16.0",-->
<!-- });-->
<!-- };-->

<!-- (function (d, s, id) {-->
<!-- var js,-->
<!-- fjs = d.getElementsByTagName(s)[0];-->
<!-- if (d.getElementById(id)) return;-->
<!-- js = d.createElement(s);-->
<!-- js.id = id;-->
<!-- js.src = "https://connect.facebook.net/ro_RO/sdk/xfbml.customerchat.js";-->
<!-- fjs.parentNode.insertBefore(js, fjs);-->
<!-- })(document, "script", "facebook-jssdk");-->
<!-- </script>-->

<script async src="https://www.googletagmanager.com/gtag/js?id=G-YYGDLRNFCC"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag("js", new Date());
gtag("config", "G-YYGDLRNFCC");
</script>
</body>

</html>
96 changes: 96 additions & 0 deletions client2/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
{
"name": "crestem-ong",
"version": "0.0.0",
"private": true,
"type": "module",
"scripts": {
"dev": "vite serve",
"build": "vite build",
"preview": "vite preview",
"test": "vitest",
"coverage": "vitest --coverage",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@headlessui/react": "^2.2.7",
"@heroicons/react": "^2.2.0",
"@hookform/error-message": "^2.0.1",
"@hookform/resolvers": "^5.2.1",
"@radix-ui/react-aspect-ratio": "^1.1.7",
"@radix-ui/react-avatar": "^1.1.10",
"@radix-ui/react-checkbox": "^1.3.3",
"@radix-ui/react-collapsible": "^1.1.12",
"@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-dropdown-menu": "^2.1.16",
"@radix-ui/react-label": "^2.1.7",
"@radix-ui/react-popover": "^1.1.15",
"@radix-ui/react-radio-group": "^1.3.8",
"@radix-ui/react-select": "^2.2.6",
"@radix-ui/react-separator": "^1.1.7",
"@radix-ui/react-slider": "^1.3.6",
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-switch": "^1.2.6",
"@radix-ui/react-toggle": "^1.1.10",
"@radix-ui/react-tooltip": "^1.2.8",
"@reduxjs/toolkit": "^2.9.0",
"@tailwindcss/vite": "^4.1.13",
"@tanstack/react-query": "^5.87.4",
"@tanstack/react-router": "^1.131.41",
"@tanstack/react-table": "^8.21.3",
"@tanstack/zod-adapter": "^1.131.41",
"@types/qs": "^6.14.0",
"@uidotdev/usehooks": "^2.4.1",
"axios": "^1.12.1",
"better-auth": "^1.3.9",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
"date-fns": "^4.1.0",
"jotai": "^2.14.0",
"jotai-effect": "^2.1.1",
"js-cookie": "^3.0.5",
"localforage": "^1.10.0",
"lucide-react": "^0.543.0",
"next-themes": "^0.4.6",
"qs": "^6.14.0",
"react": "^19.1.1",
"react-circle-chart": "^1.0.4",
"react-day-picker": "^9.10.0",
"react-dom": "^19.1.1",
"react-dropzone": "^14.3.8",
"react-error-boundary": "^6.0.0",
"react-export-table-to-excel": "^1.0.6",
"react-hook-form": "^7.62.0",
"react-range-slider-input": "^3.2.1",
"react-redux": "^9.2.0",
"sonner": "^2.0.7",
"tailwind-merge": "^3.3.1",
"xlsx": "^0.18.5",
"zod": "^4.1.8"
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.10",
"@tailwindcss/postcss": "^4.1.13",
"@tanstack/react-query-devtools": "^5.87.3",
"@tanstack/react-router-devtools": "^1.131.36",
"@tanstack/router-plugin": "^1.131.36",
"@types/js-cookie": "^3.0.6",
"@types/node": "^24.3.1",
"@types/react": "^19.1.12",
"@types/react-dom": "^19.1.9",
"@vitejs/plugin-react": "^5.0.2",
"@vitejs/plugin-react-swc": "^4.0.1",
"autoprefixer": "^10.4.21",
"envars": "^1.1.1",
"execa": "^9.6.0",
"globby": "^14.1.0",
"happy-dom": "^18.0.1",
"postcss": "^8.5.6",
"tailwindcss": "^4.1.13",
"tw-animate-css": "^1.3.8",
"typescript": "~5.9.2",
"vite": "~7.1.5",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "~3.2.4"
}
}
Loading