Skip to content

Commit add8eca

Browse files
committed
Merge branch 'dev' into fix/remove-tacode
2 parents c9c0355 + 90ecfa0 commit add8eca

File tree

49 files changed

+600
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+600
-137
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Describe the bug\*\*
2+
3+
A clear and concise description of what the bug is.
4+
5+
**To Reproduce**
6+
Steps to reproduce the behavior:
7+
8+
1. Go to '...'
9+
2. Click on '....'
10+
3. Scroll down to '....'
11+
4. See error
12+
13+
**Expected behavior**
14+
A clear and concise description of what you expected to happen.
15+
16+
**Screenshots**
17+
If applicable, add screenshots to help explain your problem.
18+
19+
**Environment:**
20+
21+
- Operating System: [e.g. iOS]
22+
- Browser and version: (To be filled based on the specific browser used)
23+
- Application or software version: (The specific version of the application where the issue is discovered)
24+
25+
**Additional context**
26+
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
name: Custom issue template
3+
about: Describe this issue template's purpose here.
4+
5+
6+
---
7+
8+
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
**Is your feature request related to a problem? Please describe.**
2+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
3+
4+
**Describe the solution you'd like**
5+
A clear and concise description of what you want to happen.
6+
7+
**Describe alternatives you've considered**
8+
A clear and concise description of any alternative solutions or features you've considered.
9+
10+
**Additional context**
11+
Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Submit a pull request
2+
3+
- [ ] This is not a duplicate of an existing pull request.
4+
- [ ] No existing features have been broken without good reason.
5+
- [ ] Your commit messages are detailed
6+
- [ ] The code style guideline have been followed.
7+
- [ ] Documentation has been updated to reflect your changes.
8+
- [ ] Tests have been added or updated to reflect your changes.
9+
- [ ] All tests pass.
10+
11+
---
12+
13+
Replace any ":question:" below with information about your pull request.
14+
15+
## Pull Request Details
16+
17+
Provide details about your pull request and what it adds, fixes, or changes.
18+
19+
:question:
20+
21+
## Breaking Changes
22+
23+
Describe what features are broken by this pull request and why, if any.
24+
25+
:question:
26+
27+
## Issues Fixed
28+
29+
Enter the issue numbers resolved by this pull request below, if any.
30+
31+
1. :question:
32+
33+
## Other Relevant Information
34+
35+
Provide any other important details below.

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://us-central1-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://us-central1-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: 6 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,14 +168,16 @@
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",
174176
"communities.card.submissions": "{{count}} Изявления",
175177
"communities.card.submission": "{{count}} Подчинение",
176178
"communities.card.courses": "in {{count}} Courses",
179+
"communities.card.challenges": "в {{count}} Предизвикателства",
180+
"communities.card.challenge": "в {{count}} Предизвикателство",
177181
"communities.card.course": "in {{count}} Course",
178182

179183
"communities.list-card.earn": "Earn",

public/locales/en/common.json

Lines changed: 4 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",
@@ -178,6 +180,8 @@
178180
"communities.card.submission": "{{count}} Submission",
179181
"communities.card.courses": "in {{count}} Courses",
180182
"communities.card.course": "in {{count}} Course",
183+
"communities.card.challenges": "in {{count}} Challenges",
184+
"communities.card.challenge": "in {{count}} Challenge",
181185
"communities.list-card.earn": "Earn",
182186
"course.challenge.button": "Start now",
183187
"course.challenge.level-0": "Beginner",

0 commit comments

Comments
 (0)