Skip to content

landing page content & basic cng #4

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.

Sign up for GitHub

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

Open
arif362 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

landing page content & basic cng #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 2 deletions app/assets/stylesheets/contact_us.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,12 @@ $ph-letter-spacing: 1px;

/* Contact Us From Design */
.contact-us-wrapper {
background: image-url("map-image.png") no-repeat;
background-image: image-url("m_4.png");
background-repeat: no-repeat;
background-size: cover;
background-position: center center;
//background: image-url("map-image.png") no-repeat;
//background-size: cover;
//background-position: center center;
background-color: #222;
//border: 8px solid #fff;
.contact-us-bg-opacity {
Expand Down
14 changes: 7 additions & 7 deletions app/assets/stylesheets/pricing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ $accent_hover: darkslategray;
#pp {
.pricing {
border-radius: 5px;
background: $accent;
padding: 40px 0 20px;
color: #fff;
//background: $accent;
//padding: 40px 0 20px;
//color: #fff;
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .3);
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, .3);
box-shadow: 0 0 3px rgba(0, 0, 0, .3);
Expand All @@ -34,14 +34,14 @@ $accent_hover: darkslategray;
}
}
& .title {
background: $accent_hover;
margin: 40px 0 0;
//background: $accent_hover;
//margin: 40px 0 0;
padding: 10px;
font-size: 18px;
text-align: center;
text-transform: uppercase;
font-weight: 700;
color: #ffffff;
//color: #ffffff;
}
& .content {
//display: none;
Expand Down Expand Up @@ -82,6 +82,6 @@ $accent_hover: darkslategray;
}
}
}
margin-bottom: 20px;
//margin-bottom: 20px;
}
}
6 changes: 3 additions & 3 deletions app/models/app_settings.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ class AppSettings
MONTHS_SHORT_NAME = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'June', 'July', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec']

REGISTRATION_PROGRESS = {
create_account: 'Create Account',
company_profile: 'Company Profile',
select_module: 'Select Module',
create_account: 'User Info',
company_profile: 'Company Info',
select_module: 'Select Services',
# finalize: 'Finalize'
}

Expand Down
2 changes: 2 additions & 0 deletions app/models/billing/invoice.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
#
module Billing
class Invoice < ActiveRecord::Base
self.table_name = 'billing_invoices'

# include ::OSB
DISCOUNT_TYPE = %w(% FLAT)
include DateFormats
Expand Down
8 changes: 4 additions & 4 deletions app/views/employees/registrations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<div class="reg-wrap-header">
<%= render 'shared/account_progress_bar', step_value: 0 %>

<h4 class="">
<h4 class="" style="font-size: 13px">
To create your Company account provide your personal and company's profile information. This information
can be changed at anytime once your Company account is activated.
</h4>

</div>

<div class="reg-form-wrap">
<div class="reg-form-wrap" >
<%= form_for(resource, as: resource_name,html: { id: 'company-registration' }) do |f| %>
<div class="reg-form-column col-md-12">
<div class="your-profile-container">
<h3 class="text-center mt0">Your Profile</h3>
<div class="your-profile-container" style="border: 2px solid cadetblue;margin-top: 12px">
<h3 class="text-center mt0">Profile Info</h3>

<div class="row your-profile-row">
<div class="col-md-6 pl0 your-profile-media-col">
Expand Down
9 changes: 5 additions & 4 deletions app/views/employees/sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<div class="clearfix body-wrapper mt80 min-height-viewport-80">
<div class="col-md-12">
<div class="bg-box sign-in-box clearfix">
<div class="circle-logo">
<i class="fa fa-user fa-5x"></i>
</div>
<div class="bg-box sign-in-box clearfix" style="border: 2px solid cadetblue">
<h3 style="text-align: center"> Login Info</h3>
<!-- <div class="circle-logo">-->
<!-- <i class="fa fa-user fa-5x"></i>-->
<!-- </div>-->
<div class="col-md-12 signin-inputs-wrapper clearfix">
<!--<h1 class="sign-in-title">Sign In</h1>-->
<%= form_for(resource, as: resource_name, url: session_path(resource_name), html: {class: 'form-vertical', role:'form'}) do |f| %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/employees/shared/_links.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<div class="custom-link-text">
<%= link_to new_registration_path(resource_name) do%>
<i class="fa fa-laptop custom-link-text-icon"></i>Company Registration.
<i class="fa fa-laptop custom-link-text-icon"></i>Sign Up.
<% end %>
</div>
<% end -%>

<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
<div class="custom-link-text">
<%= link_to new_password_path(resource_name), remote: true do%>
<i class="fa fa-deaf custom-link-text-icon"></i>Forgot your password?
<i class="fa fa-deaf custom-link-text-icon"></i>Forgot password?
<% end %>
</div>
<% end -%>
Expand Down
90 changes: 45 additions & 45 deletions app/views/home/_landing.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="header-content-item">
<div class="overlay-item mt40"></div>
<div class="text-item">
<h3>Human resource automation with <span style="color: #00a5df">M</span>HR.</h3>
<h3>Human resource Management with <span style="color: #00a5df">M</span>HR.</h3>

<p>
All-in-one option for any kind of organization.
Expand All @@ -21,7 +21,7 @@
<div class="container service-container-wrapper" id="apps">
<div class="row service-container">
<div class="col-md-12 service-content">
<h2 class="title title-h2 title-botom-space text-center">Our Modules</h2>
<h2 class="title title-h2 title-botom-space text-center">Our Services</h2>

<p class="description text-center"><strong>MHR</strong>
has absolutely everything for you to make your life comfortable with
Expand All @@ -34,6 +34,33 @@
<div class="row component-wrapper">

<div class="components col-md-12 mb20">
<div class="components-item col-md-4">
<!--<i class="fa fa-refresh"></i>-->
<%= link_to modules_attendance_path do %>
<%#= image_tag('module_settings/attendance.png', width: 45) %>
<%= image_tag('icon.svg', width: 45) %>
<h3 class="title title-h3">Attendance</h3>
<% end %>


<p class="text-left">
The attendance is an activity module for tracking time spent by Employees (or other users) in a
Company or in a related group of Institution. Online activity is<br>
</p>

<div class="btn-dual">
<%= link_to '#', class: 'btn-outline gray-btn mr10' do %>
<%#= link_to modules_attendance_path, class: 'btn-outline gray-btn mr10' do %>
LEARN MORE
<i class="fa fa-play-circle icon-extra-small"></i>
<% end %>
<%#= link_to watch_video_path('attendance'), remote: true, class: 'btn-outline gray-btn' do %>
<%= link_to '#', remote: true, class: 'btn-outline gray-btn' do %>
WATCH VIDEO
<i class="fa fa-play-circle icon-extra-small"></i>
<% end %>
</div>
</div>
<div class="components-item col-md-4">
<%= link_to modules_employee_path do %>
<%= image_tag('icon.svg', width: 45) %>
Expand Down Expand Up @@ -83,36 +110,36 @@
<% end %>
</div>
</div>
</div>

<div class="components col-md-12 mb20">
<div class="components-item col-md-4">
<!--<i class="fa fa-refresh"></i>-->
<%= link_to modules_attendance_path do %>
<%#= image_tag('module_settings/attendance.png', width: 45) %>
<%= image_tag('icon.svg', width: 45) %>
<h3 class="title title-h3">Attendance</h3>
<%= link_to modules_expense_path do %>
<%#= image_tag('module_settings/expense.png', width: 45) %>
<%= image_tag('icon.svg', width: 45) %>
<h3 class="title title-h3">Expense</h3>
<% end %>


<p class="text-left">
The attendance is an activity module for tracking time spent by Employees (or other users) in a
Company or in a related group of Institution. Online activity is<br>
If you enable the expense module feature, you can implement an approval process that will
allow you to monitor costs before your employees actually<br>
</p>

<div class="btn-dual">
<%#= link_to modules_expense_path, class: 'btn-outline gray-btn mr10' do %>
<%= link_to '#', class: 'btn-outline gray-btn mr10' do %>
<%#= link_to modules_attendance_path, class: 'btn-outline gray-btn mr10' do %>
LEARN MORE
<i class="fa fa-play-circle icon-extra-small"></i>
LEARN MORE
<i class="fa fa-play-circle icon-extra-small"></i>
<% end %>
<%#= link_to watch_video_path('attendance'), remote: true, class: 'btn-outline gray-btn' do %>
<%#= link_to watch_video_path('expense'), remote: true, class: 'btn-outline gray-btn' do %>
<%= link_to '#', remote: true, class: 'btn-outline gray-btn' do %>
WATCH VIDEO
<i class="fa fa-play-circle icon-extra-small"></i>
WATCH VIDEO
<i class="fa fa-play-circle icon-extra-small"></i>
<% end %>
</div>
</div>
</div>

<div class="components col-md-12 mb20">
<div class="components-item col-md-4">
<!--<i class="fa fa-fonticons"></i>-->
<%= link_to modules_payroll_path do %>
Expand Down Expand Up @@ -164,33 +191,6 @@
<% end %>
</div>
</div>
<div class="components-item col-md-4">
<!--<i class="fa fa-refresh"></i>-->
<%= link_to modules_expense_path do %>
<%#= image_tag('module_settings/expense.png', width: 45) %>
<%= image_tag('icon.svg', width: 45) %>
<h3 class="title title-h3">Expense</h3>
<% end %>


<p class="text-left">
If you enable the expense module feature, you can implement an approval process that will
allow you to monitor costs before your employees actually<br>
</p>

<div class="btn-dual">
<%#= link_to modules_expense_path, class: 'btn-outline gray-btn mr10' do %>
<%= link_to '#', class: 'btn-outline gray-btn mr10' do %>
LEARN MORE
<i class="fa fa-play-circle icon-extra-small"></i>
<% end %>
<%#= link_to watch_video_path('expense'), remote: true, class: 'btn-outline gray-btn' do %>
<%= link_to '#', remote: true, class: 'btn-outline gray-btn' do %>
WATCH VIDEO
<i class="fa fa-play-circle icon-extra-small"></i>
<% end %>
</div>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -258,7 +258,7 @@
<div class="contact-us-bg-opacity">
<div class="contact-us-container container mt0 ">
<div class="contact-us-row row">
<h2 class="title title-h2 text-center">Send us a quote</h2>
<h2 class="title title-h2 text-center">Contact us</h2>

<div class="form-wrapper clearfix">
<!--send us a quote section-->
Expand Down
Loading