From c5475d3bbdcbb2cd7766b7df383819d337917515 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Thu, 22 Mar 2018 13:48:59 -0700
Subject: [PATCH] Rename a bunch of files and deal with paths
---
.../stylesheets/{room.scss => hub.scss} | 0
.../stylesheets/index.scss} | 2 +-
src/{room.html => hub.html} | 2 +-
src/{room.js => hub.js} | 2 +-
src/{lobby.html => index.html} | 0
src/{lobby.js => index.js} | 2 +-
src/onboarding.css | 15 ------
src/onboarding.html | 12 -----
src/onboarding.js | 51 -------------------
webpack.config.js | 24 ++++-----
10 files changed, 13 insertions(+), 97 deletions(-)
rename src/assets/stylesheets/{room.scss => hub.scss} (100%)
rename src/{lobby.css => assets/stylesheets/index.scss} (90%)
rename src/{room.html => hub.html} (99%)
rename src/{room.js => hub.js} (99%)
rename src/{lobby.html => index.html} (100%)
rename src/{lobby.js => index.js} (98%)
delete mode 100644 src/onboarding.css
delete mode 100644 src/onboarding.html
delete mode 100644 src/onboarding.js
diff --git a/src/assets/stylesheets/room.scss b/src/assets/stylesheets/hub.scss
similarity index 100%
rename from src/assets/stylesheets/room.scss
rename to src/assets/stylesheets/hub.scss
diff --git a/src/lobby.css b/src/assets/stylesheets/index.scss
similarity index 90%
rename from src/lobby.css
rename to src/assets/stylesheets/index.scss
index 539c8ab79..710520a1a 100644
--- a/src/lobby.css
+++ b/src/assets/stylesheets/index.scss
@@ -5,7 +5,7 @@
body {
margin: 0;
padding: 0;
- background: black url(./assets/background.jpg) no-repeat left center;
+ background: black url(../background.jpg) no-repeat left center;
background-size: cover;
}
diff --git a/src/room.html b/src/hub.html
similarity index 99%
rename from src/room.html
rename to src/hub.html
index 52fd9ddd2..0d21aafd9 100644
--- a/src/room.html
+++ b/src/hub.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>Mozilla Mixed Reality Social Client</title>
+ <title>moz://a duck</title>
<meta http-equiv="origin-trial" data-feature="WebVR (For Chrome M62+)" data-expires="<%= ORIGIN_TRIAL_EXPIRES %>" content="<%= ORIGIN_TRIAL_TOKEN %>">
<% if(NODE_ENV === "production") { %>
diff --git a/src/room.js b/src/hub.js
similarity index 99%
rename from src/room.js
rename to src/hub.js
index 6369effad..37f6b9769 100644
--- a/src/room.js
+++ b/src/hub.js
@@ -1,4 +1,4 @@
-import "./assets/stylesheets/room.scss";
+import "./assets/stylesheets/hub.scss";
import queryString from "query-string";
import { patchWebGLRenderingContext } from "./utils/webgl";
diff --git a/src/lobby.html b/src/index.html
similarity index 100%
rename from src/lobby.html
rename to src/index.html
diff --git a/src/lobby.js b/src/index.js
similarity index 98%
rename from src/lobby.js
rename to src/index.js
index c3c9a6bae..6cc93b05f 100644
--- a/src/lobby.js
+++ b/src/index.js
@@ -4,7 +4,7 @@ import { JanusSession, JanusPluginHandle } from "minijanus";
import "material-design-lite";
import "material-design-lite/material.css";
-import "./lobby.css";
+import "./assets/stylesheets/index.scss";
import "webrtc-adapter";
import registerTelemetry from "./telemetry";
diff --git a/src/onboarding.css b/src/onboarding.css
deleted file mode 100644
index c3332df40..000000000
--- a/src/onboarding.css
+++ /dev/null
@@ -1,15 +0,0 @@
-* {
- box-sizing: border-box;
-}
-
-body {
- margin: 0;
- padding: 0;
-}
-
-:local(.onboarding) {
- display: flex;
- flex: 1;
- margin: 20px;
- flex-direction: column;
-}
diff --git a/src/onboarding.html b/src/onboarding.html
deleted file mode 100644
index cda90ad3c..000000000
--- a/src/onboarding.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Mozilla Mixed Reality Social Client Lobby</title>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- </head>
- <body>
- <div id="root"></div>
- </body>
-</html>
diff --git a/src/onboarding.js b/src/onboarding.js
deleted file mode 100644
index a3d25c27b..000000000
--- a/src/onboarding.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import ReactDOM from "react-dom";
-import React from "react";
-import { HashRouter as Router, Route, Link } from "react-router-dom";
-import styles from "./onboarding.css";
-
-const Onboarding = () => (
- <Router basename="">
- <div className={styles.onboarding}>
- <Link to="/">Start Over</Link>
-
- <hr />
-
- <Route exact path="/" component={Landing} />
- <Route path="/step1" component={Step1} />
- <Route path="/step2" component={Step2} />
- <Route path="/step3" component={Step3} />
- </div>
- </Router>
-);
-
-const Landing = () => (
- <div>
- <h2>Landing</h2>
- <Link to="/step1">Get Started</Link>
- </div>
-);
-
-const Step1 = () => (
- <div>
- <h2>Step 1</h2>
- <Link to="/step2">Next</Link>
- </div>
-);
-
-const Step2 = () => (
- <div>
- <h2>Step 2</h2>
- <Link to="/step1">Back</Link>
- <Link to="/step3">Next</Link>
- </div>
-);
-
-const Step3 = () => (
- <div>
- <h2>Step 3</h2>
- <Link to="/step2">Back</Link>
- <a href="/room.html?room=1">Create Room</a>
- </div>
-);
-
-ReactDOM.render(<Onboarding />, document.getElementById("root"));
diff --git a/webpack.config.js b/webpack.config.js
index 4996b8925..fdb7c6b1e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -75,13 +75,12 @@ class LodashTemplatePlugin {
const config = {
entry: {
- lobby: path.join(__dirname, "src", "lobby.js"),
- room: path.join(__dirname, "src", "room.js"),
- onboarding: path.join(__dirname, "src", "onboarding.js")
+ index: path.join(__dirname, "src", "index.js"),
+ hub: path.join(__dirname, "src", "hub.js"),
},
output: {
path: path.join(__dirname, "public"),
- filename: "[name]-[chunkhash].js",
+ filename: "assets/js/[name]-[chunkhash].js",
publicPath: process.env.BASE_ASSETS_PATH || ""
},
mode: "development",
@@ -186,23 +185,18 @@ const config = {
// Each output page needs a HTMLWebpackPlugin entry
new HTMLWebpackPlugin({
filename: "index.html",
- template: path.join(__dirname, "src", "lobby.html"),
+ template: path.join(__dirname, "src", "index.html"),
// Chunks correspond with the entries you wish to include in your html template
- chunks: ["lobby"]
+ chunks: ["index"]
}),
new HTMLWebpackPlugin({
- filename: "room.html",
- template: path.join(__dirname, "src", "room.html"),
- chunks: ["room"],
+ filename: "hub.html",
+ template: path.join(__dirname, "src", "hub.html"),
+ chunks: ["hub"],
inject: "head"
}),
- new HTMLWebpackPlugin({
- filename: "onboarding.html",
- template: path.join(__dirname, "src", "onboarding.html"),
- chunks: ["onboarding"]
- }),
// Extract required css and add a content hash.
- new ExtractTextPlugin("[name]-[contenthash].css", {
+ new ExtractTextPlugin("assets/stylesheets/[name]-[contenthash].css", {
disable: process.env.NODE_ENV !== "production"
}),
// Transform the output of the html-loader using _.template
--
GitLab