Skip to content

Commit

Permalink
Merge pull request #13 from JacobAnavisca/develop
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
JacobAnavisca authored Jan 31, 2021
2 parents 5ca4482 + b50fece commit b539610
Show file tree
Hide file tree
Showing 32 changed files with 200 additions and 129 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
static/sw.js
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
},
extends: [
'@nuxtjs/eslint-config-typescript',
'plugin:nuxt/recommended'
'plugin:vue/recommended'
],
plugins: [
],
Expand Down
5 changes: 3 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const app = express()
const nuxt = new Nuxt({
...config,
dev: false,
_start: true,
_start: true
})

// app.use(async (req, res, next) => {
Expand Down Expand Up @@ -50,6 +50,7 @@ app.use(async (req, res) => {
}
nuxt.render(req, res)
})
// eslint-disable-next-line no-void
const server = createServer(app, void 0, [
'application/javascript',
'application/json',
Expand All @@ -72,7 +73,7 @@ const server = createServer(app, void 0, [
'text/text',
'text/xml',
'application/rss+xml',
'application/atom+xml',
'application/atom+xml'
])

module.exports.handler = (event, ctx) => {
Expand Down
5 changes: 3 additions & 2 deletions buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ phases:
- npm run lint
# TODO: uncomment if there are integration or unit tests to run
# - npm test
- npm run sls -- deploy --stage dev --noDeploy
- npm run sls -- deploy --stage $sls_stage --noDeploy
build:
commands:
- npm run sls -- deploy --stage dev
- npm run build
- npm run sls -- deploy --stage $sls_stage
post_build:
commands:
- cat ./.serverless/serverless-state.json
12 changes: 6 additions & 6 deletions components/AboutCardComp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<v-list-item two-line>
<v-list-item-content>
<v-list-item-title class="headline">
{{ this.card.title }}
{{ card.title }}
</v-list-item-title>
<v-list-item-subtitle>{{ this.card.subtitle }}</v-list-item-subtitle>
<v-list-item-subtitle>{{ card.subtitle }}</v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
<div
Expand All @@ -24,10 +24,10 @@
:width="card.width"
class="rounded-lg"
>
<source
:src="card.src"
type="video/mp4"
>
<source
:src="card.src"
type="video/mp4"
>
</video>
<br>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/FluidMarginContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<v-container
fluid
>
<slot></slot>
<slot />
</v-container>
</div>
</v-col>
Expand Down
22 changes: 11 additions & 11 deletions components/SkillCardComp.vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable vue/no-v-html */
<template>
<client-only placeholder="Loading...">
<v-card
Expand All @@ -15,14 +16,14 @@
color="background"
value="languages"
hide-details
></v-checkbox>
/>
<v-checkbox
v-model="selectedCategories"
label="databases"
color="background"
value="databases"
hide-details
></v-checkbox>
/>
</v-col>
<v-col
cols="6"
Expand All @@ -33,18 +34,18 @@
color="background"
value="tools"
hide-details
></v-checkbox>
/>
<v-checkbox
v-model="selectedCategories"
label="concepts"
color="background"
value="concepts"
hide-details
></v-checkbox>
/>
</v-col>
</v-row>
<br>
<v-divider></v-divider>
<v-divider />
<br>
<v-row class="mx-auto">
<v-col>
Expand All @@ -55,9 +56,9 @@
v-for="(skillItem, index) in skillItems"
:key="skillItem + index"
:active="selectedCategories.length === 0 || categoryCheck(selectedCategories, skillItem.categories)"
v-html="skillItem.title"
color="background"
>
{{ skillItem.title }}
</v-chip>
</v-chip-group>
</v-col>
Expand All @@ -76,16 +77,15 @@ export default class SkillCardComp extends Vue {
@Prop({ default: [] }) readonly selectedCategories!: string[]
@Prop({ default: [] }) readonly skillItems!: SkillsItem[]
get languagesFrameworksLabel() {
const label = this.$vuetify.breakpoint.mdAndDown ?
'langs/fwks' :
'languages/frameworks'
get languagesFrameworksLabel () {
const label = this.$vuetify.breakpoint.mdAndDown
? 'langs/fwks'
: 'languages/frameworks'
return label
}
@Emit()
categoryCheck (arrayToCheck: string[], valuesToFind: string[]): boolean {
const numberOfValues = valuesToFind.length
let matchingValue = false
for (const value of valuesToFind) {
Expand Down
6 changes: 3 additions & 3 deletions components/WorkCardsComp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
class="white--text align-end"
height="200px"
/>
<v-card-title v-text="card.title"></v-card-title>
<v-card-title v-text="card.title" />
<v-card-text>
{{card.description}}
{{ card.description }}
</v-card-text>
</v-card>
</v-col>
</v-row>
</template>

<script lang="ts">
import { Component, Vue, Prop, Emit } from 'vue-property-decorator'
import { Component, Vue, Prop } from 'vue-property-decorator'
import { WorkCard } from '@/types'
@Component
Expand Down
26 changes: 12 additions & 14 deletions layouts/default.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<template>
<v-app>

<v-navigation-drawer
:app="$vuetify.breakpoint.mdAndDown ? false: true"
permanent
mini-variant
class="primary hidden-md-and-down"
>
<v-list>
</v-list>
<v-list />
<v-list
nav
rounded
Expand All @@ -17,9 +15,9 @@
<v-list-item-group>
<v-list-item link>
<NuxtLink to="/">
<v-list-item-icon>
<v-icon>mdi-home</v-icon>
</v-list-item-icon>
<v-list-item-icon>
<v-icon>mdi-home</v-icon>
</v-list-item-icon>
</NuxtLink>
</v-list-item>

Expand Down Expand Up @@ -57,7 +55,7 @@
</v-list-item-group>
</v-list>

<template v-slot:append>
<template #append>
<v-list
nav
rounded
Expand Down Expand Up @@ -158,7 +156,7 @@
text
elevation="2"
>
You've copied my Discord username <strong>{{ this.discordUsr }}</strong>!
You've copied my Discord username <strong>{{ discordUsr }}</strong>!
</v-alert>
<v-alert
v-model="errorAlert"
Expand All @@ -172,8 +170,8 @@
There was an issue copying my Discord username 😞Check the console for more info.
</v-alert>
<v-btn
class="hidden-lg-and-up"
v-show="this.$route.path !== '/contact'"
class="hidden-lg-and-up"
fab
color="secondary"
top
Expand Down Expand Up @@ -205,24 +203,24 @@ export default Vue.extend({
}),
computed: {
successAlert: {
get: function () {
get: () => {
return mainStore.showSuccessAlert
},
set: function () {
set: () => {
return mainStore.setSuccessAlert(false)
}
},
errorAlert: {
get: function () {
get: () => {
return mainStore.showErrorAlert
},
set: function () {
set: () => {
return mainStore.setErrorAlert(false)
}
}
},
methods: {
copyDiscordUsr: async function () {
async copyDiscordUsr () {
try {
await navigator.clipboard.writeText(this.discordUsr)
mainStore.setSuccessAlert(true)
Expand Down
2 changes: 1 addition & 1 deletion middleware/browserDebug.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Middleware } from '@nuxt/types'

const browserDebug: Middleware = (context) => {
const browserDebug: Middleware = () => { // context
// Do not run on server
if (process.server) {
return
Expand Down
8 changes: 8 additions & 0 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,13 @@ module.exports = {

router: {
middleware: 'browserDebug'
},

typescript: {
typeCheck: {
eslint: {
files: './**/*.{ts,js,vue}'
}
}
}
}
79 changes: 69 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b539610

Please sign in to comment.