From 2949b2911caef94ac471612b43274d45c644e08f Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Thu, 25 Apr 2019 08:47:29 +0200
Subject: [PATCH] moving back to old structure
---
.gitmodules | 2 +-
2019/template/Gruntfile.coffee | 131 +++++++++++++++++-
2019/template/package.json | 23 ++-
2019/template/theme | 2 +-
components/Gruntfile.coffee | 130 -----------------
components/package.json | 22 ---
{components/theme => theme}/css/style.css | 0
.../img/LCSB_short_small_4c_cropped.svg | 0
.../img/University-of-Luxembourg-Fr-01.svg | 0
{components/theme => theme}/img/lcsb_bg.png | Bin
{components/theme => theme}/reveal.js | 0
.../theme => theme}/templates/_index.html | 0
.../theme => theme}/templates/_section.html | 0
13 files changed, 154 insertions(+), 156 deletions(-)
mode change 120000 => 100644 2019/template/Gruntfile.coffee
mode change 120000 => 100644 2019/template/package.json
delete mode 100644 components/Gruntfile.coffee
delete mode 100644 components/package.json
rename {components/theme => theme}/css/style.css (100%)
rename {components/theme => theme}/img/LCSB_short_small_4c_cropped.svg (100%)
rename {components/theme => theme}/img/University-of-Luxembourg-Fr-01.svg (100%)
rename {components/theme => theme}/img/lcsb_bg.png (100%)
rename {components/theme => theme}/reveal.js (100%)
rename {components/theme => theme}/templates/_index.html (100%)
rename {components/theme => theme}/templates/_section.html (100%)
diff --git a/.gitmodules b/.gitmodules
index c6f897f7..2022e0b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "theme/reveal.js"]
- path = components/theme/reveal.js
+ path = theme/reveal.js
url = https://github.com/hakimel/reveal.js.git
diff --git a/2019/template/Gruntfile.coffee b/2019/template/Gruntfile.coffee
deleted file mode 120000
index 71ae4e3a..00000000
--- a/2019/template/Gruntfile.coffee
+++ /dev/null
@@ -1 +0,0 @@
-../../components/Gruntfile.coffee
\ No newline at end of file
diff --git a/2019/template/Gruntfile.coffee b/2019/template/Gruntfile.coffee
new file mode 100644
index 00000000..2207935a
--- /dev/null
+++ b/2019/template/Gruntfile.coffee
@@ -0,0 +1,130 @@
+# Generated on 2013-11-27 using generator-reveal 0.3.2
+module.exports = (grunt) ->
+
+ grunt.loadNpmTasks 'grunt-gh-pages'
+
+ grunt.initConfig
+
+ "gh-pages":
+ "gh-pages":
+ options:
+ base: "dist"
+ src: [ '**' ]
+
+ watch:
+
+ livereload:
+ options:
+ livereload: true
+ files: [
+ 'index.html'
+ 'slides/*.md'
+ 'slides/*.html'
+ 'theme/js/*.js'
+ ]
+
+ index:
+ files: [
+ 'theme/templates/_index.html'
+ 'theme/templates/_section.html'
+ 'slides/list.json'
+ ]
+ tasks: ['buildIndex']
+
+ coffeelint:
+ files: ['Gruntfile.coffee']
+ tasks: ['coffeelint']
+
+ jshint:
+ files: ['theme/js/*.js']
+ tasks: ['jshint']
+
+ connect:
+
+ livereload:
+ options:
+ port: 9000
+ # Change hostname to '0.0.0.0' to access
+ # the server from outside.
+ hostname: 'localhost'
+ base: '.'
+ open: true
+ livereload: true
+
+ coffeelint:
+
+ options:
+ indentation:
+ value: 4
+
+ all: ['Gruntfile.coffee']
+
+ jshint:
+
+ all: ['theme/js/*.js']
+
+ copy:
+
+ dist:
+ files: [{
+ expand: true
+ src: [
+ 'slides/**'
+ 'theme/**'
+ 'theme/css/**'
+ 'theme/js/**'
+ 'slides/img/**'
+ ]
+ dest: 'public/'
+ },{
+ expand: true
+ src: ['index.html']
+ dest: 'public/'
+ filter: 'isFile'
+ }]
+
+
+ # Load all grunt tasks.
+ require('load-grunt-tasks')(grunt)
+
+ grunt.registerTask 'buildIndex',
+ 'Build theme/templates/_index.html and slides/list.json.',
+ ->
+ indexTemplate = grunt.file.read 'theme/templates/_index.html'
+ sectionTemplate = grunt.file.read 'theme/templates/_section.html'
+ slides = grunt.file.readJSON 'slides/list.json'
+
+ html = grunt.template.process indexTemplate, data:
+ slides:
+ slides
+ section: (slide) ->
+ grunt.template.process sectionTemplate, data:
+ slide:
+ slide
+ grunt.file.write 'index.html', html
+
+ grunt.registerTask 'test',
+ '*Lint* javascript and coffee files.', [
+ 'coffeelint'
+ 'jshint'
+ ]
+
+ grunt.registerTask 'server',
+ 'Run presentation locally and start watch process (living document).', [
+ 'buildIndex'
+ 'connect:livereload'
+ 'watch'
+ ]
+
+ grunt.registerTask 'dist',
+ 'Save presentation files to *public* directory.', [
+ 'test'
+ 'buildIndex'
+ 'copy'
+ ]
+
+ # Define default task.
+ grunt.registerTask 'default', [
+ 'test'
+ 'server'
+ ]
diff --git a/2019/template/package.json b/2019/template/package.json
deleted file mode 120000
index d1ec8ef1..00000000
--- a/2019/template/package.json
+++ /dev/null
@@ -1 +0,0 @@
-../../components/package.json
\ No newline at end of file
diff --git a/2019/template/package.json b/2019/template/package.json
new file mode 100644
index 00000000..5c7507c6
--- /dev/null
+++ b/2019/template/package.json
@@ -0,0 +1,22 @@
+{
+ "name": "template",
+ "version": "0.0.1",
+ "private": true,
+ "devDependencies": {
+ "grunt": "~0.4.1",
+ "grunt-coffeelint": "0.0.7",
+ "grunt-contrib-connect": "~0.5.0",
+ "grunt-contrib-copy": "~0.4.1",
+ "grunt-contrib-jshint": "~0.7.0",
+ "grunt-contrib-sass": "^1.0.0",
+ "grunt-contrib-watch": "~0.5.3",
+ "grunt-gh-pages": "~0.9.0",
+ "load-grunt-tasks": "~0.2.0"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ },
+ "scripts": {
+ "test": "grunt test"
+ }
+}
diff --git a/2019/template/theme b/2019/template/theme
index eac76485..c825a7e2 120000
--- a/2019/template/theme
+++ b/2019/template/theme
@@ -1 +1 @@
-../../components/theme
\ No newline at end of file
+../../theme
\ No newline at end of file
diff --git a/components/Gruntfile.coffee b/components/Gruntfile.coffee
deleted file mode 100644
index 2207935a..00000000
--- a/components/Gruntfile.coffee
+++ /dev/null
@@ -1,130 +0,0 @@
-# Generated on 2013-11-27 using generator-reveal 0.3.2
-module.exports = (grunt) ->
-
- grunt.loadNpmTasks 'grunt-gh-pages'
-
- grunt.initConfig
-
- "gh-pages":
- "gh-pages":
- options:
- base: "dist"
- src: [ '**' ]
-
- watch:
-
- livereload:
- options:
- livereload: true
- files: [
- 'index.html'
- 'slides/*.md'
- 'slides/*.html'
- 'theme/js/*.js'
- ]
-
- index:
- files: [
- 'theme/templates/_index.html'
- 'theme/templates/_section.html'
- 'slides/list.json'
- ]
- tasks: ['buildIndex']
-
- coffeelint:
- files: ['Gruntfile.coffee']
- tasks: ['coffeelint']
-
- jshint:
- files: ['theme/js/*.js']
- tasks: ['jshint']
-
- connect:
-
- livereload:
- options:
- port: 9000
- # Change hostname to '0.0.0.0' to access
- # the server from outside.
- hostname: 'localhost'
- base: '.'
- open: true
- livereload: true
-
- coffeelint:
-
- options:
- indentation:
- value: 4
-
- all: ['Gruntfile.coffee']
-
- jshint:
-
- all: ['theme/js/*.js']
-
- copy:
-
- dist:
- files: [{
- expand: true
- src: [
- 'slides/**'
- 'theme/**'
- 'theme/css/**'
- 'theme/js/**'
- 'slides/img/**'
- ]
- dest: 'public/'
- },{
- expand: true
- src: ['index.html']
- dest: 'public/'
- filter: 'isFile'
- }]
-
-
- # Load all grunt tasks.
- require('load-grunt-tasks')(grunt)
-
- grunt.registerTask 'buildIndex',
- 'Build theme/templates/_index.html and slides/list.json.',
- ->
- indexTemplate = grunt.file.read 'theme/templates/_index.html'
- sectionTemplate = grunt.file.read 'theme/templates/_section.html'
- slides = grunt.file.readJSON 'slides/list.json'
-
- html = grunt.template.process indexTemplate, data:
- slides:
- slides
- section: (slide) ->
- grunt.template.process sectionTemplate, data:
- slide:
- slide
- grunt.file.write 'index.html', html
-
- grunt.registerTask 'test',
- '*Lint* javascript and coffee files.', [
- 'coffeelint'
- 'jshint'
- ]
-
- grunt.registerTask 'server',
- 'Run presentation locally and start watch process (living document).', [
- 'buildIndex'
- 'connect:livereload'
- 'watch'
- ]
-
- grunt.registerTask 'dist',
- 'Save presentation files to *public* directory.', [
- 'test'
- 'buildIndex'
- 'copy'
- ]
-
- # Define default task.
- grunt.registerTask 'default', [
- 'test'
- 'server'
- ]
diff --git a/components/package.json b/components/package.json
deleted file mode 100644
index 5c7507c6..00000000
--- a/components/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "name": "template",
- "version": "0.0.1",
- "private": true,
- "devDependencies": {
- "grunt": "~0.4.1",
- "grunt-coffeelint": "0.0.7",
- "grunt-contrib-connect": "~0.5.0",
- "grunt-contrib-copy": "~0.4.1",
- "grunt-contrib-jshint": "~0.7.0",
- "grunt-contrib-sass": "^1.0.0",
- "grunt-contrib-watch": "~0.5.3",
- "grunt-gh-pages": "~0.9.0",
- "load-grunt-tasks": "~0.2.0"
- },
- "engines": {
- "node": ">=0.8.0"
- },
- "scripts": {
- "test": "grunt test"
- }
-}
diff --git a/components/theme/css/style.css b/theme/css/style.css
similarity index 100%
rename from components/theme/css/style.css
rename to theme/css/style.css
diff --git a/components/theme/img/LCSB_short_small_4c_cropped.svg b/theme/img/LCSB_short_small_4c_cropped.svg
similarity index 100%
rename from components/theme/img/LCSB_short_small_4c_cropped.svg
rename to theme/img/LCSB_short_small_4c_cropped.svg
diff --git a/components/theme/img/University-of-Luxembourg-Fr-01.svg b/theme/img/University-of-Luxembourg-Fr-01.svg
similarity index 100%
rename from components/theme/img/University-of-Luxembourg-Fr-01.svg
rename to theme/img/University-of-Luxembourg-Fr-01.svg
diff --git a/components/theme/img/lcsb_bg.png b/theme/img/lcsb_bg.png
similarity index 100%
rename from components/theme/img/lcsb_bg.png
rename to theme/img/lcsb_bg.png
diff --git a/components/theme/reveal.js b/theme/reveal.js
similarity index 100%
rename from components/theme/reveal.js
rename to theme/reveal.js
diff --git a/components/theme/templates/_index.html b/theme/templates/_index.html
similarity index 100%
rename from components/theme/templates/_index.html
rename to theme/templates/_index.html
diff --git a/components/theme/templates/_section.html b/theme/templates/_section.html
similarity index 100%
rename from components/theme/templates/_section.html
rename to theme/templates/_section.html
--
GitLab