refactor: add src folder #3171

filipesilva · 2017-01-31T15:25:15Z

Should be merged together with angular/quickstart#362.

Foxandxss

At least toh 1,2,3,7 have problems with the headers not showing the entire path. In the pt7 is on the tabs at the end and perhaps it is not a good idea to add them, will clutter the header like hell.

Foxandxss · 2017-02-02T13:02:25Z

public/docs/ts/latest/quickstart.jade

@@ -20,7 +20,7 @@ block qs-src-online-and-local
  <span if-docs="ts">takes a _metadata_ object. The metadata object</span> describes how the HTML template and component class work together.

  The `selector` property tells Angular to display the component inside a custom `<my-app>` tag in the `index.html`.
-+makeExample('index.html','my-app','index.html (inside <body>)')(format='.')
+makeExample('src/index.html','my-app','index.html (inside <body>)')(format='.')


Shouldn't this say src/index.html (inside <body>) ?

No, because in the quickstart you are looking at the plunker.

Foxandxss · 2017-02-02T13:12:14Z

public/docs/ts/latest/guide/setup.jade

@@ -110,25 +110,32 @@ block core-files
    Focus on the following three TypeScript (`.ts`) files in the **`/app`** folder.


In the /src folder. You can also specify it more if you want.

Foxandxss · 2017-02-02T13:16:11Z

public/docs/ts/latest/guide/setup.jade

+  Whenever a new Typescript, HTML or CSS file is created, it should go inside the `src/` directory (unless noted otherwise).
+  This is the folder containing your app itself.
+
+  Outside `src/` are files meant to support your app, like configuration files and external dependencies.


This is not wrong, but this sentence and then a table with files, I thought for a minute that the list of files were the ones meant to be outside src/. There needs to be another sentence or something to present the table.

Fixed by changing the paragraph order.

Foxandxss · 2017-02-02T13:56:57Z

public/docs/ts/latest/tutorial/toh-pt1.jade

-    .children
-      .file app.component.ts
-      .file app.module.ts
+    .file src


For some reason, the tree doesn't show as we expect to.

Well, not only src, is screwed up completely.

Foxandxss · 2017-02-02T14:10:19Z

public/docs/ts/latest/tutorial/toh-pt1.jade

@@ -69,13 +71,13 @@ code-example(language="sh" class="code-shell").
  Create a `Hero` class with `id` and `name` properties.
  For now put this near the top of the `app.component.ts` file, just below the import statement.

-+makeExample('toh-1/ts/app/app.component.ts', 'hero-class-1', 'app.component.ts (Hero class)')(format=".")
+makeExample('toh-1/ts/src/app/app.component.ts', 'hero-class-1', 'app.component.ts (Hero class)')(format=".")


the header needs to be updated. Well, all of them in the file.

Foxandxss · 2017-02-02T14:18:42Z

public/docs/ts/latest/guide/change-log.jade

+  You can read about moving your existing project to this structure in 
+  [the QuickStart repo update instructions](https://github.com/angular/quickstart#updating-to-a-newer-version-of-the-quickstart-repo).
+  * `app/` has been moved to `src/app/`
+  * `src/app/main.ts` has been moved to `src/main.ts`


Shouldn't be better to say:

app/main.ts is not at src/main.ts or something like that?

Foxandxss · 2017-02-02T14:18:59Z

public/docs/ts/latest/guide/change-log.jade

+  * `src/app/main.ts` has been moved to `src/main.ts`
+  * `index.html`, `styles.css` and `tsconfig.json` have been moved inside `src/`
+  * `systemjs.config.js` now imports `main.js` instead of `app`.
+  * There is a new `bs-config.json` file at root to configure `lite-server` to serve `src/`


This sentence needs rewording, too many "to"

googlebot · 2017-02-02T17:59:45Z

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

googlebot · 2017-02-02T17:59:45Z

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

* boilerplate, gulpfile, quickstart * move ts files up to cookbooks * move rest of ts files * fix tsconfig, default build task, json file * fix js examples * fix webpack example * remove a2docs.css references * fix aot examples * fix webpack run task * fix cb-i18n * fix upgrade examples * fix unit tests * fix comment in deployment index * removed unused typings.json * fix plunkers * fix js example paths * fix ts quickstart/setup prose * add src folder note to setup * broadly replace app/ -> src/app/ * broadly replace main.ts * broadly replaced index.html * broadly replace tsconfig * replace systemjs * fix filetrees * Minor prose fixes to aot, i18n cookbooks * remove char harp was complaining about * update new reactive forms example * fix quickstart jade error * fix mistakes uncovered by CI * fix bad filename errors * edit style guide 04-06 rule to use src * add changelog * Incorporate Jesus's feedback * fix snippet headers in toh1/2 * chore: tweak changelog and setup text

filipesilva added the pr_state: WIP label Jan 31, 2017

googlebot added the CLA: yes label Jan 31, 2017

filipesilva force-pushed the add-src-folder branch 2 times, most recently from 7a1ba4f to f7d6a62 Compare February 1, 2017 14:28

filipesilva added 26 commits February 1, 2017 22:07

boilerplate, gulpfile, quickstart

7bc7a53

move ts files up to cookbooks

f4bea02

move rest of ts files

a1f9c0b

fix tsconfig, default build task, json file

90a88ca

fix js examples

d494e5d

fix webpack example

74048a0

remove a2docs.css references

41712e6

fix aot examples

fed922d

fix webpack run task

81f5694

fix cb-i18n

3f24fa3

fix upgrade examples

f422bd9

fix unit tests

3ae9182

fix comment in deployment index

a187a25

removed unused typings.json

652e6fa

fix plunkers

cc75ad9

fix js example paths

128be8a

fix ts quickstart/setup prose

b097525

add src folder note to setup

1be1534

broadly replace app/ -> src/app/

33298d0

broadly replace main.ts

0a50ed7

broadly replaced index.html

88a7616

broadly replace tsconfig

99feb82

replace systemjs

a805364

fix filetrees

e49686f

Minor prose fixes to aot, i18n cookbooks

d527d2c

remove char harp was complaining about

ecceee4

filipesilva added 4 commits February 1, 2017 22:07

update new reactive forms example

01d0a8a

fix quickstart jade error

2eaec29

fix mistakes uncovered by CI

db7c819

fix bad filename errors

65a5f89

filipesilva force-pushed the add-src-folder branch from aaf39de to 65a5f89 Compare February 1, 2017 22:08

filipesilva added 2 commits February 2, 2017 12:36

edit style guide 04-06 rule to use src

d873717

add changelog

4dc0bed

filipesilva changed the title ~~[WIP] refactor: add src folder~~ refactor: add src folder Feb 2, 2017

filipesilva added action: review and removed pr_state: WIP labels Feb 2, 2017

Foxandxss suggested changes Feb 2, 2017

View reviewed changes

filipesilva added 2 commits February 2, 2017 14:55

Incorporate Jesus's feedback

9e7e636

fix snippet headers in toh1/2

281df32

Foxandxss approved these changes Feb 2, 2017

View reviewed changes

googlebot added CLA: no and removed CLA: yes labels Feb 2, 2017

chore: tweak changelog and setup text

cec1f33

wardbell force-pushed the add-src-folder branch from 47ebe4d to cec1f33 Compare February 2, 2017 18:25

Foxandxss merged commit 1101f07 into angular:master Feb 2, 2017

Urigo mentioned this pull request Feb 3, 2017

Angular-GraphQL cookbook #3135

Open

9 tasks

filipesilva deleted the add-src-folder branch February 3, 2017 10:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: add src folder #3171

refactor: add src folder #3171

filipesilva commented Jan 31, 2017 •

edited by Foxandxss

Loading

Foxandxss left a comment

Foxandxss Feb 2, 2017

filipesilva Feb 2, 2017

Foxandxss Feb 2, 2017

filipesilva Feb 2, 2017

Foxandxss Feb 2, 2017

filipesilva Feb 2, 2017

Foxandxss Feb 2, 2017

Foxandxss Feb 2, 2017

filipesilva Feb 2, 2017

Foxandxss Feb 2, 2017

filipesilva Feb 2, 2017

Foxandxss Feb 2, 2017

filipesilva Feb 2, 2017

Foxandxss Feb 2, 2017

filipesilva Feb 2, 2017

googlebot commented Feb 2, 2017

googlebot commented Feb 2, 2017

		@@ -110,25 +110,32 @@ block core-files
		Focus on the following three TypeScript (`.ts`) files in the `/app` folder.

refactor: add src folder #3171

refactor: add src folder #3171

Conversation

filipesilva commented Jan 31, 2017 • edited by Foxandxss Loading

Foxandxss left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

googlebot commented Feb 2, 2017

googlebot commented Feb 2, 2017

filipesilva commented Jan 31, 2017 •

edited by Foxandxss

Loading