mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Merge branch 'master' into 4732-Put-Footer-Content-In-The-Menu-On-Mobil-Phones
This commit is contained in:
commit
f399fa11a1
2
.github/ISSUE_TEMPLATE.md
vendored
2
.github/ISSUE_TEMPLATE.md
vendored
@ -1,3 +1,5 @@
|
|||||||
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Please take a look at the issue templates at https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/new/choose
|
Please take a look at the issue templates at https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/new/choose
|
||||||
before submitting a new issue. Following one of the issue templates will ensure maintainers can route your request efficiently.
|
before submitting a new issue. Following one of the issue templates will ensure maintainers can route your request efficiently.
|
||||||
|
|||||||
11
.github/ISSUE_TEMPLATE/bug_report.md
vendored
11
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -1,11 +1,10 @@
|
|||||||
---
|
---
|
||||||
name: "\U0001F41B Bug Report"
|
name: 🐛 Bug report
|
||||||
about: Create a report to help us to improve.
|
about: Create a report to help us improve
|
||||||
title: "\U0001F41B [Bug] XXX"
|
|
||||||
labels: bug
|
labels: bug
|
||||||
assignees: ''
|
title: 🐛 [Bug]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
## :bug: Bug Report
|
## 🐛 Bugreport
|
||||||
<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
|
<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
|
||||||
|
|||||||
11
.github/ISSUE_TEMPLATE/devops_ticket.md
vendored
11
.github/ISSUE_TEMPLATE/devops_ticket.md
vendored
@ -1,11 +1,10 @@
|
|||||||
---
|
---
|
||||||
name: "\U0001F4A5 DevOps Ticket"
|
name: 💥 DevOps ticket
|
||||||
about: Help us manage our deployed app.
|
about: Help us manage our deployed Software.
|
||||||
title: "\U0001F4A5 [DevOps] XXX"
|
|
||||||
labels: devops
|
labels: devops
|
||||||
assignees: ''
|
title: 💥 [DevOps]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
## 💥 DevOps Ticket
|
## 💥 DevOps ticket
|
||||||
<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
|
<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
|
||||||
|
|||||||
12
.github/ISSUE_TEMPLATE/epic.md
vendored
12
.github/ISSUE_TEMPLATE/epic.md
vendored
@ -1,15 +1,13 @@
|
|||||||
---
|
---
|
||||||
name: "\U0001F31F Epic"
|
name: 🌟 Epic
|
||||||
about: Define a big development step.
|
about: Define a big development Step
|
||||||
title: "\U0001F31F [EPIC] XXX"
|
|
||||||
labels: epic
|
labels: epic
|
||||||
assignees: ''
|
title: 🌟 [EPIC]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
<!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
|
<!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
|
||||||
<!-- If you need an answer right away, visit the ocelot.social Discord:
|
<!-- Proceed only if you know what you are doing - have a chat with Project's Team first -->
|
||||||
https://discord.gg/AJSX9DCSUA -->
|
|
||||||
|
|
||||||
## 🌟 EPIC
|
## 🌟 EPIC
|
||||||
<!-- Describe your Epic in detail. Include screenshots and drawings -->
|
<!-- Describe your Epic in detail. Include screenshots and drawings -->
|
||||||
|
|||||||
11
.github/ISSUE_TEMPLATE/feature_request.md
vendored
11
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@ -1,11 +1,10 @@
|
|||||||
---
|
---
|
||||||
name: "\U0001F680 Feature Request"
|
name: 🚀 Feature request
|
||||||
about: Suggest an idea for this project.
|
about: Suggest an idea for this project
|
||||||
title: "\U0001F680 [Feature] XXX"
|
|
||||||
labels: feature
|
labels: feature
|
||||||
assignees: ''
|
title: 🚀 [Feature]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
## :rocket: Feature Request
|
## 🚀 Feature
|
||||||
<!-- Give a short summary of the Feature. Use Screenshots if you want. -->
|
<!-- Give a short summary of the Feature. Use Screenshots if you want. -->
|
||||||
|
|||||||
14
.github/ISSUE_TEMPLATE/question.md
vendored
14
.github/ISSUE_TEMPLATE/question.md
vendored
@ -1,15 +1,13 @@
|
|||||||
---
|
---
|
||||||
name: "\U0001F4AC Question"
|
name: 💬 Question
|
||||||
about: If you need help understanding ocelot.social.
|
about: If you need help understanding our Software.
|
||||||
title: "\U0001F4AC [Question] XXX"
|
|
||||||
labels: question
|
labels: question
|
||||||
assignees: ''
|
title: 💬 [Question]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
<!-- Chat with ocelot.social team -->
|
<!-- Question the project's team -->
|
||||||
<!-- If you need an answer right away, visit the ocelot.social Discord:
|
<!-- If you need an answer right away, consider to take other means of communication with the project's team -->
|
||||||
https://discord.gg/AJSX9DCSUA -->
|
|
||||||
|
|
||||||
## 💬 Question
|
## 💬 Question
|
||||||
<!-- Describe your Question in detail. Include screenshots and drawings if needed. -->
|
<!-- Describe your Question in detail. Include screenshots and drawings if needed. -->
|
||||||
|
|||||||
@ -1,11 +1,10 @@
|
|||||||
---
|
---
|
||||||
name: "\U0001F527 Refactor"
|
name: 🔧 Refactor ticket
|
||||||
about: Help us improve our code by refactoring it.
|
about: Help us improve our code by refactoring it.
|
||||||
title: "\U0001F527 [Refactor] XXX"
|
|
||||||
labels: refactor
|
labels: refactor
|
||||||
assignees: ''
|
title: 🔧 [Refactor]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
## 🔧 Refactor
|
## 🔧 Refactor ticket
|
||||||
<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
|
<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
|
||||||
13
.github/ISSUE_TEMPLATE/release.md
vendored
Normal file
13
.github/ISSUE_TEMPLATE/release.md
vendored
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
---
|
||||||
|
name: 🎂 Release
|
||||||
|
about: Define a Release
|
||||||
|
labels: release
|
||||||
|
title: 🎂 [RELEASE]
|
||||||
|
---
|
||||||
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
|
<!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
|
||||||
|
<!-- Proceed only if you know what you are doing - have a chat with Project's Team first -->
|
||||||
|
|
||||||
|
## 🎂 RELEASE
|
||||||
|
<!-- Describe your Release in detail. Include screenshots and drawings -->
|
||||||
14
.github/PULL_REQUEST_TEMPLATE.md
vendored
14
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,15 +1,15 @@
|
|||||||
## 🍰 Pull Request
|
<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
|
||||||
|
|
||||||
|
## 🍰 Pullrequest
|
||||||
<!-- Describe the Pullrequest. Use Screenshots if possible. -->
|
<!-- Describe the Pullrequest. Use Screenshots if possible. -->
|
||||||
|
|
||||||
XXX
|
|
||||||
|
|
||||||
### Issues
|
### Issues
|
||||||
<!-- Which Issues does this fix, which are related? -->
|
<!-- Which Issues does this fix, which are related?
|
||||||
|
|
||||||
- fixes #XXX
|
- fixes #XXX
|
||||||
- relates #XXX
|
- relates #XXX
|
||||||
|
-->
|
||||||
|
- None
|
||||||
|
|
||||||
### Todo
|
### Todo
|
||||||
<!-- In case some parts are still missing, list them here. -->
|
<!-- In case some parts are still missing, list them here. -->
|
||||||
|
- [X] None
|
||||||
- [ ] XXX list here …
|
|
||||||
|
|||||||
@ -3,6 +3,15 @@
|
|||||||
export default {
|
export default {
|
||||||
LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
|
LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
|
||||||
LOGO_HEADER_WIDTH: '130px',
|
LOGO_HEADER_WIDTH: '130px',
|
||||||
|
LOGO_HEADER_CLICK: {
|
||||||
|
externalLink: null,
|
||||||
|
internalPath: {
|
||||||
|
to: {
|
||||||
|
name: 'index',
|
||||||
|
},
|
||||||
|
scrollTo: '.main-navigation',
|
||||||
|
},
|
||||||
|
},
|
||||||
LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg',
|
LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg',
|
||||||
LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg',
|
LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg',
|
||||||
LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg',
|
LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg',
|
||||||
|
|||||||
@ -7,7 +7,17 @@
|
|||||||
<ds-flex v-if="!showMobileMenu" class="main-navigation-flex">
|
<ds-flex v-if="!showMobileMenu" class="main-navigation-flex">
|
||||||
<!-- logo -->
|
<!-- logo -->
|
||||||
<ds-flex-item :width="{ base: LOGOS.LOGO_HEADER_WIDTH }" style="margin-right: 20px">
|
<ds-flex-item :width="{ base: LOGOS.LOGO_HEADER_WIDTH }" style="margin-right: 20px">
|
||||||
<nuxt-link :to="{ name: 'index' }" v-scroll-to="'.main-navigation'">
|
<a
|
||||||
|
v-if="LOGOS.LOGO_HEADER_CLICK.externalLink"
|
||||||
|
:href="LOGOS.LOGO_HEADER_CLICK.externalLink"
|
||||||
|
>
|
||||||
|
<logo logoType="header" />
|
||||||
|
</a>
|
||||||
|
<nuxt-link
|
||||||
|
v-else
|
||||||
|
:to="LOGOS.LOGO_HEADER_CLICK.internalPath.to"
|
||||||
|
v-scroll-to="LOGOS.LOGO_HEADER_CLICK.internalPath.scrollTo"
|
||||||
|
>
|
||||||
<logo logoType="header" />
|
<logo logoType="header" />
|
||||||
</nuxt-link>
|
</nuxt-link>
|
||||||
</ds-flex-item>
|
</ds-flex-item>
|
||||||
@ -207,34 +217,34 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import Logo from '~/components/Logo/Logo'
|
import { mapGetters } from 'vuex'
|
||||||
import LOGOS from '../constants/logos.js'
|
import LOGOS from '../constants/logos.js'
|
||||||
import headerMenu from '../constants/headerMenu.js'
|
import headerMenu from '../constants/headerMenu.js'
|
||||||
import { mapGetters } from 'vuex'
|
import seo from '~/mixins/seo'
|
||||||
|
import AvatarMenu from '~/components/AvatarMenu/AvatarMenu'
|
||||||
|
import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
|
||||||
|
import InviteButton from '~/components/InviteButton/InviteButton'
|
||||||
import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
|
import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
|
||||||
|
import Logo from '~/components/Logo/Logo'
|
||||||
import SearchField from '~/components/features/SearchField/SearchField.vue'
|
import SearchField from '~/components/features/SearchField/SearchField.vue'
|
||||||
import Modal from '~/components/Modal'
|
import Modal from '~/components/Modal'
|
||||||
import NotificationMenu from '~/components/NotificationMenu/NotificationMenu'
|
import NotificationMenu from '~/components/NotificationMenu/NotificationMenu'
|
||||||
import seo from '~/mixins/seo'
|
|
||||||
import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
|
|
||||||
import PageFooter from '~/components/PageFooter/PageFooter'
|
import PageFooter from '~/components/PageFooter/PageFooter'
|
||||||
import AvatarMenu from '~/components/AvatarMenu/AvatarMenu'
|
|
||||||
import InviteButton from '~/components/InviteButton/InviteButton'
|
|
||||||
import links from '~/constants/links.js'
|
import links from '~/constants/links.js'
|
||||||
import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
|
import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
Logo,
|
|
||||||
LocaleSwitch,
|
|
||||||
SearchField,
|
|
||||||
Modal,
|
|
||||||
NotificationMenu,
|
|
||||||
AvatarMenu,
|
AvatarMenu,
|
||||||
FilterMenu,
|
FilterMenu,
|
||||||
PageFooter,
|
|
||||||
InviteButton,
|
InviteButton,
|
||||||
|
LocaleSwitch,
|
||||||
|
Logo,
|
||||||
|
Modal,
|
||||||
|
NotificationMenu,
|
||||||
|
PageFooter,
|
||||||
PageParamsLink,
|
PageParamsLink,
|
||||||
|
SearchField,
|
||||||
},
|
},
|
||||||
mixins: [seo],
|
mixins: [seo],
|
||||||
data() {
|
data() {
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
<ds-grid-item v-if="showDonations" class="top-info-bar" :row-span="1" column-span="fullWidth">
|
<ds-grid-item v-if="showDonations" class="top-info-bar" :row-span="1" column-span="fullWidth">
|
||||||
<donation-info :goal="goal" :progress="progress" />
|
<donation-info :goal="goal" :progress="progress" />
|
||||||
</ds-grid-item>
|
</ds-grid-item>
|
||||||
<!-- newsfeed -->
|
<!-- news feed -->
|
||||||
<template v-if="hasResults">
|
<template v-if="hasResults">
|
||||||
<masonry-grid-item
|
<masonry-grid-item
|
||||||
v-for="post in posts"
|
v-for="post in posts"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user