Merge pull request #12 from vuestorefront-community/dev

chore: release version 1.0.0-rc.5
vuestorefront-community · Jan 6, 2022 · e6f3f9a · e6f3f9a
2 parents 34fb85a + 6c53cbb
commit e6f3f9a
Show file tree

Hide file tree

Showing 8 changed files with 6,816 additions and 8,830 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/odoo-api",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "private": false,
   "sideEffects": false,
   "server": "server/index.js",

diff --git a/packages/api-client/src/fragments/orderFragment.ts b/packages/api-client/src/fragments/orderFragment.ts
@@ -8,6 +8,19 @@ order {
   dateOrder
   orderUrl
   stage
+  websiteOrderLine {
+    id
+    name
+    product {
+      id
+      name
+      image
+      image
+      displayName
+    }
+    quantity
+    priceTotal
+  }
   orderLines {
     id
     name

diff --git a/packages/api-client/src/types/types.ts b/packages/api-client/src/types/types.ts
@@ -400,6 +400,7 @@ export type Order = {
   amountDelivery: number;
   currency: Currency;
   orderLines?: OrderLine[];
+  websiteOrderLine?: OrderLine[];
   stage: OrderStage;
   orderUrl: string;
   transactions: PaymentTransaction[];

diff --git a/packages/composables/package.json b/packages/composables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/odoo",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "private": false,
   "sideEffects": false,
   "main": "lib/index.cjs.js",
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@vue-storefront/core": "2.4.0",
-    "@vue-storefront/odoo-api": "1.0.0-rc.4"
+    "@vue-storefront/odoo-api": "1.0.0-rc.5"
   },
   "peerDependencies": {
     "@vue/composition-api": "1.0.0-beta.21"

diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
@@ -57,6 +57,10 @@ export default {
   },
   loading: { color: '#fff' },
   plugins: [],
+  serverMiddleware: [
+    // Server-side redirects
+    '~/serverMiddleware/redirects',
+  ],
   buildModules: [
     // to core
     '@nuxtjs/pwa',

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/odoo-theme",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "private": true,
   "scripts": {
     "build": "nuxt build -m --dotenv .env_production",
@@ -24,7 +24,7 @@
     "@vue-storefront/middleware": "2.4.0",
     "@vue-storefront/nuxt": "2.4.0",
     "@vue-storefront/nuxt-theme": "2.4.0",
-    "@vue-storefront/odoo": "1.0.0-rc.4",
+    "@vue-storefront/odoo": "1.0.0-rc.5",
     "cookie-universal-nuxt": "^2.1.3",
     "core-js": "^2.6.5",
     "nuxt": "2.15.6",

diff --git a/packages/theme/serverMiddleware/redirects.js b/packages/theme/serverMiddleware/redirects.js
@@ -0,0 +1,28 @@
+redirects = [
+    { from: '/test', to: '/test-new' },
+    { from: '/test2', to: '/test2-new' }
+]
+
+module.exports = function (req, res, next) {
+  var url = req.url.split('?')[0];
+  var urlParams = null;
+  if (req.url.includes("?")) {
+    urlParams = '?' + req.url.split('?')[1]
+  }
+
+  const redirect = redirects.find(r => r.from === url)
+  if (redirect) {
+    var newLocation;
+    if (urlParams) {
+      newLocation = redirect.to + urlParams;
+    } else {
+      newLocation = redirect.to;
+    }
+    res.writeHead(301, {
+      Location: newLocation
+    });
+    res.end()
+  } else {
+    next()
+  }
+}