]> _ Git - fluidbook-toolbox.git/commitdiff
projects / fluidbook-toolbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 13aa46f)
wip #5045 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 28 Jan 2022 10:50:39 +0000 (11:50 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 28 Jan 2022 10:50:39 +0000 (11:50 +0100)
.idea/watcherTasks.xml patch | blob | history
resources/elearningmedia/index.html [new file with mode: 0644] patch | blob
resources/elearningmedia/js/app.js [new file with mode: 0644] patch | blob
resources/elearningmedia/js/bootstrap.js [new file with mode: 0644] patch | blob
resources/elearningmedia/sass/app.sass [new file with mode: 0644] patch | blob
resources/sass/app.sass [new file with mode: 0644] patch | blob
resources/sass/app.scss [deleted file] patch | blob | history
webpack.mix.js patch | blob | history

diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 2c91a1999e673861c19fba32e3563b6d21dca8c6..50642367923c48f6bec0dc8b9863be5e364c3a3d 100644 (file)
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectTasksOptions">
+  <component name="ProjectTasksOptions" suppressed-tasks="SCSS">
     <TaskOptions isEnabled="true">
       <option name="arguments" value="$FileName$ $FileNameWithoutExtension$.css --source-map" />
       <option name="checkSyntaxErrors" value="true" />
diff --git a/resources/elearningmedia/index.html b/resources/elearningmedia/index.html
new file mode 100644 (file)
index 0000000..a4dbfe5
--- /dev/null
+++ b/resources/elearningmedia/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/resources/elearningmedia/js/app.js b/resources/elearningmedia/js/app.js
new file mode 100644 (file)
index 0000000..40c55f6
--- /dev/null
+++ b/resources/elearningmedia/js/app.js
@@ -0,0 +1 @@
+require('./bootstrap');
diff --git a/resources/elearningmedia/js/bootstrap.js b/resources/elearningmedia/js/bootstrap.js
new file mode 100644 (file)
index 0000000..1cc1b0a
--- /dev/null
+++ b/resources/elearningmedia/js/bootstrap.js
@@ -0,0 +1,15 @@
+window._ = require('lodash');
+
+/**
+ * We'll load the axios HTTP library which allows us to easily issue requests
+ * to our Laravel back-end. This library automatically handles sending the
+ * CSRF token as a header based on the value of the "XSRF" token cookie.
+ */
+
+window.axios = require('axios');
+
+window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+
+import Plyr from 'plyr';
+
+const player = new Plyr('#player');
diff --git a/resources/elearningmedia/sass/app.sass b/resources/elearningmedia/sass/app.sass
new file mode 100644 (file)
index 0000000..01ac7ba
--- /dev/null
+++ b/resources/elearningmedia/sass/app.sass
@@ -0,0 +1,2 @@
+body
+    background-color: #f00
diff --git a/resources/sass/app.sass b/resources/sass/app.sass
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/resources/sass/app.sass
@@ -0,0 +1 @@
+
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
deleted file mode 100644 (file)
index 8337712..0000000
--- a/resources/sass/app.scss
+++ /dev/null
@@ -1 +0,0 @@
-//
diff --git a/webpack.mix.js b/webpack.mix.js
index 8a923cbb4bafb98cf8103195c70ea8af1b2d17af..9c4a147f228f0eb95643a574a5445b6400840194 100644 (file)
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -12,4 +12,7 @@ const mix = require('laravel-mix');
  */
 
 mix.js('resources/js/app.js', 'public/js')
-    .sass('resources/sass/app.scss', 'public/css');
+    .sass('resources/sass/app.sass', 'public/css');
+
+mix.js('resources/elearningmedia/js/app.js','resources/elearningmedia/dist/js')
+    .sass('resources/elearningmedia/sass/app.sass','resources/elearningmedia/dist/css');
Unnamed repository; edit this file 'description' to name the repository.