Fix: beamer ux

resources/theme/claire_variables.scss

@@ -0,0 +1,118 @@
+
+$blue: #173050;
+$indigo: #3297b2;
+$pink: #e83e8c;
+$red: #dc355e;
+$yellow: #f2ae03;
+$green: #28a745;
+$teal: #1abc7f;
+$cyan: #17a2b8;
+$gray-100: #e7eced;
+$gray-600: #868e96;
+$primary: $cyan;
+$secondary: $blue;
+$info: $indigo;
+$indigo-800: shade-color($indigo, 60%);
+$gray-800: #343a40;
+$dark: $gray-800;
+$link-color: #17a2b8;
+$link-decoration: none;
+$link-hover-decoration: underline;
+$link-hover-color: #173050;
+$border-radius: 1rem;
+$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+$spacer: 1.1rem;
+$headings-margin-bottom: $spacer / 2;
+$headings-font-family: helvetica;
+$headings-font-weight: 100;
+$headings-color: $cyan;
+$nav-tabs-border-color: $yellow;
+$border-width: 1px;
+$nav-tabs-border-width: $border-width * 2;
+$white: #fff;
+$nav-tabs-link-hover-border-color: $yellow $yellow $white;
+$nav-tabs-link-active-border-color: $yellow $yellow $white;
+$nav-tabs-link-active-bg: $white;
+$nav-tabs-link-active-color: $yellow;
+$dropdown-bg: $white;
+$btn-disabled-opacity: .25;
+$font-weight-bold: 700;
+$btn-font-weight: $font-weight-bold;
+$input-bg: $white;
+$input-disabled-bg: $gray-100;
+$input-border-color: $gray-100;
+$input-btn-border-width: $border-width*2;
+$input-focus-bg: $white;
+$variable-prefix: bs-;
+$prefix: $variable-prefix;
+$text-muted: var(--#{$prefix}secondary-color);
+$input-placeholder-color: $text-muted;
+$input-group-addon-bg: $cyan;
+$input-group-addon-border-color: $cyan;
+$input-group-addon-color: $white;
+$black: #000;
+$dropdown-border-color: rgba($black, 0.15);
+$dropdown-divider-bg: $white;
+$dropdown-box-shadow: 0 0.5rem 1rem rgba($black, 0.175);
+$gray-900: #212529;
+$dropdown-link-color: $gray-900;
+$dropdown-link-hover-color: darken($gray-900, 5%);
+$dropdown-link-hover-bg: $yellow;
+$dropdown-link-disabled-color: $gray-600;
+$navbar-padding-x: 2rem;
+$nav-link-disabled-color: $text-muted;
+$table-cell-padding-y: 1rem;
+$table-cell-padding-x: 1rem;
+$table-cell-padding-y-sm: .5rem;
+$table-cell-padding-x-sm: .5rem;
+$gray-300: #dee2e6;
+$table-hover-bg: $gray-300;
+$table-border-width: $border-width*3;
+$table-border-color: rgba($gray-100, 0);
+$pagination-bg: $white;
+$gray-200: #e9ecef;
+$pagination-hover-bg: $gray-200;
+$pagination-active-color: $white;
+$pagination-disabled-color: $gray-600;
+$card-spacer-y: 0.75rem;
+$card-spacer-x: 1.25rem;
+$card-cap-bg: $white;
+$card-bg: $white;
+$tooltip-color: $white;
+$tooltip-bg: $black;
+$tooltip-padding-y: 3px;
+$tooltip-padding-x: 8px;
+$tooltip-margin: 0;
+$tooltip-arrow-color: $tooltip-bg;
+$badge-font-size: 75%;
+$font-weight-normal: 400;
+$badge-font-weight: $font-weight-normal;
+$badge-padding-y: .5em;
+$badge-padding-x: .5em;
+$modal-inner-padding: 1rem;
+$modal-content-bg: $white;
+$modal-content-border-color: $gray-100;
+$modal-content-box-shadow-xs: 0 3px 9px rgba($black, 0.5);
+$modal-content-box-shadow-sm-up: 0 5px 15px rgba($black, 0.5);
+$modal-header-border-color: $gray-200;
+$alert-padding-y: 0.75rem;
+$alert-padding-x: 1.25rem;
+$list-group-bg: $white;
+$list-group-border-color: $gray-100;
+$list-group-border-width: $border-width*3;
+$list-group-item-padding-y: 0.75rem;
+$list-group-item-padding-x: 1.25rem;
+$list-group-hover-bg: $gray-300;
+$list-group-disabled-color: $gray-600;
+$list-group-action-active-bg: $gray-200;
+$card-cap-color: $gray-600;
+$card-border-width: $border-width * 2;
+$list-group-active-color: $white;
+$list-group-action-color: var(--#{$prefix}secondary-color);
+$list-group-action-hover-color: $list-group-action-color;
+$list-group-action-active-color: $cyan;
+$figure-caption-font-size: 90%;
+$figure-caption-color: $gray-600;
+$code-font-size: 90%;
+$kbd-padding-y: .2rem;
+$kbd-padding-x: .4rem;

resources/theme/custom.scss

@@ -0,0 +1,11 @@
+@import "../../src/node_modules/bootstrap/scss/functions";
+@import "../../src/node_modules/bootstrap/scss/variables";
+
+@each $color, $value in $theme-colors {
+  .btn-outline-#{$color}:hover {
+    color: $white;
+  }
+  .btn-#{$color}:hover {
+    color: $white;
+  }
+}

resources/theme/theme_template.scss

@@ -0,0 +1,57 @@
+// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
+@import "../../src/node_modules/bootstrap/scss/functions";
+
+// 2. Include any default variable overrides here
+@import "claire_variables";
+
+// 3. Include remainder of required Bootstrap stylesheets (including any separate color mode stylesheets)
+@import "../../src/node_modules/bootstrap/scss/variables";
+@import "../../src/node_modules/bootstrap/scss/variables-dark";
+
+// 4. Include any default map overrides here
+// ???
+
+// 5. Include remainder of required parts
+@import "../../src/node_modules/bootstrap/scss/maps";
+@import "../../src/node_modules/bootstrap/scss/mixins";
+@import "../../src/node_modules/bootstrap/scss/utilities";
+
+// 6. Include any other optional stylesheet partials as desired; list below is not inclusive of all available stylesheets
+@import "../../src/node_modules/bootstrap/scss/root";
+@import "../../src/node_modules/bootstrap/scss/reboot";
+@import "../../src/node_modules/bootstrap/scss/type";
+@import "../../src/node_modules/bootstrap/scss/images";
+@import "../../src/node_modules/bootstrap/scss/containers";
+@import "../../src/node_modules/bootstrap/scss/grid";
+@import "../../src/node_modules/bootstrap/scss/tables";
+@import "../../src/node_modules/bootstrap/scss/forms";
+@import "../../src/node_modules/bootstrap/scss/buttons";
+@import "../../src/node_modules/bootstrap/scss/transitions";
+@import "../../src/node_modules/bootstrap/scss/dropdown";
+@import "../../src/node_modules/bootstrap/scss/button-group";
+@import "../../src/node_modules/bootstrap/scss/nav";
+@import "../../src/node_modules/bootstrap/scss/navbar";
+@import "../../src/node_modules/bootstrap/scss/card";
+@import "../../src/node_modules/bootstrap/scss/accordion";
+@import "../../src/node_modules/bootstrap/scss/breadcrumb";
+@import "../../src/node_modules/bootstrap/scss/pagination";
+@import "../../src/node_modules/bootstrap/scss/badge";
+@import "../../src/node_modules/bootstrap/scss/alert";
+@import "../../src/node_modules/bootstrap/scss/progress";
+@import "../../src/node_modules/bootstrap/scss/list-group";
+@import "../../src/node_modules/bootstrap/scss/close";
+@import "../../src/node_modules/bootstrap/scss/toasts";
+@import "../../src/node_modules/bootstrap/scss/modal";
+@import "../../src/node_modules/bootstrap/scss/tooltip";
+@import "../../src/node_modules/bootstrap/scss/popover";
+@import "../../src/node_modules/bootstrap/scss/carousel";
+@import "../../src/node_modules/bootstrap/scss/spinners";
+@import "../../src/node_modules/bootstrap/scss/offcanvas";
+@import "../../src/node_modules/bootstrap/scss/placeholders";
+@import "../../src/node_modules/bootstrap/scss/helpers";
+
+// 7. Optionally include utilities API last to generate classes based on the Sass map in `_utilities.scss`
+@import "../../src/node_modules/bootstrap/scss/utilities/api";
+
+// 8. Add additional custom code here
+// @import "custom";

src/.meteor/packages

@@ -6,15 +6,15 @@
 
 meteor-base@1.5.2             # Packages every Meteor app needs to have
 # mobile-experience@1.1.0       # Packages for a great mobile UX
-mongo@2.2.0                   # The database Meteor supports right now
+mongo@2.3.0                   # The database Meteor supports right now
 blaze-html-templates # Compile .html files into Meteor Blaze views
 jquery@3.0.0!                  # Wrapper package for npm-installed jquery
 reactive-var@1.0.13            # Reactive variable for tracker
 tracker@1.3.4                 # Meteor's client-side reactive programming library
 
 es5-shim@4.8.1                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.17.0              # Enable ECMAScript2015+ syntax in app code
-typescript@5.9.3              # Enable TypeScript syntax in .ts and .tsx modules
+ecmascript@0.18.0              # Enable ECMAScript2015+ syntax in app code
+typescript@5.10.0              # Enable TypeScript syntax in .ts and .tsx modules
 shell-server@0.7.0            # Server-side component of the `meteor shell` command
 
 # hot-module-replacement@0.3.0  # Update code in development without reloading the page
@@ -35,8 +35,8 @@ facts-ui@1.0.2
 #========================================
 # Accounts
 #========================================
-accounts-base@3.2.0
-accounts-password@3.2.2
+accounts-base@3.2.1
+accounts-password@3.2.3
 jkuester:userpresence@2.0.0
 alanning:roles
 

src/.meteor/release

@@ -1 +1 @@
-METEOR@3.4
+METEOR@3.4.1

src/.meteor/versions

@@ -1,23 +1,23 @@
-accounts-base@3.2.0
-accounts-password@3.2.2
+accounts-base@3.2.1
+accounts-password@3.2.3
 alanning:roles@4.0.0
 aldeed:autoform@8.0.0
-aldeed:collection2@4.1.5
+aldeed:collection2@4.2.0
 aldeed:simple-schema@2.0.0
 allow-deny@2.1.0
 audit-argument-checks@1.0.8
 autoupdate@2.0.1
-babel-compiler@7.13.0
+babel-compiler@7.14.0
 babel-runtime@1.5.2
 base64@1.0.13
 binary-heap@1.0.12
-blaze@3.0.2
-blaze-html-templates@3.0.0
-blaze-tools@2.0.0
+blaze@3.0.3
+blaze-html-templates@3.0.1
+blaze-tools@2.0.1
 boilerplate-generator@2.1.0
 caching-compiler@2.0.1
-caching-html-compiler@2.0.0
-callback-hook@1.6.1
+caching-html-compiler@2.0.1
+callback-hook@1.7.0
 ccorcos:subs-cache@0.9.12
 check@1.5.0
 claire:h5p@1.0.0
@@ -28,15 +28,15 @@ communitypackages:autoform-bootstrap5@2.0.0
 core-runtime@1.0.0
 dburles:mongo-collection-instances@1.0.1
 ddp@1.4.2
-ddp-client@3.1.1
+ddp-client@3.2.0
 ddp-common@1.4.4
 ddp-rate-limiter@1.2.2
-ddp-server@3.1.2
+ddp-server@3.2.0
 diff-sequence@1.1.3
 dynamic-import@0.7.4
-ecmascript@0.17.0
+ecmascript@0.18.0
 ecmascript-runtime@0.8.3
-ecmascript-runtime-client@0.12.3
+ecmascript-runtime-client@0.13.0
 ecmascript-runtime-server@0.11.1
 ejson@1.1.5
 email@3.1.2
@@ -49,8 +49,8 @@ force-ssl-common@1.1.1
 fourseven:scss@4.17.0-rc.1
 geojson-utils@1.0.12
 hot-code-push@1.0.5
-html-tools@2.0.0
-htmljs@2.0.1
+html-tools@2.0.1
+htmljs@2.0.2
 http@1.4.4
 id-map@1.2.0
 inter-process-messaging@0.1.2
@@ -74,27 +74,27 @@ lmieulet:meteor-coverage@5.0.0
 localstorage@1.2.1
 logging@1.3.6
 mdg:validated-method@1.3.0
-meteor@2.2.0
+meteor@2.3.0
 meteor-base@1.5.2
 meteortesting:browser-tests@1.8.0
 meteortesting:mocha@3.3.0
 meteortesting:mocha-core@8.2.0
-minifier-js@3.1.0
-minimongo@2.0.5
+minifier-js@3.2.0
+minimongo@2.1.0
 modern-browsers@0.2.3
 modules@0.20.3
 modules-runtime@0.13.2
-mongo@2.2.0
+mongo@2.3.0
 mongo-decimal@0.2.0
 mongo-dev-server@1.1.1
 mongo-id@1.0.9
 npm-mongo@6.16.1
-observe-sequence@2.0.0
+observe-sequence@2.0.1
 ordered-dict@1.2.0
-ostrio:cookies@2.9.1
+ostrio:cookies@2.9.2
 ostrio:cstorage@4.0.1
 ostrio:files@3.0.1
-ostrio:flow-router-extra@3.12.1
+ostrio:flow-router-extra@3.15.3
 ostrio:i18n@3.2.1
 promise@1.0.0
 raix:eventemitter@2.0.0
@@ -109,16 +109,16 @@ routepolicy@1.1.2
 sha@1.0.10
 shell-server@0.7.0
 socket-stream-client@0.6.1
-spacebars@2.0.0
-spacebars-compiler@2.0.0
+spacebars@2.0.1
+spacebars-compiler@2.0.1
 standard-minifier-js@3.2.0
-templating@1.4.4
-templating-compiler@2.0.0
-templating-runtime@2.0.1
-templating-tools@2.0.0
+templating@1.4.5
+templating-compiler@2.0.1
+templating-runtime@2.0.2
+templating-tools@2.0.1
 tracker@1.3.4
-typescript@5.9.3
+typescript@5.10.0
 url@1.3.5
-webapp@2.1.0
+webapp@2.1.2
 webapp-hashing@1.1.2
 zodern:types@1.0.13

src/imports/contexts/beamer/Beamer.js

@@ -270,10 +270,10 @@ onClientExec(() => {
 
 	/**
 	 * Check if material reference exists in the beamer document.
-	 * @param lessonId
-	 * @param referenceId
-	 * @param itemId
-	 * @param context
+	 * @param lessonId {string}
+	 * @param referenceId {string}
+	 * @param itemId {string=}
+	 * @param context {string=}
 	 * @return {*|null}
 	 */
 	Beamer.doc.has = ({ lessonId, referenceId, itemId, context }) => {

src/imports/contexts/files/document/renderer/main/documentFileRenderer.html

@@ -1,7 +1,7 @@
 <template name="documentFileRenderer">
   <div class="w-100 text-center">
     <div class="py-2">{{file.name}}</div>
-    <div class="pdf-target"></div>
+    <div class="pdf-target" id="document-file-{{targetId}}"></div>
       {{#unless rendered}}
           {{#if hasThumbnail file}}
             <div>

src/imports/contexts/files/document/renderer/main/documentFileRenderer.js

@@ -34,7 +34,8 @@ Template.documentFileRenderer.onRendered(function () {
 		this.state.set({ pdfUrl });
 
 		if (PDFObject.supportsPDFs) {
-			PDFObject.embed(pdfUrl, document.querySelector(".pdf-target"), {
+			const selector = `#document-file-${data._id}`;
+			PDFObject.embed(pdfUrl, document.querySelector(selector), {
 				height: "60vh",
 				title: data.name,
 				pdfOpenParams: {
@@ -71,6 +72,9 @@ Template.documentFileRenderer.helpers({
 			name: DocumentFiles.name,
 		});
 	},
+	targetId() {
+		return Template.instance().data._id;
+	},
 	file() {
 		return Template.instance().data;
 	},