Skip to content

Commit 11d677d

Browse files
author
Yeliazar
committed
add dev to master
2 parents 792ca80 + 3a605ad commit 11d677d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+4555
-1103
lines changed

.prettierrc

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"singleQuote": true,
3+
"tabWidth": 2,
4+
"trailingComma": "all",
5+
"quoteProps": "as-needed",
6+
"jsxSingleQuote": true,
7+
"bracketSpacing": true,
8+
"bracketSameLine": false,
9+
"arrowParens": "always",
10+
"vueIndentScriptAndStyle": true
11+
}

Dockerfile

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM node:14
2+
3+
# Create app directory
4+
WORKDIR /usr/src/app
5+
6+
# Install app dependencies
7+
# A wildcard is used to ensure both package.json AND package-lock.json are copied
8+
# where available (npm@5+)
9+
COPY package*.json ./
10+
11+
RUN yarn install
12+
# If you are building your code for production
13+
# RUN npm ci --only=production
14+
15+
# Bundle app source
16+
COPY . .
17+
18+
EXPOSE 3000
19+
CMD [ "yarn", "start" ]

README.md

+47-61
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,67 @@
1-
# 🤘 Vue Material Admin
1+
# vue material test model
22

3-
Free and open-source admin dashboard template built with Vue and Vuetify. Developed with ❤️ by [Flatlogic](https://flatlogic.com/). If you love our project please star ⭐️ our repo!
3+
## This project was generated by Flatlogic Platform.
44

5-
[View Demo](https://templates-flatlogic.herokuapp.com/vue-material/) | [Download](https://github.com/flatlogic/material-vue-full.git) | [More templates](https://flatlogic.com/templates) | [Support forum](https://flatlogic.com/forum)
5+
## To start the project:
66

7-
[![image](https://github.com/flatlogic/material-vue-full/blob/master/src/assets/img/screenshots/1.png)](https://templates-flatlogic.herokuapp.com/vue-material/)
7+
Install dependencies via yarn
88

9-
## Features
10-
11-
Vue Material Admin is a great template to quick-start development of SAAS, CMS, IoT Dashboard, E-Commerce apps, etc
12-
Lite version of a Vue Material Admin includes following features and pages:
13-
14-
* Vuetify
15-
* Responsive layout
16-
* Vue Apex Charts
17-
* Simple login / logout
18-
* Error page
19-
* Styled Vuetify components like buttons, modals, etc
20-
21-
## Pages
22-
We have implemented some basic pages, so you can see our template in action.
23-
24-
* Dashboard sample
25-
* Typography
26-
* Tables
27-
* Notifications
28-
* Charts
29-
* Icons
30-
* Maps
31-
* Chat
32-
* Login
33-
* Error page
34-
35-
## Instalation
36-
37-
1. Clone repository
38-
```shell
39-
git clone https://github.com/flatlogic/material-vue-full.git
40-
```
41-
2. Get in the project folder
42-
```shell
43-
cd material-vue-full
44-
```
45-
3. Install dependencies via npm or yarn
469
```shell
4710
yarn
4811
```
4912

50-
## Quick start
5113
Run development server
14+
5215
```shell
53-
yarn serve
16+
yarn start:backend
5417
```
5518

5619
## Support
20+
5721
For any additional information please refer to [Flatlogic homepage](https://flatlogic.com).
5822

59-
## How can I support developers?
60-
- Star our GitHub repo :star:
61-
- [Tweet about it](https://twitter.com/intent/tweet?text=Amazing%20dashboard%20built%20with%20%23VueJS%20and%20%23Bootstrap!&url=https://github.com/flatlogic/light-blue-vue-admin&via=flatlogic).
62-
- Create pull requests, submit bugs, suggest new features or documentation updates :wrench:
63-
- Follow [@flatlogic on Twitter](https://twitter.com/flatlogic).
64-
- Subscribe to Flatlogic newsletter at [flatlogic.com](https://flatlogic.com/)
65-
- Like our page on [Facebook](https://www.facebook.com/flatlogic/) :thumbsup:
23+
## To start the project with Docker:
24+
25+
## Description:
26+
27+
The project contains the **docker folder** and the `Dockerfile`.
28+
29+
The `Dockerfile` is used to Deploy the project to Google Cloud.
30+
31+
The **docker folder** contains a couple of helper scripts:
32+
33+
- `docker-compose.yml` (all our services: web, backend, db are described here)
34+
- `start-backend.sh` (starts backend, but only after the database)
35+
- `wait-for-it.sh` (imported from https://github.com/vishnubob/wait-for-it)
36+
37+
> To avoid breaking the application, we recommend you don't edit the following files: everything that includes the **docker folder** and `Dokerfile`.
38+
39+
## Run services:
40+
41+
1. Install docker compose (https://docs.docker.com/compose/install/)
42+
43+
2. Move to `docker` folder. All next steps should be done from this folder.
44+
45+
`cd docker`
46+
47+
3. Make executables from `wait-for-it.sh` and `start-backend.sh`:
48+
49+
`chmod +x start-backend.sh && chmod +x wait-for-it.sh`
50+
51+
4. Download dependend projects for services.
52+
53+
5. Review the docker-compose.yml file. Make sure that all services have Dockerfiles. Only db service doesn't require a Dockerfile.
54+
55+
6. Make sure you have needed ports (see them in `ports`) available on your local machine.
56+
57+
7. Start services:
6658

67-
## More from Flatlogic
68-
- [Awesome Bootstrap Checkboxes & Radios](https://github.com/flatlogic/awesome-bootstrap-checkbox) - ✅ Pure css way to make inputs look prettier
69-
- [React Native Starter](https://github.com/flatlogic/react-native-starter) - 🚀 A powerful react native starter template that bootstraps development of your mobile application
70-
- [React Dashboard](https://github.com/flatlogic/react-dashboard) - 🔥 React Dashboard - isomorphic admin dashboard template with GraphQL
71-
- [Sing App](https://github.com/flatlogic/sing-app) - 💥 Free and open-source admin dashboard template built with Bootstrap 4
72-
- [Light Blue Dashboard](https://github.com/flatlogic/light-blue-dashboard) - 💦 Free and open-source (no frameworks) admin dashboard template built with Bootstrap
59+
7.1. With an empty database `rm -rf data && docker-compose up`
7360

74-
## Premium themes
75-
Looking for premium themes and templates? Check out our other template at [flatlogic.com](https://flatlogic.com/admin-dashboards).
61+
7.2. With a stored (from previus runs) database data `docker-compose up`
7662

77-
## License
63+
8. Check http://localhost:3000
7864

79-
Flatlogic One React Template version is [MIT](https://github.com/flatlogic/one-react-template/blob/master/LICENCE)-licensed.
65+
9. Stop services:
8066

81-
* that's a joke actually, but we would really appreciate if you support us by buying a premium version. Anyways free is just free and is limited to only few components, while premium one has more and comes with premium support.
67+
9.1. Just press `Ctr+C`

babel.config.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
module.exports = {
2-
presets: [
3-
'@vue/cli-plugin-babel/preset'
4-
]
5-
}
2+
presets: ['@vue/cli-plugin-babel/preset'],
3+
};

package.json

+31-23
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,51 @@
11
{
2-
"name": "vue-material-admin-full",
3-
"version": "1.0.8",
2+
"name": "vuematerialtestmodel",
3+
"description": "vue material test model - template backend",
44
"private": true,
55
"scripts": {
6-
"serve": "vue-cli-service serve --port 3000",
7-
"serve:backend": "cross-env VUE_APP_BACKEND=true vue-cli-service serve --port 3000",
8-
"build": "cross-env VUE_APP_BACKEND=true vue-cli-service build",
6+
"start": "vue-cli-service serve --port 3000",
7+
"start:backend": "cross-env VUE_APP_BACKEND=true vue-cli-service serve --port 3000",
8+
"build": "cross-env VUE_APP_BACKEND=true vue-cli-service build --dest build",
99
"lint": "vue-cli-service lint"
1010
},
1111
"dependencies": {
12-
"@amcharts/amcharts4": "^4.10.22",
13-
"@amcharts/amcharts4-geodata": "^4.1.22",
14-
"apexcharts": "^3.29.0",
15-
"axios": "^0.23.0",
16-
"core-js": "^3.19.0",
12+
"@amcharts/amcharts4": "^4.10.25",
13+
"@amcharts/amcharts4-geodata": "^4.1.23",
14+
"apexcharts": "^3.35.3",
15+
"axios": "^0.27.2",
16+
"core-js": "^3.22.7",
1717
"cross-env": "^7.0.3",
18-
"css-loader": "^6.4.0",
18+
"css-loader": "^5.2.7",
19+
"dayjs": "^1.11.2",
1920
"font-awesome": "^4.7.0",
20-
"highcharts": "^9.3.0",
21-
"highcharts-vue": "^1.4.0",
22-
"jsonwebtoken": "^8.5.1",
23-
"moment": "^2.29.1",
21+
"jwt-decode": "^3.1.2",
22+
"moment": "^2.29.3",
2423
"vue": "^2.6.14",
2524
"vue-apexcharts": "^1.6.2",
26-
"vue-router": "^3.5.2",
25+
"vue-cool-lightbox": "^2.7.4",
26+
"vue-router": "^3.5.3",
2727
"vue2-google-maps": "^0.10.7",
28-
"vuetify": "^2.5.10",
28+
"vuetify": "^2.6.6",
29+
"vuetify-datetime-picker": "^2.1.1",
2930
"vuex": "^3.6.2"
3031
},
3132
"devDependencies": {
32-
"@vue/cli-plugin-babel": "~4.5.14",
33-
"@vue/cli-plugin-eslint": "~4.5.14",
34-
"@vue/cli-service": "~4.5.14",
33+
"@vue/cli-plugin-babel": "~4.5.17",
34+
"@vue/cli-plugin-eslint": "~4.5.17",
35+
"@vue/cli-service": "~4.5.17",
3536
"babel-eslint": "^10.1.0",
3637
"eslint": "^6.8.0",
3738
"eslint-plugin-vue": "^6.2.2",
38-
"sass": "^1.43.3",
39+
"sass": "^1.52.1",
3940
"sass-loader": "^8.0.2",
40-
"vue-cli-plugin-vuetify": "~2.4.3",
41+
"vue-cli-plugin-vuetify": "~2.5.0",
4142
"vue-style-loader": "^4.1.3",
4243
"vue-template-compiler": "^2.6.14",
4344
"vuetify-loader": "^1.7.3"
4445
},
46+
"resolutions": {
47+
"@vue/babel-preset-app/core-js": "^3.21.1"
48+
},
4549
"eslintConfig": {
4650
"root": true,
4751
"env": {
@@ -54,7 +58,11 @@
5458
"parserOptions": {
5559
"parser": "babel-eslint"
5660
},
57-
"rules": {}
61+
"rules": {
62+
"vue/no-unused-components": [
63+
"off"
64+
]
65+
}
5866
},
5967
"browserslist": [
6068
"> 1%",

public/index.html

+23-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,32 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8">
5-
<meta name="referrer" content="no-referrer-when-downgrade">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7-
<meta name="viewport" content="width=device-width,initial-scale=1.0">
8-
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
9-
<title>Vue Material Admin Full</title>
10-
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
11-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
4+
<meta charset="utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="referrer" content="no-referrer-when-downgrade" />
7+
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
8+
<meta
9+
name="description"
10+
content="vue material test model was created by Flatlogic generator."
11+
/>
12+
<link rel="icon" href="<%= BASE_URL %>logo.svg" />
13+
<title>vue material test model</title>
14+
<link
15+
rel="stylesheet"
16+
href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"
17+
/>
18+
<link
19+
rel="stylesheet"
20+
href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"
21+
/>
1222
</head>
1323
<body>
1424
<noscript>
15-
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
25+
<strong
26+
>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
27+
properly without JavaScript enabled. Please enable it to
28+
continue.</strong
29+
>
1630
</noscript>
1731
<div id="app"></div>
1832
<!-- built files will be auto injected -->

public/logo.png

3.37 KB
Loading

src/App.vue

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
};
99
</script>
1010

11-
<style src="./styles/app.scss" lang="scss"/>
12-
11+
<style lang="scss">
12+
@import 'styles/base';
1313
14+
@import '~vuetify/src/styles/main.sass';
15+
</style>

0 commit comments

Comments
 (0)