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

Teams page #572

Merged
merged 29 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fd53b8d
add methods to print analytics to console
Aug 29, 2024
e5e06e5
init translations for teams page
Aug 30, 2024
aed5c9e
save
Aug 30, 2024
0ff5cb6
add header and filter section UI
Aug 30, 2024
ebbeca4
save hover animation on filterToggle
Aug 30, 2024
2014740
compute active contributors (+show)
Aug 30, 2024
180bb48
fix copy-past typo component name
Aug 30, 2024
402260e
fix trophy sorting bug
Aug 30, 2024
4aa34ce
update enums + expertise
Aug 31, 2024
e839040
add filtering logic
Aug 31, 2024
6689c9e
fix expertise filter not working
Aug 31, 2024
4f86054
update filter UI
dcts Aug 31, 2024
f0acadb
add contributor cards V0
dcts Aug 31, 2024
3e9f38a
small adaptations
dcts Aug 31, 2024
a5d3856
add OG badge to all contributors of phase 1-3
dcts Sep 1, 2024
c1a3bd8
add social links + badges
dcts Sep 1, 2024
319c446
remove discord as no links possible + add hover text over truncated e…
dcts Sep 1, 2024
6c3978e
add selector to filter contributors
dcts Sep 1, 2024
825862e
implement selector to filter contributors
dcts Sep 1, 2024
e292a50
implement filtering
dcts Sep 1, 2024
4b75fc8
sort contributors by impact
dcts Sep 1, 2024
6925551
add loading state using skeleton
dcts Sep 1, 2024
84f9993
add translations
dcts Sep 1, 2024
9dee5e3
add spacing
dcts Sep 2, 2024
14360bb
replace hardcoded colors with configured colors
dcts Sep 2, 2024
4de239a
fix 'selector leading to unnecessary rerenders' bug
dcts Sep 2, 2024
4bda694
add capability to change display name
dcts Sep 2, 2024
dbcd7bd
Merge branch 'main' into teams-page
dcts Sep 3, 2024
dc01503
Merge branch 'main' into teams-page
dcts Sep 3, 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
4 changes: 4 additions & 0 deletions src/app/components/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ const NavItems: { path: string; title: string }[] = [
path: "/roadmap",
title: "roadmap",
},
{
path: "/team",
title: "team",
},
];

export function Navbar() {
Expand Down
4 changes: 4 additions & 0 deletions src/app/state/i18nSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ import enFooter from "./locales/en/footer.json";
import enLanding from "./locales/en/landing.json";
import enRewards from "./locales/en/rewards.json";
import enTrade from "./locales/en/trade.json";
import enTeam from "./locales/en/team.json";

import ptEnums from "./locales/pt/enums.json";
import ptErrors from "./locales/pt/errors.json";
import ptFooter from "./locales/pt/footer.json";
import ptLanding from "./locales/pt/landing.json";
import ptRewards from "./locales/pt/rewards.json";
import ptTrade from "./locales/pt/trade.json";
import ptTeam from "./locales/pt/team.json";
import { RootState } from "./store";

interface TextContent {
Expand Down Expand Up @@ -59,6 +61,7 @@ const initialState: I18nState = {
...enLanding,
...enRewards,
...enTrade,
...enTeam,
},
pt: {
...ptEnums,
Expand All @@ -67,6 +70,7 @@ const initialState: I18nState = {
...ptLanding,
...ptRewards,
...ptTrade,
...ptTeam,
},
},
};
Expand Down
9 changes: 8 additions & 1 deletion src/app/state/locales/en/enums.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,12 @@
"ORDER_HISTORY": "Order history",
"TRADE_HISTORY": "Trade history",
"PAY": "You pay",
"RECEIVE": "You receive"
"RECEIVE": "You receive",
"ADMIN": "Admin",
"DEV": "Dev",
"DESIGN": "Design",
"SOCIAL_MEDIA": "Social media",
"TESTING": "Testing",
"ACTIVE": "Active",
"PAST": "Past"
}
13 changes: 13 additions & 0 deletions src/app/state/locales/en/team.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"team": "Team",
"meet_our_contributors": "Meet our contributors",
"we_have_a_diverse_talented": "We have a diverse, talented pool of contributors from various fields and locations worldwide. Anyone can join. Browse our current active or past members and connect with contributors to collaborate.",
"all": "All",
"activity_status": "Activity status",
"area_of_work": "Area of work",
"N_contributors_found": "<$NUMBER> contributors found",
"want_to_join_us": "Want to join us?",
"we_are_always_looking_for": "We are always looking for talented contributors.",
"register_now": "Register now",
"contributed_in_N_phases": "contributed in <$NUMBER> phases"
}
9 changes: 8 additions & 1 deletion src/app/state/locales/pt/enums.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,12 @@
"ORDER_HISTORY": "Histórico de ordens",
"TRADE_HISTORY": "Histórico de transações",
"PAY": "Você paga",
"RECEIVE": "Você recebe"
"RECEIVE": "Você recebe",
"ADMIN": "Admin",
"DEV": "Dev",
"DESIGN": "Design",
"SOCIAL_MEDIA": "Mídias sociais",
"TESTING": "Testes",
"ACTIVE": "Ativo",
"PAST": "Passado"
}
13 changes: 13 additions & 0 deletions src/app/state/locales/pt/team.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"team": "Equipe",
"meet_our_contributors": "Conheça nossos colaboradores",
"we_have_a_diverse_talented": "Temos um grupo diversificado e talentoso de colaboradores de várias áreas e localizações ao redor do mundo. Qualquer pessoa pode participar. Explore nossos membros atuais ou passados e conecte-se com colaboradores para colaborar.",
"all": "Todos",
"activity_status": "Status da atividade",
"area_of_work": "Área de trabalho",
"N_contributors_found": "<$NUMBER> contributors found",
"want_to_join_us": "Quer se juntar a nós?",
"we_are_always_looking_for": "Estamos sempre à procura de colaboradores talentosos.",
"register_now": "Registre-se agora",
"contributed_in_N_phases": "contribuiu em <$NUMBER> fases"
}
2 changes: 2 additions & 0 deletions src/app/state/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { radixSlice } from "./radixSlice";
import { rewardSlice } from "./rewardSlice";
import { priceInfoSlice } from "./priceInfoSlice";
import { i18nSlice } from "./i18nSlice";
import { teamSlice } from "./teamSlice";

export const store = configureStore({
reducer: {
Expand All @@ -20,6 +21,7 @@ export const store = configureStore({
priceInfo: priceInfoSlice.reducer,
i18n: i18nSlice.reducer,
rewardSlice: rewardSlice.reducer,
teamSlice: teamSlice.reducer,
},
});

Expand Down
Loading
Loading