Skip to content

Commit

Permalink
Add syntax fix
Browse files Browse the repository at this point in the history
  • Loading branch information
1v4n4 committed Jun 30, 2021
1 parent c67d43f commit 88071b9
Show file tree
Hide file tree
Showing 21 changed files with 22,324 additions and 246 deletions.
36 changes: 0 additions & 36 deletions .github copy/workflows/linters.yml

This file was deleted.

1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ gem 'gravatar_image_tag', '~> 1.2'
# gem 'image_processing', '~> 1.2'
gem 'carrierwave', '~> 2.2', '>= 2.2.2'
gem 'rexml'
gem 'draper', '~> 4.0', '>= 4.0.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.4', require: false
Expand Down
15 changes: 0 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ GEM
globalid (>= 0.3.6)
activemodel (6.1.3.2)
activesupport (= 6.1.3.2)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (6.1.3.2)
activemodel (= 6.1.3.2)
activesupport (= 6.1.3.2)
Expand Down Expand Up @@ -94,13 +90,6 @@ GEM
concurrent-ruby (1.1.9)
crass (1.0.6)
diff-lcs (1.4.4)
draper (4.0.2)
actionpack (>= 5.0)
activemodel (>= 5.0)
activemodel-serializers-xml (>= 1.0)
activesupport (>= 5.0)
request_store (>= 1.0)
ruby2_keywords
erubi (1.10.0)
ffi (1.15.3)
globalid (0.4.2)
Expand Down Expand Up @@ -173,8 +162,6 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (2.1.1)
request_store (1.5.0)
rack (>= 1.4)
rexml (3.2.5)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
Expand All @@ -195,7 +182,6 @@ GEM
rspec-support (3.10.2)
ruby-vips (2.1.2)
ffi (~> 1.12)
ruby2_keywords (0.0.4)
rubyzip (2.3.0)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
Expand Down Expand Up @@ -258,7 +244,6 @@ DEPENDENCIES
byebug
capybara (>= 3.26)
carrierwave (~> 2.2, >= 2.2.2)
draper (~> 4.0, >= 4.0.2)
gravatar_image_tag (~> 1.2)
jbuilder (~> 2.7)
listen (~> 3.3)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@

@import "reset";
@import "general";


/* Header */

.logo {
Expand Down
51 changes: 0 additions & 51 deletions app/assets/stylesheets/_reset.css

This file was deleted.

132 changes: 132 additions & 0 deletions app/assets/stylesheets/_reset.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/* Reset (http://meyerweb.com/eric/tools/css/reset/)
*/

html,
body,
div,
span,
applet,
object,
iframe,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
a,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
tfoot,
thead,
tr,
th,
td,
article,
aside,
canvas,
details,
embed,
figure,
figcaption,
footer,
header,
hgroup,
menu,
nav,
output,
ruby,
section,
summary,
time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
vertical-align: baseline;
}

/* HTML5 display-role reset for older browsers */
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}

body {
line-height: 1;
}

ol,
ul {
list-style: none;
}

blockquote,
q {
quotes: none;
}

blockquote::before,
blockquote::after,
q::before,
q::after {
content: '';
content: none;
}

table {
border-collapse: collapse;
border-spacing: 0;
}
6 changes: 5 additions & 1 deletion app/assets/stylesheets/articles.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// Place all the styles related to the Articles controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: https://sass-lang.com/

@import "reset";
@import "general";

.texta {
height: 250px;
}
}
2 changes: 2 additions & 0 deletions app/assets/stylesheets/categories.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: https://sass-lang.com/

@import "reset";
@import "general";

.fixed1 {
position: fixed;
Expand Down
8 changes: 0 additions & 8 deletions app/decorators/application_decorator.rb

This file was deleted.

13 changes: 0 additions & 13 deletions app/decorators/article_decorator.rb

This file was deleted.

13 changes: 4 additions & 9 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
module ApplicationHelper

def log
if current_user
if current_user
'layouts/h1'
else
else
'layouts/h2'
end
end

def alertss(alert)
if alert
render 'layouts/alerts'
end
render 'layouts/alerts' if alert
end

def noticess(notice)
if notice
render 'layouts/notices'
end
render 'layouts/notices' if notice
end
end
11 changes: 4 additions & 7 deletions app/helpers/articles_helper.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module ArticlesHelper
# rubocop: disable Lint/Void
def title_error
@article.errors.full_messages_for(:title).each do |msg|
msg
Expand All @@ -18,15 +19,11 @@ def image_error
end

def ed_links(article)
if article.author == current_user
render 'articles/editdelete', :article => article
end
render 'articles/editdelete', article: article if article.author == current_user
end

def ed_links_show(article)
if article.author == current_user
render 'articles/edlinksforshow', :article => article
end
render 'articles/edlinksforshow', article: article if article.author == current_user
end

end
# rubocop: enable Lint/Void
Loading

0 comments on commit 88071b9

Please sign in to comment.