Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
VITE_NODE_ENV=development
VITE_APP_BASE_URL=http://localhost:3001
VITE_APP_URL=http://localhost:5173
VITE_APP_NETWORK=sepolia
VITE_APP_BLOCK_EXPLORER=https://sepolia.arbiscan.io/

# WalletConnect and RainbowKit Project ID
VITE_APP_RAINBOW_PROJECT_ID=
VITE_APP_WALLETCONNECT_PROJECT_ID=

# Contract Factory Addresses
VITE_APP_TEAM_POINTS_FACTORY_ADDRESS=
VITE_APP_TEAM_POINTS_FACTORY_ADDRESS_CELO=

# RPC URLs for different networks
VITE_APP_ARBITRUM_SEPOLIA_RPC=
VITE_APP_CELO_ALFAJORES_RPC=
30 changes: 30 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
'plugin:react/recommended',
'plugin:tailwindcss/recommended',
'prettier',
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parser: '@typescript-eslint/parser',
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
'react/prop-types': 'off',
'react/react-in-jsx-scope': 'off',
'tailwindcss/classnames-order': 'warn',
'tailwindcss/enforces-shorthand': 'off',
},
settings: {
react: {
version: 'detect',
},
},
};
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
// ... existing code ...
# misc
.DS_Store
.env
npm-debug.log
.trae/

# See http://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
Expand All @@ -12,4 +19,5 @@
# misc
.DS_Store
.env
npm-debug.log
npm-debug.log
.trae/
14 changes: 3 additions & 11 deletions docker-compose.ci-demo-01.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,10 @@ services:
build:
context: .
dockerfile: Dockerfile
args:
- VITE_APP_BASE_URL=https://beta-api.collabberry.xyz
- VITE_APP_TEAM_POINTS_FACTORY_ADDRESS=0x86207Ce1202766041F414C47134A8b0A1607d899
- VITE_NODE_ENV=production
- VITE_APP_URL=https://beta.collabberry.xyz
- VITE_APP_NETWORK=Arbitrum
- VITE_APP_BLOCK_EXPLORER=https://arbiscan.io/tx
- VITE_APP_TEAM_POINTS_FACTORY_ADDRESS_CELO=0x0e414560fdEeC039c4636b9392176ddc938b182D


env_file:
- .env
image: collabberry/frontend-app-demo-01:latest

networks:
collabberry-frontend:
driver: bridge
driver: bridge
12 changes: 3 additions & 9 deletions docker-compose.ci-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@ services:
build:
context: .
dockerfile: Dockerfile
args:
- VITE_APP_BASE_URL=https://api.collabberry.xyz
- VITE_APP_TEAM_POINTS_FACTORY_ADDRESS=0x69a99AeAc1F2410e82A84E08268b336116Ab3B5a
- VITE_NODE_ENV=development
- VITE_APP_URL=https://app.collabberry.xyz
- VITE_APP_NETWORK=Arbitrum Sepolia
- VITE_APP_BLOCK_EXPLORER=https://sepolia.arbiscan.io/tx
- VITE_APP_TEAM_POINTS_FACTORY_ADDRESS_CELO=0x0e414560fdEeC039c4636b9392176ddc938b182D
env_file:
- .env
image: collabberry/frontend-app:latest

networks:
collabberry-frontend:
driver: bridge
driver: bridge
12 changes: 3 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,11 @@ services:
build:
context: .
dockerfile: Dockerfile
args:
- VITE_APP_BASE_URL=http://16.171.142.20
- VITE_APP_TEAM_POINTS_FACTORY_ADDRESS=0x69a99AeAc1F2410e82A84E08268b336116Ab3B5a
- VITE_NODE_ENV=development
- VITE_APP_URL=https://app.collabberry.xyz
- VITE_APP_NETWORK=Arbitrum Sepolia
- VITE_APP_BLOCK_EXPLORER=https://sepolia.arbiscan.io/tx
- VITE_APP_TEAM_POINTS_FACTORY_ADDRESS_CELO=0x0e414560fdEeC039c4636b9392176ddc938b182D
env_file:
- .env
ports:
- 4100:4100

networks:
collabberry-frontend:
driver: bridge
driver: bridge
28 changes: 28 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.1",
"eslint-plugin-tailwindcss": "^3.18.2",
"postcss": "^8.4.21",
"postcss-cli": "^11.0.0",
"postcss-nesting": "^12.0.2",
Expand Down
28 changes: 17 additions & 11 deletions src/@types/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,23 @@ export type RegisterCredential = {
};

export type OrganizationData = {
id?: string;
par?: number;
compensationStartDay?: string;
assessmentStartDelayInDays?: number;
assessmentDurationInDays?: number
compensationPeriod?: number;
name: string;
logo?: string;
};
id?: string
par?: number
compensationStartDay?: string
assessmentStartDelayInDays?: number
assessmentDurationInDays?: number
compensationPeriod?: number
name: string
logo?: string
chain?: 'arbitrum' | 'sepolia'
safeAddress?: string
stablecoinAddress?: string
recognitionTokenAddress?: string
recognitionMode?: 'hours-based' | 'discretionary'
chainId?: number
}

export type Assessment = {
export type User = {
contributorId: string;
cultureScore: number;
workScore: number;
Expand All @@ -59,4 +65,4 @@ export type ForgotPassword = {

export type ResetPassword = {
password: string;
};
};
1 change: 1 addition & 0 deletions src/@types/payouts.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export type RecognitionMode = 'hours-based' | 'discretionary';
6 changes: 5 additions & 1 deletion src/api/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ export const envVariables = {
apiUrl: "VITE_APP_BASE_URL",
teamPointsFactoryAddress: "VITE_APP_TEAM_POINTS_FACTORY_ADDRESS",
teamPointsFactoryAddressCelo: "VITE_APP_TEAM_POINTS_FACTORY_ADDRESS_CELO",
rainbowProjectId: "VITE_APP_RAINBOW_PROJECT_ID",
walletConnectProjectId: "VITE_APP_WALLETCONNECT_PROJECT_ID",
arbitrumSepoliaRpc: "VITE_APP_ARBITRUM_SEPOLIA_RPC",
celoAlfajoresRpc: "VITE_APP_CELO_ALFAJORES_RPC",
appUrl: "VITE_APP_URL",
network: "VITE_APP_NETWORK",
blockExplorer: "VITE_APP_BLOCK_EXPLORER"

};

export const environment: typeof envVariables =
envionmentGenerator(envVariables);
envionmentGenerator(envVariables);
12 changes: 6 additions & 6 deletions src/components/collabberry/PrivacyPolicy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ import React from "react";
const PrivacyPolicy: React.FC = () => {
return (
<>
<h5 className="text-2xl font-semibold mb-4">Privacy Policy</h5>
<h5 className="mb-4 text-2xl font-semibold">Privacy Policy</h5>
<div className="max-h-96 overflow-y-auto">
<p className="mb-4">
Your privacy is important to us. It is Collabberry's policy to respect
your privacy regarding any information we may collect from you across
our website, http://collabberry.com, and other sites we own and
operate.
</p>
<h2 className="text-2xl font-semibold mb-2">
<h2 className="mb-2 text-2xl font-semibold">
1. Information we collect
</h2>
<p className="mb-4">
We only collect information about you if we have a reason to do so —
for example, to provide our services, to communicate with you, or to
make our services better.
</p>
<h2 className="text-2xl font-semibold mb-2">
<h2 className="mb-2 text-2xl font-semibold">
2. How we use information
</h2>
<p className="mb-4">
Expand All @@ -32,18 +32,18 @@ const PrivacyPolicy: React.FC = () => {
information relating to the website, and for marketing and promotional
purposes.
</p>
<h2 className="text-2xl font-semibold mb-2">3. Sharing information</h2>
<h2 className="mb-2 text-2xl font-semibold">3. Sharing information</h2>
<p className="mb-4">
We do not share your personal information with anyone except to comply
with the law, develop our products, or protect our rights.
</p>
<h2 className="text-2xl font-semibold mb-2">4. Security</h2>
<h2 className="mb-2 text-2xl font-semibold">4. Security</h2>
<p className="mb-4">
We take reasonable measures to help protect your personal information
from loss, theft, misuse, and unauthorized access, disclosure,
alteration, and destruction.
</p>
<h2 className="text-2xl font-semibold mb-2">5. Contact us</h2>
<h2 className="mb-2 text-2xl font-semibold">5. Contact us</h2>
<p className="mb-4">
If you have any questions about this Privacy Policy, please contact us
at support@collabberry.com.
Expand Down
Loading