Skip to content

Commit

Permalink
conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
Bansal0527 committed Aug 30, 2023
2 parents b0fdfb9 + b8ed222 commit 1fd63d9
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 97 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Build and Deploy
on:
push:
branches:
- vue

jobs:
build-and-deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout 🛎️
uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2
with:
node-version: '16'

- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
${{ runner.os }}-
- name: Install and Build 🔧
run: |
npm ci --legacy-peer-deps
npm run build
- name: Deploy 🚀
uses: JamesIves/[email protected]
with:
branch: gh-deployment
folder: dist # The build folder
target-folder: './' # This ensures the contents of dist are pushed to the root
clean: true
token: ${{ secrets.GITHUB_TOKEN }}
105 changes: 54 additions & 51 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"core-js": "^3.6.4",
"node-sass": "^7.0.1",
"node-sass": "^7.0.3",
"vue": "^2.6.11",
"vue-router": "^3.1.6",
"vuetify": "^2.2.11"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footer.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template lang="pug">
v-card.elevation-24
v-card.elevation-24
v-footer(color="basic" padless)
v-row(justify="center" no-gutters)
v-btn.mt-1.px-6(v-for="link in links" :key="link" :href="link.href" color="white" icon)
Expand Down
5 changes: 2 additions & 3 deletions src/components/Podcastcard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ v-layout(row='' wrap='')
</template>
<script>
export default {
name: "Podcastcard",
name: "Podcastcard",
props: {
podcast: {type: Object , required: true}
podcast: { type: Object, required: true }
}
};
</script>
16 changes: 8 additions & 8 deletions src/components/ProfileCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ v-row(justify='left')
v-row
v-col(cols="4" style="background-color:#fff")
v-avatar(:size="(4.5/15)*getProfileWidth")
img(:src="Profile[5]" contain)
img(:src="Profile.src" contain)
v-col.pa-2(cols="7")
div
h4.mt-1.mb-n2 {{ Profile[1] }}
h4.mt-1.mb-n2 {{ Profile.name }}
v-row.justify-center
v-col
h6 {{ Profile[2] }} | {{Profile[3] }}
h6 {{ Profile.currentDesignation }} | {{Profile.devlupDesignation }}
v-row(align="center" justify="center")
v-btn(color='red',:href="Profile[6]",target='_blank',v-if='Profile[6]' icon small)
v-btn(color='red',:href="Profile.linkemail",target='_blank',v-if='Profile.linkemail' icon small)
v-icon(color='red') mdi-email
v-btn(color='black',:href="Profile[7]",target='_blank',v-if='Profile[7]' icon small)
v-btn(color='black',:href="Profile.linkgithub",target='_blank',v-if='Profile.linkgithub' icon small)
v-icon(color='black') mdi-github
v-btn(color='orange',:href="Profile[8]",target='_blank',v-if='Profile[8]' icon small)
v-btn(color='orange',:href="Profile.linkgitlab",target='_blank',v-if='Profile.linkgitlab' icon small)
v-icon(color='orange') mdi-gitlab
v-btn(color='blue',:href="Profile[9]",target='_blank',v-if='Profile[9]' icon small)
v-btn(color='blue',:href="Profile.linklinkedin",target='_blank',v-if='Profile.linklinkedin' icon small)
v-icon(color='blue') mdi-linkedin
v-col(cols="1")
v-icon.ml-n4.mt-8(@click="pageNo = 2" color="#1b65c4") mdi-chevron-right
Expand All @@ -42,7 +42,7 @@ v-row(justify='left')
v-row.justify-center.align-center
v-col(cols="1")
v-icon.mx-1(@click="pageNo = 1" color="#1b65c4") mdi-chevron-left
v-col.mb-2(cols="11") {{ Profile[4] }}
v-col.mb-2(cols="11") {{ Profile.info }}
</template>
<script>
export default {
Expand Down
33 changes: 17 additions & 16 deletions src/components/ProjectCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,32 @@
v-row(align='center', justify='left')
v-flex
v-card.pa-2.elevation-6(:width='0.9*getProjectHeight', hover='hover')
h2(underline='underline') {{ Project[1] }}
h2(underline='underline') {{ Project.name }}
v-carousel(hide-delimiters='hide-delimiters', :height='0.5*getProjectHeight', show-arrows-on-hover='show-arrows-on-hover')
v-carousel-item(v-if='Project[9]',contain='contain', :src='Project[9]')
v-carousel-item(v-if='Project[10]',contain='contain', :src='Project[10]')
v-carousel-item(v-if='Project[11]',contain='contain', :src='Project[11]')
v-carousel-item(v-if='Project.image1',contain='contain', :src='Project.image1')
v-carousel-item(v-if='Project.image2',contain='contain', :src='Project.image2')
v-carousel-item(v-if='Project.image3',contain='contain', :src='Project.image3')
v-card(flat='flat')
h5.pa-1.d-inline-blocktext-truncate(style='height:50px') {{ Project[2] }}
v-divider
v-row.justify-end.align-center
v-divider.ml-7
v-btn.pa-0.mr-2(icon='icon', @click='show = !show')
v-icon.pa-0.ma-0 {{ show ? 'mdi-chevron-up' : 'mdi-chevron-down' }}
v-flex.pa-1
v-chip.pa-2.ma-1(v-if='Project[6]',label='label', small='small') {{ Project[6] }}
v-chip.pa-2.ma-1(v-if='Project[7]',label='label', small='small') {{ Project[7] }}
v-chip.pa-2.ma-1(v-if='Project[8]',label='label', small='small') {{ Project[8] }}
v-btn(icon='icon', @click='show = !show')
v-icon {{ show ? 'mdi-chevron-up' : 'mdi-chevron-down' }}
v-chip.pa-2.ma-1(v-if='Project.tag1',label='label', small='small') {{ Project.tag1 }}
v-chip.pa-2.ma-1(v-if='Project.tag2',label='label', small='small') {{ Project.tag2 }}
v-chip.pa-2.ma-1(v-if='Project.tag3',label='label', small='small') {{ Project.tag3 }}
v-expand-transition
div(v-show='show')
h6.pa-1 {{ Project[3] }}
h6.pa-1 {{ Project.info }}
v-row.justify-space-around
v-col(cols='5', v-if='Project[4]')
v-btn.ml-1.mr-1(:href='Project[4]',target='_blank', dark='dark', block='block')
v-col(cols='5', v-if='Project.info')
v-btn.ml-1.mr-1(:href='Project.info',target='_blank', dark='dark', block='block')
v-icon mdi-github
v-col(cols='5', v-if='Project[5]')
v-btn.ml-1.mr-1(:href='Project[5]',target='_blank', block='block')
v-col(cols='5', v-if='Project.weblink')
v-btn.ml-1.mr-1(:href='Project.weblink',target='_blank', block='block')
v-icon mdi-web

</template>

<script>
Expand Down
Loading

0 comments on commit 1fd63d9

Please sign in to comment.