prepare for develop branch

README.md

@@ -1,10 +1,37 @@
-# murr_front
+<p align="center">
+<img src="readme/img/thumbnail.png" align="center" title="Murrengan network"/>
+</p>
 
-## Project setup
+<h2 align="center">Murrengan provide core functionality for web applications:</h2>
+
+<ul>
+    <li>user registration (0.0.12v)</li>
+    <li>getting information from client (in dev)</li>
+    <li>chat application (in plan)</li>
+    <li>cart and payments (in plan)</li>
+</ul>
+
+<h3 align="center">For ease of use there are 2 main branches:</h3>
+
+<b>[master](https://github.com/Murrengan/murr_front/tree/master)</b> - Main branch, the result of which can be seen at the link http://www.murrengan.ru/.
+
+<b>[develop](https://github.com/Murrengan/murr_front/tree/develop)</b> - Branch for developers. Checkout from here and implement new features</b>.
+
+<h2 align="center">In developing used:</h2>
+
+* [Vuejs](https://vuejs.org) as main frontend framework
+* [eleme.io](https://element.eleme.io/) as base UI Library
+* [vuex](https://vuex.vuejs.org/) for state management and code simplify 
+* [vuex-persistedstate](https://www.npmjs.com/package/vuex-persistedstate) for save state on reload pages
+* [vuelidate](https://vuelidate.js.org/) as helper, for field validator
+* [axios](https://github.com/axios/axios) as HTTP client for the browser (post, get and etc requests)
+* [vue-recaptcha](https://www.npmjs.com/package/vue-recaptcha) for save our precious site from bots
+* [vue-router](https://router.vuejs.org/) for help on navigation and route defender 
+
+### Setup
 ```
 npm install
 ```
-
 ### Compiles and hot-reloads for development
 ```
 npm run serve
@@ -15,10 +42,15 @@ npm run serve
 npm run build
 ```
 
-### Lints and fixes files
-```
-npm run lint
-```
+<br/>
+
+<h2 align="center">Download, train and take part in improving the functionality!❤</h2>
+
+# 🌟Support🌟 
+[click](http://bit.do/eWnnm)
+
+<h4>Contacts:</h4>
 
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
+[Telegram](https://tlgg.ru/MurrenganChat)<br/>
+[Youtube](https://youtube.com/murrengan/)<br/>
+[Site](http://www.murrengan.ru/)

package.json

@@ -15,7 +15,8 @@
     "vue-recaptcha": "^1.3.0",
     "vue-router": "^3.1.5",
     "vuelidate": "^0.7.5",
-    "vuex": "^3.1.2"
+    "vuex": "^3.1.2",
+    "vuex-persistedstate": "^2.7.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.0",

src/App.vue

@@ -21,11 +21,8 @@
             layout() {
                 return this.$route.meta.layout
             },
-
-            // isMurrenLoggedIn() {
-            //     return this.$store.getters.accessToken
-            // }
         },
+
         components: {
             EmptyLayout, MainLayout
         }

src/devAndProdVariables.js

@@ -1,10 +1,10 @@
 /* eslint-disable */
 
 // dev
-// export const axios_defaults_baseURL = 'http://127.0.0.1:8000';
+export const axios_defaults_baseURL = 'http://127.0.0.1:8000';
 
 // prod
-export const axios_defaults_baseURL = 'http://murrengan.ru';
+// export const axios_defaults_baseURL = 'http://murrengan.ru';
 
 // variables
 export const siteKey = '6LfLNNcUAAAAAH1pmBGDLqtKEfYfRf31fHcyp2SX';

src/layouts/EmptyLayout.vue

@@ -16,5 +16,4 @@
     background-color: #1a2931;
   }
 
-
 </style>

src/layouts/MainLayout.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="main">
+
     <TopNavbar/>
 
     <div class="nav-container">

src/store/auth.js

@@ -3,7 +3,7 @@ import axios from 'axios'
 export default {
     state: {
 
-        accessToken: localStorage.getItem('accessToken') || null,
+        accessToken:null,
         murrenName: ''
     },
 
@@ -20,7 +20,6 @@ export default {
 
                     await commit('setAccessToken_mutations', accessToken);
                     await commit('setMurrenName_mutations', username);
-                    await localStorage.setItem('accessToken', accessToken);
                 }
 
             } catch (e) {
@@ -29,8 +28,6 @@ export default {
         },
 
         async logout({commit}) {
-
-            localStorage.removeItem('accessToken');
             commit('logout_mutations');
         }
     },

src/store/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import auth from './auth'
 import showPopUpMessage from './showPopUpMessage'
+import createPersistedState from "vuex-persistedstate";
 
 Vue.use(Vuex);
 
@@ -85,6 +86,8 @@ export default new Vuex.Store({
         },
     },
 
+    plugins: [createPersistedState()],
+
     modules: {
 
         auth,

src/views/Home.vue

@@ -36,21 +36,18 @@
 
             const r = await axios.get('/murren/all');
             this.signUpMurrens = r.data.reverse();
-
         },
 
         data: () => ({
             signUpMurrens: ''
         }),
-        components: {},
     }
 
 </script>
 
 <style scoped>
 
   .murrens-list {
-
     width: 300px;
     max-height: 40vh;
     overflow: auto;
@@ -67,7 +64,6 @@
     align-items: center;
     text-align: center;
     padding: 0 15px 5px;
-
     background-color: #1a2931;
   }
 

src/views/murren/ConfirmEmail.vue

@@ -21,10 +21,8 @@
     </div>
 
   </div>
-
 </template>
 
-
 <script>
 
     import axios from "axios";

src/views/murren/Login.vue

@@ -171,5 +171,4 @@
 
 <style scoped>
 
-
 </style>

src/views/murren/Murren.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="home-main-container">
+
     <p class="mb font">Это личная страничка Муррена</p>
     <small>Доступно для авторизованного Муррена</small>
     <div>
@@ -17,6 +18,7 @@
         Выйти
       </el-button>
     </div>
+
   </div>
 </template>
 
@@ -29,15 +31,15 @@
         async beforeCreate() {
 
             const r = await axios.get('murren/tanochka/',
-                {headers: {'Authorization': 'Bearer ' + localStorage.getItem('accessToken')}});
+                {headers: {'Authorization': 'Bearer ' + this.$store.getters.accessToken_getters}});
             this.tanochkaUrl = axios.defaults.baseURL + r.data.img_url;
 
         },
 
         data: () => ({
-
             tanochkaUrl: ''
         }),
+
         methods: {
             async logout() {
 

src/views/murren/ResetPassword.vue

@@ -72,15 +72,14 @@
             native-type="submit"
             class="murr-button mb"
             :loading="this.showLoadingBtn"
-
-        >Жду письмо
+        >
+          Жду письмо
         </el-button>
 
       </div>
 
     </form>
 
-
   </div>
 </template>