Skip to content

Commit

Permalink
Update dependencies and minor adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@aldwin7894
aldwin7894 committed Jun 28, 2023
1 parent a9a46a8 commit c8a480a
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 118 deletions.
6 changes: 3 additions & 3 deletions .trunk/trunk.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ merge:
plugins:
sources:
- id: trunk
ref: v0.0.20
ref: v0.0.21
uri: https://github.com/trunk-io/plugins
runtimes:
enabled:
Expand Down Expand Up @@ -66,8 +66,8 @@ lint:
- hadolint@2.12.0
- gitleaks@8.17.0
- yamllint@1.32.0
- checkov@2.3.301
- checkov@2.3.303
- sort-package-json@2.4.1
- brakeman@5.4.0
- terrascan@1.18.1
- trufflehog@3.40.0
- trufflehog@3.41.1
1 change: 0 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"eslint.packageManager": "yarn",
"solargraph.autoformat": true,
"solargraph.formatting": true,
"solargraph.useBundler": true,
Expand Down
114 changes: 57 additions & 57 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/shardlab/discordrb.git
revision: 984826cbc1378620f63dc83958734bbd3926b9f2
revision: aee6c8383e4a4f6f328d88c233bab809ee8e88ce
ref: 984826c
branch: main
specs:
Expand All @@ -16,67 +16,67 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.5)
actionpack (= 7.0.5)
activesupport (= 7.0.5)
actioncable (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.5)
actionpack (= 7.0.5)
activejob (= 7.0.5)
activerecord (= 7.0.5)
activestorage (= 7.0.5)
activesupport (= 7.0.5)
actionmailbox (7.0.5.1)
actionpack (= 7.0.5.1)
activejob (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.5)
actionpack (= 7.0.5)
actionview (= 7.0.5)
activejob (= 7.0.5)
activesupport (= 7.0.5)
actionmailer (7.0.5.1)
actionpack (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.5)
actionview (= 7.0.5)
activesupport (= 7.0.5)
actionpack (7.0.5.1)
actionview (= 7.0.5.1)
activesupport (= 7.0.5.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.5)
actionpack (= 7.0.5)
activerecord (= 7.0.5)
activestorage (= 7.0.5)
activesupport (= 7.0.5)
actiontext (7.0.5.1)
actionpack (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.5)
activesupport (= 7.0.5)
actionview (7.0.5.1)
activesupport (= 7.0.5.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.5)
activesupport (= 7.0.5)
activejob (7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.3.6)
activemodel (7.0.5)
activesupport (= 7.0.5)
activerecord (7.0.5)
activemodel (= 7.0.5)
activesupport (= 7.0.5)
activestorage (7.0.5)
actionpack (= 7.0.5)
activejob (= 7.0.5)
activerecord (= 7.0.5)
activesupport (= 7.0.5)
activemodel (7.0.5.1)
activesupport (= 7.0.5.1)
activerecord (7.0.5.1)
activemodel (= 7.0.5.1)
activesupport (= 7.0.5.1)
activestorage (7.0.5.1)
actionpack (= 7.0.5.1)
activejob (= 7.0.5.1)
activerecord (= 7.0.5.1)
activesupport (= 7.0.5.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.5)
activesupport (7.0.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -139,7 +139,7 @@ GEM
google-protobuf (3.23.3-x86_64-linux)
googleapis-common-protos-types (1.6.0)
google-protobuf (~> 3.14)
graphql (2.0.23)
graphql (2.0.24)
graphql-client (0.18.0)
activesupport (>= 3.0)
graphql
Expand Down Expand Up @@ -425,29 +425,29 @@ GEM
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.5)
actioncable (= 7.0.5)
actionmailbox (= 7.0.5)
actionmailer (= 7.0.5)
actionpack (= 7.0.5)
actiontext (= 7.0.5)
actionview (= 7.0.5)
activejob (= 7.0.5)
activemodel (= 7.0.5)
activerecord (= 7.0.5)
activestorage (= 7.0.5)
activesupport (= 7.0.5)
rails (7.0.5.1)
actioncable (= 7.0.5.1)
actionmailbox (= 7.0.5.1)
actionmailer (= 7.0.5.1)
actionpack (= 7.0.5.1)
actiontext (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activemodel (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
bundler (>= 1.15.0)
railties (= 7.0.5)
railties (= 7.0.5.1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.5)
actionpack (= 7.0.5)
activesupport (= 7.0.5)
railties (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -477,7 +477,7 @@ GEM
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.5)
rubocop (1.53.0)
rubocop (1.53.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand Down Expand Up @@ -542,7 +542,7 @@ GEM
vite_rails (3.0.15)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.3.3)
vite_ruby (3.3.4)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
Expand Down
6 changes: 3 additions & 3 deletions app/views/home/_watched_section.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<section class="flex-1 mb-20">
<div class="container w-full mx-auto">
<h2 class="dark:text-white phone:text-center tablet:text-left my-10 text-4xl">
<h2 class="dark:text-white phone:text-center tablet:text-left tablet:text-4xl flex flex-row items-center gap-1 my-10 text-2xl">
<iconify-icon icon="mdi:timer-play" width="35"></iconify-icon>
Recently watched episodes
</h2>
<turbo-frame id="watched_anime_section" src="<%= watched_anime_section_path %>" loading="lazy" class="relative min-h-[322px] block" x-data="{swiper: null}">
<div></div>
</turbo-frame>

<h2 class="dark:text-white phone:text-center tablet:text-left my-10 text-4xl">
<h2 class="dark:text-white phone:text-center tablet:text-left tablet:text-4xl flex flex-row items-center gap-1 my-10 text-2xl">
<iconify-icon icon="mdi:timer-play" width="35"></iconify-icon>
Recently watched movies / ova / specials
Recently watched movies&nbsp;/&nbsp;ova&nbsp;/&nbsp;specials
</h2>
<turbo-frame id="watched_movie_section" src="<%= watched_movie_section_path %>" loading="lazy" class="relative min-h-[322px] block" x-data="{swiper: null}">
<div></div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/home/last_watched.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<% if @last_watched.present? %>
<a class="hover:underline" href="<%= @last_watched&.[]("media")&.[]("siteUrl") %>" rel="noopener noreferrer">
<h3 class="text-shadow shadow-black text-4xl font-bold"><%= @last_watched&.[]("media")&.[]("title")&.[]("userPreferred") %></h3>
<span class="text-gray-300/60 text-shadow shadow-black text-2xl"><%= @last_watched&.[]("media")&.[]("seasonYear") %></span>
<span class="text-gray-200/80 text-shadow shadow-black text-2xl"><%= @last_watched&.[]("media")&.[]("seasonYear") %></span>
</a>
<div class="self-end mt-auto">
<a class="hover:underline grow text-shadow shadow-black text-lg" href="<%= @last_watched&.[]("siteUrl") %>" rel="noopener noreferrer">MORE INFO</a>
Expand Down
2 changes: 1 addition & 1 deletion app/views/home/last_watched_movie.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<% if @last_watched_movie.present? %>
<a class="hover:underline" href="<%= @last_watched_movie&.[]("media")&.[]("siteUrl") %>" rel="noopener noreferrer">
<h3 class="text-shadow shadow-black text-4xl font-bold"><%= @last_watched_movie&.[]("media")&.[]("title")&.[]("userPreferred") %></h3>
<span class="text-gray-300/60 text-shadow shadow-black text-2xl"><%= @last_watched_movie&.[]("media")&.[]("seasonYear") %></span>
<span class="text-gray-200/80 text-shadow shadow-black text-2xl"><%= @last_watched_movie&.[]("media")&.[]("seasonYear") %></span>
</a>
<div class="self-end mt-auto">
<a class="hover:underline grow text-shadow shadow-black text-lg" href="<%= @last_watched_movie&.[]("siteUrl") %>" rel="noopener noreferrer">MORE INFO</a>
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,26 @@
"swiper": "^9.4.1",
"tailwindcss": "^3.3.2",
"tailwindcss-animatecss": "^3.0.4",
"terser": "^5.18.1",
"terser": "^5.18.2",
"tippy.js": "^6.3.7",
"tw-elements": "^1.0.0-alpha13",
"vite": "^4.3.9",
"vite-plugin-full-reload": "^1.0.5",
"vite-plugin-ruby": "^3.2.2"
},
"devDependencies": {
"@types/node": "^18.16.3",
"@typescript-eslint/parser": "^5.60.0",
"@types/node": "^20.3.2",
"@typescript-eslint/parser": "^5.60.1",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-html-erb": "^1.0.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-tailwindcss": "^3.12.1",
"eslint-plugin-tailwindcss": "^3.13.0",
"prettier": "^2.8.8",
"prettier-plugin-tailwindcss": "^0.3.0",
"typescript": "^5.1.3"
"typescript": "^5.1.5"
},
"engines": {
"node": "18.16.0",
Expand Down
2 changes: 1 addition & 1 deletion vite.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default defineConfig({
},
server: {
watch: {
ignored: ["**/.trunk/**"],
ignored: ["**/.trunk/**", "**/tmp/**", "**/log/**"],
},
},
});
Loading

0 comments on commit c8a480a

Please sign in to comment.