Skip to content

Commit 40781ea

Browse files
Merge branch 'dev' into fix/console-errors
2 parents 683a4c1 + f3e107a commit 40781ea

File tree

27 files changed

+447
-82
lines changed

27 files changed

+447
-82
lines changed

CONTRIBUTING.md

Lines changed: 283 additions & 16 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,23 @@ yarn install
7676
Before running the application locally, the following environment variables are required to be set:
7777

7878
```js
79-
NEXT_PUBLIC_FIREBASE_API_KEY = "AIzaSyDjGCuQB-aOc0qFZPNJTfF9Is-UywXakUg";
80-
NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN = "dacade-mvp-1.firebaseapp.com";
81-
NEXT_PUBLIC_FIREBASE_PROJECT_ID = "dacade-mvp-1";
79+
NEXT_PUBLIC_FIREBASE_API_KEY = "AIzaSyAmodim2lJZBradsjx6Zl98hECO7vpo2To";
80+
NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN = "dacade-d02d2.firebaseapp.com";
81+
NEXT_PUBLIC_FIREBASE_PROJECT_ID = "dacade-d02d2";
8282
NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID = "${config.measurementId}";
83-
NEXT_PUBLIC_FIREBASE_APP_ID = "1:1087159887585:web:67f23902be38515b23f9a0";
83+
NEXT_PUBLIC_FIREBASE_APP_ID = "1:194074425069:web:e519dce8d78a458d8b3ee4";
8484

85-
NEXT_PUBLIC_API_BASE_URL = "https://europe-west1-dacade-mvp-1.cloudfunctions.net/api";
85+
NEXT_PUBLIC_API_BASE_URL = "https://europe-west1-dacade-d02d2.cloudfunctions.net/api";
8686

87-
NEXT_PUBLIC_BUGSNAG_API_KEY = "77a1ecc00ef7ab8ac27ac7ebfb353afd";
87+
NEXT_PUBLIC_BUGSNAG_API_KEY = "";
8888
NEXT_PUBLIC_SHOW_LANGUAGE_SELECTOR = true;
8989

90-
NEXT_PUBLIC_DISCORD_CALLBACK_URL = "http://localhost:3000/profile";
91-
NEXT_PUBLIC_DISCORD_CLIENT_ID = "910900810815246346";
92-
NEXT_PUBLIC_DISCORD_OAUTH_BASE_URL = "https://discord.com/oauth2/authorize";
90+
NEXT_PUBLIC_DISCORD_CLIENT_ID = "";
91+
NEXT_PUBLIC_DISCORD_CALLBACK_URL = "https://europe-west1-dacade-d02d2.cloudfunctions.net/api/discord-bot/oauth/callback";
92+
NEXT_PUBLIC_DISCORD_OAUTH_BASE_URL = "https://discord.com/api/oauth2/authorize";
9393
NEXT_PUBLIC_DISCORD_SCOPE = "identify email";
9494

95-
NEXT_PUBLIC_GOOGLE_TRANSLATE_API_KEY = "AIzaSyC6XYHCctzfWaxQK6Lbl9eZ0JUzbATcjpM";
95+
NEXT_PUBLIC_GOOGLE_TRANSLATE_API_KEY = "";
9696

9797
NEXT_PUBLIC_BLOCK_EXPLORER_URL = "https://alfajores.celoscan.io";
9898

Lines changed: 40 additions & 0 deletions
Loading

public/img/communities/sui.svg

Lines changed: 4 additions & 0 deletions
Loading

public/locales/bg/common.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
"page.protocols.contact.name.2": "Paul Walton",
9090
"page.protocols.contact.title.2": "Business Development",
9191
"page.protocols.contact.email.2": "[email protected]",
92+
"communities.overview.challenges.title": "Предизвикателства",
93+
"communities.overview.challenges.description": "В курсовете на тази общност ще имате възможност да научите за нови технологии, да решавате предизвикателства, да получавате обратна връзка и да печелите награди.",
9294
"communities.overview.challenge": "Creative Challenge",
9395
"communities.overview.chapter": "Chapter Overview",
9496
"communities.overview.learning-modules": "Learning Modules",
@@ -166,8 +168,8 @@
166168
"communities.navigation.language.es": "Spanish",
167169
"communities.overview.courses.title": "Courses",
168170
"communities.overview.courses.description": "In the courses of this community, you will be able to learn about new technologies, solve challenges, get feedback and earn bounties.",
169-
"communities.overview.scoreboard.title": "Scoreboard",
170-
"communities.overview.scoreboard.description": "On the scoreboard, you can see which users have accumulated the most reputation by giving valuable feedback to their peers.",
171+
"communities.overview.scoreboard.title": "Табло за резултати",
172+
"communities.overview.scoreboard.description": "На таблото можете да видите кои потребители са натрупали най-много репутация, като предоставят ценни обратни връзки на своите колеги.",
171173
"communities.scoreboard.empty-state.title": "Няма оценки за тази категория.",
172174
"communities.card.estimated": "Estimated Time",
173175
"communities.card.earn": "Earn rewards",

public/locales/en/common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@
110110
"communities.submissions": "Submissions",
111111
"communities.submission": "Submission",
112112
"communities.challenge.title": "Challenge",
113+
"communities.overview.challenges.title": "Challenges",
114+
"communities.overview.challenges.description": "In the courses of this community, you will be able to learn about new technologies, solve challenges, get feedback, and earn bounties.",
113115
"communities.overview.challenge.title": "Already ready to complete the challenge?",
114116
"communities.overview.challenge.rewards": " Rewards",
115117
"communities.overview.challenge.certificate": "Certificate",

public/locales/es/common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@
110110
"communities.submissions": "Propuestas",
111111
"communities.submission": "Envío",
112112
"communities.challenge.title": "Reto",
113+
"communities.overview.challenges.title": "Desafíos",
114+
"communities.overview.challenges.description": "En los cursos de esta comunidad, podrás aprender sobre nuevas tecnologías, resolver desafíos, recibir retroalimentación y ganar recompensas.",
113115
"communities.overview.challenge.rewards": "Recompensas",
114116
"communities.overview.challenge.certificate": "Certificate",
115117
"communities.overview.challenge.subtitle": "Al completar con éxito",

public/locales/hr/common.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
"page.protocols.contact.name.2": "Paul Walton",
9090
"page.protocols.contact.title.2": "Business Development",
9191
"page.protocols.contact.email.2": "[email protected]",
92+
"communities.overview.challenges.title": "Izazovi",
93+
"communities.overview.challenges.description": "Kroz tečajeve ove zajednice, moći ćete učiti o novim tehnologijama, rješavati izazove, dobivati povratne informacije i zarađivati nagrade.",
9294
"communities.overview.challenge": "Kreativni izazov",
9395
"communities.overview.chapter": "Chapter Overview",
9496
"communities.overview.learning-modules": "Moduli učenja",
@@ -153,8 +155,8 @@
153155
"communities.navigation.language.es": "Spanish",
154156
"communities.overview.courses.title": "Courses",
155157
"communities.overview.courses.description": "In the courses of this community, you will be able to learn about new technologies, solve challenges, get feedback and earn bounties.",
156-
"communities.overview.scoreboard.title": "Scoreboard",
157-
"communities.overview.scoreboard.description": "On the scoreboard, you can see which users have accumulated the most reputation by giving valuable feedback to their peers.",
158+
"communities.overview.scoreboard.title": "Rezultatska ploča",
159+
"communities.overview.scoreboard.description": "Na ploči rezultata možete vidjeti koji su korisnici stekli najviše reputacije pružanjem vrijednih povratnih informacija svojim kolegama.",
158160
"communities.scoreboard.empty-state.title": "Nema bodova za ovu kategoriju.",
159161
"communities.card.estimated": "Estimated Time",
160162
"communities.card.earn": "Earn rewards",

src/components/cards/community/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default function CommunityCard({ showRewards = true, community }: Communi
7474
</div>
7575
<div className="flex flex-col items-start justify-start max-w-xs -mt-4 md:flex-row lg:flex-col md:-mt-7 md:max-w-lg">
7676
{showRewards && reward && (
77-
<div className="text-sm">
77+
<div className="text-sm flex">
7878
<RewardBadge reward={{ token: reward.token }} styles={rewardBadgeStyle} />
7979
</div>
8080
)}

src/components/sections/challenges/Learning.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default function Learning({ courses, learningModules, community }: { cour
2424
isExpanded
2525
content={
2626
<>
27-
<div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-99">{t("communities.overview.challenge.learning.title")}</div>
27+
<div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-182.5">{t("communities.overview.challenge.learning.title")}</div>
2828
<div className="md:grid grid-cols-2 gap-3">
2929
{courses?.map((course) => (
3030
<LearningCard

0 commit comments

Comments
 (0)