Merge master

Author: zackkrida

.cc-metadata.yml

@@ -5,4 +5,4 @@ english_name: CC Chooser
 # All technologies used
 technologies: HTML, CSS, JS, Bulma, Vue, Jest
 # Whether this repository should be featured on the CC Open Source site
-featured: false
+featured: true

README.md

@@ -44,6 +44,6 @@ To run e2e tests, you must have Java installed. [[download Java here](https://ja
 
 
 ## Deployment
-The source files for the beta deployment are contained in the `./docs/` dir, and are live. Any changes to this dir's contents will be automatically deployed, so please take care when making modifications to this location. 
+The chooser is deployed to GitHub Pages. The source files for the beta deployment are contained in the `./docs/` dir, and are live. Any changes to this dir's contents will be automatically deployed, so please take care when making modifications to this location. 
 
 To update the dist bundle, run ```$ npm run build```, and copy the generated files from `./dist/` to `./docs/`, taking care to not delete the CNAME file in `./docs/`.

package-lock.json

@@ -5,6 +5,21 @@
             id="site-container"
             class="container"
         >
+            <nav
+                class="breadcrumb caption bold"
+                aria-label="breadcrumbs"
+            >
+                <ul>
+                    <li><a href="#">Home</a></li>
+                    <li><a href="#">Child Page</a></li>
+                    <li class="is-active">
+                        <a
+                            href="#"
+                            aria-current="page"
+                        >Chooser</a>
+                    </li>
+                </ul>
+            </nav>
             <div class="page-head">
                 <div class="select-license-column">
                     <h2 class="vocab">
@@ -115,6 +130,9 @@ export default {
     #site-container {
         padding: 0.75rem;
     }
+    .breadcrumb {
+        margin-bottom: 2rem;
+    }
     .page-head {
         display: grid;
         grid-template-columns: 1fr;

src/App.vue

@@ -73,15 +73,15 @@
                 },
                 "creator-profile": {
                     "label": "URL of creator profile",
-                    "placeholder": "www.author.com"
+                    "placeholder": "https://janedoe.com"
                 },
                 "work-title": {
                     "label": "Title of Work",
                     "placeholder": "This work"
                 },
                 "work-url": {
                     "label": "Work URL",
-                    "placeholder": "www.author.com/work.jpg"
+                    "placeholder": "https://janedoe.com/best-photo-ever.jpg"
                 }
             }
         }

src/locales/ru.json

@@ -17,15 +17,16 @@ module.exports = {
     // 'Check if the links in the license code redirects properly': function(browser) {
     //     browser
     //         .setValue('input[placeholder="Jane Doe"]', 'Jane Doe')
-    //         .setValue('input[placeholder="www.author.com"]', 'www.author.com')
+    //         .setValue('input[placeholder="https://janedoe.com"]', 'https://janedoe.com')
     //         .setValue('input[placeholder="This work"]', 'This work')
-    //         .setValue('input[placeholder="www.author.com/work.jpg"]', 'www.author.com/work.jpg')
+    //         .setValue('input[placeholder="https://janedoe.com/best-photo-ever.jpg"]', 'https://janedoe.com/best-photo-ever.jpg')
     //         .assert.elementPresent('p[class="license-text"] a')
     //         .getAttribute('p > span > a:nth-child(1)', 'href', function(result) {
-    //             this.assert.equal(result.value, 'http://www.author.com/work.jpg')
+    //             this.assert.equal(result.value, 'https://janedoe.com/best-photo-ever.jpg')
+     //         })
     //         })
     //         .getAttribute('p > span > a:nth-child(2)', 'href', function(result) {
-    //             this.assert.equal(result.value, 'http://www.author.com/')
+    //             this.assert.equal(result.value, 'https://janedoe.com')
     //         })
     //         .getAttribute('p > span > a:nth-child(4)', 'href', function(result) {
     //             const urlString = result.value.split('/').slice(3).join('/')
@@ -51,7 +52,7 @@ module.exports = {
     //     browser
     //         .expect.element('#attribution-text > p > span:nth-child(1) > span:nth-child(4)').text.to.equal('CC BY-SA 4.0')
     // },
-    // 'Check if the author-name in plain text is displayed': function(browser) {
+    // 'Check if the creator-name in plain text is displayed': function(browser) {
     //     browser
     //         .expect.element('#attribution-text > p > span:nth-child(1) > span:nth-child(2) > span').text.to.equal('Jane Doe')
     // },

tests/e2e/specs/LicenseCode.js

@@ -7,9 +7,9 @@ import { CCBYAttributes, LICENSES } from '@/utils/license-utilities'
 
 const TEST_DATA = {
     creatorName: 'Jane Doe',
-    creatorProfileUrl: 'www.author.com',
+    creatorProfileUrl: 'https://janedoe.com',
     workTitle: 'My work',
-    workUrl: 'www.author.com/picture.jpg'
+    workUrl: 'https://janedoe.com/best-photo-ever.jpg'
 }
 
 describe('LicenseText.vue', () => {