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.

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

Recompiled assets #48

Merged
merged 4 commits into from
Dec 2, 2024
Merged

Recompiled assets #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28bb0c2
recompiled all precompiled assets in public/assets
BranHill21 Dec 2, 2024
1bea570
updating header
BranHill21 Dec 2, 2024
1af82f1
fixing config/storage related test
BranHill21 Dec 2, 2024
0ce7095
adding updated header to job search page
BranHill21 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 6 additions & 2 deletions app/assets/stylesheets/stylesheet.css.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,11 @@ a.social-btn:hover { opacity: 0.6; color: #fff; }
.be-large-post { border: 1px solid #edeff2; border-radius: 2px; padding-bottom: 50px; margin-bottom: 50px; padding-top: 80px; }

/*mobile view edit profile boundary*/
@media screen and (min-width:350px) and (max-width:560px) {.be-large-post}
@media (min-width:350px) and (max-width:560px) {
.be-large-post {
/* Add your styles here */
}
}

.be-largepost-iframe { margin-bottom: 50px !important; padding-left: 0; }

Expand Down Expand Up @@ -4131,7 +4135,7 @@ button #Model {
}

/*Mobile View of pictures in each project*/
@media screen and (max-width:560px)
@media screen and (max-width:560px) {
.col-md-3 {
padding: 20px;
padding-bottom: 120px;
Expand Down
84 changes: 1 addition & 83 deletions app/views/job_search/jobshow.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,89 +26,7 @@
</head>
<body>
<!-- THE HEADER -->
<header>

<div class="container-fluid custom-container">
<div class="row no_row row-header">
<div class="brand-be">
<a href="/">
<img class="logo-c active be_logo" src="<%= asset_path "new_logo.png"%>" alt="logo">
<img class="logo-c be_logo" src="<%= asset_path "logo.png"%>" alt="logo2">
<img class="logo-c be_logo" src="<%= asset_path "logo.png"%>" alt="logo3">
<img class="logo-c be_logo" src="<%= asset_path "logo.png"%>" alt="logo4">
</a>
</div>
``
<div class="header-menu-block">
<button class="cmn-toggle-switch cmn-toggle-switch__htx"><span></span></button>
<ul class="header-menu" id="one">
<% if session[:current_user_key] %>
<li><a href="/job_info">Manage Job</a></li>
<li><a href="/job_info/new_job">Post Job</a></li>
<li><a href="/show_profile">My Profile</a></li>
<% end %>
</ul>
</div>

<!--Logout Button Begin -->
<div class="login-header-block">
<div class="login_block">
<div class="login_block_rightup">
<% if session[:current_user_key] %>
<div class="dropdown">
<%if GeneralInfo.find_by(userKey: session[:current_user_key]).notification %>
<button onclick="dropdown()" class="dropbtn" id='notif'><i class="fa-regular fa-bell fa-xl fa-fw" style="color:#147efb"></i></button>
<div id="myDropdown" class="dropdown-content">
<% @notifications_from = GeneralInfo.find_by(userKey: session[:current_user_key]).notification_from %>
<% @notifications_from.each do |notification|%>
<a href="/dm/<%= notification %>"> <b> <%= GeneralInfo.find_by(id: notification).first_name %> <%= GeneralInfo.find_by(id: notification).last_name %> sent you a message! </b> </a>
<% end %>
<% else %>
<button onclick="dropdown()" class="dropbtn" id='notif'><i class="fa-regular fa-bell fa-xl fa-fw" style="color:black"></i></button>
<div id="myDropdown" class="dropdown-content">
<i class="fa-regular fa-circle-check fa-5x" style="color:black;padding:30px"></i>
<div style="color: black; height: 20px; width 0px; overflow-wrap: break-word;"> <b> You're all caught up! </b> </div>
<div style="color: black; height: 20px; width 0px; overflow-wrap: break-word;"> <b> No new messages. </b> </div>
<% end %>
</div>
</div>
<a href="/dm" class="dropbtn" id="dm"><i class="fa-regular fa-message fa-xl fa-fw" style="color:black"></i></a>
<a class="btn color-1 size-2 hover-2" href="/show_profile"><%= @username %></a>
<%= link_to 'Log out', logout_path, method: :get, :class => "btn color-1 size-2 hover-2" %>
<% else %>
<a class="btn color-1 size-2 hover-2" href="/login" id="sign_in_up"><i class="fa fa-lock"></i>Sign In</a>
<% end %>


</div>
</div>
</div>
<!--Logout Button End-->


</div>
</div>
</div>

<% if flash[:success_post_job] %>
<div class="alert-container col-md-12">
<div class="alert style-3 alert-dismissible">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<alertstrong1><%= flash[:success_post_job]%></alertstrong1>
</div>
</div>
<% elsif flash[:error_post_job] %>
<div class="alert-container col-md-12">
<div class="alert style-3 alert-dismissible">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<alertstrong1><%= flash[:error_post_job]%></alertstrong1>
</div>
</div>
<% end %>



</header>
<%= render 'shared/header' %>



Expand Down
11 changes: 7 additions & 4 deletions app/views/shared/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!-- THE HEADER -->
<style>
/* CSS for small screens */
@media (max-width: 576px) {
@media (max-width: 560px) {
.navbar-toggle {
width: 30%; /* Take half the width */
width: 20%; /* Take half the width */
}

.navbar-brand {
width: 50%; /* Take half the width */
width: 60%; /* Take half the width */
}

.navbar-brand img {
Expand All @@ -20,7 +20,10 @@
<nav class="navbar" style="color: black;">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle col-6" data-toggle="collapse" data-target="#myNavbar"> &#x25BC; Options
<button type="button" class="navbar-toggle col-6" data-toggle="collapse" data-target="#myNavbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand col-6" href="/">
<img class="logo-c active be_logo" src="<%= asset_path "new_logo.png"%>" alt="logo">
Expand Down
1 change: 1 addition & 0 deletions config/credentials/production.yml.enc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2ah799wcUo57KGZB+RHnoEiqvfXv3WX2KgqEhWukif5L4d/3pylP2q7gH4coaz0UNoT1iNa/z5QunyQzL3k7V6zg0o=--9RJla1m+Jvj77DgT--PoLbAmIu9fi3wI0gMpz/tw==
3 changes: 0 additions & 3 deletions config/storage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ local:
# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
amazon:
service: S3
# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
secret_access_key: <%= ENV['AWS_SECRET_KEY'] %>
region: <%= ENV['AWS_REGION'] %>
Expand All @@ -27,7 +25,6 @@ amazon:
# microsoft:
# service: AzureStorage
# storage_account_name: your_account_name
# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
# container: your_container_name

# mirror:
Expand Down
1 change: 0 additions & 1 deletion public/assets/.sprockets-manifest-6f393eab2220f774003952140c83910e.json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions public/assets/.sprockets-manifest-e73a0e69265f12220753333adc9719ad.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading