diff --git a/package-lock.json b/package-lock.json index 079f9d578..e78b96f99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15772,6 +15772,11 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vuex": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz", + "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ==" + }, "w3c-hr-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz", diff --git a/package.json b/package.json index c421ad71e..d749f035c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "core-js": "^3.6.1", "vue": "^2.6.10", "vue-analytics": "^5.22.1", - "vue-i18n": "^8.15.3" + "vue-i18n": "^8.15.3", + "vuex": "^3.1.2" }, "devDependencies": { "@vue/cli-plugin-babel": "^4.1.0", diff --git a/src/App.vue b/src/App.vue index 254488ecc..ca4fca134 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,29 +1,22 @@ @@ -32,20 +25,37 @@ import '@creativecommons/vocabulary/css/root.css' import '@creativecommons/vocabulary/css/index.css' -import Chooser from './components/Chooser' import HelpSection from './components/HelpSection' -import { Header, Footer, Locale } from '@creativecommons/vue-vocabulary' -import Feedback from './components/Feedback' +import Stepper from './components/Stepper' +import SelectedLicenseCard from './components/SelectedLicenseCard' +import LicenseUseCard from './components/LicenseUseCard' +import Header from './components/Header.vue' +import Footer from './components/Footer' +import LocaleChooser from './components/LocaleChooser' export default { name: 'App', components: { - Chooser, HelpSection, - Feedback, + Stepper, + SelectedLicenseCard, + LicenseUseCard, Header, Footer, - Locale + LocaleChooser + }, + data() { + return { + currentStepId: 0 + } + }, + computed: { + showLicense() { + return this.currentStepId > 0 + }, + showLicenseUse() { + return this.currentStepId === 7 + } }, created: function() { // send home to google analytics @@ -57,9 +67,7 @@ export default { - diff --git a/src/assets/arrow-right.png b/src/assets/arrow-right.png new file mode 100644 index 000000000..afddcb0ae Binary files /dev/null and b/src/assets/arrow-right.png differ diff --git a/src/assets/language.png b/src/assets/language.png new file mode 100644 index 000000000..c4f5eb3f6 Binary files /dev/null and b/src/assets/language.png differ diff --git a/src/assets/license-icons/icon-by-white.png b/src/assets/license-icons/icon-by-white.png new file mode 100644 index 000000000..cef6733d7 Binary files /dev/null and b/src/assets/license-icons/icon-by-white.png differ diff --git a/src/assets/license-icons/icon-cc_white.png b/src/assets/license-icons/icon-cc_white.png new file mode 100644 index 000000000..80456d56f Binary files /dev/null and b/src/assets/license-icons/icon-cc_white.png differ diff --git a/src/components/AttributionDetails.vue b/src/components/AttributionDetails.vue new file mode 100644 index 000000000..fe0434e5a --- /dev/null +++ b/src/components/AttributionDetails.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/components/AttributionDetailsStep.vue b/src/components/AttributionDetailsStep.vue deleted file mode 100644 index 4f5176ad8..000000000 --- a/src/components/AttributionDetailsStep.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/src/components/Chooser.vue b/src/components/Chooser.vue deleted file mode 100644 index 8c2c0c2a6..000000000 --- a/src/components/Chooser.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - diff --git a/src/components/CopyrightWaiverStep.vue b/src/components/CopyrightWaiverStep.vue index a7c175dd2..e56021c08 100644 --- a/src/components/CopyrightWaiverStep.vue +++ b/src/components/CopyrightWaiverStep.vue @@ -29,7 +29,4 @@ label.label { .b-checkbox { align-items: flex-start; } - nav.step-navigation { - margin-top:1.8rem; - } diff --git a/src/components/DropdownStep.vue b/src/components/DropdownStep.vue new file mode 100644 index 000000000..86d27abdf --- /dev/null +++ b/src/components/DropdownStep.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/components/FirstStep.vue b/src/components/FirstStep.vue new file mode 100644 index 000000000..fe4a45ece --- /dev/null +++ b/src/components/FirstStep.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/components/Footer.vue b/src/components/Footer.vue new file mode 100644 index 000000000..519c4fd0c --- /dev/null +++ b/src/components/Footer.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/components/Header.vue b/src/components/Header.vue new file mode 100644 index 000000000..2905744a4 --- /dev/null +++ b/src/components/Header.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/components/HelpSection.vue b/src/components/HelpSection.vue index d29d0256c..ffd442dc2 100644 --- a/src/components/HelpSection.vue +++ b/src/components/HelpSection.vue @@ -1,58 +1,14 @@ -