Skip to content

Commit

Permalink
chore: 774 - resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Quiddlee committed Feb 16, 2025
2 parents 41ab6ca + 0c2187a commit 97013d6
Show file tree
Hide file tree
Showing 49 changed files with 417 additions and 222 deletions.
32 changes: 32 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Next.js: debug server-side",
"type": "node-terminal",
"request": "launch",
"command": "npm run dev"
},
{
"name": "Next.js: debug client-side",
"type": "chrome",
"request": "launch",
"url": "http://localhost:3000"
},
{
"name": "Next.js: debug full stack",
"type": "node",
"request": "launch",
"program": "${workspaceFolder}/node_modules/next/dist/bin/next",
"runtimeArgs": ["--inspect"],
"skipFiles": ["<node_internals>/**"],
"serverReadyAction": {
"action": "debugWithChrome",
"killOnServerStop": true,
"pattern": "- Local:.+(https?://.+)",
"uriFormat": "%s",
"webRoot": "${workspaceFolder}"
}
}
]
}
21 changes: 10 additions & 11 deletions dev-data/courses-path.data.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { type CoursesPath } from './courses-data.types';
import { ROUTES } from '@/core/const';
import AWSDeveloperIcon from '@/shared/assets/icons/aws-developer.webp';
import AWSFundamentalsIcon from '@/shared/assets/icons/aws-fundamentals.webp';
import HTMLIcon from '@/shared/assets/icons/html.webp';
import JSIcon from '@/shared/assets/icons/javascript.webp';
import NodeJSIcon from '@/shared/assets/icons/nodejs.webp';
import awsBlack from '@/shared/assets/icons/aws-black.svg';
import html from '@/shared/assets/icons/html5.svg';
import javascript from '@/shared/assets/icons/javascript.svg';
import nodeJs from '@/shared/assets/icons/node-js.svg';
import ReactAngIcon from '@/shared/assets/icons/react-angular.svg';

export const coursesPath: CoursesPath[] = [
Expand All @@ -13,7 +12,7 @@ export const coursesPath: CoursesPath[] = [
title: 'Pre-school (RU)',
description:
'For those brand new to coding, this is your starting point. Get acquainted with the basics and build a strong foundation.',
logoIcon: HTMLIcon,
logoIcon: html,
links: [
{
linkTitle: 'Pre-school (RU)',
Expand All @@ -27,7 +26,7 @@ export const coursesPath: CoursesPath[] = [
title: 'JS/TS/FE Fundamentals',
description:
'Dive deep into the world of JavaScript, TypeScript, and Frontend development. Understand the core concepts and set yourself up for success.',
logoIcon: JSIcon,
logoIcon: javascript,
links: [
{
linkTitle: 'JS/TS/FE Fundamentals (RU)',
Expand Down Expand Up @@ -61,7 +60,7 @@ export const coursesPath: CoursesPath[] = [
title: 'NodeJS',
description:
"Grasp the power of backend development. With Nodejs, you'll learn to build robust and scalable applications",
logoIcon: NodeJSIcon,
logoIcon: nodeJs,
links: [
{
linkTitle: 'Node',
Expand All @@ -74,7 +73,7 @@ export const coursesPath: CoursesPath[] = [
title: 'AWS Fundamentals',
description:
'Delve into the cloud with Amazon Web Services. Understand the essentials and ensure your apps are hosted seamlessly.',
logoIcon: AWSFundamentalsIcon,
logoIcon: awsBlack,
links: [
{
linkTitle: 'AWS Fundamentals',
Expand All @@ -87,7 +86,7 @@ export const coursesPath: CoursesPath[] = [
title: 'AWS Developer',
description:
'Go beyond the basics. Become an AWS pro and unlock the potential of cloud development.',
logoIcon: AWSDeveloperIcon,
logoIcon: awsBlack,
links: [
{
linkTitle: 'AWS Developer',
Expand All @@ -100,7 +99,7 @@ export const coursesPath: CoursesPath[] = [
title: 'AWS DevOps',
description:
'If you are looking for an entry point to kickstart your IT career as a DevOps engineer, then this AWS course challenge is what you need.',
logoIcon: AWSDeveloperIcon,
logoIcon: awsBlack,
links: [
{
linkTitle: 'AWS DevOps',
Expand Down
72 changes: 36 additions & 36 deletions dev-data/courses.data.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
import { ROUTES } from '@/core/const';
import type { Course } from '@/entities/course';
import angularSecondary from '@/shared/assets/icons/angular-secondary.webp';
import angular from '@/shared/assets/icons/angular.svg';
import awsSecondary from '@/shared/assets/icons/aws-secondary.webp';
import aws from '@/shared/assets/icons/aws.svg';
import angularSmall from '@/shared/assets/icons/footer/angular.webp';
import awsDevSmall from '@/shared/assets/icons/footer/aws-dev.webp';
import awsFundSmall from '@/shared/assets/icons/footer/aws-fundamentals.webp';
import htmlSmall from '@/shared/assets/icons/footer/html.webp';
import jsSmall from '@/shared/assets/icons/footer/javascript.webp';
import nodejsSmall from '@/shared/assets/icons/footer/nodejs.webp';
import reactSmall from '@/shared/assets/icons/footer/react.webp';
import javascript from '@/shared/assets/icons/javascript.webp';
import jsSecondary from '@/shared/assets/icons/js-secondary.webp';
import nodejs from '@/shared/assets/icons/node.svg';
import nodejsSecondary from '@/shared/assets/icons/nodejs-secondary.webp';
import reactSecondary from '@/shared/assets/icons/react-secondary.webp';
import awsBlack from '@/shared/assets/icons/aws-black.svg';
import awsWhite from '@/shared/assets/icons/aws-white.svg';
import html5 from '@/shared/assets/icons/html5.svg';
import javascriptBlack from '@/shared/assets/icons/javascript-black.svg';
import javascript from '@/shared/assets/icons/javascript.svg';
import nodejs from '@/shared/assets/icons/node-js.svg';
import react from '@/shared/assets/icons/react.svg';
import { COURSE_LINKS, TO_BE_DETERMINED } from '@/shared/constants';
import { COURSE_TITLES } from 'data';
Expand All @@ -28,8 +19,9 @@ export const courses: Course[] = [
descriptionUrl: COURSE_LINKS.JS_PRESCHOOL_RU,
altTitle: 'JavaScript / Front-end',
iconSrc: javascript,
iconSmall: htmlSmall,
secondaryIcon: jsSecondary,
iconSmall: html5,
iconFooter: html5,
secondaryIcon: javascriptBlack,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'ru',
Expand All @@ -48,8 +40,9 @@ export const courses: Course[] = [
descriptionUrl: COURSE_LINKS.JS_EN,
altTitle: 'JavaScript / Front-end',
iconSrc: javascript,
iconSmall: jsSmall,
secondaryIcon: jsSecondary,
iconSmall: javascript,
iconFooter: javascript,
secondaryIcon: javascriptBlack,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'en',
Expand All @@ -68,8 +61,9 @@ export const courses: Course[] = [
descriptionUrl: COURSE_LINKS.JS_RU,
altTitle: 'JavaScript / Front-end',
iconSrc: javascript,
iconSmall: jsSmall,
secondaryIcon: jsSecondary,
iconSmall: javascript,
iconFooter: javascript,
secondaryIcon: javascriptBlack,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'ru',
Expand All @@ -87,8 +81,9 @@ export const courses: Course[] = [
subTitle: null,
descriptionUrl: COURSE_LINKS.REACT,
iconSrc: react,
iconSmall: reactSmall,
secondaryIcon: reactSecondary,
iconSmall: react,
iconFooter: react,
secondaryIcon: react,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'en',
Expand All @@ -106,8 +101,9 @@ export const courses: Course[] = [
subTitle: null,
descriptionUrl: COURSE_LINKS.ANGULAR,
iconSrc: angular,
iconSmall: angularSmall,
secondaryIcon: angularSecondary,
iconSmall: angular,
iconFooter: angular,
secondaryIcon: angular,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'en',
Expand All @@ -125,8 +121,9 @@ export const courses: Course[] = [
subTitle: null,
descriptionUrl: COURSE_LINKS.NODE,
iconSrc: nodejs,
iconSmall: nodejsSmall,
secondaryIcon: nodejsSecondary,
iconSmall: nodejs,
iconFooter: nodejs,
secondaryIcon: nodejs,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'en',
Expand All @@ -143,9 +140,10 @@ export const courses: Course[] = [
title: COURSE_TITLES.AWS_FUNDAMENTALS,
subTitle: null,
descriptionUrl: COURSE_LINKS.AWS_FUNDAMENTALS,
iconSrc: aws,
iconSmall: awsFundSmall,
secondaryIcon: awsSecondary,
iconSrc: awsBlack,
iconSmall: awsBlack,
iconFooter: awsWhite,
secondaryIcon: awsBlack,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'en',
Expand All @@ -163,9 +161,10 @@ export const courses: Course[] = [
title: COURSE_TITLES.AWS_CLOUD_DEVELOPER,
subTitle: null,
descriptionUrl: COURSE_LINKS.AWS_CLOUD_DEVELOPER,
iconSrc: aws,
iconSmall: awsDevSmall,
secondaryIcon: awsSecondary,
iconSrc: awsBlack,
iconSmall: awsBlack,
secondaryIcon: awsBlack,
iconFooter: awsWhite,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'en',
Expand All @@ -182,9 +181,10 @@ export const courses: Course[] = [
title: COURSE_TITLES.AWS_DEVOPS,
subTitle: null,
descriptionUrl: COURSE_LINKS.AWS_DEVOPS,
iconSrc: aws,
iconSmall: awsDevSmall,
secondaryIcon: awsSecondary,
iconSrc: awsBlack,
iconSmall: awsBlack,
secondaryIcon: awsBlack,
iconFooter: awsWhite,
startDate: TO_BE_DETERMINED,
registrationEndDate: TO_BE_DETERMINED,
language: 'en',
Expand Down
25 changes: 11 additions & 14 deletions dev-data/mentorship.data.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import { COURSE_TITLES } from './courseTitles.data';
import { ROUTES } from '@/core/const';
import angular from '@/shared/assets/icons/angular.svg';
import angularSmall from '@/shared/assets/icons/footer/angular.webp';
import jsSmall from '@/shared/assets/icons/footer/javascript.webp';
import reactSmall from '@/shared/assets/icons/footer/react.webp';
import javascript from '@/shared/assets/icons/javascript.webp';
import javascript from '@/shared/assets/icons/javascript.svg';
import react from '@/shared/assets/icons/react.svg';
import assignment from '@/shared/assets/svg/assignment.svg';
import bestPractices from '@/shared/assets/svg/best-practices-icon.svg';
import codeReview from '@/shared/assets/svg/code-review-icon.svg';
import conductingTechInterview from '@/shared/assets/svg/conducting-tech-interview-icon.svg';
import supervisingTeamAssignment from '@/shared/assets/svg/supervising-team-assignment-icon.svg';
import interview from '@/shared/assets/svg/interview.svg';
import { TelegramIcon } from '@/shared/icons';
import { MENTOR_ONBOARD_TELEGRAM_EN, MENTOR_ONBOARD_TELEGRAM_RU, MentorshipCourse } from 'data';

Expand Down Expand Up @@ -52,12 +49,12 @@ const activitiesContent = {
"The mentor's experience and practical knowledge will help organize students to work on a team project",
},
icon: {
interview: conductingTechInterview,
interviewCore: conductingTechInterview,
interview: interview,
interviewCore: interview,
codeReview: codeReview,
bestPracticesFrame: bestPractices,
bestPracticesJS: bestPractices,
finalProject: supervisingTeamAssignment,
finalProject: assignment,
},
};

Expand Down Expand Up @@ -91,7 +88,7 @@ const onboardLinks = {
export const mentorshipCoursesDefault: MentorshipCourse = {
id: 0,
title: COURSE_TITLES.JS_EN,
iconSmall: jsSmall,
iconSmall: javascript,
lang: 'en',
detailsUrl: `/${ROUTES.MENTORSHIP}`,
links: {
Expand Down Expand Up @@ -161,7 +158,7 @@ export const mentorshipCourses: MentorshipCourse[] = [
id: 1,
title: COURSE_TITLES.JS_EN,
description: '',
iconSmall: jsSmall,
iconSmall: javascript,
lang: 'en',
detailsUrl: `/${ROUTES.MENTORSHIP}/${ROUTES.JS}`,
links: {
Expand Down Expand Up @@ -242,7 +239,7 @@ export const mentorshipCourses: MentorshipCourse[] = [
id: 2,
title: COURSE_TITLES.JS_RU,
description: '',
iconSmall: jsSmall,
iconSmall: javascript,
lang: 'ru',
detailsUrl: `/${ROUTES.MENTORSHIP}/${ROUTES.JS_RU}`,
links: {
Expand Down Expand Up @@ -322,7 +319,7 @@ export const mentorshipCourses: MentorshipCourse[] = [
id: 3,
title: COURSE_TITLES.REACT,
description: '',
iconSmall: reactSmall,
iconSmall: react,
lang: 'en',
detailsUrl: `/${ROUTES.MENTORSHIP}/${ROUTES.REACT}`,
links: {
Expand Down Expand Up @@ -390,7 +387,7 @@ export const mentorshipCourses: MentorshipCourse[] = [
id: 4,
title: COURSE_TITLES.ANGULAR,
description: '',
iconSmall: angularSmall,
iconSmall: angular,
lang: 'en',
detailsUrl: `/${ROUTES.MENTORSHIP}/${ROUTES.ANGULAR}`,
links: {
Expand Down
39 changes: 39 additions & 0 deletions readme/debugging.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Debugging Next.js

## Debugging Next.js with VS Code

This guide provides a brief overview of how to set up and debug a Next.js application using Visual Studio Code (VS Code).

### Steps to Debug Next.js in VS Code

**1. Configure VS Code debugger for Next.js with Chrome**

At the root of your project in the `.vscode` folder you have a launch configuration in VS Code to debug your Next.js application (`launch.json`). This configuration is created for debugging in `Chrome`, for other browsers, please use the settings described in the [Next.js documentation](https://nextjs.org/docs/app/building-your-application/configuring/debugging#debugging-with-vs-code).

**2. Start Debugging**

Now you can start debugging your Next.js application. Go to the `Debug view` by clicking on the Debug icon in the Activity Bar or press `⇧+⌘+D` (macOS) / `Ctrl+Shift+D` (Windows/Linux), select a launch configuration `Next.js: debug full stack`, then press `F5` or click the green `Start Debugging` or select `Debug: Start Debugging` from the Command Palette to start your debugging session.

**3. Set Breakpoints**

You can set breakpoints in your code by clicking in the gutter next to the line numbers in the editor. When the code execution reaches a breakpoint, it will pause, allowing you to inspect variables, step through code, and evaluate expressions.

**4. Inspect and Debug**

Use the Debug toolbar to control the execution of your code (macOs/Windows):

- Continue (`F5`): Resume execution until the next breakpoint.

- Step Over (`F10`): Execute the next line of code, but do not step into functions.

- Step Into (`F11`): Step into the function call on the current line.

- Step Out (`Shift+F11`): Step out of the current function.

- Restart (`⇧+⌘+F5` / `Ctrl+Shift+F5`): Restart the debugging session.

- Stop (`Shift+F5`): Stop debugging.

For more advanced debugging techniques, refer to the [VS Code Debugging Documentation](https://code.visualstudio.com/docs/editor/debugging) and the [Next.js Documentation](https://nextjs.org/docs/app/building-your-application/configuring/debugging).

Happy debugging! 🚀
2 changes: 1 addition & 1 deletion src/core/base-layout/components/footer/desktop-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const DesktopView = async () => {
{courses.map((course) => (
<SchoolMenu.Item
key={course.id}
icon={course.iconSmall}
icon={course.iconFooter}
title={course.title}
description={course.startDate}
url={course.detailsUrl}
Expand Down
1 change: 1 addition & 0 deletions src/entities/course/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export type Course = {
iconSrc: StaticImageData;
secondaryIcon: StaticImageData;
iconSmall: StaticImageData;
iconFooter: StaticImageData;
startDate: string;
registrationEndDate: string;
language: Language;
Expand Down
Loading

0 comments on commit 97013d6

Please sign in to comment.