Skip to content

Commit d16eccd

Browse files
author
Adam Adamczyk
committed
up to webpack 4
1 parent fea02cf commit d16eccd

Some content is hidden

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

85 files changed

+730
-459
lines changed

.eslintignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
######################################################
2+
# https://eslint.org/docs/user-guide/configuring
3+
######################################################
4+
# /node_modules/* and /bower_components/* in the project root are ignored by default
5+
# Ignore built files except build/index.js
6+
/ClientApp/Static/**/*.js
7+
8+
# !build/index.js ... if i would like to ignore all except that... then it's the way

.eslintrc.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module.exports = {
2+
root: true,
3+
"parserOptions": {
4+
"parser": "babel-eslint"
5+
},
6+
"extends": [
7+
"standard",
8+
"plugin:vue/recommended"
9+
]
10+
};
11+

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.DS_Store
2-
/ClientApp/node_modules/
2+
/node_modules/
33
/ClientApp/npm-debug.log
44

55
/Properties/launchSettings.json
@@ -28,7 +28,6 @@ package-lock.json
2828
[Rr]eleases/
2929
x64/
3030
x86/
31-
build/
3231
bld/
3332
bin/
3433
Bin/

ClientApp/.babelrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

ClientApp/.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Editor configuration, see http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
max_line_length = off
13+
trim_trailing_whitespace = false

ClientApp/.eslintrc.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

ClientApp/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

ClientApp/README.md

Lines changed: 0 additions & 18 deletions
This file was deleted.
File renamed without changes.

ClientApp/app.js

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import Vue from 'vue'
2+
import Vuetify from 'vuetify'
3+
import upperFirst from 'lodash/upperFirst'
4+
import camelCase from 'lodash/camelCase'
5+
import axios from 'axios'
6+
import router from './router/index'
7+
import store from './store'
8+
import { sync } from 'vuex-router-sync'
9+
10+
import App from './app.vue'
11+
import 'vuetify/dist/vuetify.css'
12+
13+
// Mode details on: https://vuejs.org/v2/guide/components-registration.html
14+
const requireComponent = require.context(
15+
// The relative path of the components folder
16+
'./components',
17+
// Whether or not to look in subfolders
18+
true,
19+
// The regular expression used to match base component filenames
20+
/base[A-Z]\w+\.(vue|js)$/
21+
)
22+
23+
requireComponent.keys().forEach(fileName => {
24+
// Get component config
25+
const componentConfig = requireComponent(fileName)
26+
27+
// Get PascalCase name of component
28+
const componentName = upperFirst(
29+
camelCase(
30+
// Strip the leading `./` and extension from the filename
31+
fileName.replace(/base/, '').replace(/^\.\/(.*)\.\w+$/, '$1')
32+
)
33+
)
34+
35+
// Register component globally
36+
Vue.component(
37+
componentName,
38+
// Look for the component options on `.default`, which will
39+
// exist if the component was exported with `export default`,
40+
// otherwise fall back to module's root.
41+
componentConfig.default || componentConfig
42+
)
43+
})
44+
45+
Vue.use(Vuetify)
46+
Vue.prototype.$http = axios
47+
sync(store, router)
48+
49+
new Vue({ // eslint-disable-line
50+
el: '#app',
51+
store,
52+
router,
53+
...App
54+
})
File renamed without changes.

ClientApp/assets/custom_picnic.scss

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
// $picnic-nav-sides: 0;
2+
$picnic-nav-position: inherit;
3+
$theme-dark-color: #222;
4+
$green: #00AA55;
5+
6+
@import "../../node_modules/picnic/src/picnic.scss";
7+
8+
nav.dark {
9+
background-color: $theme-dark-color;
10+
}
11+
12+
// Bug fix in the template. The card somehow does not react well for no apparent reason.
13+
// This is not the proper solution especially if you start using card within a popup.
14+
article.card {
15+
header,
16+
content,
17+
footer {
18+
position: inherit !important;
19+
}
20+
21+
position: inherit !important;
22+
}
23+
24+
@media all and (max-width: $picnic-breakpoint) {
25+
%nav {
26+
.burger~.menu {
27+
background-color: $theme-dark-color;
28+
}
29+
30+
.brand {
31+
max-width: initial;
32+
}
33+
34+
.menu {
35+
.nav-item {
36+
color: #CCC;
37+
}
38+
39+
.nav-item.active {
40+
color: #fff;
41+
background: rgb(28, 66, 92);
42+
}
43+
}
44+
}
45+
}
46+
47+
@media all and (min-width: $picnic-breakpoint) {
48+
$picnic-nav-width: 18em !default;
49+
// $picnic-nav-height_custom: inherit !important;
50+
51+
.main {
52+
display: inline-flex;
53+
min-height: 100%;
54+
width: 100%;
55+
}
56+
57+
.main-content {
58+
width: calc(100% - #{$picnic-nav-width});
59+
margin-left: 0.5em;
60+
}
61+
62+
%nav,
63+
.main-content {
64+
display: inline-block;
65+
vertical-align: top;
66+
}
67+
68+
%nav {
69+
z-index: inherit;
70+
background: $theme-dark-color;
71+
right: inherit;
72+
width: $picnic-nav-width;
73+
height: inherit;
74+
padding: inherit;
75+
76+
.brand {
77+
padding: 0.5em 0;
78+
border-bottom: 1px #666 solid;
79+
max-width: inherit;
80+
font-size: 20px;
81+
}
82+
83+
.brand,
84+
.menu {
85+
float: inherit;
86+
top: auto;
87+
clear: both;
88+
padding-left: 0.5em;
89+
display: block;
90+
91+
// position: relative;
92+
-webkit-transform: inherit;
93+
transform: inherit;
94+
95+
.nav-item {
96+
display: block;
97+
padding: 0.4em;
98+
padding-left: inherit;
99+
width: 100%;
100+
color: #CCC;
101+
}
102+
103+
.nav-item.active {
104+
color: #fff;
105+
background: rgb(28, 66, 92);
106+
}
107+
}
108+
109+
.menu {
110+
padding-top: 0.5em;
111+
}
112+
}
113+
}
114+
115+
table {
116+
thead {
117+
font-size: 0.9em;
118+
white-space: nowrap;
119+
120+
tr {
121+
th {
122+
background-color: $theme-dark-color;
123+
}
124+
}
125+
}
126+
}
127+
128+
.page-title {
129+
border-bottom: 1px solid #ddd;
130+
margin-bottom: 1em;
131+
margin-left: -0.5em;
132+
padding-left: 0.5em;
133+
134+
h1 {
135+
padding: 0.1em;
136+
}
137+
}
File renamed without changes.

ClientApp/assets/site.scss

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
$theme-dark-color: #222;
2+
@import "../../node_modules/picnic/src/themes/default/theme";
3+
4+
article {
5+
header {
6+
background-color: $theme-dark-color;
7+
color: $white;
8+
}
9+
10+
content {
11+
padding: 0 1em;
12+
}
13+
14+
footer {
15+
background-color: $silver;
16+
padding: 0 1em !important;
17+
}
18+
}
19+
20+
.text-right {
21+
text-align: right;
22+
}
23+
24+
// Optimization can be done by using a list + substring + ...
25+
// http://sass-lang.com/documentation/Sass/Script/Functions.html
26+
@for $size from 1 to 4 {
27+
.pt-#{$size}, .py-#{$size} {
28+
padding-top: #{$size}em;
29+
}
30+
.pb-#{$size}, .py-#{$size} {
31+
padding-bottom: #{$size}em;
32+
}
33+
34+
.pl-#{$size}, .px-#{$size} {
35+
padding-left: #{$size}em;
36+
}
37+
.pr-#{$size}, .px-#{$size} {
38+
padding-right: #{$size}em;
39+
}
40+
41+
.ml-#{$size}, .mx-#{$size} {
42+
margin-left: #{$size}em;
43+
}
44+
.mr-#{$size}, .mx-#{$size} {
45+
margin-right: #{$size}em;
46+
}
47+
48+
.mt-#{$size}, .my-#{$size} {
49+
margin-left: #{$size}em;
50+
}
51+
.mb-#{$size}, .my-#{$size} {
52+
margin-right: #{$size}em;
53+
}
54+
}
55+
56+
.color-white {
57+
color: $white;
58+
}
59+
.color-red {
60+
color: $picnic-error;
61+
}
62+
63+
.bt {
64+
border-top: $picnic-border;
65+
}
File renamed without changes.

ClientApp/src/components/intro.vue renamed to ClientApp/components/intro.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="intro">
33
<div class="text-md-center">
4-
<img src="icon.png" />
4+
<img src="/static/images/icon.png" />
55
<h1>{{ appName }}</h1>
66
</div>
77
<div class="text-md-center">

ClientApp/src/components/introAdmin.vue renamed to ClientApp/components/introAdmin.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="intro">
33
<div class="text-md-center">
4-
<img src="iconadminpage.png" />
4+
<img src="/static/images/iconadminpage.png" />
55
<h1 class="app-title">{{ appName }}</h1>
66
</div>
77
<div class="text-md-center">

ClientApp/favicon.ico

15 KB
Binary file not shown.

0 commit comments

Comments
 (0)