Merge pull request #76 from sfeir-open-source/feat/75-components-in-s…

…ource-tree feat: #75 - Components in source tree
sfeir-open-source · Aug 11, 2020 · d304a52 · d304a52
2 parents c9a05f5 + 8c256fd
commit d304a52
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/src/client/layouts/on-stage/on-stage.html b/src/client/layouts/on-stage/on-stage.html
@@ -8,8 +8,8 @@
         <link rel="stylesheet" href="index.css" />
         <script defer src="../../../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
         <!-- type="module" not needed because we work with parcel bundler -->
-        <script defer src="../common/slide-view/slide-view.js"></script>
-        <script defer src="../common/menu-dropdown/menu-dropdown.js"></script>
+        <script defer src="../../web-components/slide-view/slide-view.js"></script>
+        <script defer src="../../web-components/menu-dropdown/menu-dropdown.js"></script>
         <title>On stage</title>
     </head>
     <body>

diff --git a/src/client/layouts/presenter/presenter-mobile.html b/src/client/layouts/presenter/presenter-mobile.html
@@ -8,11 +8,11 @@
         <link rel="stylesheet" href="index.css" />
         <script defer src="../../../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
         <!-- type="module" not needed because we work with parcel bundler -->
-        <script src="../common/slide-view/slide-view.js"></script>
-        <script src="../common/url-form/url-form.js"></script>
-        <script src="./components/timer/timer.js"></script>
-        <script src="./components/notes/notes.js"></script>
-        <script type="module" src="../common/menu-dropdown/menu-dropdown.js"></script>
+        <script src="../../web-components/slide-view/slide-view.js"></script>
+        <script src="../../web-components/url-form/url-form.js"></script>
+        <script src="../../web-components/timer/timer.js"></script>
+        <script src="../../web-components/notes/notes.js"></script>
+        <script src="../../web-components/menu-dropdown/menu-dropdown.js"></script>
         <title>Presenter view</title>
     </head>
     <body>

diff --git a/src/client/layouts/presenter/presenter.html b/src/client/layouts/presenter/presenter.html
@@ -8,11 +8,11 @@
         <link rel="stylesheet" href="index.css" />
         <script defer src="../../../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
         <!-- type="module" not needed because we work with parcel bundler -->
-        <script defer src="../common/slide-view/slide-view.js"></script>
-        <script defer src="../common/url-form/url-form.js"></script>
-        <script defer src="./components/timer/timer.js"></script>
-        <script defer src="./components/notes/notes.js"></script>
-        <script defer src="../common/menu-dropdown/menu-dropdown.js"></script>
+        <script defer src="../../web-components/slide-view/slide-view.js"></script>
+        <script defer src="../../web-components/url-form/url-form.js"></script>
+        <script defer src="../../web-components/timer/timer.js"></script>
+        <script defer src="../../web-components/notes/notes.js"></script>
+        <script defer src="../../web-components/menu-dropdown/menu-dropdown.js"></script>
         <title>Presenter view</title>
     </head>
     <body>

diff --git a/src/client/tc-controller/index.html b/src/client/tc-controller/index.html
@@ -3,12 +3,12 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>TC Controller</title>
+        <title>Talk Control</title>
         <link rel="stylesheet" href="../../../node_modules/bulma/css/bulma.min.css" />
         <link rel="stylesheet" href="./index.css" />
         <script defer src="../../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
         <!-- type="module" not needed because we work with parcel bundler -->
-        <script defer src="../layouts/common/url-form/url-form.js"></script>
+        <script defer src="../web-components/url-form/url-form.js"></script>
     </head>
     <body>
         <section class="section">

diff --git a/...uts/common/menu-dropdown/menu-dropdown.js → ...components/menu-dropdown/menu-dropdown.js b/...uts/common/menu-dropdown/menu-dropdown.js → ...components/menu-dropdown/menu-dropdown.js
diff --git a/...er/components/notes/notes-tc-component.js → ...eb-components/notes/notes-tc-component.js b/...er/components/notes/notes-tc-component.js → ...eb-components/notes/notes-tc-component.js
diff --git a/...youts/presenter/components/notes/notes.js → src/client/web-components/notes/notes.js b/...youts/presenter/components/notes/notes.js → src/client/web-components/notes/notes.js
diff --git a/...mon/slide-view/slide-view-tc-component.js → ...nts/slide-view/slide-view-tc-component.js b/...mon/slide-view/slide-view-tc-component.js → ...nts/slide-view/slide-view-tc-component.js
diff --git a/...t/layouts/common/slide-view/slide-view.js → ...t/web-components/slide-view/slide-view.js b/...t/layouts/common/slide-view/slide-view.js → ...t/web-components/slide-view/slide-view.js
diff --git a/...er/components/timer/timer-tc-component.js → ...eb-components/timer/timer-tc-component.js b/...er/components/timer/timer-tc-component.js → ...eb-components/timer/timer-tc-component.js
diff --git a/...youts/presenter/components/timer/timer.js → src/client/web-components/timer/timer.js b/...youts/presenter/components/timer/timer.js → src/client/web-components/timer/timer.js
diff --git a/...lient/layouts/common/url-form/url-form.js → ...lient/web-components/url-form/url-form.js b/...lient/layouts/common/url-form/url-form.js → ...lient/web-components/url-form/url-form.js
diff --git a/src/plugins/input/touch-pointer/component/touch-pointer.js b/src/plugins/input/touch-pointer/component/touch-pointer.js
@@ -1,7 +1,7 @@
 import '@webcomponents/webcomponentsjs/webcomponents-loader';
 import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter';
 import { LitElement, html, css } from 'lit-element';
-import '@client/layouts/common/slide-view/slide-view'
+import '@client/web-components/slide-view/slide-view';
 import { TouchPointerTCComponent } from './touch-pointer-tc-component';
 import bulmaStyle from '@granite-elements/granite-lit-bulma/granite-lit-bulma.js';