Skip to content
Snippets Groups Projects
Commit e9ecc6f4 authored by iaibrys's avatar iaibrys
Browse files

Fix issues with pdf rendering and admin index.

parent 1de68219
No related branches found
No related tags found
No related merge requests found
Pipeline #367 failed
Stage: build
Stage: test
Stage: release
Stage: deploy
Show whitespace changes
Inline Side-by-side
Showing
with 26 additions and 32 deletions
.dockerignore
+ 2
− 3
View file @ e9ecc6f4
...@@ -2,13 +2,12 @@ README.md ...@@ -2,13 +2,12 @@ README.md
README.rdoc README.rdoc
**/.git **/.git
**/.gitignore **/.gitignore
.idea **/.idea
pdf.js/node_modules **/node_modules
LICENSE LICENSE
tmp/ tmp/
log/ log/
**/*.sqlite3 **/*.sqlite3
**/node_modules
vendor/assets/components/ vendor/assets/components/
public/assets/ public/assets/
**/.codeclimate.yml **/.codeclimate.yml
......
Dockerfile
+ 1
− 0
View file @ e9ecc6f4
...@@ -48,6 +48,7 @@ RUN bundle install --without development --binstubs ...@@ -48,6 +48,7 @@ RUN bundle install --without development --binstubs
# Install client-side components # Install client-side components
COPY package.json ${APP_ROOT}/package.json COPY package.json ${APP_ROOT}/package.json
COPY yarn.lock ${APP_ROOT}/yarn.lock
RUN sudo chown -R ${CHOWN} ~/.npm RUN sudo chown -R ${CHOWN} ~/.npm
RUN sudo chown -R ${CHOWN} ~/.config RUN sudo chown -R ${CHOWN} ~/.config
RUN cd deps/feedbackjs && npm install && npm install gulp RUN cd deps/feedbackjs && npm install && npm install gulp
......
app/javascript/packs/application.js
+ 0
− 1
View file @ e9ecc6f4
...@@ -28,7 +28,6 @@ window.stringifySafe = stringifySafe; ...@@ -28,7 +28,6 @@ window.stringifySafe = stringifySafe;
window.serializerSafe = serializerSafe; window.serializerSafe = serializerSafe;
import '../src/utils'; import '../src/utils';
import '../src/enotes';
import '../src/nav'; import '../src/nav';
import '../src/exercise'; import '../src/exercise';
import '../src/client-flash'; import '../src/client-flash';
......
app/javascript/src/admin.js
+ 0
− 1
View file @ e9ecc6f4
...@@ -700,7 +700,6 @@ via turbolink and page isn't configured`); ...@@ -700,7 +700,6 @@ via turbolink and page isn't configured`);
} }
AdminPage.initClass(); AdminPage.initClass();
window.AdminPage = AdminPage; window.AdminPage = AdminPage;
function __guard__(value, transform) { function __guard__(value, transform) {
......
app/javascript/src/enotes.js deleted 100644 → 0
+ 0
− 6
View file @ 1de68219
// h/t http://brandonhilkert.com/blog/page-specific-javascript-in-rails/
$('.enote').ready(() => {
const url = $(this).data('pdf-url');
return console.log(`loading PDF at URL ${url}`);
});
app/javascript/src/page-index.js
+ 1
− 1
View file @ e9ecc6f4
...@@ -413,7 +413,7 @@ via turbolink and page isn't configured`); ...@@ -413,7 +413,7 @@ via turbolink and page isn't configured`);
return window.page_index; return window.page_index;
} }
} }
PageIndex.initClass();
PageIndex.initClass();
window.PageIndex = PageIndex; window.PageIndex = PageIndex;
app/javascript/src/page-load.js
+ 14
− 11
View file @ e9ecc6f4
...@@ -10,21 +10,24 @@ ...@@ -10,21 +10,24 @@
// Rails 4.2.x gets new turbolinks with new behavior // Rails 4.2.x gets new turbolinks with new behavior
const pageClassNames = ['AdminPage', 'PageIndex', 'MdPage', 'PageEditor']; const pageClassNames = ['AdminPage', 'PageIndex', 'MdPage', 'PageEditor'];
$(document).ready((x) => {
$(document).ready(() => {
// $(document).on 'turbolinks:load', (x) -> // $(document).on 'turbolinks:load', (x) ->
// console.log(`Page Loaded: ${x.type} ${window.location.href}`);
console.log(`Page Loaded: ${x.type} ${window.location.href}`); console.log(`Page Loaded: ${window.location.href}`);
$('.dropdown-toggle').dropdown(); $('.dropdown-toggle').dropdown();
for (const pageClassName of pageClassNames) { const pages = pageClassNames.filter((pageClassName) => {
const klass = window[pageClassName]; const klass = window[pageClassName];
return ((typeof klass === 'function') && klass.isMyPage());
});
if ((typeof klass === 'function') && klass.isMyPage()) { if (pages.length > 0) {
klass.initPage(); console.log('Initializing pages %o', pages);
return; pages.forEach((page) => window[page].initPage());
} } else {
}
return console.warn('Not a Feature Page'); return console.warn('Not a Feature Page');
}
}); });
app/views/layouts/edit_page.html.erb
+ 0
− 1
View file @ e9ecc6f4
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" /> <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="/images/kunlogo.png" rel="apple-touch-icon" type="image/png" /> <link href="/images/kunlogo.png" rel="apple-touch-icon" type="image/png" />
</head>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
</head> </head>
<body data-no-turbolink="true"> <body data-no-turbolink="true">
......
app/views/layouts/enote.html.erb
+ 4
− 3
View file @ e9ecc6f4
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>DTU Compute Course Website <%= my_course._id if my_course %> </title> <title>DTU Compute Course Website <%= my_course._id if my_course %> </title>
<%= stylesheet_link_tag 'styles', media: 'all' %> <%= stylesheet_pack_tag 'styles.css', media: 'all' %>
<%= javascript_pack_tag 'application' %> <%= javascript_pack_tag 'application' %>
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/> <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/>
<link href="/images/kunlogo.png" rel="apple-touch-icon" type="image/png"/> <link href="/images/kunlogo.png" rel="apple-touch-icon" type="image/png"/>
</head>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
</head> </head>
<body data-no-turbolink="true"> <body data-no-turbolink="true">
<div class="wrapper"> <div class="wrapper">
......
app/views/layouts/error.html.erb
+ 2
− 2
View file @ e9ecc6f4
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<%= javascript_pack_tag 'application' %> <%= javascript_pack_tag 'application' %>
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/> <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/>
<link href="<%= image_path 'kunlogo.png' %>" rel="apple-touch-icon" type="image/png"/> <link href="<%= image_path 'kunlogo.png' %>" rel="apple-touch-icon" type="image/png"/>
</head>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
</head> </head>
<body data-no-turbolink="true"> <body data-no-turbolink="true">
<div class="wrapper"> <div class="wrapper">
......
app/views/layouts/md_rendered_page.html.erb
+ 1
− 2
View file @ e9ecc6f4
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<%= javascript_pack_tag 'application' %> <%= javascript_pack_tag 'application' %>
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/> <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/>
<link href="<%= image_path 'kunlogo.png' %>" rel="apple-touch-icon" type="image/png"/> <link href="<%= image_path 'kunlogo.png' %>" rel="apple-touch-icon" type="image/png"/>
</head>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
</head> </head>
<body data-no-turbolink="true"> <body data-no-turbolink="true">
......
feedbackjs @ 9af8711e
Compare 63f3310e...9af8711e
Subproject commit 63f3310e2a1a8b659a831703e4d43f6ed90d82f3 Subproject commit 9af8711e9a869100065033cf22813f8baab39fc2
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment