clean up

BerkeleyLibrary · Nov 26, 2024 · d8dcd33 · d8dcd33
1 parent e9351c5
commit d8dcd33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 38 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -32,17 +32,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     default-jre \
     ca-certificates \ 
     libpq-dev \
-    libvips42 \
-    && rm -rf /var/lib/apt/lists/*
+    libvips42 
 
 # Install Node.js (using NodeSource to get the latest LTS version, e.g., 20.x)
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x| bash - && \
-    apt-get install -y --no-install-recommends nodejs
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x| bash - \
+    && apt-get install -y --no-install-recommends nodejs
 
 # Install Yarn (using the official Yarn repository)
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && apt-get install -y --no-install-recommends yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    && apt-get update && apt-get install -y --no-install-recommends yarn \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* 
 
 # By default, run as the geodata user
 USER geodata
@@ -90,10 +90,6 @@ COPY --chown=geodata . .
 RUN bundle exec -- rails log:clear tmp:create \
     &&  rails assets:precompile
 
-
-# RUN npx vite build --debug
-# RUN mkdir tmp/cache/downloads
-
 # ============================================================================
 # Target: production
 #

diff --git a/app/views/layouts/blacklight/base.html.erb b/app/views/layouts/blacklight/base.html.erb
@@ -24,45 +24,27 @@
     </script>
     <% end %>
     <%= opensearch_description_tag application_name, opensearch_catalog_url(format: 'xml') %>
-
     <%= favicon_link_tag %>
     <%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload" %>
     <%= javascript_include_tag "application", "data-turbo-track": "reload" %>
-
-
     <%= vite_client_tag %>
     <% if openlayers_container? %>
     <%= vite_javascript_tag 'ol' %>
     <% elsif iiif_manifest_container? %>
     <%= vite_javascript_tag 'clover' %>
     <% end %>
-
-
-    <!--%= vite_client_tag %-->
-    <!--%= vite_stylesheet_tag 'application.scss', media: 'all' %-->
-    <!--%= vite_javascript_tag 'application' %-->
-
-    <%
-=begin%>
-    <%= stylesheet_link_tag "application", media: "all" %>
-    <%= javascript_include_tag "application" %>
-    <%
-=end%>
-
     <%= csrf_meta_tags %>
     <%= content_for(:head) %>
 </head>
 
 <body class="<%= render_body_class %>">
-
     <nav id="skip-link" role="navigation" aria-label="<%= t('blacklight.skip_links.label') %>">
         <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
         <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
         <%= content_for(:skip_links) %>
     </nav>
     <div class="ucb_container">
         <%= render partial: 'shared/header_navbar' %>
-
         <main id="main-container" class="<%= container_classes %>" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
             <%= content_for(:container_header) %>
             <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>

diff --git a/vite.config.mts b/vite.config.mts
@@ -1,12 +1,3 @@
-// import { defineConfig } from 'vite'
-// import rails from 'vite-plugin-rails'
-
-// export default defineConfig({
-//   plugins: [
-//     rails(),
-//   ]
-// })
-
 import { defineConfig, searchForWorkspaceRoot } from "vite";
 import rails from "vite-plugin-rails";