Skip to content

Commit 0429f52

Browse files
SaraVieiraCompuIves
authored andcommitted
Fix New Sandbox Modal (codesandbox#1194)
* fix modal * lint :( * Update sapper.js
1 parent 6951e8f commit 0429f52

File tree

7 files changed

+31
-14
lines changed

7 files changed

+31
-14
lines changed

packages/app/src/app/pages/Dashboard/Content/CreateNewSandbox/Modal/index.js

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ const usedTemplates = sortBy(
2626

2727
const TEMPLATE_BASE_WIDTH = 150;
2828
const MAIN_TEMPLATE_BASE_WIDTH = 190;
29-
const SERVER_TEMPLATE_BASE_WIDTH = 150; // 150
3029

3130
export default class Modal extends React.PureComponent {
3231
selectTemplate = template => {
@@ -39,21 +38,21 @@ export default class Modal extends React.PureComponent {
3938
const paddedWidth = width;
4039
const mainTemplates = usedTemplates.filter(t => t.main && !t.isServer);
4140
const otherTemplates = usedTemplates.filter(t => !t.main && !t.isServer);
42-
const serverTemplates = usedTemplates.filter(t => t.isServer);
41+
const mainServerTemplates = usedTemplates.filter(t => t.main && t.isServer);
42+
const otherServerTemplates = usedTemplates.filter(
43+
t => !t.main && t.isServer
44+
);
4345

4446
const mainTemplatesPerRow = Math.max(
4547
1,
4648
paddedWidth / MAIN_TEMPLATE_BASE_WIDTH
4749
);
4850
const templatesPerRow = Math.max(1, paddedWidth / TEMPLATE_BASE_WIDTH);
49-
const serverTemplatesPerRow = Math.max(
50-
1,
51-
paddedWidth / SERVER_TEMPLATE_BASE_WIDTH
52-
);
5351

5452
const mainRows = chunk(mainTemplates, mainTemplatesPerRow);
5553
const rows = chunk(otherTemplates, templatesPerRow);
56-
const serverRows = chunk(serverTemplates, serverTemplatesPerRow);
54+
const mainServerRows = chunk(mainServerTemplates, mainTemplatesPerRow);
55+
const serverRows = chunk(otherServerTemplates, templatesPerRow);
5756

5857
return (
5958
<Container
@@ -64,7 +63,7 @@ export default class Modal extends React.PureComponent {
6463
<InnerContainer forking={forking} closing={closing}>
6564
<Title>Client Templates</Title>
6665
{mainRows.map((ts, i) => (
67-
// eslint-disable-next-line
66+
// eslint-disable-next-line react/no-array-index-key
6867
<Templates key={i}>
6968
{ts.map(t => (
7069
<Template
@@ -78,7 +77,7 @@ export default class Modal extends React.PureComponent {
7877
))}
7978

8079
{rows.map((ts, i) => (
81-
// eslint-disable-next-line
80+
// eslint-disable-next-line react/no-array-index-key
8281
<Templates style={{ fontSize: '.8rem' }} key={i}>
8382
{ts.map(t => (
8483
<Template
@@ -93,12 +92,27 @@ export default class Modal extends React.PureComponent {
9392
))}
9493

9594
<Title>Server Templates</Title>
95+
{mainServerRows.map((ts, i) => (
96+
// eslint-disable-next-line react/no-array-index-key
97+
<Templates key={i}>
98+
{ts.map(t => (
99+
<Template
100+
width={Math.floor(paddedWidth / mainTemplatesPerRow - 16)}
101+
key={t.name}
102+
template={t}
103+
selectTemplate={this.selectTemplate}
104+
/>
105+
))}
106+
</Templates>
107+
))}
108+
96109
{serverRows.map((ts, i) => (
97-
// eslint-disable-next-line
98-
<Templates style={{ fontSize: '.9rem' }} key={i}>
110+
// eslint-disable-next-line react/no-array-index-key
111+
<Templates style={{ fontSize: '.8rem' }} key={i}>
99112
{ts.map(t => (
100113
<Template
101-
width={Math.floor(paddedWidth / serverTemplatesPerRow - 16)}
114+
small
115+
width={Math.floor(paddedWidth / templatesPerRow - 16)}
102116
key={t.name}
103117
template={t}
104118
selectTemplate={this.selectTemplate}

packages/common/templates/gatsby.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ export default new Template(
1616
isServer: true,
1717
mainFile: ['/src/pages/index.js'],
1818
showOnHomePage: true,
19+
main: true,
1920
}
2021
);

packages/common/templates/next.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ export default new Template(
1717
mainFile: ['/pages/index.js'],
1818
backgroundColor: decorateSelector(() => '#000000'),
1919
showOnHomePage: true,
20+
main: true,
2021
}
2122
);

packages/common/templates/node.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export default new Template(
1111
{
1212
isServer: true,
1313
showOnHomePage: true,
14+
main: true,
1415
mainFile: ['/pages/index.vue', '/pages/index.js', '/src/pages/index.js'],
1516
}
1617
);

packages/common/templates/nuxt.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ export default new Template(
1616
isServer: true,
1717
mainFile: ['/pages/index.vue'],
1818
showOnHomePage: true,
19+
main: true,
1920
}
2021
);

packages/common/templates/sapper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ export default new Template(
1111
{
1212
isServer: true,
1313
mainFile: ['/src/routes/index.html'],
14-
showOnHomePage: false,
14+
showOnHomePage: true,
1515
}
1616
);

packages/homepage/content/docs/2-importing.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ We infer sandbox settings based on several files in a repository.
3232
| Template - React | If `package.json` dependencies contains `react-scripts`. |
3333
| Template - React-Typescript | If `package.json` dependencies contains `react-scripts-ts`. |
3434
| Template - Svelte | If `package.json` dependencies contains `svelte`. |
35-
| Template - Node | If `package.json` dependencies contains `ember-cli`. |
3635

3736
Additionally, you may specify a `template` property in your `./sandbox.config.json` file.
3837

0 commit comments

Comments
 (0)