Skip to content

Commit a119514

Browse files
JoeJoe
Joe
authored and
Joe
committed
latest wave of cards - im messy lol
1 parent c8a1aaf commit a119514

37 files changed

+2462
-123
lines changed

package-lock.json

Lines changed: 66 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@
88
"lint": "vue-cli-service lint"
99
},
1010
"dependencies": {
11+
"@fortawesome/fontawesome-svg-core": "^1.2.28",
12+
"@fortawesome/free-brands-svg-icons": "^5.13.0",
13+
"@fortawesome/vue-fontawesome": "^0.1.9",
1114
"apexcharts": "^3.18.1",
1215
"chartist-plugin-fill-donut": "^0.1.4",
1316
"core-js": "^3.6.4",
1417
"leaflet": "^1.6.0",
1518
"vue": "^2.6.11",
1619
"vue-agile": "^1.0.12",
1720
"vue-apexcharts": "^1.5.3",
21+
"vue-carousel": "^0.18.0",
1822
"vue-chartist": "^2.2.1",
1923
"vue-router": "^3.1.6",
2024
"vue-styled-components": "^1.4.14",

src/App.vue

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
<template>
2-
<Content>
3-
<router-view />
4-
</Content>
2+
<StyledWrapper>
3+
<Topbar />
4+
<Content>
5+
<router-view />
6+
</Content>
7+
</StyledWrapper>
58
</template>
69

710
<script>
11+
import styled from "vue-styled-components";
812
import Content from "./components/layout/Content";
13+
import Topbar from "./components/layout/Topbar";
914
1015
require("./assets/css/bootstrap.css");
1116
require("./assets/css/tonicons.css");
1217
require("chartist/dist/chartist.min.css");
1318
19+
const StyledWrapper = styled.div`
20+
flex: 1;
21+
height: 100%;
22+
display: flex;
23+
flex-direction: column;
24+
`;
25+
1426
export default {
1527
name: "App",
1628
components: {
17-
Content
29+
StyledWrapper,
30+
Content,
31+
Topbar
1832
}
1933
};
2034
</script>
@@ -37,9 +51,20 @@ html {
3751
* {
3852
box-sizing: border-box;
3953
line-height: 1;
54+
cursor: default;
4055
}
4156
42-
button {
57+
button,
58+
input {
4359
font-family: "Alata", Helvetica, Arial, sans-serif;
4460
}
61+
62+
button,
63+
a,
64+
input {
65+
background: transparent;
66+
outline: none;
67+
cursor: pointer;
68+
font-size: 1rem;
69+
}
4570
</style>

src/assets/css/bootstrap.css

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/assets/images/arrows.png

-519 Bytes
Loading

src/assets/images/intro1.png

35.3 KB
Loading

src/assets/images/intro2.png

69.9 KB
Loading

src/assets/images/intro3.png

51.2 KB
Loading

src/assets/images/joe.png

1.05 MB
Loading

src/assets/images/leeo.png

509 KB
Loading

src/assets/images/person1.jpeg

117 KB
Loading

src/assets/images/person2.jpg

39.1 KB
Loading

src/assets/images/person3.jpg

7.21 KB
Loading

src/assets/images/setup.png

490 KB
Loading

0 commit comments

Comments
 (0)