From 0727c3314dc188f5a6f138dd4216e16a09a5abdb Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 20 Nov 2019 16:13:07 +0300
Subject: [PATCH] move styles from view folder to assets

---
 webapp/README.md                                | 3 +--
 webapp/{view => assets/_new}/styles/tokens.scss | 0
 webapp/nuxt.config.js                           | 2 +-
 webapp/storybook/webpack.config.js              | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename webapp/{view => assets/_new}/styles/tokens.scss (100%)

diff --git a/webapp/README.md b/webapp/README.md
index 9632fbf81..2ad10acba 100644
--- a/webapp/README.md
+++ b/webapp/README.md
@@ -98,10 +98,9 @@ We are currently in the process of migrating our styleguide components and desig
 
 The folder structure we are following is [prescribed by Nuxt.js](https://nuxtjs.org/guide/directory-structure):
 
-- **assets** contains icons, images and logos in `svg` format
+- **assets** contains icons, images and logos in `svg` format and all shared SCSS files such as `tokens`
 - **components** separated into two sub-folders:
     - **generics** are the generic building blocks of the app – small, reusable and usually not coupled to state
     - **features** are composed of components but tied to a particular function of the app (e.g. `comment` or `post`)
 - **layouts** can use components to create layout templates for pages
 - **pages** are the entry points for all `routes` in the app and are composed of layouts, features and components
-- **styles** holds all shared SCSS files such as `variables` and `mixins`
diff --git a/webapp/view/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
similarity index 100%
rename from webapp/view/styles/tokens.scss
rename to webapp/assets/_new/styles/tokens.scss
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index 4a35e37f4..9bea7b3c0 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -100,7 +100,7 @@ export default {
    ** Global processed styles
    */
   styleResources: {
-    scss: [styleguideStyles, '~view/styles/tokens.scss'],
+    scss: [styleguideStyles, '~assets/_new/styles/tokens.scss'],
   },
 
   /*
diff --git a/webapp/storybook/webpack.config.js b/webapp/storybook/webpack.config.js
index db0a8924c..6463386b1 100644
--- a/webapp/storybook/webpack.config.js
+++ b/webapp/storybook/webpack.config.js
@@ -23,7 +23,7 @@ module.exports = async ({ config, mode }) => {
               __dirname,
               '../node_modules/@human-connection/styleguide/dist/shared.scss',
             ),
-            path.resolve(__dirname, '../view/styles/tokens.scss'),
+            path.resolve(__dirname, '../assets/_new/styles/tokens.scss'),
           ],
           injector: 'prepend',
         },