Merge remote-tracking branch 'origin/buy-sell-panel-slider' into buy-…

…sell-panel-slider

src/app/components/NavBar.tsx

@@ -47,6 +47,10 @@ const NavItems: { path: string; title: string }[] = [
     path: "/roadmap",
     title: "roadmap",
   },
+  {
+    path: "/team",
+    title: "team",
+  },
 ];
 
 export function Navbar() {

src/app/state/i18nSlice.ts

@@ -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 {
@@ -59,6 +61,7 @@ const initialState: I18nState = {
       ...enLanding,
       ...enRewards,
       ...enTrade,
+      ...enTeam,
     },
     pt: {
       ...ptEnums,
@@ -67,6 +70,7 @@ const initialState: I18nState = {
       ...ptLanding,
       ...ptRewards,
       ...ptTrade,
+      ...ptTeam,
     },
   },
 };

src/app/state/locales/en/enums.json

@@ -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"
 }

src/app/state/locales/en/team.json

@@ -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"
+}

src/app/state/locales/pt/enums.json

@@ -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"
 }

src/app/state/locales/pt/footer.json

@@ -18,5 +18,5 @@
   "report_bug": "Relatar erro",
   "support": "Suporte",
   "report_translation_issue": "Relatar problema de tradução",
-  "roadmap": "Mapa rodoviário"
+  "roadmap": "Roadmap"
 }

src/app/state/locales/pt/team.json

@@ -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"
+}

src/app/state/store.ts

@@ -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: {
@@ -20,6 +21,7 @@ export const store = configureStore({
     priceInfo: priceInfoSlice.reducer,
     i18n: i18nSlice.reducer,
     rewardSlice: rewardSlice.reducer,
+    teamSlice: teamSlice.reducer,
   },
 });