From f8980ea2b303dc8a6a809045c1c2f06c7053ac39 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Sun, 30 Dec 2018 14:41:33 -0700 Subject: rename preview-site-src folder to preview-src --- README.adoc | 4 +- docs/modules/ROOT/pages/build-preview-ui.adoc | 12 +- docs/modules/ROOT/pages/index.adoc | 5 +- gulpfile.js/index.js | 2 +- preview-site-src/404.adoc | 0 preview-site-src/index.adoc | 202 -------------------------- preview-site-src/ui-model.yml | 110 -------------- preview-src/404.adoc | 0 preview-src/index.adoc | 202 ++++++++++++++++++++++++++ preview-src/ui-model.yml | 110 ++++++++++++++ 10 files changed, 328 insertions(+), 319 deletions(-) delete mode 100644 preview-site-src/404.adoc delete mode 100644 preview-site-src/index.adoc delete mode 100644 preview-site-src/ui-model.yml create mode 100644 preview-src/404.adoc create mode 100644 preview-src/index.adoc create mode 100644 preview-src/ui-model.yml diff --git a/README.adoc b/README.adoc index a4218b7..3a476ba 100644 --- a/README.adoc +++ b/README.adoc @@ -126,7 +126,7 @@ This folder does not get included in the UI bundle. === Preview the UI The default UI project is configured to preview offline. -That's what the files in the [.path]_preview-site-src/_ folder are for. +That's what the files in the [.path]_preview-src/_ folder are for. This folder contains HTML file fragments that provide a representative sample of content from the site. To build the UI and preview it in a local web server, run the `preview` command: @@ -162,6 +162,8 @@ If you have the preview running, and you want to bundle without causing the prev $ gulp bundle:pack +The UI bundle will again be available at [.path]_build/ui-bundle.zip_. + == Copyright and License Copyright (C) 2017-2018 OpenDevise Inc. and the Antora Project. diff --git a/docs/modules/ROOT/pages/build-preview-ui.adoc b/docs/modules/ROOT/pages/build-preview-ui.adoc index 3daab1c..291f8bb 100644 --- a/docs/modules/ROOT/pages/build-preview-ui.adoc +++ b/docs/modules/ROOT/pages/build-preview-ui.adoc @@ -10,7 +10,7 @@ endif::[] == Build Preview Site Once you've modified the site UI, the first thing you'll want to do is check out how it looks. -That's what the files in the [.path]_preview-site-src/_ folder are for. +That's what the files in the [.path]_preview-src/_ folder are for. This folder contains HTML file fragments that provide a representative sample of content from the site. The preview saves you from having to generate the whole site just to test the UI. These files should give you an idea of how the UI will look when applied to the actual site. @@ -24,7 +24,7 @@ The next two sections explain how to use these modes. === Build Once -To build the UI once for preview, then stop, execute the `build-preview` task using the following command: +To build the UI once for preview, then stop, execute the following command: $ gulp preview:build @@ -33,7 +33,7 @@ To view the preview pages, navigate to the HTML pages in the [.path]_public_ dir === Build Continuously -To avoid the need to run the `preview:build` task over and over, you can use the `preview` command instead to have it run continuously. +To avoid the need to run the `preview:build` task over and over while developing, you can use the `preview` command instead to have it run continuously. This task also launches a local HTTP server so updates get synchronized with the browser (i.e., "`live reload`"). To launch the preview server, execute the following command: @@ -65,3 +65,9 @@ The `bundle` command also invokes the `lint` command to check that the CSS and J The UI bundle will be available at [.path]_build/ui-bundle.zip_. You can then point Antora at this bundle using the `--ui-bundle-url` command-line option. + +If you have the preview running, and you want to bundle without causing the preview to be clobbered, use: + + $ gulp bundle:pack + +The UI bundle will again be available at [.path]_build/ui-bundle.zip_. diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 4258c3f..6d2afe3 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -93,7 +93,8 @@ Here's how the files are structured in the UI project: README.adoc gulpfile.js/ index.js - ... + lib/ + tasks/ package.json yarn.lock src/ @@ -122,7 +123,7 @@ src/ ... vendor/ highlight.js -preview-site-src/ +preview-src/ index.html ui-model.yml .... diff --git a/gulpfile.js/index.js b/gulpfile.js/index.js index cf95f35..11f64ac 100644 --- a/gulpfile.js/index.js +++ b/gulpfile.js/index.js @@ -5,7 +5,7 @@ const task = require('./lib/task') const bundleName = 'ui' const buildDir = 'build' -const previewSrcDir = 'preview-site-src' +const previewSrcDir = 'preview-src' const previewDestDir = 'public' const srcDir = 'src' const destDir = `${previewDestDir}/_` diff --git a/preview-site-src/404.adoc b/preview-site-src/404.adoc deleted file mode 100644 index e69de29..0000000 diff --git a/preview-site-src/index.adoc b/preview-site-src/index.adoc deleted file mode 100644 index 862e646..0000000 --- a/preview-site-src/index.adoc +++ /dev/null @@ -1,202 +0,0 @@ -= Hardware and Software Requirements -Author Name -:idprefix: -:idseparator: - -:!example-caption: - -Platonem complectitur mediocritatem ea eos. -Ei nonumy deseruisse ius. -Mel id omnes verear. -Vis no velit audiam, sonet <> eum ne. -*Prompta eripuit* nec ad. - -== Cu solet - -Nominavi luptatum eos, an vim hinc philosophia intellegebat. -Lorem `expetenda` pertinacia et nec, wisi illud sonet qui ea. -Eum an doctus <>. -Eu mea inani iriure. - -[source,json] ----- -{ - "name": "module-name", - "version": "10.0.1", - "description": "An example module to illustrate the usage of package.json", - "author": "Author Name ", - "scripts": { - "test": "mocha", - "lint": "eslint" - } -} ----- - -.Example paragraph syntax -[source,asciidoc] ----- -.Optional title -[example] -This is an example paragraph. ----- - -.Optional title -[example] -This is an example paragraph. - -How about some code? - -[source,js] ----- -vfs - .src('js/vendor/*.js', { cwd: 'src', cwdbase: true, read: false }) - .pipe(tap((file) => { // <1> - file.contents = browserify(file.relative, { basedir: 'src', detectGlobals: false }).bundle() - })) - .pipe(buffer()) - .pipe(uglify()) - .pipe(gulp.dest('build')) ----- -<1> The tap function is used to wiretap the data in the pipe. - -Cum dicat #putant# ne. -Est in <> homero principes, meis deleniti mediocrem ad has. -Altera atomorum his ex, has cu elitr melius propriae. -Eos suscipit scaevola at. - -.... -pom.xml -src/ - main/ - java/ - HelloWorld.java - test/ - java/ - HelloWorldTest.java -.... - -Select menu:File[Open Project] to open the project in your IDE. -Per ea btn:[Cancel] inimicus. -Ferri kbd:[F11] tacimates constituam sed ex, eu mea munere vituperata kbd:[Ctrl,T] constituam. - -.Sidebar -**** -Platonem complectitur mediocritatem ea eos. -Ei nonumy deseruisse ius. -Mel id omnes verear. - -Altera atomorum his ex, has cu elitr melius propriae. -Eos suscipit scaevola at. -**** - -=== Liber recusabo - -No sea, at invenire voluptaria mnesarchum has. -Ex nam suas nemore dignissim, vel apeirian democritum et. -At ornatus splendide sed, phaedrum omittantur usu an, vix an noster voluptatibus. - -. potenti donec cubilia tincidunt -. etiam pulvinar inceptos velit quisque aptent himenaeos -. lacus volutpat semper porttitor aliquet ornare primis nulla enim - -Natum facilisis theophrastus an duo. -No sea, at invenire voluptaria mnesarchum has. - -* ultricies sociosqu tristique integer -* lacus volutpat semper porttitor aliquet ornare primis nulla enim -* etiam pulvinar inceptos velit quisque aptent himenaeos - -Eu sed antiopam gloriatur. -Ea mea agam graeci philosophia. - -* [ ] todo -* [x] done! - -Vis veri graeci legimus ad. - -sed:: -splendide sed - -mea:: -agam graeci - -At ornatus splendide sed. - -[#dependencies%autowidth] -|=== -|Library |Version - -|eslint -|^1.7.3 - -|eslint-config-gulp -|^2.0.0 - -|expect -|^1.20.2 - -|istanbul -|^0.4.3 - -|istanbul-coveralls -|^1.0.3 - -|jscs -|^2.3.5 -|=== - -Cum dicat putant ne. -Est in reque homero principes, meis deleniti mediocrem ad has. -Altera atomorum his ex, has cu elitr melius propriae. -Eos suscipit scaevola at. - -[TIP] -This oughta do it! - -Cum dicat putant ne. -Est in reque homero principes, meis deleniti mediocrem ad has. -Altera atomorum his ex, has cu elitr melius propriae. -Eos suscipit scaevola at. - -[NOTE] -==== -You've been down _this_ road before. -==== - -Cum dicat putant ne. -Est in reque homero principes, meis deleniti mediocrem ad has. -Altera atomorum his ex, has cu elitr melius propriae. -Eos suscipit scaevola at. - -[WARNING] -==== -Watch out! -==== - -[CAUTION] -==== -[#inline]#I wouldn't try that if I were you.# -==== - -[IMPORTANT] -==== -Don't forget this step! -==== - -.Key Points to Remember -[TIP] -==== -If you installed the CLI and the default site generator globally, you can upgrade both of them with the same command. - - $ npm i -g @antora/cli @antora/site-generator-default -==== - -Nominavi luptatum eos, an vim hinc philosophia intellegebat. -Eu mea inani iriure. - -[discrete] -== Voluptua singulis - -Cum dicat putant ne. -Est in reque homero principes, meis deleniti mediocrem ad has. -Altera atomorum his ex, has cu elitr melius propriae. -Eos suscipit scaevola at. diff --git a/preview-site-src/ui-model.yml b/preview-site-src/ui-model.yml deleted file mode 100644 index 1aca0f2..0000000 --- a/preview-site-src/ui-model.yml +++ /dev/null @@ -1,110 +0,0 @@ -antoraVersion: '1.0.0' -site: - url: http://localhost:5252 - title: Brand Docs - components: - - name: abc - title: Project ABC - url: '#' - versions: - - &latest_version_abc - url: '#' - version: '1.1' - displayVersion: '1.1' - - url: '#' - version: '1.0' - displayVersion: '1.0' - latestVersion: *latest_version_abc - - &component - name: xyz - title: Project XYZ - url: /xyz/6.0/index.html - versions: - - &latest_version_xyz - url: /xyz/6.0/index.html - version: '6.0' - displayVersion: '6.0' - - &component_version - url: '#' - version: '5.2' - displayVersion: '5.2' - - url: '#' - version: '5.1' - displayVersion: '5.1' - - url: '#' - version: '5.0' - displayVersion: '5.0' - latestVersion: *latest_version_xyz - - name: 123 - title: Project 123 - url: '#' - versions: - - &latest_version_123 - url: '#' - version: '2.2' - displayVersion: '2.2' - - url: '#' - version: '2.1' - displayVersion: '2.1' - - url: '#' - version: '2.0' - displayVersion: '2.0' - latestVersion: *latest_version_123 -page: - title: Brand’s Hardware & Software Requirements - url: /xyz/5.2/index.html - component: *component - componentVersion: *component_version - version: '5.2' - displayVersion: '5.2' - module: ROOT - home: false - editUrl: http://example.com/project-xyz/blob/master/index.adoc - breadcrumbs: - - content: Quickstart - url: '#' - urlType: fragment - - content: Brand’s Hardware & Software Requirements - url: /xyz/5.2/index.html - urlType: internal - versions: - - version: '6.0' - displayVersion: '6.0' - url: '#' - - version: '5.2' - displayVersion: '5.2' - url: '#' - - version: '5.1' - displayVersion: '5.1' - url: '#' - - version: '5.0' - displayVersion: '5.0' - missing: true - url: '#' - navigation: - - root: true - content: Project XYZ - url: '#' - urlType: fragment - items: - - content: Quickstart - url: '#' - urlType: fragment - items: - - content: Brand’s Hardware & Software Requirements - url: /xyz/5.2/index.html - urlType: internal - - title: IDE Integration - url: '#' - urlType: fragment - - content: Liber Recusabo - url: '#liber-recusabo' - urlType: fragment - - content: Reference - items: - - content: Keyboard Shortcuts - url: '#' - urlType: fragment - - content: Importing and Exporting - url: '#' - urlType: fragment diff --git a/preview-src/404.adoc b/preview-src/404.adoc new file mode 100644 index 0000000..e69de29 diff --git a/preview-src/index.adoc b/preview-src/index.adoc new file mode 100644 index 0000000..862e646 --- /dev/null +++ b/preview-src/index.adoc @@ -0,0 +1,202 @@ += Hardware and Software Requirements +Author Name +:idprefix: +:idseparator: - +:!example-caption: + +Platonem complectitur mediocritatem ea eos. +Ei nonumy deseruisse ius. +Mel id omnes verear. +Vis no velit audiam, sonet <> eum ne. +*Prompta eripuit* nec ad. + +== Cu solet + +Nominavi luptatum eos, an vim hinc philosophia intellegebat. +Lorem `expetenda` pertinacia et nec, wisi illud sonet qui ea. +Eum an doctus <>. +Eu mea inani iriure. + +[source,json] +---- +{ + "name": "module-name", + "version": "10.0.1", + "description": "An example module to illustrate the usage of package.json", + "author": "Author Name ", + "scripts": { + "test": "mocha", + "lint": "eslint" + } +} +---- + +.Example paragraph syntax +[source,asciidoc] +---- +.Optional title +[example] +This is an example paragraph. +---- + +.Optional title +[example] +This is an example paragraph. + +How about some code? + +[source,js] +---- +vfs + .src('js/vendor/*.js', { cwd: 'src', cwdbase: true, read: false }) + .pipe(tap((file) => { // <1> + file.contents = browserify(file.relative, { basedir: 'src', detectGlobals: false }).bundle() + })) + .pipe(buffer()) + .pipe(uglify()) + .pipe(gulp.dest('build')) +---- +<1> The tap function is used to wiretap the data in the pipe. + +Cum dicat #putant# ne. +Est in <> homero principes, meis deleniti mediocrem ad has. +Altera atomorum his ex, has cu elitr melius propriae. +Eos suscipit scaevola at. + +.... +pom.xml +src/ + main/ + java/ + HelloWorld.java + test/ + java/ + HelloWorldTest.java +.... + +Select menu:File[Open Project] to open the project in your IDE. +Per ea btn:[Cancel] inimicus. +Ferri kbd:[F11] tacimates constituam sed ex, eu mea munere vituperata kbd:[Ctrl,T] constituam. + +.Sidebar +**** +Platonem complectitur mediocritatem ea eos. +Ei nonumy deseruisse ius. +Mel id omnes verear. + +Altera atomorum his ex, has cu elitr melius propriae. +Eos suscipit scaevola at. +**** + +=== Liber recusabo + +No sea, at invenire voluptaria mnesarchum has. +Ex nam suas nemore dignissim, vel apeirian democritum et. +At ornatus splendide sed, phaedrum omittantur usu an, vix an noster voluptatibus. + +. potenti donec cubilia tincidunt +. etiam pulvinar inceptos velit quisque aptent himenaeos +. lacus volutpat semper porttitor aliquet ornare primis nulla enim + +Natum facilisis theophrastus an duo. +No sea, at invenire voluptaria mnesarchum has. + +* ultricies sociosqu tristique integer +* lacus volutpat semper porttitor aliquet ornare primis nulla enim +* etiam pulvinar inceptos velit quisque aptent himenaeos + +Eu sed antiopam gloriatur. +Ea mea agam graeci philosophia. + +* [ ] todo +* [x] done! + +Vis veri graeci legimus ad. + +sed:: +splendide sed + +mea:: +agam graeci + +At ornatus splendide sed. + +[#dependencies%autowidth] +|=== +|Library |Version + +|eslint +|^1.7.3 + +|eslint-config-gulp +|^2.0.0 + +|expect +|^1.20.2 + +|istanbul +|^0.4.3 + +|istanbul-coveralls +|^1.0.3 + +|jscs +|^2.3.5 +|=== + +Cum dicat putant ne. +Est in reque homero principes, meis deleniti mediocrem ad has. +Altera atomorum his ex, has cu elitr melius propriae. +Eos suscipit scaevola at. + +[TIP] +This oughta do it! + +Cum dicat putant ne. +Est in reque homero principes, meis deleniti mediocrem ad has. +Altera atomorum his ex, has cu elitr melius propriae. +Eos suscipit scaevola at. + +[NOTE] +==== +You've been down _this_ road before. +==== + +Cum dicat putant ne. +Est in reque homero principes, meis deleniti mediocrem ad has. +Altera atomorum his ex, has cu elitr melius propriae. +Eos suscipit scaevola at. + +[WARNING] +==== +Watch out! +==== + +[CAUTION] +==== +[#inline]#I wouldn't try that if I were you.# +==== + +[IMPORTANT] +==== +Don't forget this step! +==== + +.Key Points to Remember +[TIP] +==== +If you installed the CLI and the default site generator globally, you can upgrade both of them with the same command. + + $ npm i -g @antora/cli @antora/site-generator-default +==== + +Nominavi luptatum eos, an vim hinc philosophia intellegebat. +Eu mea inani iriure. + +[discrete] +== Voluptua singulis + +Cum dicat putant ne. +Est in reque homero principes, meis deleniti mediocrem ad has. +Altera atomorum his ex, has cu elitr melius propriae. +Eos suscipit scaevola at. diff --git a/preview-src/ui-model.yml b/preview-src/ui-model.yml new file mode 100644 index 0000000..1aca0f2 --- /dev/null +++ b/preview-src/ui-model.yml @@ -0,0 +1,110 @@ +antoraVersion: '1.0.0' +site: + url: http://localhost:5252 + title: Brand Docs + components: + - name: abc + title: Project ABC + url: '#' + versions: + - &latest_version_abc + url: '#' + version: '1.1' + displayVersion: '1.1' + - url: '#' + version: '1.0' + displayVersion: '1.0' + latestVersion: *latest_version_abc + - &component + name: xyz + title: Project XYZ + url: /xyz/6.0/index.html + versions: + - &latest_version_xyz + url: /xyz/6.0/index.html + version: '6.0' + displayVersion: '6.0' + - &component_version + url: '#' + version: '5.2' + displayVersion: '5.2' + - url: '#' + version: '5.1' + displayVersion: '5.1' + - url: '#' + version: '5.0' + displayVersion: '5.0' + latestVersion: *latest_version_xyz + - name: 123 + title: Project 123 + url: '#' + versions: + - &latest_version_123 + url: '#' + version: '2.2' + displayVersion: '2.2' + - url: '#' + version: '2.1' + displayVersion: '2.1' + - url: '#' + version: '2.0' + displayVersion: '2.0' + latestVersion: *latest_version_123 +page: + title: Brand’s Hardware & Software Requirements + url: /xyz/5.2/index.html + component: *component + componentVersion: *component_version + version: '5.2' + displayVersion: '5.2' + module: ROOT + home: false + editUrl: http://example.com/project-xyz/blob/master/index.adoc + breadcrumbs: + - content: Quickstart + url: '#' + urlType: fragment + - content: Brand’s Hardware & Software Requirements + url: /xyz/5.2/index.html + urlType: internal + versions: + - version: '6.0' + displayVersion: '6.0' + url: '#' + - version: '5.2' + displayVersion: '5.2' + url: '#' + - version: '5.1' + displayVersion: '5.1' + url: '#' + - version: '5.0' + displayVersion: '5.0' + missing: true + url: '#' + navigation: + - root: true + content: Project XYZ + url: '#' + urlType: fragment + items: + - content: Quickstart + url: '#' + urlType: fragment + items: + - content: Brand’s Hardware & Software Requirements + url: /xyz/5.2/index.html + urlType: internal + - title: IDE Integration + url: '#' + urlType: fragment + - content: Liber Recusabo + url: '#liber-recusabo' + urlType: fragment + - content: Reference + items: + - content: Keyboard Shortcuts + url: '#' + urlType: fragment + - content: Importing and Exporting + url: '#' + urlType: fragment -- cgit v1.2.3