tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

Multiple fixes

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2020-06-11 11:45:52 +02:00
parent fea721e5f9
commit da4ea84baf
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
7 changed files with 79 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/package.json
View file

@ -95,5 +95,9 @@
"vue-i18n-extract": "^1.0.2", "vue-i18n-extract": "^1.0.2",
"vue-template-compiler": "^2.6.11", "vue-template-compiler": "^2.6.11",
"webpack-cli": "^3.3.11" "webpack-cli": "^3.3.11"
},
"resolutions": {
"prosemirror-model": "1.9.1",
"prosemirror-state": "1.3.3"
} }
} }

43
js/public/index.html
View file

@ -1,23 +1,24 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="utf-8" /> <head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link rel="icon" href="<%= BASE_URL %>favicon.ico" /> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<title><%= htmlWebpackPlugin.options.title %></title> <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
<!-- <%= VUE_APP_INJECT_COMMENT %> --> <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
<meta name="server-injected-data" /> <!-- <%= VUE_APP_INJECT_COMMENT %> -->
</head> <meta name="server-injected-data" />
<body> </head>
<noscript>
<strong <body>
>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work <noscript>
properly without JavaScript enabled. Please enable it to <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
continue.</strong properly without JavaScript enabled. Please enable it to
> continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
</html>
</html>

2
js/src/components/Event/EventListCard.vue
View file

@ -98,7 +98,7 @@
>{{ $t("Edit") }}</b-button >{{ $t("Edit") }}</b-button
> >
</li> </li>
<li> <li v-if="participation.role === ParticipantRole.CREATOR">
<b-button <b-button
type="is-text" type="is-text"
@click=" @click="

3
js/src/components/SearchField.vue
View file

@ -1,8 +1,9 @@
<template> <template>
<label> <label for="navSearchField">
<span class="visually-hidden">{{ defaultPlaceHolder }}</span> <span class="visually-hidden">{{ defaultPlaceHolder }}</span>
<b-input <b-input
custom-class="searchField" custom-class="searchField"
id="navSearchField"
icon="magnify" icon="magnify"
type="search" type="search"
rounded rounded

33
js/src/views/About.vue
View file

@ -24,7 +24,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="container" id="mobilizon"> <div class="container">
<section> <section>
<div class="columns"> <div class="columns">
<div class="column has-text-left-desktop"> <div class="column has-text-left-desktop">
@ -46,7 +46,11 @@
/> />
</div> </div>
<div class="column has-text-right-desktop has-text-centered-mobile"> <div class="column has-text-right-desktop has-text-centered-mobile">
<img src="img/about/action-mobilizon.png" width="300" alt="" /> <img
src="img/about/action-mobilizon.png"
width="300"
:alt="$t('Organize and take action, freely')"
/>
</div> </div>
</div> </div>
</section> </section>
@ -81,7 +85,11 @@
</p> </p>
</div> </div>
<div class="column has-text-left-desktop has-text-centered-mobile"> <div class="column has-text-left-desktop has-text-centered-mobile">
<img src="img/about/common-mobilizon.png" width="300" alt="" /> <img
src="img/about/common-mobilizon.png"
width="300"
:alt="$t('Let\'s create a new common')"
/>
</div> </div>
</div> </div>
</section> </section>
@ -140,7 +148,11 @@
</i18n> </i18n>
</div> </div>
<div class="column has-text-right-desktop has-text-centered-mobile"> <div class="column has-text-right-desktop has-text-centered-mobile">
<img src="img/about/software-to-the-people-mobilizon.png" width="300" alt="" /> <img
src="img/about/software-to-the-people-mobilizon.png"
width="300"
:alt="('Software to the people')"
/>
</div> </div>
</div> </div>
</section> </section>
@ -162,7 +174,11 @@
</i18n> </i18n>
</div> </div>
<div class="column has-text-left-desktop has-text-centered-mobile"> <div class="column has-text-left-desktop has-text-centered-mobile">
<img src="img/about/concieved-mobilizon.png" width="300" alt="" /> <img
src="img/about/concieved-mobilizon.png"
width="300"
:alt="$t('Concieved with care for humans')"
/>
</div> </div>
</div> </div>
</section> </section>
@ -216,6 +232,12 @@ export default class About extends Vue {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../variables.scss"; @import "../variables.scss";
a:not(.button) {
padding: 0.3rem;
background: #ffd599;
color: #111;
}
.hero.is-primary .subtitle { .hero.is-primary .subtitle {
padding: 1rem; padding: 1rem;
display: block; display: block;
@ -267,6 +289,7 @@ section {
.blockquote-footer a { .blockquote-footer a {
color: #6c757d; color: #6c757d;
background: initial;
&:before { &:before {
content: "\2014\00A0"; content: "\2014\00A0";

22
js/src/views/Home.vue
View file

@ -30,6 +30,22 @@
</div> </div>
</div> </div>
</section> </section>
<div class="container section" v-if="config && (!currentUser.id || !currentActor.id)">
<section class="events-featured">
<h3 class="title">{{ $t("Featured events") }}</h3>
<b-loading :active.sync="$apollo.loading" />
<div v-if="filteredFeaturedEvents.length > 0" class="columns is-multiline">
<div
class="column is-one-third-desktop"
v-for="event in filteredFeaturedEvents.slice(0, 6)"
:key="event.uuid"
>
<EventCard :event="event" />
</div>
</div>
<b-message v-else type="is-danger">{{ $t("No events found") }}</b-message>
</section>
</div>
<div class="container section" v-if="config && loggedUser && loggedUser.settings"> <div class="container section" v-if="config && loggedUser && loggedUser.settings">
<section v-if="currentActor.id"> <section v-if="currentActor.id">
<b-message type="is-info" v-if="welcomeBack">{{ <b-message type="is-info" v-if="welcomeBack">{{
@ -299,7 +315,11 @@ export default class Home extends Vue {
*/ */
get filteredFeaturedEvents() { get filteredFeaturedEvents() {
return this.events.filter( return this.events.filter(
({ id }) => !this.currentUserParticipations.map(({ event: { id } }) => id).includes(id) ({ id }) =>
!this.currentUserParticipations
.filter((participation) => participation.role === ParticipantRole.CREATOR)
.map(({ event: { id } }) => id)
.includes(id)
); );
} }

9
js/yarn.lock
View file

@ -10963,20 +10963,13 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2:
prosemirror-state "^1.0.0" prosemirror-state "^1.0.0"
w3c-keyname "^2.2.0" w3c-keyname "^2.2.0"
prosemirror-model@1.9.1: prosemirror-model@1.9.1, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1:
version "1.9.1" version "1.9.1"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz#8c08cf556f593c5f015548d2c1a6825661df087f" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz#8c08cf556f593c5f015548d2c1a6825661df087f"
integrity sha512-Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q== integrity sha512-Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q==
dependencies: dependencies:
orderedmap "^1.1.0" orderedmap "^1.1.0"
prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1:
version "1.10.0"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.10.0.tgz#bb1101732bccacf336e23a36a8b045b865025fa2"
integrity sha512-xTMbbO2q4abs5lJdeRvk/SrftNfZlMdvChKziTiK+OKtP8LkQI8uw39u4S5zqyflrmW3Or6+qnyFPf1p4v2u1g==
dependencies:
orderedmap "^1.1.0"
prosemirror-schema-list@1.1.2: prosemirror-schema-list@1.1.2:
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.2.tgz#310809209094b03425da7f5c337105074913da6c" resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.2.tgz#310809209094b03425da7f5c337105074913da6c"