Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modal content (fixes #113) #151

Merged
merged 36 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
9753360
modals
OtisRed Jul 24, 2019
5e2152e
merge master
OtisRed Jul 31, 2019
54545f8
added new child component
OtisRed Jul 31, 2019
a61796a
indefinite loop
OtisRed Aug 7, 2019
d34e67b
added hash
OtisRed Aug 7, 2019
fce6cd7
repaired modal
OtisRed Aug 8, 2019
0c33281
lint corrections
OtisRed Aug 8, 2019
4a15de2
unstylized modal
OtisRed Aug 15, 2019
a73b83a
rm of redundant code
OtisRed Aug 15, 2019
c0c4108
minors
OtisRed Aug 21, 2019
f0ae269
not sure, need to switch branch and don't wanna stash
OtisRed Aug 23, 2019
40acd61
working version
OtisRed Aug 24, 2019
89e6c28
Update Copyleft.svg
OtisRed Aug 24, 2019
ec913b9
minor changes
OtisRed Aug 24, 2019
b1d6d45
minor changesagain
OtisRed Aug 24, 2019
cf91822
Merge branch 'modal_content' of github.com:OtisRed/codeforpoznan.pl_v…
OtisRed Aug 24, 2019
fe579df
minors again
OtisRed Aug 24, 2019
53cd918
Merge branch 'master' into modal_content
OtisRed Aug 28, 2019
c114d80
minor change
OtisRed Aug 28, 2019
a2b650a
Merge branch 'master' into modal_content
OtisRed Aug 28, 2019
ebff826
working js file
OtisRed Nov 13, 2019
1941fb7
Merge branch 'master' into modal_content
OtisRed Nov 20, 2019
271298e
checkpoint
OtisRed Nov 20, 2019
2008e7f
close enough
OtisRed Nov 20, 2019
820e299
close enough after review
OtisRed Nov 20, 2019
db57167
different margins
OtisRed Nov 23, 2019
e965910
stack renaming
OtisRed Nov 23, 2019
4f48591
review changes
OtisRed Dec 4, 2019
ac2289b
small css fix
OtisRed Dec 4, 2019
ffb3fd2
checkingout commit
OtisRed Jan 15, 2020
8bad486
fixed button color
OtisRed Jan 15, 2020
9f691ae
Merge branch 'master' into modal_content
OtisRed Jan 15, 2020
8b7c658
minor adjustments
OtisRed Jan 15, 2020
afa1160
update
OtisRed Jan 22, 2020
8222dde
recent version
OtisRed Feb 5, 2020
49a77cc
final commit - solves grid problem
OtisRed Feb 8, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 180 additions & 0 deletions frontend/src/assets/projects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
const projects = [
{
description:
'Portal Volontulo powstał dla ludzi i organizacji skupionych wokół idei pomocy innym poprzez udział we wolontariacie. Celem projektu jest pomoc we wzajemnym odnalezieniu się ludzi, którzy chcą realizować się jako wolontariusze/szki oraz organizacji i instytucji, które takich osób poszukują. Podział na strefę "Wolontariusza" oraz "Strefę organizacji i instytucji" umożliwa użytkownikom zwinną nawigację na stronie.',
githubLink: 'https://github.com/CodeForPoznan/volontulo',
imageAdress: require('@/assets/images/volontulo.png'),
licenseName: 'MIT',
licensePage: 'https://pl.wikipedia.org/wiki/Licencja_MIT',
name: 'Volontulo',
partner: 'Wielkopolska Rada Koordynacyjna',
partnerPage: 'https://centrum.wrk.org.pl/',
stack: [
{
type: 'Frontend',
name: 'Angular',
version: '2.0',
documentation: 'https://angular.io/'
},
{
type: 'Backend',
name: 'Django',
version: '2.2',
documentation: 'https://docs.djangoproject.com/en/2.2/'
}
],
websiteLink: 'http://volontuloapp.org/o'
},
{
description: '',
githubLink: '',
image: '',
license: '',
licensePage: '',
name: 'Fleet Manager',
partner: '',
partnerPage: '',
stack: [
{
type: 'Frontend',
name: '',
version: '',
documentation: ''
},
{
type: 'Backend',
name: '',
version: '',
documentation: ''
}
],
website: ''
},
{
description: '',
githubLink: '',
image: '',
license: '',
licensePage: '',
name: 'Alinka',
partner: '',
partnerPage: '',
stack: [
{
type: 'Frontend',
name: '',
version: '',
documentation: ''
},
{
type: 'Backend',
name: '',
version: '',
documentation: ''
}
],
website: ''
},
{
description: '',
githubLink: '',
image: '',
license: '',
licensePage: '',
name: 'Bank Empatii',
partner: '',
partnerPage: '',
stack: [
{
type: 'Frontend',
name: '',
version: '',
documentation: ''
},
{
type: 'Backend',
name: '',
version: '',
documentation: ''
}
],
website: ''
},
{
description: '',
githubLink: '',
image: '',
license: '',
licensePage: '',
name: 'StreetMix',
partner: '',
partnerPage: '',
stack: [
{
type: 'Frontend',
name: '',
version: '',
documentation: ''
},
{
type: 'Backend',
name: '',
version: '',
documentation: ''
}
],
website: ''
},
{
description: '',
githubLink: '',
image: '',
license: '',
licensePage: '',
name: 'Wysadź ulicę',
partner: '',
partnerPage: '',
stack: [
{
type: 'Frontend',
name: '',
version: '',
documentation: ''
},
{
type: 'Backend',
name: '',
version: '',
documentation: ''
}
],
website: ''
},
{
description: '',
githubLink: '',
image: '',
license: '',
licensePage: '',
name: 'Strona społeczności',
partner: '',
partnerPage: '',
stack: [
{
type: 'Frontend',
name: '',
version: '',
documentation: ''
},
{
type: 'Backend',
name: '',
version: '',
documentation: ''
}
],
website: ''
}
];

export default projects;
183 changes: 183 additions & 0 deletions frontend/src/components/ModalContent.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
<template>
<v-card>
<v-card-title class="title-header">
<v-row>
<p class="modal-title">{{ selectedProject.name }}</p>
<v-card-actions>
<v-btn
class="mr-2"
absolute
fab
rounded
icon
large
right
@click="onClick()"
>
<v-icon size="3.5rem" color="white">close</v-icon>
</v-btn>
</v-card-actions>
</v-row>
</v-card-title>
<v-card-actions>
<div class="buttons-list">
<v-row>
<v-btn
class="buttons"
text
rounded
large
:href="selectedProject.licensePage"
target="_blank"
>
<v-icon>far fa-copyright</v-icon>
<p class="buttons--text">
Licencja {{ selectedProject.licenseName }}
</p>
</v-btn>
<v-btn
class="buttons"
text
rounded
large
:href="selectedProject.githubLink"
target="_blank"
>
<v-icon>fab fa-github</v-icon>
<p class="buttons--text">Repozytorium</p>
</v-btn>
<v-btn
class="buttons"
text
rounded
large
:href="selectedProject.websiteLink"
target="_blank"
>
<v-icon>language</v-icon>
<p class="buttons--text">Strona projektu</p>
</v-btn>
<v-btn
class="buttons"
text
rounded
large
:href="selectedProject.partnerPage"
target="_blank"
>
<v-icon>fas fa-handshake</v-icon>
<p class="buttons--text">Strona partnera</p>
</v-btn>
</v-row>
</div>
</v-card-actions>
<div class="text-list">
<v-row>
<p class="modal-subtitle">Partner projektu:</p>
<p class="modal-subtitle">{{ selectedProject.partner }}</p>
</v-row>
</div>
<div class="text-list">
<v-row>
<p class="content-black">{{ selectedProject.description }}</p>
</v-row>
</div>
<div class="text-list">
<v-row>
<p class="modal-subtitle">Wykorzystane technologie:</p>
</v-row>
</div>
<v-card-actions>
<div class="buttons-list">
<v-row>
<v-btn
v-for="(item, index) in selectedProject.stack"
:key="index"
:href="item.documentation"
class="stack-list"
target="_blank"
text
rounded
>
{{ item.type }}: {{ item.name }} {{ item.version }}
</v-btn>
</v-row>
</div>
</v-card-actions>
</v-card>
</template>

<script>
export default {
props: ['selectedProject'],
methods: {
onClick() {
this.$root.$emit('close');
}
}
};
</script>

<style lang="scss" scoped>
@import './../main.scss';

OtisRed marked this conversation as resolved.
Show resolved Hide resolved
a {
text-transform: none;
}

.buttons-list {
margin: 0.5rem 2rem;
}

.text-list {
margin: 0.25rem 3rem;
}

.buttons {
margin: 0.5rem;
}

.buttons--text {
display: flex;
align-content: center;
margin: 0.5rem;
}

.content-black {
color: black;
text-align: justify;
}

.modal-title {
display: flex;
align-content: center;
font-family: $font-header;
font-size: 3rem;
padding: 2rem 0;
color: $white;
margin: 0.5rem 0 0 2rem;
}

.modal-subtitle {
color: black;
font-family: $font-content;
font-size: 1.5rem;
font-weight: bold;
line-height: 1.43;
margin: 0.5rem 0rem;
}

.stack-list {
background-color: $blue;
color: $white;
margin: 0.5rem;
}

.text-row {
padding: 1px;
}

.title-header {
background: $blue;
}
</style>
Loading