diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2908070..3043212e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.7.2, 3.0.0] + ruby: [3.3.0, 3.3.1] #removed 3.0.0 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.ruby-version b/.ruby-version index 85588beb..c1f575c6 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.0.0 +ruby-3.3.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 7353afda..1b9f8766 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "jekyll", "~> 4.2.2" +gem "jekyll", "~> 4.3.3" gem 'jekyll-seo-tag' # check out this https://jekyll.github.io/jekyll-seo-tag/usage/ # If you want to use GitHub Pages, remove the "gem "jekyll"" above and diff --git a/Gemfile.lock b/Gemfile.lock index b8bda348..766759d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,111 +1,182 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + Ascii85 (1.1.1) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + afm (0.2.2) + async (2.11.0) + console (~> 1.25, >= 1.25.2) + fiber-annotation + io-event (~> 1.5, >= 1.5.1) + timers (~> 4.1) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.1.9) + concurrent-ruby (1.2.3) + console (1.25.2) + fiber-annotation + fiber-local (~> 1.1) + json em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) - eventmachine (1.2.7-x64-mingw32) - ffi (1.15.5) - ffi (1.15.5-x64-mingw32) + ffi (1.16.3) + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (0.1.1) forwardable-extended (2.6.0) - html-proofer (4.4.0) + google-protobuf (4.26.1) + rake (>= 13) + google-protobuf (4.26.1-aarch64-linux) + rake (>= 13) + google-protobuf (4.26.1-arm64-darwin) + rake (>= 13) + google-protobuf (4.26.1-x86-linux) + rake (>= 13) + google-protobuf (4.26.1-x86_64-darwin) + rake (>= 13) + google-protobuf (4.26.1-x86_64-linux) + rake (>= 13) + hashery (2.1.2) + html-proofer (5.0.9) addressable (~> 2.3) - mercenary (~> 0.3) + async (~> 2.1) nokogiri (~> 1.13) - parallel (~> 1.10) + pdf-reader (~> 2.11) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) zeitwerk (~> 2.5) http_parser.rb (0.8.0) - i18n (1.10.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + io-event (1.5.1) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-category-pages (1.1.2) jekyll (~> 4.0) jekyll-paginate (~> 1.1, >= 1.0.0) - jekyll-feed (0.16.0) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.1) + json (2.7.2) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.1) + liquid (4.0.4) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.8.0) - nokogiri (1.13.8) - mini_portile2 (~> 2.8.0) + nokogiri (1.16.5-aarch64-linux) racc (~> 1.4) - nokogiri (1.13.8-x64-mingw32) + nokogiri (1.16.5-arm-linux) + racc (~> 1.4) + nokogiri (1.16.5-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.5-x86-linux) + racc (~> 1.4) + nokogiri (1.16.5-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) - parallel (1.22.1) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.7) - racc (1.6.0) + pdf-reader (2.12.0) + Ascii85 (~> 1.0) + afm (~> 0.2.1) + hashery (~> 2.0) + ruby-rc4 + ttfunk + public_suffix (5.0.5) + racc (1.8.0) rainbow (3.1.1) - rake (13.0.6) - rb-fsevent (0.11.1) - rb-inotify (0.10.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (3.28.0) + rexml (3.2.8) + strscan (>= 3.0.9) + rouge (4.2.1) + ruby-rc4 (0.1.5) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) - sassc (2.4.0-x64-mingw32) - ffi (~> 1.9) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) - typhoeus (1.4.0) + sass-embedded (1.77.2-aarch64-linux-gnu) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-aarch64-linux-musl) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-arm-linux-gnueabihf) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-arm-linux-musleabihf) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-arm64-darwin) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-x86-linux-gnu) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-x86-linux-musl) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-x86_64-darwin) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-x86_64-linux-gnu) + google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.77.2-x86_64-linux-musl) + google-protobuf (>= 3.25, < 5.0) + strscan (3.1.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + timers (4.3.5) + ttfunk (1.8.0) + bigdecimal (~> 3.1) + typhoeus (1.4.1) ethon (>= 0.9.0) - tzinfo (2.0.2) - concurrent-ruby (~> 1.0) - tzinfo-data (1.2020.2) - tzinfo (>= 1.0.0) - unicode-display_width (1.8.0) - webrick (1.7.0) + unicode-display_width (2.5.0) + webrick (1.8.1) yell (2.2.2) - zeitwerk (2.6.0) + zeitwerk (2.6.14) PLATFORMS - ruby - x64-mingw32 + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnueabihf + arm-linux-musleabihf + arm64-darwin + x86-linux + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES html-proofer - jekyll (~> 4.2.2) + jekyll (~> 4.3.3) jekyll-category-pages jekyll-feed jekyll-paginate @@ -115,4 +186,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.2.5 + 2.5.10 diff --git a/README.md b/README.md index fe3c244b..7067a54c 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,10 @@ Configuration file: /Users/matt/code/tla/static/_config.yml ``` + +If these steps do not work for you, you may also try doing this: + + Visit whatever follows the server address line in your browser, which is usually [http://127.0.0.1:4000/](http://127.0.0.1:4000/). If you run into any issues, please let us know on our [issues tracker](https://github.com/uclaacm/teach-la-website)! diff --git a/_includes/blog-preview-card-small.html b/_includes/blog-preview-card-small.html new file mode 100644 index 00000000..43ca920d --- /dev/null +++ b/_includes/blog-preview-card-small.html @@ -0,0 +1,17 @@ + +
+ {{post.alt}} +
+
+

+ {{post.category}} | {{post.date | date: "%b %-d, %Y"}} +

+

{{post.title}}

+

by {{post.author}}

+
+
+ diff --git a/_includes/blog-preview-card.html b/_includes/blog-preview-card.html index 9deb8822..c4d47cc7 100644 --- a/_includes/blog-preview-card.html +++ b/_includes/blog-preview-card.html @@ -1,16 +1,12 @@ -
- - {{post.alt}} - -
-

- {{post.title}} -

-

- by {{post.author}} on {{ post.date | date: "%b %-d, %Y" }} | category: {{post.category}} -

-
-

{{post.excerpt}}

-
+ +
+ {{post.alt}} +
+

{{post.category}} | {{post.date | date: "%b %-d, %Y"}}

+

{{post.title}}

+

by {{post.author}}

+
+

{{post.excerpt}}

+
- \ No newline at end of file + \ No newline at end of file diff --git a/_sass/_basic.scss b/_sass/_basic.scss index 1c5a4ee8..4b2a47c7 100644 --- a/_sass/_basic.scss +++ b/_sass/_basic.scss @@ -126,6 +126,14 @@ ul > li { font-weight: 600; } +.subtitle{ + font-family: $font-display; + color: $teachla-green; + margin-bottom: 0; + font-size: 32px; + font-weight: 600; +} + .text-1x { font-size: 1rem !important; } @@ -342,6 +350,8 @@ ul > li { font-size: $pronouns-font-size; } + + .img-sponsor { max-width: 80%; } @@ -400,3 +410,22 @@ ul > li { padding: 20vh 0; // background-size: 100vw 100%; } + +.why-teach-la-column-left{ + float: left; + width: 30%; +} +.why-teach-la-column-right{ + float: right; + width: 70%; +} + +.why-teach-la-row{ + content: ""; + display: table; + clear: both; +} + +.about-table{ + color: $teachla-green; +} \ No newline at end of file diff --git a/_sass/_post.scss b/_sass/_post.scss index b0ace3e6..110921ed 100644 --- a/_sass/_post.scss +++ b/_sass/_post.scss @@ -1,3 +1,110 @@ +:root { + --primary: #5eda12; + --neutral: #585858; + --black: #313235; +} + +.top-padding { + padding-top: 3.5rem; +} + +.blogs { + display: grid; + grid-template-columns: repeat(2, minmax(300px, 1fr)); + gap: 4rem; + + @media (max-width: 768px) { + grid-template-columns: 1fr; + gap: 2rem; + } +} + +.post-card { + display: flex; + gap: 2rem; + + width: 100%; + padding: 3rem; + padding-right: 6rem; + + border-radius: 15px; + border: 1px solid var(--primary); + -webkit-box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.3); + box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.3); + + @media (max-width: 768px) { + flex-direction: column; + gap: 1rem; + padding: 2rem; + } +} + +.post-card.small-post-card { + flex-direction: column; + gap: 1rem; + padding: 2rem; + border: 0px; + height: 100%; +} + +.post-card .small-post-card--image { + max-height: 200px; + max-width: 100%; + border-radius: 15px; +} + +.post-card--description { + flex: 1 1 0px; + color: var(--black); + + h1 { + font-size: 24px; + } + + h2 { + font-size: 18px; + } + + h4 { + font-size: 12px; + font-weight: 400; + } + + span { + color: var(--primary); + + font-size: 18px; + letter-spacing: 0.3rem; + text-transform: uppercase; + } + + hr { + border: 1px solid var(--primary); + margin: 10px 0; + } + + * { + margin: 0.3rem; + padding: 0; + } +} + +.post-card--image { + flex: 1 1 0px; + object-fit: cover; + + max-width: 40%; + + @media (max-width: 768px) { + max-width: 100%; + max-height: 200px; + + border-radius: 15px; + } +} + + @media (min-width: $desktop-width) { .post-preview{ display: grid; @@ -7,13 +114,6 @@ } } -.post-card{ - border: solid black 2px; - margin-top: 3em; - padding: 1em; - padding-top: 0em; -} - .post-preview-img{ margin: 0.5em; margin-right: 1em; @@ -167,3 +267,7 @@ .social-RSS-icon { font-size: 2rem; } + +a { + text-decoration: none; +} \ No newline at end of file diff --git a/about.html b/about.html index 19920aec..7dc252d8 100644 --- a/about.html +++ b/about.html @@ -6,11 +6,12 @@ +
-

About Us

+

About

- Here is a comprehensive list of all of the classes that ACM Teach LA provides! You can find more information about what the class is about, its learning goals, and its curiculm. Part of our mission is making you education truly accessible, and that involves open-sourcing as much information as possible: everything out instructors have, you’ll find here. + bundle exec jekyll serve Here is a comprehensive list of all of the classes that ACM Teach LA provides! You can find more information about what the class is about, its learning goals, and its curiculm. Part of our mission is making you education truly accessible, and that involves open-sourcing as much information as possible: everything out instructors have, you’ll find here.

@@ -23,6 +24,9 @@

About Us

+ + +
@@ -31,93 +35,63 @@

About Us

- -

Our Mission

+
+

How We Work

- ACM Teach LA's core mission is to empower students in the LA area with the power of computer science, and to provide mentorship and support to students who want to pursue computer science, either academically or as a career. -

- -

Virtual Learning

-

- Due to updates with the COVID-19 pandemic, as of now, the majority of UCLA courses will be taught in person. As a result, Teach LA has shifted most of its classes back to in person instruction. However, our Python courses will utilize virtual spaces and will continue to operate remotely until further notice. As many of our partner schools continue to make the transition to in-person learning, we will work with teachers and our instructors to determine the best way to continue serving our students. -

- -

How Do I Join As A Teacher?

+ Classes are taught weekly, typically sized between 15 and 25 students, and are lead by UCLA undergraduate students with academic, personal or industry experience in computer science. Undergrads meet once a week with our Curriculum Director before each class to prepare for weekly lessons.

- Great question! Why not check out our join us page? + If you are an undergrad not specifically interested in teaching but still want to contribute to Teach LA’s mission, we have a dev team in which undergrads maintain and expand Teach LA’s website. Dev team meets weekly on a separate schedule that varies.

- If you have other questions, you can also send us an email at {{site.email}}! + Lastly, Teach LA has other outreach events with schools in the LA area. This may include speaker events in which undergrads give a talk on a specific topic within computer science or day long activities with a given school.

-

We're a School/Organization. Can We Work Together?

-

- Of course! Currently, we're looking to partner with schools to run quarter/year-long curriculums, as well as running one-off instructional and networking events. If you're interested, please send an email to {{site.email}}.

+
+

Why Teach LA

+
+
+
+

+ As of 2018, only 22 out of 50 states have K-12 computer science standards, and only 35% of public high schools in America teach computer science. Specifically, students from minority backgrounds receive the least exposure to computer science, especially as school districts serving minority communities often lack STEM funding. +

+

+ ACM Teach LA aims to fill this gap by providing schools and students with in-school and extracurricular support. Our flagship program consists of quarter to year-long structured classes on various computer science topics (basic programming, web development, machine learning, data science, computer graphics), backed by robust and structured curriculums and student tutors with academic and industry experience. We've also developed an open-source online code IDE, with the goal of supporting students' computer science learning regardless of their access to a certain type of computer. We also perform outreach, either through events (e.g. Day of Code) or by visitng schools and talking to students. +

+
+
+ graph of schools that offer computer science +
+
-

Spring Quarter Schools and Schedule

- - - - - - + +

Reports, Reflections, & Accountability

SchoolsClassSchedule
- - - - - - - - - - - - - - - - - - - - - - - + +
Emerson Middle School Intro to Python Wednesdays at 8:00 - 8:50 AM
Western TECH STEAM K-8 Python Date and time TBD
North Hollywood High School Web & Mobile App Development Monday at 3:30 - 4:30 PM
Short Avenue Elementary School Scratch Fridays at 12:40-1:40 PM
Speaker Series Varied N/A

'20-21 Intern Application Stats

+

+ + A quick summary of statistics surrounding our '20-21 intern application cycle.
+ + + + + -

How Does Teach LA Work?

-

- Classes are taught weekly, typically sized between 15 and 25 students, and are lead by UCLA undergraduate students with academic, personal or industry experience in computer science. Undergrads meet once a week with our Curriculum Director before each class to prepare for weekly lessons. -

-

- If you are an undergrad not specifically interested in teaching but still want to contribute to Teach LA’s mission, we have a dev team in which undergrads maintain and expand Teach LA’s website. Dev team meets weekly on a separate schedule that varies. -

-

- Lastly, Teach LA has other outreach events with schools in the LA area. This may include speaker events in which undergrads give a talk on a specific topic within computer science or day long activities with a given school. -

-

What Do Students Learn?

-

- Depending on the group of students and their coding backgrounds, we shape the class to maximize their learning. Topics that students have learned in the past include programming fundamentals (in Python or Scratch) and intro to web development (in HTML/CSS), as well as complex topics like machine learning and mobile app development. We’re looking to expand our set of topics: data science, game development, digital art, you name it - if you're interested, get in touch! -

-

- You can find out more on our classes page. -

+

'20-21 Intern Application Stats

+

+ A quick summary of statistics surrounding our '20-21 intern application cycle.

+ + + + + -

About ACM

-

- ACM is the largest computer science student organization at UCLA. It is split into eight committees (of which ACM Teach LA is one), each serving a different topic and mission. ACM regularly holds events for the UCLA community with the goal of giving students more opportunities to explore different aspects of computer science. UCLA students are encouraged to attend as many of the events as they'd like (they're free, beginner-friendly, and have free food). Organizations looking to work with ACM @ UCLA should contact ACM at acm@ucla.edu. -

+

'20-21 Intern Application Stats

+

-

Why Teach LA?

-

- As of 2018, only 22 out of 50 states have K-12 computer science standards, and only 35% of public high schools in America teach computer science. Specifically, students from minority backgrounds receive the least exposure to computer science, especially as school districts serving minority communities often lack STEM funding. -

-

- ACM Teach LA aims to fill this gap by providing schools and students with in-school and extracurricular support. Our flagship program consists of quarter to year-long structured classes on various computer science topics (basic programming, web development, machine learning, data science, computer graphics), backed by robust and structured curriculums and student tutors with academic and industry experience. We've also developed an open-source online code IDE, with the goal of supporting students' computer science learning regardless of their access to a certain type of computer. We also perform outreach, either through events (e.g. Day of Code) or by visitng schools and talking to students. -

+ A quick summary of statistics surrounding our '20-21 intern application cycle.

\ No newline at end of file diff --git a/blog.html b/blog.html index c2f94dea..260c92d0 100644 --- a/blog.html +++ b/blog.html @@ -8,32 +8,35 @@

The Teach LA Blog

We love what we do, and we want to share it with you! Here are some insights from our members on how our club operates: how we teach, write code, and create a community!

-

- Interested in more formal reflections on the inner workings of our club? Check out reports section. Curious in how we handle teaching an artificial intelligence and machine learning class at a high school, or our joint efforts to provide AI education? Peep the ACM AI blog! -

-

- Read posts via RSS - - - - - -

+

Most Recent

+{% assign post_count = 0 %} {% for post in site.posts %} -
+ {% assign post_count = post_count | plus: 1 %} + + {% if post_count == 2 %} +

Past blogs

+
+ {% endif %} + + {% if post_count == 1 %} + {% include blog-preview-card.html %} + {% endif %} + {% if post_count >= 2 %} + {% include blog-preview-card-small.html %} + {% endif %} + +{% endfor %} +
- + - {% comment %} + \ No newline at end of file diff --git a/img/links.png b/img/links.png new file mode 100644 index 00000000..7f89a633 Binary files /dev/null and b/img/links.png differ diff --git a/img/teach-la-pie-chart.png b/img/teach-la-pie-chart.png new file mode 100644 index 00000000..84176157 Binary files /dev/null and b/img/teach-la-pie-chart.png differ