Skip to content

Commit eee739d

Browse files
Lulu300Lulu300
committed
Merge branch 'develop'
2 parents 3de3187 + eba03ad commit eee739d

40 files changed

+380
-281
lines changed

‎install/docker.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,9 @@ then
88
fi
99
source /etc/environment
1010
systemctl restart docker
11-
docker pull ubuntu
12-
docker run --name code-chill -dti ubuntu /bin/bash
11+
12+
git clone https://github.com/CodeChillAlluna/DockerFiles.git
13+
docker build -f DockerFiles/CodeChill-Ubuntu/DockerFile -t codechill/ubuntu-base .
14+
docker build -f DockerFiles/CodeChill-Ubuntu-User/DockerFile -t codechill/ubuntu-base-user .
15+
rm -R DockerFiles
16+
docker run --name codechill -dti codechill/ubuntu-base-user /bin/bash

‎install/install.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ StartLimitBurst=3
141141
StartLimitInterval=60s\n
142142
[Install]
143143
WantedBy=multi-user.target" > /lib/systemd/system/docker.service
144-
systemctl daemon-reload
144+
systemctl daemon-reload
145145
systemctl restart docker
146146
export DOCKER_HOST=tcp://localhost:2375
147147
if ! grep -qF "DOCKER_HOST=tcp://localhost:2375" /etc/environment
@@ -150,8 +150,12 @@ then
150150
fi
151151
source /etc/environment
152152
systemctl restart docker
153-
docker pull ubuntu
154-
docker run --name code-chill -dti ubuntu /bin/bash
153+
154+
git clone https://github.com/CodeChillAlluna/DockerFiles.git
155+
docker build -f DockerFiles/CodeChill-Ubuntu/DockerFile -t codechill/ubuntu-base .
156+
docker build -f DockerFiles/CodeChill-Ubuntu-User/DockerFile -t codechill/ubuntu-base-user .
157+
rm -R DockerFiles
158+
docker run --name codechill -dti codechill/ubuntu-base-user /bin/bash
155159

156160
# Install nginx
157161
sudo apt-get install nginx

‎src/client/src/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import withAuth from "./components/withAuth";
44

55
class App extends React.Component<any, any> {
66
Auth: AuthService;
7-
7+
88
constructor(props?: any, context?: any) {
99
super(props, context);
1010
this.Auth = new AuthService();

‎src/client/src/AuthService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export default class AuthService {
171171
if (response.status >= 200 && response.status < 400) { // Success status lies between 200 to 300
172172
return response;
173173
} else {
174-
var error = new Error(response.statusText);
174+
let error = new Error(response.statusText);
175175
// error.response = response
176176
throw error;
177177
}

‎src/client/src/components/CodeChillRouter.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import UserProfile from "./user/UserProfile";
99
import NotFound from "./NotFound";
1010
import UserForgotPassword from "./user/UserForgotPassword";
1111
import UserResetPassword from "./user/UserResetPassword";
12-
var config = require("../../package.json");
12+
const config = require("../../package.json");
1313

1414
export default class CodeChillRouter extends React.Component<any, any> {
15-
15+
1616
render() {
1717
return (
1818
<main>
1919
<BrowserRouter basename={config.homepage}>
2020
<Switch>
2121

22-
<Route
23-
exact={true}
22+
<Route
23+
exact={true}
2424
path={R.HOME}
2525
component={App}
2626
/>
@@ -29,33 +29,33 @@ export default class CodeChillRouter extends React.Component<any, any> {
2929
path={R.PROFILE}
3030
component={UserProfile}
3131
/>
32-
<Route
32+
<Route
3333
exact={true}
3434
path={R.FORGOT_PASSWORD}
35-
component={UserForgotPassword}
35+
component={UserForgotPassword}
3636
/>
37-
<Route
37+
<Route
3838
exact={true}
3939
path={R.RESET_PASSWORD}
40-
component={UserResetPassword}
40+
component={UserResetPassword}
4141
/>
42-
<Route
42+
<Route
4343
exact={true}
4444
path={R.LOGIN}
45-
component={UserConnection}
45+
component={UserConnection}
4646
/>
47-
<Route
47+
<Route
4848
exact={true}
49-
path={R.SIGNUP}
49+
path={R.SIGNUP}
5050
// render={(props) => <UserConnection props={...props} />}
51-
component={UserSignUp}
51+
component={UserSignUp}
5252
/>
5353
<Route
5454
exact={true}
5555
path={R.TERMINAL}
56-
component={CodeChillXterm}
56+
component={CodeChillXterm}
5757
/>
58-
<Route
58+
<Route
5959
path={R.NOTFOUND}
6060
component={NotFound}
6161
/>

‎src/client/src/components/CodeChillXterm.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as fit from "xterm/build/addons/fit/fit";
55
import * as ClassName from "classnames";
66
import AuthService from "../AuthService";
77
import withAuth from "./withAuth";
8-
var config = require("../../package.json");
8+
const config = require("../../package.json");
99

1010
export interface IxTermProps extends React.DOMAttributes<{}> {
1111
onChange?: (e: any) => void;
@@ -22,7 +22,6 @@ export interface IxTermProps extends React.DOMAttributes<{}> {
2222
history?: any;
2323
token?: any;
2424
user?: any;
25-
2625
}
2726

2827
export interface IxTermState {
@@ -57,7 +56,7 @@ attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1`);
5756
}
5857

5958
componentDidMount() {
60-
var xt = this;
59+
let xt = this;
6160
this.xterm.open(this.refs.container);
6261
(this.xterm as any).fit();
6362
this.webSocket.addEventListener("open", function () {
@@ -86,7 +85,7 @@ attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1`);
8685
this.props.className
8786
);
8887
const container = "container";
89-
const css = `.ui.container{
88+
const css = `.ui.container{
9089
width: 100%!important;
9190
margin-left: 0!important;
9291
margin-right: 0!important;

‎src/client/src/components/NavBar.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import { Link } from "react-router-dom";
1414
import { formatRoute } from "react-router-named-routes";
1515
import { TERMINAL, HOME, LOGIN, PROFILE } from "../Routes";
1616
const logo = require("../resources/logocodeandchill.png");
17-
17+
1818
const NavBarChildren = ({ children }) => (
1919
<Container style={{ marginTop: "5em" }}>{children}</Container>
2020
);
21-
21+
2222
export default class NavBar extends React.Component<any, any> {
2323

2424
Auth: AuthService;
@@ -33,7 +33,7 @@ export default class NavBar extends React.Component<any, any> {
3333
visible: false
3434
};
3535
}
36-
36+
3737
render() {
3838
const { children } = this.props;
3939
let rmenu: any;
@@ -121,14 +121,14 @@ export default class NavBar extends React.Component<any, any> {
121121

122122
private handlePusher() {
123123
const { visible } = this.state;
124-
124+
125125
if (visible) {
126126
this.setState(
127127
{ visible: false }
128128
);
129129
}
130130
}
131-
131+
132132
private handleToggle() {
133133
this.setState({ visible: !this.state.visible });
134134
}

‎src/client/src/components/user/DeleteUser.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class DeleteUser extends React.Component<any, any> {
1818
render() {
1919
return (
2020
<div>
21-
<Button
21+
<Button
2222
color="teal"
2323
fluid={true}
2424
size="medium"

‎src/client/src/components/user/UserConnection.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default class UserConnection extends React.Component<any, any> {
4444
<Image src={logo} />
4545
{" "}Log-in to your account
4646
</Header>
47-
<Form
47+
<Form
4848
size="large"
4949
onSubmit={this.handleFormSubmit}
5050
>
@@ -67,7 +67,7 @@ export default class UserConnection extends React.Component<any, any> {
6767
onChange={this.handleChange}
6868
/>
6969

70-
<Button
70+
<Button
7171
color="teal"
7272
fluid={true}
7373
size="large"

‎src/client/src/components/user/UserForgotPassword.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default class UserForgotPassword extends React.Component<any, any> {
5151
<Image src={logo} />
5252
{" "}Recover your password
5353
</Header>
54-
<Form
54+
<Form
5555
error={true}
5656
success={true}
5757
size="large"
@@ -68,7 +68,7 @@ export default class UserForgotPassword extends React.Component<any, any> {
6868
onChange={this.handleChange}
6969
/>
7070
{this.displayErrors}
71-
<Button
71+
<Button
7272
color="teal"
7373
fluid={true}
7474
size="large"
@@ -111,7 +111,7 @@ export default class UserForgotPassword extends React.Component<any, any> {
111111
<Message.Header>Request sent</Message.Header>
112112
<p>{content}</p>
113113
</Message>
114-
)
114+
)
115115
}
116116
}
117117
);
@@ -125,7 +125,7 @@ export default class UserForgotPassword extends React.Component<any, any> {
125125
<Message.Header>Request failed</Message.Header>
126126
<p>{content}</p>
127127
</Message>
128-
)
128+
)
129129
}
130130
}
131131
);

0 commit comments

Comments
 (0)