Skip to content

Commit a4caa23

Browse files
committed
[ide] Omega IDE
1 parent ac2c5d9 commit a4caa23

35 files changed

+5495
-18522
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ node_modules
22
.DS_Store
33
.firebase/**/*
44
build
5+
pnpm-lock.yaml
6+
yarn.lock

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "src/pages/omega-ide"]
2+
path = src/pages/omega-ide
3+
url = [email protected]:Omega-Numworks/Omega-IDE.git

package-lock.json

+3,806-4,368
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44
"private": true,
55
"dependencies": {
66
"@testing-library/jest-dom": "^4.2.4",
7-
"@testing-library/react": "^9.4.0",
7+
"@testing-library/react": "^9.5.0",
88
"@testing-library/user-event": "^7.2.1",
9-
"firebase": "^7.15.3",
9+
"firebase": "^7.17.2",
10+
"jszip": "^3.5.0",
1011
"monaco-editor": "^0.20.0",
1112
"monaco-editor-webpack-plugin": "^1.9.0",
1213
"node-sass": "^4.14.1",
13-
"numworks.js": "^1.0.5",
14-
"react": "^16.12.0",
15-
"react-dom": "^16.12.0",
16-
"react-intl": "^4.6.9",
14+
"numworks.js": "^1.1.0",
15+
"react": "^16.13.1",
16+
"react-dom": "^16.13.1",
17+
"react-intl": "^4.7.6",
1718
"react-intl-cra": "^0.3.4",
1819
"react-intl-translations-manager": "^5.0.3",
1920
"react-monaco-editor": "^0.34.0",
20-
"react-resize-detector": "^4.2.1",
21-
"react-router-dom": "^5.1.2",
22-
"react-scripts": "^3.3.0"
21+
"react-resize-detector": "^4.2.3",
22+
"react-router-dom": "^5.2.0",
23+
"react-scripts": "^3.4.1"
2324
},
2425
"scripts": {
2526
"start": "react-app-rewired start",
@@ -45,6 +46,6 @@
4546
]
4647
},
4748
"devDependencies": {
48-
"react-app-rewired": "^2.1.5"
49+
"react-app-rewired": "^2.1.6"
4950
}
5051
}

public/index.html

-1
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,4 @@
122122
console.log("GA Disabled with localhost");
123123
}
124124
</script>
125-
126125
</html>

src/App.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import Toolbar from './components/Toolbar';
55
import Footer from './components/Footer';
66
import Home from './pages/Home';
77
import Simulator from './pages/Simulator';
8+
import FullSimulator from './pages/simulator/FullSimulator';
89
import Releases from './pages/Releases';
910
import Policy from './pages/Policy';
1011
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';
1515
import NotFound from './pages/NotFound';
16+
import GithubConnector from './GithubConnector';
1617

1718
import { IntlProvider } from "react-intl";
1819
import translations from './i18n/locales'
@@ -54,24 +55,23 @@ class App extends Component {
5455
return (
5556
<IntlProvider locale={this.state.locale} messages={this.state.messages}>
5657
<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 />}
5960
<Switch>
6061
<Route path="/simulator" component={Simulator} exact />
62+
<Route path="/simulator/run/full" component={FullSimulator} exact />
6163
<Route path="/releases" component={Releases} exact />
6264
<Route path="/install" component={Install} exact />
6365
<Route path="/install/:version" component={Install} />
6466
<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 />
7070
<Route path="/wiki" component={Wiki} exact />
7171
<Route path="/" component={Home} exact />
7272
<Route component={NotFound} />
7373
</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} />}
7575
</div>
7676
</Router>
7777
</IntlProvider>

0 commit comments

Comments
 (0)