Skip to content

Commit fd7148c

Browse files
ShMcKShMcK
committed
fix task width
1 parent 9556b2d commit fd7148c

File tree

15 files changed

+144
-110
lines changed

15 files changed

+144
-110
lines changed

‎lib/atom/actions.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
"use strict";
2+
function closeAllPanels() {
3+
var editors = atom.workspace.getTextEditors();
4+
editors.forEach(function (editor) {
5+
editor.destroy();
6+
});
7+
}
8+
exports.closeAllPanels = closeAllPanels;
9+
function quit() {
10+
}
11+
exports.quit = quit;
12+
function openFolder() {
13+
atom.open();
14+
}
15+
exports.openFolder = openFolder;
16+
var consoleHasOpened = false;
17+
function toggleDevTools() {
18+
if (!consoleHasOpened) {
19+
consoleHasOpened = true;
20+
console.log('Atom-CodeRoad: runs on save');
21+
}
22+
atom.toggleDevTools();
23+
}
24+
exports.toggleDevTools = toggleDevTools;
25+
function openDevTools() {
26+
atom.openDevTools();
27+
consoleHasOpened = true;
28+
}
29+
exports.openDevTools = openDevTools;
30+
function openTerminal() {
31+
if (atom.packages.isPackageActive('terminal-plus')) {
32+
if (!document.getElementsByClassName('xterm')[0]) {
33+
atom.commands.dispatch(document.getElementsByTagName('atom-workspace')[0], 'terminal-plus:toggle');
34+
}
35+
return true;
36+
}
37+
return false;
38+
}
39+
exports.openTerminal = openTerminal;

‎lib/atom/editor.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,3 @@ function setCursorPosition(editor) {
8585
editor.setCursorScreenPosition(start, { autoscroll: true });
8686
});
8787
}
88-
function closeAllPanels() {
89-
var editors = atom.workspace.getTextEditors();
90-
editors.forEach(function (editor) {
91-
editor.destroy();
92-
});
93-
}
94-
exports.closeAllPanels = closeAllPanels;
95-
function quit() {
96-
}
97-
exports.quit = quit;
98-
function openFolder() {
99-
atom.open();
100-
}
101-
exports.openFolder = openFolder;
102-
var consoleHasOpened = false;
103-
function toggleDevTools() {
104-
if (!consoleHasOpened) {
105-
consoleHasOpened = true;
106-
console.log('Atom-CodeRoad: runs on save');
107-
}
108-
atom.toggleDevTools();
109-
}
110-
exports.toggleDevTools = toggleDevTools;
111-
function openDevTools() {
112-
atom.openDevTools();
113-
consoleHasOpened = true;
114-
}
115-
exports.openDevTools = openDevTools;

‎lib/reducers/editor-actions/actions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22
var Editor = require('../../atom/editor');
3+
var actions_1 = require('../../atom/actions');
34
var action_helpers_1 = require('./action-helpers');
45
var Type = {
56
open: 'open',
@@ -44,7 +45,7 @@ function editorActions(actionString) {
4445
case Type.openConsole:
4546
if (params.length === 0) {
4647
setTimeout(function () {
47-
Editor.openDevTools();
48+
actions_1.openDevTools();
4849
resolve(true);
4950
});
5051
}

‎lib/services/child-process.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
"use strict";
2+
var child_process_1 = require('child_process');
3+
var path = require('path');
4+
var node = null;
5+
if (process.platform === 'darwin' && process.resourcesPath) {
6+
node = path.resolve(process.resourcesPath, '..', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Atom Helper');
7+
}
8+
else if (process.platform.match(/win/)) {
9+
node = 'node';
10+
}
11+
else {
12+
node = process.execPath;
13+
}
14+
var options = {
15+
cwd: path.resolve(__dirname, '..', '..')
16+
};
17+
if (options.env == null) {
18+
options.env = Object.create(process.env);
19+
}
20+
options.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE = 1;
21+
function checkNodeVersion(params) {
22+
var child = child_process_1.spawn(node, params, options);
23+
child.stdout.on('data', function (data) { return console.log(data); });
24+
}
25+
exports.checkNodeVersion = checkNodeVersion;

‎lib/services/setup-actions.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"use strict";
22
var path = require('path');
33
var editor_1 = require('../atom/editor');
4+
var actions_1 = require('../atom/actions');
45
var setup_checks_1 = require('./setup-checks');
56
var packageData = "{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.1\"\n }\n}";
67
function createPackageJson() {
@@ -17,10 +18,10 @@ function createPackageJson() {
1718
}
1819
exports.createPackageJson = createPackageJson;
1920
function openDirectory() {
20-
return editor_1.openFolder();
21+
return actions_1.openFolder();
2122
}
2223
exports.openDirectory = openDirectory;
2324
function installTutorial() {
24-
return;
25+
return actions_1.openTerminal();
2526
}
2627
exports.installTutorial = installTutorial;

‎src/atom/actions.ts

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
export function closeAllPanels() {
2+
var editors: AtomCore.IEditor[] = atom.workspace.getTextEditors();
3+
editors.forEach((editor: AtomCore.IEditor) => {
4+
// if (editor !== activeEditor) {
5+
editor.destroy();
6+
// }
7+
});
8+
}
9+
10+
export function quit() {
11+
// TODO: quit without destroying ALL subscriptions
12+
}
13+
14+
export function openFolder() {
15+
atom.open();
16+
}
17+
18+
let consoleHasOpened = false;
19+
export function toggleDevTools() {
20+
if (!consoleHasOpened) {
21+
// clear console on first run
22+
// atom.executeJavaScriptInDevTools(console.clear());
23+
consoleHasOpened = true;
24+
console.log('Atom-CodeRoad: runs on save');
25+
}
26+
atom.toggleDevTools();
27+
}
28+
29+
export function openDevTools() {
30+
atom.openDevTools();
31+
consoleHasOpened = true;
32+
}
33+
34+
export function openTerminal(): boolean {
35+
if (atom.packages.isPackageActive('terminal-plus')) {
36+
if (!document.getElementsByClassName('xterm')[0]) {
37+
atom.commands.dispatch(document.getElementsByTagName('atom-workspace')[0], 'terminal-plus:toggle');
38+
}
39+
return true;
40+
}
41+
return false;
42+
}

‎src/atom/editor.ts

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -93,36 +93,3 @@ function setCursorPosition(editor: AtomCore.IEditor) {
9393
// export function select() { }
9494

9595
// export function decorate() { }
96-
97-
export function closeAllPanels() {
98-
var editors: AtomCore.IEditor[] = atom.workspace.getTextEditors();
99-
editors.forEach((editor: AtomCore.IEditor) => {
100-
// if (editor !== activeEditor) {
101-
editor.destroy();
102-
// }
103-
});
104-
}
105-
106-
export function quit() {
107-
// TODO: quit without destroying ALL subscriptions
108-
}
109-
110-
export function openFolder() {
111-
atom.open();
112-
}
113-
114-
let consoleHasOpened = false;
115-
export function toggleDevTools() {
116-
if (!consoleHasOpened) {
117-
// clear console on first run
118-
// atom.executeJavaScriptInDevTools(console.clear());
119-
consoleHasOpened = true;
120-
console.log('Atom-CodeRoad: runs on save');
121-
}
122-
atom.toggleDevTools();
123-
}
124-
125-
export function openDevTools() {
126-
atom.openDevTools();
127-
consoleHasOpened = true;
128-
}

‎src/components/_app.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
@import './menu/_menu';
44
@import './page/_chapter';
55
@import './page/_page';
6+
@import './page/_task';
67
@import './progress/_progress';
78
@import './alert/_alert';
89
@import './start/_start';

‎src/components/page/_page.less

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,3 @@
1414
width: 400px;
1515
}
1616
}
17-
.cr-tasks {
18-
overflow-y: scroll;
19-
.cr-task {
20-
padding: 10px;
21-
position: relative;
22-
&-checkbox {
23-
position: absolute;
24-
top: 15px;
25-
}
26-
&-index {
27-
position: absolute;
28-
top: 20px;
29-
left: 45px;
30-
}
31-
&-description {
32-
background-color: inherit;
33-
padding-top: -10px;
34-
padding-left: 55px;
35-
font-size: 14px;
36-
line-height: 1.6;
37-
}
38-
}
39-
}
40-
.cr-task-hints {
41-
margin-bottom: 100px;
42-
}

‎src/components/page/_task.less

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.cr-tasks {
2+
.cr-task {
3+
padding: 10px;
4+
position: relative;
5+
&-checkbox {
6+
position: absolute;
7+
top: 15px;
8+
}
9+
&-index {
10+
position: absolute;
11+
top: 20px;
12+
left: 45px;
13+
}
14+
&-description {
15+
background-color: inherit;
16+
padding-top: -10px;
17+
padding-left: 55px;
18+
font-size: 14px;
19+
line-height: 1.6;
20+
}
21+
}
22+
}
23+
.cr-task-hints {
24+
margin-bottom: 100px;
25+
}

‎src/components/start/_start.less

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
}
2323
}
2424
.cr-setup {
25-
.cr-setup-action {
26-
padding: 10px auto;
27-
margin-bottom: 10px;
28-
}
25+
.cr-setup-action {}
2926
.setupGuide {
3027
margin: 0 auto;
3128
padding: 20px;

‎src/reducers/editor-actions/actions.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as Editor from '../../atom/editor';
2+
import {openDevTools} from '../../atom/actions';
23
import {getCommand, getParams, getOptions} from './action-helpers';
34

45
const Type = {
@@ -48,7 +49,7 @@ export function editorActions(actionString: string): Promise<void> {
4849
case Type.openConsole:
4950
if (params.length === 0) {
5051
setTimeout(function() {
51-
Editor.openDevTools();
52+
openDevTools();
5253
resolve(true);
5354
});
5455
}

‎src/services/child-process.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/services/setup-actions.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as path from 'path';
2-
import {open, set, openFolder} from '../atom/editor';
2+
import {open, set} from '../atom/editor';
3+
import {openFolder, openTerminal} from '../atom/actions';
34
import {store} from '../_base';
45
import * as Action from '../actions/actions';
56
import {verifySetupComplete} from './setup-checks';
@@ -29,5 +30,5 @@ export function openDirectory() {
2930
}
3031

3132
export function installTutorial() {
32-
return;
33+
return openTerminal();
3334
}

‎tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"src/actions/progress-actions.ts",
6060
"src/actions/task-actions.ts",
6161
"src/actions/tutorials.ts",
62+
"src/atom/actions.ts",
6263
"src/atom/editor.ts",
6364
"src/atom/main.ts",
6465
"src/atom/subscriptions.ts",
@@ -87,7 +88,6 @@
8788
"src/reducers/tasks/tasks.ts",
8889
"src/reducers/tutorials/tutorials.ts",
8990
"src/reducers/warning/warning.ts",
90-
"src/services/child-process.ts",
9191
"src/services/exists.ts",
9292
"src/services/package.ts",
9393
"src/services/polyfills.ts",

0 commit comments

Comments
 (0)