Skip to content

Commit

Permalink
Update packages for security vulnerabilities (gitcoinco#1193)
Browse files Browse the repository at this point in the history
- update and remove unused packages
- remove circleci cache binstub (doesn't work)
- update stylesheets
- update gem graph
  • Loading branch information
andrewmcodes authored Apr 2, 2020
1 parent 692e7b4 commit 0237a91
Show file tree
Hide file tree
Showing 25 changed files with 177 additions and 265 deletions.
1 change: 0 additions & 1 deletion .env-example
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export BASE_ECPM=400
export CAMO_HOST=
export CAMO_KEY=
export CAMPAIGN_DEMO_ID=395
export CIRCLE_CI_TOKEN=
export CLOUDFRONT_HOST=
export CODEFUND_ANALYTICS_KEY=
export DATABASE_URL=
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gem "acts_as_commentable_with_threading", "~> 2.0.1"
gem "aws-sdk-s3", "~> 1.61.1", require: false
gem "barnes", "~> 0.0.7"
gem "bootsnap", ">= 1.4.2", require: false
gem "cable_ready", "~> 4.0.7"
gem "cable_ready", "~> 4.0.9"
gem "camo", "~> 0.1.0"
gem "chroma", "~> 0.2.0"
gem "chronic", "~> 0.10.2"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ DEPENDENCIES
bootsnap (>= 1.4.2)
bullet
byebug
cable_ready (~> 4.0.7)
cable_ready (~> 4.0.9)
camo (~> 0.1.0)
capybara (>= 2.15)
chroma (~> 0.2.0)
Expand Down
1 change: 0 additions & 1 deletion app/javascript/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require('channels')
import 'bootstrap'
import 'select2'
import 'moment'
import 'trix'
import 'bootstrap-daterangepicker'
import '../events'
import './prefetch'
Expand Down
3 changes: 1 addition & 2 deletions app/javascript/themes/current/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
@import '~noty/src/noty';
@import '~noty/src/themes/mint';
@import '~bootstrap-daterangepicker/daterangepicker';
@import '~trix/dist/trix';
@import 'mixins';
@import 'variables';
@import 'theme';
@import 'utilities';
@import 'components';
2 changes: 0 additions & 2 deletions app/javascript/themes/current/stylesheets/components.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import './components/accordians';
@import './components/autocomplete';
@import './components/cards';
@import './components/checkbox_tree';
@import './components/creative_preview';
@import './components/dropdown';
Expand Down

This file was deleted.

10 changes: 0 additions & 10 deletions app/javascript/themes/current/stylesheets/components/cards.scss

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
display: grid;
grid-template-columns: auto 1fr;
grid-template-rows: auto 1fr;
color: $primary;
color: $color-primary;
}

&__branch > i {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// =========== Base ===========
th[scope='col'] a {
color: #1e2022;
text-decoration: none;
}

Expand All @@ -9,7 +8,11 @@ th[scope='col'] a {
display: block;
line-height: 0.7;
cursor: pointer;
color: #bdc5d1;
color: $color-gray-500;

&:hover {
color: $color-gray-700;
}
}

// =========== Pagination ===========
Expand Down
11 changes: 0 additions & 11 deletions app/javascript/themes/current/stylesheets/mixins.scss

This file was deleted.

22 changes: 11 additions & 11 deletions app/javascript/themes/current/stylesheets/theme.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import './theme_variables';

// =========== Webpack ===========
@import '~animate.css/animate';
@import '~bootstrap-select/dist/css/bootstrap-select.min';
Expand Down Expand Up @@ -30,13 +28,13 @@ footer {
}

.app-header-dark {
background-color: #222230 !important;
background-color: $color-gray-800 !important;
}

li.menu-item.active {
a.menu-link {
color: #222230;
background-color: #ffffff;
color: $color-gray-800;
background-color: $color-white;
}
}

Expand Down Expand Up @@ -71,15 +69,11 @@ button.layout-button {
flex-direction: column;
min-width: 0;
word-wrap: break-word;
background-color: #fff;
background-color: $color-white;
background-clip: border-box;
border: 1px solid rgba(20, 20, 31, 0.12);
border-radius: 0.25rem;
}

.form-group {
$color-danger: rgb(183, 107, 163);
$color-danger-light: rgba(183, 107, 163, 0.15);
.field_with_errors {
label {
color: $color-danger;
Expand All @@ -97,8 +91,14 @@ button.layout-button {

.app-header,
.auth-header {
background-color: #15003e !important;
background-color: $color-purple !important;
background-image: url('../../../images/patterns/pattern2.svg');
background-size: initial;
background-repeat: repeat;
}

.dashboard-grid-wrapper {
display: grid;
grid-gap: 10px 20px;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
}
11 changes: 0 additions & 11 deletions app/javascript/themes/current/stylesheets/theme_variables.scss

This file was deleted.

32 changes: 13 additions & 19 deletions app/javascript/themes/current/stylesheets/utilities.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
// =========== Mixins ===========
@mixin media-breakpoint-down($name, $breakpoints: $grid-breakpoints) {
$max: breakpoint-max($name, $breakpoints);
@if $max {
@media (max-width: $max) {
@content;
}
} @else {
@content;
}
}

// =========== Opacity ===========
.opacity-0 {
opacity: 0 !important;
Expand Down Expand Up @@ -52,13 +64,9 @@
}
}

.text-sm {
font-size: 0.825rem;
}

.code {
font-family: monospace;
color: rgb(232, 62, 140);
color: $code-text-color;
word-break: break-word;
font-size: 1.25em;
}
Expand All @@ -85,28 +93,14 @@
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
}

.grid-tcolumns-200 {
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
}

.grid-trows-200 {
grid-template-rows: repeat(auto-fit, minmax(200px, 1fr));
}

.dashboard-grid-wrapper {
display: grid;
grid-gap: 10px 20px;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
}

// =========== Buttons ===========
@include media-breakpoint-down(sm) {
.btn-block-sm-only {
display: block;
width: 100%;
}
}

.bg-dark-ad {
background-color: rgb(29, 29, 29);
}
25 changes: 25 additions & 0 deletions app/javascript/themes/current/stylesheets/variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// =========== Color ===========
$code-text-color: rgb(232, 62, 140);
$color-danger-light: rgba(183, 107, 163, 0.15);
$color-danger: #b76ba3;
$color-primary: #346cb0;
$color-purple: #15003e;
$color-white: #ffffff;
$color-gray-100: #f6f7f9;
$color-gray-200: #e6e8ed;
$color-gray-300: #d6d8e1;
$color-gray-400: #c6c9d5;
$color-gray-500: #a6abbd;
$color-gray-600: #888c9b;
$color-gray-700: #363642;
$color-gray-800: #222230;
$color-gray-900: #191927;

// =========== Breakpoints ===========
$grid-breakpoints: (
xs: 0,
sm: 576px,
md: 768px,
lg: 992px,
xl: 1200px
) !default;
2 changes: 1 addition & 1 deletion app/views/campaigns/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<iframe
src="<%= @iframe_url %>"
title="<%= @campaign.name %> Metabase dashboard"
class="metabase-card"
class="metabase-card border rounded"
height="800"
scrolling="yes"
allowtransparency>
Expand Down
2 changes: 1 addition & 1 deletion app/views/demos/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</div>
<% end %>
</div>
<div class="<%= @theme.inquiry.dark? ? "bg-dark-ad text-white" : "bg-white" %> vw-100 pt-4">
<div class="<%= @theme.inquiry.dark? ? "bg-dark text-white" : "bg-white" %> vw-100 pt-4">
<div class="container w-full mx-auto d-flex flex-column">
<h1>Ad Template: <%= @template.humanize %></h1>
<p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/organizations/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<iframe
src="<%= @iframe_url %>"
title="<%= @organization.name %> Metabase dashboard"
class="metabase-card"
class="metabase-card border rounded"
height="800"
scrolling="yes"
allowtransparency>
Expand Down
2 changes: 1 addition & 1 deletion app/views/properties/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
please ensure ad blockers are disabled to view the overview
</small>
<iframe
class="metabase-card"
class="metabase-card border rounded"
src="<%= @iframe_url %>"
title="<%= @property.name %> Metabase dashboard"
height="600px"
Expand Down
2 changes: 1 addition & 1 deletion app/views/property_dashboards/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<iframe
src="<%= @iframe_url %>"
title="<%= @property.name %> Metabase dashboard"
style="width: 100%; border: 0; resize: horizontal;"
class="metabase-card border rounded"
height="800"
scrolling="no"
allowtransparency></iframe>
Expand Down
29 changes: 0 additions & 29 deletions app/views/shared/_collapsible_search_form.html.erb

This file was deleted.

18 changes: 0 additions & 18 deletions bin/clear_circleci_cache

This file was deleted.

Binary file modified gem_graph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0237a91

Please sign in to comment.