Restructure urls a bit.

thewca · Dec 20, 2017 · 1787a48 · 1787a48
1 parent f2c7542
commit 1787a48
Show file tree

Hide file tree

Showing 7 changed files with 245 additions and 17 deletions.
diff --git a/git-tools/package-lock.json b/git-tools/package-lock.json
diff --git a/git-tools/package.json b/git-tools/package.json
@@ -1,7 +1,7 @@
 {
-    "name": "git-tools"
-  , "private": true
-  , "dependencies": {
+  "name": "git-tools",
+  "private": true,
+  "dependencies": {
     "jshint": ">= 1.1.0"
   }
 }
diff --git a/tnoodle-ui/package.json b/tnoodle-ui/package.json
@@ -2,7 +2,7 @@
   "name": "tnoodle-ui",
   "version": "0.1.0",
   "private": true,
-  "homepage": "http://localhost:2014/scramble-new-ui/",
+  "homepage": "http://localhost:2014/scramble/",
   "dependencies": {
     "bootstrap": "4.0.0-beta.2",
     "classnames": "^2.2.5",

diff --git a/tnoodle-ui/src/Layout.js b/tnoodle-ui/src/Layout.js
@@ -50,7 +50,7 @@ export default connect(
         contents = (
           <div>
             <div className="d-flex justify-content-around mt-5">
-              <a className="btn btn-outline-primary btn-home" href="/scramble/">Legacy UI</a>
+              <a className="btn btn-outline-primary btn-home" href="/scramble-legacy/">Legacy UI</a>
               <button className="btn btn-outline-primary btn-home pointer" onClick={() => WcaApi.logIn()}>Log in with the WCA</button>
             </div>
           </div>

diff --git a/webscrambles/WebContent/WEB-INF/urlrewrite.xml b/webscrambles/WebContent/WEB-INF/urlrewrite.xml
@@ -15,24 +15,24 @@
     </rule>
 
     <rule>
-        <from>^/scramble-new-ui$</from>
-        <to type="redirect">/scramble-new-ui/</to>
+        <from>^/scramble$</from>
+        <to type="redirect">/scramble/</to>
     </rule>
     <rule>
-        <from>^/scramble-new-ui/static</from>
+        <from>^/scramble/static</from>
         <to type="forward">/wca/new-ui/static</to>
     </rule>
     <rule>
-        <from>^/scramble-new-ui/.*</from>
+        <from>^/scramble/[^.]*$</from>
         <to type="forward">/wca/new-ui/index.html</to>
     </rule>
 
     <rule>
-        <from>^/scramble$</from>
-        <to type="redirect">/scramble/</to>
+        <from>^/scramble-legacy$</from>
+        <to type="redirect">/scramble-legacy/</to>
     </rule>
     <rule>
-        <from>^/scramble/$</from>
+        <from>^/scramble-legacy/$</from>
         <to type="forward">/wca/scramblegen.html</to>
     </rule>
 

diff --git a/webscrambles/WebContent/wca/scramblegen.html b/webscrambles/WebContent/wca/scramblegen.html
@@ -104,7 +104,7 @@
             if(runningVersion === null) {
                 runningVersion = versionJson.running_version;
             }
-            
+
 
             if(versionJson.ignorableError) {
                 // There was an error connecting to the server or something.
@@ -458,8 +458,9 @@
         showScrambles: showZip,
         competitionChanged: competitionChanged
     };
-    
+
     window.addEventListener('load', function() {
+        addStateMessage("This is the legacy TNoodle UI. Try out <a href='/scramble/'>the new UI</a>.");
         var tnoodleLinkSpan = document.createElement('span');
         var tnoodleLink = document.createElement('a');
         tnoodleLink.href = '/readme';

diff --git a/winstone/tmtproject.py b/winstone/tmtproject.py
@@ -32,7 +32,7 @@ def configure(self):
 
         self.nonJavaResourceDeps |= tmt.glob(self.srcResource, '.*$', relativeTo=self.srcResource)
         for f in xmlFileTypes:
-                self.nonJavaResourceDeps -= tmt.glob(self.srcResource, "%s$" % f, relativeTo=self.srcResource)
+            self.nonJavaResourceDeps -= tmt.glob(self.srcResource, "%s$" % f, relativeTo=self.srcResource)
 
         self.nonJavaSrcDeps |= tmt.glob(self.src, '.*\\.properties$', relativeTo=self.src)
         self.nonJavaSrcDeps |= tmt.glob(self.src, '.*\\.xsd$', relativeTo=self.src)
@@ -147,14 +147,14 @@ def mungeXmlFiles(self, topLevelWebProject):
 """
                 root = ET.fromstring(h2ConsoleServlet)
                 for child in reversed(root):
-                        xmlRoot.insert(0, child)
+                    xmlRoot.insert(0, child)
 
             for project in deps:
                 if project in list(self.plugins.values()):
                     assert project.webContent
                     pluginXmlFile = join(project.webContent, "WEB-INF", f)
                     if not os.path.exists(pluginXmlFile):
-                            continue
+                        continue
                     tree = ET.parse(pluginXmlFile)
                     root = tree.getroot()
                     for child in reversed(root):