Skip to content

Commit 61b1c11

Browse files
idormencoidormenco
authored
Rework ui to shadcn ui (#135)
* Rework ui to shadcn ui * Create .nvmrc * Update index.html * Create pnpm-lock.yaml * add missing files * add missing files * Create vercel.json * fix login * remove console * cleanup * Cleanup and fix queries * fix mentor page * cleanup * Add tiptap editor fix bugs * Fix export, add send email when mentor and ngo is matched * fix papercuts * implement view/ edit mentor * cleanup * remove routes * add export for cif in orgs * Fix various issues * Update index.tsx * fix api queries * Update index.tsx * Update index.tsx * fix bugs * Update columns.tsx * fix tables * fix programs table * fix stuff * fix evaluation unique email * fix dates * fix buttons * fix table and register page * Implement mentor issues * fix small issues * Cleanup add statistics page * Update index.tsx * Fix types * add toast * Update index.tsx * add mentees table, add crud for mentor relations * fix jurnal de activitate * fix export issues * fix columns * fix create mentor * fix types * fix mentor cards * color button for export, add column title * Add export button in report details * Add mentor names * Add mentor names * fix validation * add missing columns * add export evaluations * fix small issues * fix export report * Update get-report.api.ts * Update list-mentees.api.ts * fix small issues * cleanup * fix assign mentors * fix mentor pages * fix register * fix and style exports * fix issues * Update index.tsx * Fix isssues * fix ngo stats and reports table * restyle and sort * fix export and text wrap * add program and mentros in details * fix stuff * add missing details in report for mentor * add resend invite functionality * Fix assign programs and display programs * fix sorting * fix stuff * Update index.html * fix issues * fix notifications * rework ngo profile * Update index.tsx * Fix public pages * Update index.tsx * fix texts * Update index.tsx * Update index.tsx * fix menu * fix edit mentors * fix final stuff * Update index.tsx * fix comments * Update index.tsx * Update index.tsx * Update ActivityForm.tsx * Update index.tsx * Update package.json
1 parent 056b9d9 commit 61b1c11

408 files changed

Lines changed: 50147 additions & 134075 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/playwright.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Setup Node.js
4141
uses: actions/setup-node@v3
4242
with:
43-
node-version: 18
43+
node-version: 22
4444
- name: Cache node modules
4545
uses: actions/cache@v3
4646
with:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ frontend/target
5050
frontend/node_modules
5151
frontend/.next
5252
client/.env
53+
client/request.http

‎client/.gitignore‎

Lines changed: 76 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,82 @@
1+
# Include your project-specific ignores in this file
2+
# Read about how to use .gitignore: https://help.github.com/articles/ignoring-files
3+
4+
# Compiled output
5+
**/dist/
6+
**/*.tsbuildinfo
7+
8+
# Bun package manager
9+
# https://bun.sh/docs/install/lockfile
10+
node_modules/
11+
112
# Logs
2-
logs
313
*.log
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
7-
pnpm-debug.log*
8-
lerna-debug.log*
9-
10-
node_modules
11-
dist
12-
dist-ssr
13-
*.local
14-
15-
# Editor directories and files
14+
15+
# Cache
16+
/.cache
17+
/*/.swc/
18+
.eslintcache
19+
20+
# Testing
21+
/coverage
22+
*.lcov
23+
24+
# Environment variables
25+
.env
26+
27+
# Visual Studio Code
28+
# https://github.com/github/gitignore/blob/master/Global/VisualStudioCode.gitignore
1629
.vscode/*
1730
!.vscode/extensions.json
31+
!.vscode/launch.json
32+
!.vscode/mcp.json
33+
!.vscode/settings.json
34+
!.vscode/tasks.json
35+
36+
# WebStorm
1837
.idea
38+
39+
# Wrangler CLI
40+
# https://developers.cloudflare.com/workers/wrangler/
41+
.wrangler/
42+
43+
# Terraform
44+
# https://github.com/github/gitignore/blob/main/Terraform.gitignore
45+
*.tfstate
46+
*.tfstate.*
47+
.terraform/
48+
.terraform.lock.hcl
49+
*.tfvars
50+
*.tfvars.json
51+
override.tf
52+
override.tf.json
53+
*_override.tf
54+
*_override.tf.json
55+
.terraformrc
56+
terraform.rc
57+
58+
# Astro
59+
.astro/
60+
61+
# TanStack Router
62+
# Generated route tree files should not be committed
63+
*/lib/routeTree.gen.ts
64+
*/.tanstack/
65+
66+
# VitePress
67+
docs/.vitepress/cache
68+
docs/.vitepress/dist
69+
70+
# React Email
71+
# Generated preview build and runtime files
72+
.react-email/
73+
74+
# Local development files
75+
*.local.md
76+
*.local.json
77+
*.local.jsonc
78+
79+
# macOS
80+
# https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
1981
.DS_Store
20-
*.suo
21-
*.ntvs*
22-
*.njsproj
23-
*.sln
24-
*.sw?
25-
/test-results/
26-
/playwright-report/
27-
/playwright/.cache/
82+

‎client/.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
22

client/src/components/Form/Avatar.tsx renamed to client/README.md

File renamed without changes.

‎client/components.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"$schema": "https://ui.shadcn.com/schema.json",
3+
"style": "new-york",
4+
"rsc": false,
5+
"tsx": true,
6+
"tailwind": {
7+
"config": "",
8+
"css": "src/globals.css",
9+
"baseColor": "neutral",
10+
"cssVariables": true,
11+
"prefix": ""
12+
},
13+
"iconLibrary": "lucide",
14+
"aliases": {
15+
"components": "@/components",
16+
"utils": "@/lib/utils",
17+
"ui": "@/components/ui",
18+
"lib": "@/lib"
19+
},
20+
"registries": {
21+
"@shadcn-editor": "https://shadcn-editor.vercel.app/r/{name}.json"
22+
}
23+
}

‎client/global.d.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* SPDX-FileCopyrightText: 2014-present Kriasoft */
2+
/* SPDX-License-Identifier: MIT */
3+
4+
import * as React from "react";
5+
import "vite/client";
6+
7+
interface Window {
8+
dataLayer: unknown[];
9+
}
10+
11+
interface ImportMetaEnv {
12+
readonly VITE_SERVER_ENDPOINT: string;
13+
readonly NODE_ENV: string;
14+
}
15+
16+
declare module "relay-runtime" {
17+
interface PayloadError {
18+
errors?: Record<string, string[] | undefined>;
19+
}
20+
}
21+
22+
declare module "*.css";
23+
24+
declare module "*.svg" {
25+
const content: React.FC<React.SVGProps<SVGElement>>;
26+
export default content;
27+
}

‎client/index.html‎

Lines changed: 32 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,39 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>Evaluare ONG | Creștem.ONG</title>
7-
<meta name="apple-mobile-web-app-title" content="Creștem.ONG" />
8-
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
9-
<link rel="shortcut icon" href="/favicon.ico" />
10-
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
11-
<link rel="manifest" href="/site.webmanifest" />
12-
</head>
13-
<body>
14-
<div id="root"></div>
15-
<div id="fb-root"></div>
16-
<script type="module" src="/src/main.tsx"></script>
173

18-
<!-- Your Chat Plugin code -->
19-
<div id="fb-customer-chat" class="fb-customerchat"></div>
4+
<head>
5+
<meta charset="UTF-8" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<title>Evaluare ONG | Creștem.ONG</title>
8+
<meta name="apple-mobile-web-app-title" content="Creștem.ONG" />
9+
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
10+
<link rel="shortcut icon" href="/favicon.ico" />
11+
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
12+
<link rel="manifest" href="/site.webmanifest" />
13+
</head>
2014

21-
<script>
22-
var chatbox = document.getElementById("fb-customer-chat");
23-
chatbox.setAttribute("page_id", "158962987472579");
24-
chatbox.setAttribute("attribution", "biz_inbox");
25-
</script>
15+
<body>
16+
<div id="root"></div>
17+
<div id="fb-root"></div>
18+
<script type="module" src="/src/index.tsx"></script>
2619

27-
<!-- Your SDK code -->
28-
<!-- <script>-->
29-
<!-- window.fbAsyncInit = function () {-->
30-
<!-- FB.init({-->
31-
<!-- xfbml: true,-->
32-
<!-- version: "v16.0",-->
33-
<!-- });-->
34-
<!-- };-->
20+
<!-- Your Chat Plugin code -->
21+
<div id="fb-customer-chat" class="fb-customerchat"></div>
3522

36-
<!-- (function (d, s, id) {-->
37-
<!-- var js,-->
38-
<!-- fjs = d.getElementsByTagName(s)[0];-->
39-
<!-- if (d.getElementById(id)) return;-->
40-
<!-- js = d.createElement(s);-->
41-
<!-- js.id = id;-->
42-
<!-- js.src = "https://connect.facebook.net/ro_RO/sdk/xfbml.customerchat.js";-->
43-
<!-- fjs.parentNode.insertBefore(js, fjs);-->
44-
<!-- })(document, "script", "facebook-jssdk");-->
45-
<!-- </script>-->
23+
<script>
24+
var chatbox = document.getElementById("fb-customer-chat");
25+
chatbox.setAttribute("page_id", "158962987472579");
26+
chatbox.setAttribute("attribution", "biz_inbox");
27+
</script>
28+
<script type="text/javascript">
29+
(function (window, document, dataLayerName, id) {
30+
window[dataLayerName] = window[dataLayerName] || [], window[dataLayerName].push({ start: (new Date).getTime(), event: "stg.start" }); var scripts = document.getElementsByTagName('script')[0], tags = document.createElement('script');
31+
var qP = []; dataLayerName !== "dataLayer" && qP.push("data_layer_name=" + dataLayerName); var qPString = qP.length > 0 ? ("?" + qP.join("&")) : "";
32+
tags.async = !0, tags.src = "https://trillenials.containers.piwik.pro/" + id + ".js" + qPString, scripts.parentNode.insertBefore(tags, scripts);
33+
!function (a, n, i) { a[n] = a[n] || {}; for (var c = 0; c < i.length; c++)!function (i) { a[n][i] = a[n][i] || {}, a[n][i].api = a[n][i].api || function () { var a = [].slice.call(arguments, 0); "string" == typeof a[0] && window[dataLayerName].push({ event: n + "." + i + ":" + a[0], parameters: [].slice.call(arguments, 1) }) } }(i[c]) }(window, "ppms", ["tm", "cm"]);
34+
})(window, document, 'dataLayer', '89fa003a-2a3a-42bb-a74b-1761008dc779');
35+
</script>
4636

47-
<script
48-
async
49-
src="https://www.googletagmanager.com/gtag/js?id=G-YYGDLRNFCC"
50-
></script>
51-
<script>
52-
window.dataLayer = window.dataLayer || [];
53-
function gtag() {
54-
dataLayer.push(arguments);
55-
}
56-
gtag("js", new Date());
57-
gtag("config", "G-YYGDLRNFCC");
58-
</script>
59-
</body>
60-
</html>
37+
</body>
38+
39+
</html>

0 commit comments

Comments
 (0)