Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Our programs sections #17

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,10 @@ yarn-debug.log*
yarn.lock

/config/database.yml

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.0.2
3.0.2
Binary file added app/assets/images/Group 48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Shopify_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logo-rails.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logo-react.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions app/assets/stylesheets/home/Our_Programs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
@import './variables.scss';

.programs_container {
text-align: center;
margin: 1rem auto;
display: flex;
justify-content: center;
flex-direction: column;
background-color: #f5f6f8;
align-items: center;

h1 {
margin: 1.5rem auto;
font-weight: 800;
}
}

.white_container {
margin: 1rem auto;
background-color: white;
border-radius: 15px;
width: 85vw;
}

.program {
margin: 1rem auto;
&_img {
margin: 2rem auto;
max-width: 13rem;
}
.ux {
margin: 2rem auto;
max-width: 6rem;
}
h4 {
font-weight: 700;
color: $blue;
}
p {
font-weight: 600;
}
}

@media (min-width: 768px) {
.white_container {
display: grid;
grid-template-columns: 50% 50%;
padding: 1rem;
}
.program {
max-width: 100%;
max-height: 40vh;
align-items: center;
display: flex;
flex-direction: column;

&_img {
margin: auto;
max-width: 60%;
}
}
}

@media (min-width: 1024px) {
.white_container {
grid-template-columns: 25% 25% 25% 25%;
}
}
15 changes: 15 additions & 0 deletions app/views/home/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,18 @@
</div>
</div>
<% end %>

<div class="programs_container">
<h1>Nuestros programas</h1>
<div class="white_container">
<% t('our_programs.items').each do |item| %>
<div class="program">
<%=image_tag(item[:img], alt: t('hero.image_background'), class:item[:class])%>
<h4><%=item[:title]%></h4>
<p><%=item[:description]%></p>
</div>
<% end %>
</div>
<div>

</div>
19 changes: 9 additions & 10 deletions bin/webpack
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
ENV['NODE_ENV'] ||= 'development'
ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
ENV["NODE_ENV"] ||= "development"

require 'pathname'
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
Pathname.new(__FILE__).realpath)
require "pathname"
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
Pathname.new(__FILE__).realpath)

require 'bundler/setup'
require "bundler/setup"

require 'webpacker'
require 'webpacker/webpack_runner'
require "webpacker"
require "webpacker/webpack_runner"

APP_ROOT = File.expand_path('..', __dir__)
APP_ROOT = File.expand_path("..", __dir__)
Dir.chdir(APP_ROOT) do
Webpacker::WebpackRunner.run(ARGV)
end
19 changes: 9 additions & 10 deletions bin/webpack-dev-server
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
ENV['NODE_ENV'] ||= 'development'
ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
ENV["NODE_ENV"] ||= "development"

require 'pathname'
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
Pathname.new(__FILE__).realpath)
require "pathname"
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
Pathname.new(__FILE__).realpath)

require 'bundler/setup'
require "bundler/setup"

require 'webpacker'
require 'webpacker/dev_server_runner'
require "webpacker"
require "webpacker/dev_server_runner"

APP_ROOT = File.expand_path('..', __dir__)
APP_ROOT = File.expand_path("..", __dir__)
Dir.chdir(APP_ROOT) do
Webpacker::DevServerRunner.run(ARGV)
end
19 changes: 19 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,22 @@ en:
Intermediate object-oriented programming in HTML, CCS, and JS to start a career in technology.
It is also an option to accredit internships or professional stays."
icon: 'icon-lamp'
our_programs:
items:
- img: "logo-rails.png"
class: "program_img"
title: "Web"
description: "Ruby on rail Web Developer"
- img: "logo-react.png"
class: "program_img"
title: "Mobile"
description: "React Native Mobile Developer"
- img: "Shopify_logo.png"
class: "program_img"
title: "E-commerce"
description: "Shopify StoreFront Developer"
- img: "Group 48.png"
class: " ux "
title: "Design"
description: "UI/UX Designer"

18 changes: 18 additions & 0 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,21 @@ es:
intermedios de programación orientada a objetos en HTML, CCS, y JS para iniciar una carrera en tecnología.
También es una opción para acreditar las prácticas o estancias profesionales."
icon: 'icon-lamp'
our_programs:
items:
- img: "logo-rails.png"
class: "program_img"
title: "Web"
description: "Desarrollo web Ruby on Rail"
- img: "logo-react.png"
class: "program_img"
title: "Mobile"
description: "Desarrollador móvil React Native"
- img: "Shopify_logo.png"
class: "program_img"
title: "E-commerce"
description: "Desarrollador Shopify StoreFront"
- img: "Group 48.png"
class: " ux "
title: "Design"
description: "Diseñador UI/UX"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"husky": "^7.0.2",
"prettier": "2.3.2",
"stylelint": "^13.13.1",
"webpack-dev-server": "^4.0.0"
"webpack-dev-server": "^4.2.1"
},
"scripts": {
"precommit": "lint-staged"
Expand Down