@@ -5,14 +5,15 @@ import Toolbar from './components/Toolbar';
5
5
import Footer from './components/Footer' ;
6
6
import Home from './pages/Home' ;
7
7
import Simulator from './pages/Simulator' ;
8
+ import FullSimulator from './pages/simulator/FullSimulator' ;
8
9
import Releases from './pages/Releases' ;
9
10
import Policy from './pages/Policy' ;
10
11
import Install from './pages/Install' ;
11
- import Projects from './pages/Projects' ;
12
- import Editor from './pages/Editor' ;
13
- import EditorRun from './pages/EditorRun' ;
14
- import EditorRunPython from './pages/EditorRunPython'
12
+ import IDEMain from './pages/IDE.js' ;
13
+ import IDEEditor from './pages/omega-ide/src/ide/Editor' ;
14
+ import IDESimulator from './pages/omega-ide/src/ide/Simulator' ;
15
15
import NotFound from './pages/NotFound' ;
16
+ import GithubConnector from './GithubConnector' ;
16
17
17
18
import { IntlProvider } from "react-intl" ;
18
19
import translations from './i18n/locales'
@@ -54,24 +55,23 @@ class App extends Component {
54
55
return (
55
56
< IntlProvider locale = { this . state . locale } messages = { this . state . messages } >
56
57
< Router >
57
- < div className = "body" style = { window . location . pathname . includes ( "/editor" ) ? { overflow : "hidden" , height : "100vh" } : { } } >
58
- { ! window . location . pathname . includes ( "/editor " ) && < Toolbar /> }
58
+ < div className = "body" >
59
+ { ! window . location . pathname . includes ( "/simulator/run " ) && < Toolbar /> }
59
60
< Switch >
60
61
< Route path = "/simulator" component = { Simulator } exact />
62
+ < Route path = "/simulator/run/full" component = { FullSimulator } exact />
61
63
< Route path = "/releases" component = { Releases } exact />
62
64
< Route path = "/install" component = { Install } exact />
63
65
< Route path = "/install/:version" component = { Install } />
64
66
< Route path = "/policy" component = { Policy } exact />
65
- < Route path = "/projects" component = { Projects } exact />
66
- < Route path = "/editor/run/python/:id" component = { EditorRunPython } exact />
67
- < Route path = "/editor/run/python" component = { EditorRunPython } exact />
68
- < Route path = "/editor/run" component = { EditorRun } exact />
69
- < Route path = "/editor/:id" component = { Editor } exact />
67
+ < Route path = "/ide/" component = { IDEMain } exact />
68
+ < Route path = "/ide/editor" component = { ( ) => < IDEEditor base = "/ide/" connector = { GithubConnector } /> } exact />
69
+ < Route path = "/ide/simulator" component = { IDESimulator } exact />
70
70
< Route path = "/wiki" component = { Wiki } exact />
71
71
< Route path = "/" component = { Home } exact />
72
72
< Route component = { NotFound } />
73
73
</ Switch >
74
- { ! window . location . pathname . includes ( "/editor " ) && < Footer onChangeLanguage = { this . onChangeLanguage } locale = { this . state . locale } /> }
74
+ { ! window . location . pathname . includes ( "/simulator/run " ) && < Footer onChangeLanguage = { this . onChangeLanguage } locale = { this . state . locale } /> }
75
75
</ div >
76
76
</ Router >
77
77
</ IntlProvider >
0 commit comments