Merge branch 'main' into feat/638-add-data-reg

Author: satrija87

.env.example

@@ -1 +1,7 @@
-API_URL=URL
+API_BASE_URL=https://cdn.rs.school
+YOUTUBE_API_KEY=YOUTUBE_API_KEY
+LOG_QUERY=true
+
+# Contentful
+CONTENTFUL_SPACE_ID=CONTENTFUL_SPACE_ID
+CONTENTFUL_MANAGEMENT_TOKEN=CONTENTFUL_MANAGEMENT_TOKEN

.github/workflows/main.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   NODE_VERSION: 20.x
-  API_URL: ${{ secrets.API_URL }}
+  API_BASE_URL: ${{ secrets.API_BASE_URL }}
   YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY_DEVELOPMENT }}
 
 jobs:

.github/workflows/preview-create.yml

@@ -15,7 +15,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.DEPLOY_AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.DEPLOY_AWS_SECRET_ACCESS_KEY }}
   AWS_REGION: 'eu-central-1'
-  API_URL: ${{ secrets.API_URL }}
+  API_BASE_URL: ${{ secrets.API_BASE_URL }}
   YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY_DEVELOPMENT }}
 
 jobs:

.github/workflows/production.yml

@@ -20,7 +20,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.DEPLOY_AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.DEPLOY_AWS_SECRET_ACCESS_KEY }}
   AWS_REGION: 'eu-central-1'
-  API_URL: ${{ secrets.API_URL }}
+  API_BASE_URL: ${{ secrets.API_BASE_URL }}
   YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY_PRODUCTION }}
 
 jobs:

.github/workflows/visual-testing-on-comment.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   NODE_VERSION: 20.x
-  API_URL: ${{ secrets.API_URL }}
+  API_BASE_URL: ${{ secrets.API_BASE_URL }}
   YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY_DEVELOPMENT }}
 
 jobs:

.github/workflows/visual-testing-on-push.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   NODE_VERSION: 20.x
-  API_URL: ${{ secrets.API_URL }}
+  API_BASE_URL: ${{ secrets.API_BASE_URL }}
   YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY_DEVELOPMENT }}
 
 jobs:

dev-data/about-course.data.tsx

@@ -1,11 +1,14 @@
-import { ROUTES } from '@/core/const';
 import awardIcon from '@/shared/assets/icons/award-icon.webp';
 import giftIcon from '@/shared/assets/icons/gift.webp';
 import noteIcon from '@/shared/assets/icons/note-icon.webp';
 import paperIcon from '@/shared/assets/icons/paper-icon.webp';
 import personIcon from '@/shared/assets/icons/person-icon.webp';
 import planetIcon from '@/shared/assets/icons/planet.webp';
-import { REGISTRATION_WILL_OPEN_SOON, REGISTRATION_WILL_OPEN_SOON_RU } from '@/shared/constants';
+import {
+  REGISTRATION_WILL_OPEN_SOON,
+  REGISTRATION_WILL_OPEN_SOON_RU,
+  ROUTES,
+} from '@/shared/constants';
 import { LinkCustom } from '@/shared/ui/link-custom';
 import { List } from '@/shared/ui/list';
 import type { AboutCourseInfo } from 'data';
@@ -95,14 +98,14 @@ const listData = {
 const angularNodejsAwsFundamentals: (course: string) => AboutCourseInfo[] = () => [
   {
     id: 1,
-    title: 'For everyone',
-    info: 'Everyone can study at RS School, regardless of age, professional employment, or place of residence. However, you should have sufficient base knowledge before the program begins.The RS School is working by the principle of "Pay it forward". Members of our community share their knowledge and check students\' tasks for free. And we hope that our students will continue this work as our mentors in the future.',
+    title: 'For JS/FE graduates',
+    info: 'This course is exclusively available for students who have successfully completed JS/FE Stage 2. The RS School continues working by the principle of "Pay it forward". Members of our community share their knowledge and check students\' tasks for free. And we hope that our students will continue this work as our mentors in the future.',
     icon: personIcon,
   },
   {
     id: 2,
     title: 'Materials',
-    info: 'Everyone can study at RS School, regardless of age, professional employment, or place of residence. However, you should have sufficient base knowledge before the program begins.',
+    info: 'All materials are publicly available on the YouTube channel and GitHub',
     icon: paperIcon,
   },
   {
@@ -199,7 +202,7 @@ const javaScriptPreSchoolRU: () => AboutCourseInfo[] = () => {
     {
       id: 2,
       title: 'Время обучения',
-      info: 'Длительность обучения: 18 недель. Формат обучения: самообучение, групповое обучение, общение в Discord, задания проверяют в процессе кросс-чек и автоматически.',
+      info: 'Длительность обучения: 10 недель. Формат обучения: самообучение, групповое обучение, общение в Discord, задания проверяют в процессе кросс-чек и автоматически.',
       icon: noteIcon,
     },
     {
@@ -208,12 +211,6 @@ const javaScriptPreSchoolRU: () => AboutCourseInfo[] = () => {
       info: 'В RS School работает принцип "Pay it forward". Мы бесплатно делимся с учащимися своими знаниями сейчас, надеясь, что в будущем они вернутся к нам в качестве менторов и точно так же передадут свои знания следующему поколению студентов.',
       icon: giftIcon,
     },
-    {
-      id: 4,
-      title: 'Сертификат',
-      info: 'При успешном прохождении курса выдается электронный сертификат.',
-      icon: awardIcon,
-    },
   ];
 };
 

dev-data/angular.data.ts

@@ -1,4 +1,4 @@
-import { DISCORD_LINKS } from './courseTitles.data';
+import { DISCORD_LINKS } from './course-titles.data';
 
 export const RS_DOCS_COMMUNICATION_LINK = 'https://docs.rs.school/#/rs-school-chats';
 export const RS_DOCS_EN_LINK = 'https://docs.rs.school/#/en/';

dev-data/aws-devops.data.ts

@@ -1,4 +1,4 @@
-import { LINKS, ROUTES } from '@/core/const';
+import { LINKS, ROUTES } from '@/shared/constants';
 
 export const contributeOptions = [
   {