From 08ed1707fd7206d9d580deffaf251c187cc53938 Mon Sep 17 00:00:00 2001 From: Sonali Goel <112942761+goelsonali@users.noreply.github.com> Date: Wed, 15 May 2024 09:27:06 +0100 Subject: [PATCH 1/4] add active study group Adding active study group --- _data/study_group.yml | 28 ++++++++++++++++++++++++++++ _sass/custom/_card.scss | 18 ++++++++++++++++++ program-study-group.html | 26 ++++++++++++++++++++++---- 3 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 _data/study_group.yml diff --git a/_data/study_group.yml b/_data/study_group.yml new file mode 100644 index 00000000..ed825c6b --- /dev/null +++ b/_data/study_group.yml @@ -0,0 +1,28 @@ +- title: Data Analytics and Generative AI concepts + mentor: Kirthikka Devi Venkataram + description: The study group focuses more on the Data Analytics and Generative AI concepts and guiding on the insights across the span of industries upskilling on relevant knowledge and practical work. + participants: 3 + status: active + profile: https://www.linkedin.com/in/kirthikka-devi-v + index: 1 +- title: Frontend Javascript + mentor: Stephanie Senoner + description: Project based study group, working towards a shared application (including SDLC introduction, gaining more experience in reviewing PR, git etc), with guidance on different aspects like testing, CI/CD. + participants: 2 + status: active + profile: https://www.linkedin.com/in/stephanie-senoner + index: 2 +- title: Backend with Java and Rust + mentor: Liliia Rafikova + description: Focus on Java including the whole developing process with creating projects and push them to git doing pairing review. + participants: 5 + status: active + profile: https://www.linkedin.com/in/liliia-rafikova-635328104/ + index: 3 +- title: Fullstack - Reactjs,Nodejs and Backend in Java + mentor: Hersi Kopani + description: Focus on fullstack development using Java as backend + participants: 6 + status: active + profile: https://www.linkedin.com/in/hersi-kopani + index: 4 \ No newline at end of file diff --git a/_sass/custom/_card.scss b/_sass/custom/_card.scss index 69da0a14..3ad10e93 100644 --- a/_sass/custom/_card.scss +++ b/_sass/custom/_card.scss @@ -275,6 +275,24 @@ } } +.card-study { + border: 3px solid $link-color; + margin: 0 0 map-get($spacers, 3) 0; + + h3 { + color: $link-color; + } + a { + &:hover { + text-decoration: underline; + } + } + h7 { + color: $text-secondary; + } + +} + .card-resource { a { &:hover { diff --git a/program-study-group.html b/program-study-group.html index e4669a35..04fb2e42 100644 --- a/program-study-group.html +++ b/program-study-group.html @@ -19,11 +19,29 @@ to expand your expertise, there's a study group for you.

These study groups typically last anywhere from 1-2 months to longer durations, allowing participants to delve - deeply into the subject matter and benefit from the guidance of experienced mentors.

-

Stay tuned for exciting news about upcoming study groups! We'll be announcing new opportunities soon, so - be sure - to check back frequently for updates.

+ deeply into the subject matter and benefit from the guidance of experienced mentors.

+
+

Active Study Groups

+ {% for stgroup in site.data.study_group %} + {% if stgroup.status == 'active' %} +
+
+
+
+

{{stgroup.title}}

+

Mentor: {{stgroup.mentor}}

+

{{stgroup.description}}

+ Participants: {{stgroup.participants}} +
+
+
+
+ {% endif %} + {% endfor %} +

We'll be announcing new opportunities soon, So come join us in our

+

Study Group Slack Channel

+
From 1510218a1a8d8913dcc8aed0961e3ac4c1d05a03 Mon Sep 17 00:00:00 2001 From: Sonali Goel <112942761+goelsonali@users.noreply.github.com> Date: Wed, 15 May 2024 09:56:28 +0100 Subject: [PATCH 2/4] resolving conflict --- program-study-group.html | 77 +++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/program-study-group.html b/program-study-group.html index d267e6ad..fddbdab7 100644 --- a/program-study-group.html +++ b/program-study-group.html @@ -4,46 +4,43 @@ body_class: page page-programme page-study-group --- -
- {% include page-header.html %} -
-
-
-
-

Explore our technical study groups, created in collaboration with available mentors, to deepen your - knowledge and - skills in specific areas of interest.

-

Our study groups cover a variety of topics and are designed to accommodate different schedules and - experience - levels. Whether you're a beginner looking to dive into a new technology or an experienced professional - seeking - to expand your expertise, there's a study group for you.

-

These study groups typically last anywhere from 1-2 months to longer durations, allowing participants to - delve - deeply into the subject matter and benefit from the guidance of experienced mentors.

-
-
-

Active Study Groups

- {% for stgroup in site.data.study_group %} - {% if stgroup.status == 'active' %} -
-
-
-
-

{{stgroup.title}}

-

Mentor: {{stgroup.mentor}}

-

{{stgroup.description}}

- Participants: {{stgroup.participants}} -
-
-
-
- {% endif %} - {% endfor %} -

We'll be announcing new opportunities soon, So come join us in our

-

Study Group Slack Channel

-
-
+
+
+
+
+

Explore our technical study groups, created in collaboration with available mentors, to deepen your + knowledge and + skills in specific areas of interest.

+

Our study groups cover a variety of topics and are designed to accommodate different schedules and + experience + levels. Whether you're a beginner looking to dive into a new technology or an experienced professional + seeking + to expand your expertise, there's a study group for you.

+

These study groups typically last anywhere from 1-2 months to longer durations, allowing participants to + delve + deeply into the subject matter and benefit from the guidance of experienced mentors.

+
+
+

Active Study Groups

+ {% for stgroup in site.data.study_group %} + {% if stgroup.status == 'active' %} +
+
+
+
+

{{stgroup.title}}

+

Mentor: {{stgroup.mentor}}

+

{{stgroup.description}}

+ Participants: {{stgroup.participants}} +
+
+
+
+ {% endif %} + {% endfor %} +

We'll be announcing new opportunities soon, So come join us in our

+

Study Group Slack Channel

+
From 7f1f04ae85202d65a48dba2e2f0c399d6d92a741 Mon Sep 17 00:00:00 2001 From: Sonali Goel <112942761+goelsonali@users.noreply.github.com> Date: Wed, 15 May 2024 10:18:19 +0100 Subject: [PATCH 3/4] Address review comments --- _sass/custom/_card.scss | 3 --- program-study-group.html | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/_sass/custom/_card.scss b/_sass/custom/_card.scss index 3ad10e93..ed716090 100644 --- a/_sass/custom/_card.scss +++ b/_sass/custom/_card.scss @@ -287,9 +287,6 @@ text-decoration: underline; } } - h7 { - color: $text-secondary; - } } diff --git a/program-study-group.html b/program-study-group.html index fddbdab7..150ecf9a 100644 --- a/program-study-group.html +++ b/program-study-group.html @@ -20,18 +20,18 @@ delve deeply into the subject matter and benefit from the guidance of experienced mentors.

-
+

Active Study Groups

{% for stgroup in site.data.study_group %} {% if stgroup.status == 'active' %} -
+

{{stgroup.title}}

Mentor: {{stgroup.mentor}}

{{stgroup.description}}

- Participants: {{stgroup.participants}} +

Participants: {{stgroup.participants}}

From ab0c3a6c3a98cd4f62361d170e93a525d53e5517 Mon Sep 17 00:00:00 2001 From: Sonali Goel <112942761+goelsonali@users.noreply.github.com> Date: Wed, 15 May 2024 10:39:55 +0100 Subject: [PATCH 4/4] review comments to update styling --- _data/study_group.yml | 8 ++++---- _sass/custom/_card.scss | 2 +- program-study-group.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_data/study_group.yml b/_data/study_group.yml index ed825c6b..25a304d0 100644 --- a/_data/study_group.yml +++ b/_data/study_group.yml @@ -3,26 +3,26 @@ description: The study group focuses more on the Data Analytics and Generative AI concepts and guiding on the insights across the span of industries upskilling on relevant knowledge and practical work. participants: 3 status: active - profile: https://www.linkedin.com/in/kirthikka-devi-v + linkedin: https://www.linkedin.com/in/kirthikka-devi-v index: 1 - title: Frontend Javascript mentor: Stephanie Senoner description: Project based study group, working towards a shared application (including SDLC introduction, gaining more experience in reviewing PR, git etc), with guidance on different aspects like testing, CI/CD. participants: 2 status: active - profile: https://www.linkedin.com/in/stephanie-senoner + linkedin: https://www.linkedin.com/in/stephanie-senoner index: 2 - title: Backend with Java and Rust mentor: Liliia Rafikova description: Focus on Java including the whole developing process with creating projects and push them to git doing pairing review. participants: 5 status: active - profile: https://www.linkedin.com/in/liliia-rafikova-635328104/ + linkedin: https://www.linkedin.com/in/liliia-rafikova-635328104/ index: 3 - title: Fullstack - Reactjs,Nodejs and Backend in Java mentor: Hersi Kopani description: Focus on fullstack development using Java as backend participants: 6 status: active - profile: https://www.linkedin.com/in/hersi-kopani + linkedin: https://www.linkedin.com/in/hersi-kopani index: 4 \ No newline at end of file diff --git a/_sass/custom/_card.scss b/_sass/custom/_card.scss index ed716090..f60fe970 100644 --- a/_sass/custom/_card.scss +++ b/_sass/custom/_card.scss @@ -276,7 +276,7 @@ } .card-study { - border: 3px solid $link-color; + border: 3px solid $border-color; margin: 0 0 map-get($spacers, 3) 0; h3 { diff --git a/program-study-group.html b/program-study-group.html index 150ecf9a..b9d7aa53 100644 --- a/program-study-group.html +++ b/program-study-group.html @@ -29,7 +29,7 @@

Active Study Groups

{{stgroup.title}}

-

Mentor: {{stgroup.mentor}}

+

Mentor: {{stgroup.mentor}}

{{stgroup.description}}

Participants: {{stgroup.participants}}