Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/dark mode #2566

Open
wants to merge 87 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
edc0e3f
fix(human-app/frontend): layout improvments
KacperKoza343 Sep 4, 2024
4d00903
update(human-app/frontend): change copy
KacperKoza343 Sep 6, 2024
8df3feb
feat(human-app): add dark mode config
KacperKoza343 Sep 10, 2024
e9e42dc
feat(human-app): add dark mode icons
KacperKoza343 Sep 10, 2024
45bb045
feat(human-app): fix homepage colors
KacperKoza343 Sep 10, 2024
31c928a
feat(human-app): adjust to dark mode
KacperKoza343 Sep 11, 2024
90d3e5a
feat(human-app): adjust colors to dark mode
KacperKoza343 Sep 11, 2024
c1c9fc6
feat(human-app): achange RGBA to HEX for dark palette
KacperKoza343 Sep 11, 2024
f2042fc
feat(human-app): adjust layout to dark mode
KacperKoza343 Sep 12, 2024
3106257
Merge remote-tracking branch 'human-protocol/develop' into fix/layout…
KacperKoza343 Sep 12, 2024
8c4aacd
fix(human-app): footer and navbar width and padding adjustments
rozekmichal Sep 18, 2024
0490ed1
fix(human-app): homepage cancel button position adjusted
rozekmichal Sep 18, 2024
69ebeff
fix(human-app): max width for inputs specified
rozekmichal Sep 18, 2024
1ce841a
feat(human-app): home page state moved to context and reused in every…
rozekmichal Sep 18, 2024
584d9fd
fix(human-app): page card max width adjusted
rozekmichal Sep 19, 2024
6cd0a8f
fix(human-app): styles for some pages to adjust the align
rozekmichal Sep 19, 2024
15ac9de
fix(human-app): styles for page card to fulfill expectations for mobi…
rozekmichal Sep 19, 2024
47a8471
feat(human-app): captcha order changed in form
rozekmichal Sep 20, 2024
41f0e1a
chore(human-app): active styles for menu item link
rozekmichal Sep 20, 2024
70fafc3
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Sep 23, 2024
c9f03af
feat(human-app): captcha order changed in sign up and sign in forms
rozekmichal Sep 23, 2024
3c97187
feat(human-app): active styles for menu item link
rozekmichal Sep 23, 2024
c2ea9c6
fix(human-app): improvements after review
rozekmichal Sep 23, 2024
9ffcf80
Merge pull request #6 from KacperKoza343/fix/human-app-improvements-1…
rozekmichal Sep 23, 2024
248c0ab
feat(human-app): add dark mode for tables
KacperKoza343 Sep 24, 2024
a402618
feat(human-app): apply dark mode for tables
KacperKoza343 Sep 25, 2024
19b8348
feat(human-app): adjust alert to dark mode
KacperKoza343 Sep 25, 2024
6c20edd
fix(human-app): operator page padding adjusted
rozekmichal Sep 26, 2024
458237d
fix(human-app): copy and logic changed for notification message
rozekmichal Sep 26, 2024
903cc79
fix(human-app): copy and style changes for sign up page
rozekmichal Sep 26, 2024
c709616
feat(human-app): fix table buttons
KacperKoza343 Sep 26, 2024
b966a2f
feat(human-app): fix expiration modal error
KacperKoza343 Sep 26, 2024
67559cf
Merge pull request #9 from KacperKoza343/HUM-8-expiration-modal-error
KacperKoza343 Sep 26, 2024
a7275f1
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Sep 27, 2024
bf1a23d
fix(human-app): add layout imporovments
KacperKoza343 Sep 27, 2024
bdb9041
feat(human-app): add oracle name to jobs page
KacperKoza343 Sep 27, 2024
09a9526
feat(human-app): fix table shadows
KacperKoza343 Sep 27, 2024
cbd4439
update(human-app): rename Jobs to Tasks
KacperKoza343 Sep 27, 2024
67860c0
fix(human-app): page card component
KacperKoza343 Sep 27, 2024
a96cfb8
fix(human-app): fix page card component
KacperKoza343 Sep 28, 2024
505c4b4
Merge pull request #11 from KacperKoza343/fix-page-card
KacperKoza343 Sep 28, 2024
f1f04ee
fix(human-app): remove copy from welcome view
KacperKoza343 Sep 28, 2024
0db4efa
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Sep 28, 2024
2a9d4e4
fix(human-app): fix HTM color
KacperKoza343 Sep 28, 2024
e249924
fix(human-app): fix underlined text
KacperKoza343 Sep 28, 2024
8a560af
fix(human-app): fix underlined text
KacperKoza343 Sep 28, 2024
9be3257
Merge pull request #12 from KacperKoza343/HUM-13-rename-jobs-to-tasks
KacperKoza343 Sep 28, 2024
d57739c
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Sep 28, 2024
fc2d01d
fix(human-app): fix reject buttons in table
KacperKoza343 Sep 28, 2024
c75d048
feat(human-app): add first oracle from envs
KacperKoza343 Sep 30, 2024
6fb04ce
Merge pull request #8 from KacperKoza343/fix/human-app-26-09-2024
rozekmichal Sep 30, 2024
b375a9f
Merge pull request #13 from KacperKoza343/HUM-13-rename-jobs-to-tasks
KacperKoza343 Sep 30, 2024
e799a65
feat(human-app): revert divider to initial shape
KacperKoza343 Sep 30, 2024
843a046
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Sep 30, 2024
500901d
fix(human-app): fix home page icons for dark mode
KacperKoza343 Sep 30, 2024
bae36a4
fix(human-app): too large gap between HUMAN App and the icons
rozekmichal Sep 30, 2024
baee995
fix(human-app): too small gap between Human Protocol and How It Works
rozekmichal Sep 30, 2024
9e48dd7
fix(human-app): footer visual fixes (padding and gap changes)
rozekmichal Sep 30, 2024
af9508d
fix(human-app): fix operator ui bugs
KacperKoza343 Sep 30, 2024
fb03f59
Merge pull request #16 from KacperKoza343/HUM-23-operator-ui-bugs
KacperKoza343 Sep 30, 2024
c9b4543
Merge pull request #15 from KacperKoza343/fix/human-app-30-09-2024
rozekmichal Sep 30, 2024
158e1c9
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Sep 30, 2024
03d9c82
Merge pull request #14 from KacperKoza343/HUM-24-fix-home-page-icons-…
KacperKoza343 Sep 30, 2024
5f2d5a8
Merge branch 'feat/dark-mode' of https://github.com/KacperKoza343/hum…
KacperKoza343 Sep 30, 2024
fdef80f
feat(human-app): fix icon bugs
KacperKoza343 Sep 30, 2024
b71022b
Merge pull request #17 from KacperKoza343/HUM-25-fix-regresion-bugs
KacperKoza343 Sep 30, 2024
a24939d
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Sep 30, 2024
50f1520
fix(human-app): fix page card width
KacperKoza343 Sep 30, 2024
c169118
Merge pull request #18 from KacperKoza343/HUM-26-fix-page-card-on-dar…
KacperKoza343 Sep 30, 2024
7b088e2
feat(human-app): fix updated fields check in add keys page
KacperKoza343 Sep 30, 2024
3f92602
fix(human-app): mode switching issues
KacperKoza343 Sep 30, 2024
a85cb1a
Merge remote-tracking branch 'human-protocol/develop' into fix/layout…
KacperKoza343 Sep 30, 2024
10463b4
Merge remote-tracking branch 'human-protocol/develop' into feat/dark-…
KacperKoza343 Sep 30, 2024
9e4497f
fix(human-app): fix build
KacperKoza343 Oct 1, 2024
2f0bb82
feat(human-app): fix build
KacperKoza343 Oct 1, 2024
58ecb64
Merge remote-tracking branch 'human-protocol/develop' into fix/layout…
KacperKoza343 Oct 2, 2024
c3e492d
Merge remote-tracking branch 'human-protocol/develop' into feat/dark-…
KacperKoza343 Oct 2, 2024
a37257f
feat(human-app): dark mode switch
KacperKoza343 Oct 3, 2024
ef1a65f
fix(human-app): fix mode switching issue
KacperKoza343 Oct 3, 2024
197f67d
Merge pull request #19 from KacperKoza343/HUM-30-add-switch-dark-ligh…
KacperKoza343 Oct 7, 2024
7e9a1cb
feat(human-app/worker-profile): fix notification banner
KacperKoza343 Oct 7, 2024
3cab670
Merge pull request #20 from KacperKoza343/HUM-29-complete-profile-ale…
KacperKoza343 Oct 7, 2024
2b7a140
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Oct 7, 2024
d818d76
fix(human-app/worker/labeling): redirect user without site key to ena…
KacperKoza343 Oct 7, 2024
ba17893
Merge pull request #21 from KacperKoza343/HUM-33-new-user-cannot-view…
KacperKoza343 Oct 7, 2024
6d212de
Merge branch 'fix/layout-improvments' into feat/dark-mode
KacperKoza343 Oct 7, 2024
5c5041f
Merge branch 'feat/dark-mode' of https://github.com/KacperKoza343/hum…
KacperKoza343 Oct 7, 2024
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
10 changes: 10 additions & 0 deletions packages/apps/human-app/frontend/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ VITE_DAPP_META_URL= #string
# Dapp icons for wallet connect
VITE_DAPP_ICONS= #string => lists of icons eg.: icon1,icon2...

# This data will be use to add first oracle in the oracles table
# string
VITE_H_CAPTCHA_ORACLE_ANNOTATION_TOOL=
# string
VITE_H_CAPTCHA_ORACLE_ROLE=
# string
VITE_H_CAPTCHA_ORACLE_ADDRESS=
# job types list string
VITE_H_CAPTCHA_ORACLE_TASK_TYPES= #string => lists of job types eg.: Image labeling, BBoxes...

# network if network is equl to 'testnet' app will use first tesntet chain from .src/smart-contracts/chains.ts
# and first mainnet chain for 'mainnet'
VITE_NETWORK= # mainnet|testnet
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/human-app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"i18next": "^23.8.2",
"jwt-decode": "^4.0.0",
"lodash": "^4.17.21",
"material-react-table": "^2.12.1",
"material-react-table": "^3.0.1",
"mui-image": "^1.0.7",
"query-string": "^9.0.0",
"react": "^18.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ export const getEditEthKVStoreValuesMutationSchema = (
const newFiledData = newData[key];
const initialFiledData = initialData[key];

if (
isArray(newFiledData) &&
isArray(initialFiledData) &&
newFiledData.sort().toString() !== initialFiledData.sort().toString()
) {
if (isArray(newFiledData) && isArray(initialFiledData)) {
if (
newFiledData.sort().toString() === initialFiledData.sort().toString()
) {
return;
}
Object.assign(fieldsThatHasChanges, { [key]: newFiledData.toString() });
return;
}
Expand All @@ -105,7 +106,6 @@ export const getEditEthKVStoreValuesMutationSchema = (
path: ['form'],
});
}

return fieldsThatHasChanges;
});
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { apiClient } from '@/api/api-client';
import { apiPaths } from '@/api/api-paths';
import { useJobsTypesOraclesFilter } from '@/hooks/use-job-types-oracles-table';
import { stringifyUrlQueryObject } from '@/shared/helpers/stringify-url-query-object';
import { env } from '@/shared/env';

const OracleSuccessSchema = z.object({
address: z.string(),
Expand All @@ -18,6 +19,13 @@ const OraclesSuccessSchema = z.array(OracleSuccessSchema);
export type OracleSuccessResponse = z.infer<typeof OracleSuccessSchema>;
export type OraclesSuccessResponse = OracleSuccessResponse[];

const H_CAPTCHA_ORACLE: OracleSuccessResponse = {
address: env.VITE_H_CAPTCHA_ORACLE_ADDRESS,
jobTypes: env.VITE_H_CAPTCHA_ORACLE_TASK_TYPES,
role: env.VITE_H_CAPTCHA_ORACLE_ROLE,
url: env.VITE_H_CAPTCHA_ORACLE_ANNOTATION_TOOL,
};

export async function getOracles({
selected_job_types,
}: {
Expand All @@ -27,10 +35,17 @@ export async function getOracles({
? `?${stringifyUrlQueryObject({ selected_job_types })}`
: '';

return apiClient(`${apiPaths.worker.oracles.path}${queryParams}`, {
successSchema: OraclesSuccessSchema,
options: { method: 'GET' },
});
const result = await apiClient(
`${apiPaths.worker.oracles.path}${queryParams}`,
{
successSchema: OraclesSuccessSchema,
options: { method: 'GET' },
}
);

result.unshift(H_CAPTCHA_ORACLE);

return result;
}

export function useGetOracles() {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading