diff --git a/.gitignore b/.gitignore
index da8c3986e..ba435e214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,9 @@ erl_crash.dump
/config/*.secret.exs
.env.production
+.env.test
.env
+.env.2
setup_db.psql
diff --git a/config/config.exs b/config/config.exs
index 5626222b5..bc8ddeba9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -16,6 +16,7 @@ config :mobilizon, :instance,
hostname: System.get_env("MOBILIZON_INSTANCE_HOST") || "localhost",
registrations_open: System.get_env("MOBILIZON_INSTANCE_REGISTRATIONS_OPEN") || false,
repository: Mix.Project.config()[:source_url],
+ allow_relay: true,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
@@ -109,6 +110,9 @@ config :auto_linker,
config :phoenix, :format_encoders, json: Jason, "activity-json": Jason
config :phoenix, :json_library, Jason
+config :http_signatures,
+ adapter: Mobilizon.Service.HTTPSignatures.Signature
+
config :mobilizon, Mobilizon.Service.Geospatial.Nominatim,
endpoint:
System.get_env("GEOSPATIAL_NOMINATIM_ENDPOINT") || "https://nominatim.openstreetmap.org",
diff --git a/config/dev.exs b/config/dev.exs
index b438a25b3..21c109e0b 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -11,7 +11,9 @@ config :mobilizon, MobilizonWeb.Endpoint,
port: System.get_env("MOBILIZON_INSTANCE_PORT") || 4000
],
url: [
- host: System.get_env("MOBILIZON_INSTANCE_HOST") || "mobilizon.local"
+ host: System.get_env("MOBILIZON_INSTANCE_HOST") || "mobilizon.local",
+ port: 80,
+ scheme: "http"
],
debug_errors: true,
code_reloader: true,
diff --git a/js/package.json b/js/package.json
index 3250a61dc..cd35133be 100644
--- a/js/package.json
+++ b/js/package.json
@@ -56,6 +56,7 @@
"chai": "^4.2.0",
"dotenv-webpack": "^1.7.0",
"eslint": "^6.0.1",
+ "graphql-cli": "^3.0.12",
"node-sass": "^4.11.0",
"patch-package": "^6.1.2",
"sass-loader": "^7.1.0",
diff --git a/js/src/App.vue b/js/src/App.vue
index 2be5576e2..5f6d14d7f 100644
--- a/js/src/App.vue
+++ b/js/src/App.vue
@@ -98,6 +98,7 @@ export default class App extends Vue {
@import "~buefy/src/scss/components/tag";
@import "~buefy/src/scss/components/taginput";
@import "~buefy/src/scss/components/upload";
+@import "~buefy/src/scss/components/radio";
.router-enter-active,
.router-leave-active {
diff --git a/js/src/api/_entrypoint.ts b/js/src/api/_entrypoint.ts
index ff2558d33..16de19cd8 100644
--- a/js/src/api/_entrypoint.ts
+++ b/js/src/api/_entrypoint.ts
@@ -5,7 +5,7 @@
*
* Example: framameet.org
*/
-export const MOBILIZON_INSTANCE_HOST = process.env.MOBILIZON_INSTANCE_HOST;
+export const MOBILIZON_INSTANCE_HOST = window.location.hostname;
/**
* URL on which the API is. "/api" will be added at the end
@@ -14,7 +14,7 @@ export const MOBILIZON_INSTANCE_HOST = process.env.MOBILIZON_INSTANCE_HOST;
*
* Example: https://framameet.org
*/
-export const GRAPHQL_API_ENDPOINT = process.env.GRAPHQL_API_ENDPOINT;
+export const GRAPHQL_API_ENDPOINT = window.location.origin;
/**
* URL with path on which the API is. Replaces GRAPHQL_API_ENDPOINT if used
@@ -23,4 +23,4 @@ export const GRAPHQL_API_ENDPOINT = process.env.GRAPHQL_API_ENDPOINT;
*
* Example: https://framameet.org/api
*/
-export const GRAPHQL_API_FULL_PATH = process.env.GRAPHQL_API_FULL_PATH;
+export const GRAPHQL_API_FULL_PATH = `${window.location.origin}/api`;
diff --git a/js/src/components/Account/ActorLink.vue b/js/src/components/Account/ActorLink.vue
new file mode 100644
index 000000000..94ca6839a
--- /dev/null
+++ b/js/src/components/Account/ActorLink.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/js/src/graphql/event.ts b/js/src/graphql/event.ts
index 48ad5381f..3779894bd 100644
--- a/js/src/graphql/event.ts
+++ b/js/src/graphql/event.ts
@@ -51,6 +51,7 @@ export const FETCH_EVENT = gql`
preferredUsername,
domain,
name,
+ url,
},
# attributedTo {
# avatar {
@@ -141,11 +142,12 @@ export const CREATE_EVENT = gql`
$title: String!,
$description: String!,
$organizerActorId: ID!,
- $category: String!,
+ $category: String,
$beginsOn: DateTime!,
$picture: PictureInput,
$tags: [String],
- $physicalAddress: AddressInput!
+ $physicalAddress: AddressInput,
+ $visibility: EventVisibility
) {
createEvent(
title: $title,
@@ -155,7 +157,8 @@ export const CREATE_EVENT = gql`
category: $category,
picture: $picture,
tags: $tags,
- physicalAddress: $physicalAddress
+ physicalAddress: $physicalAddress,
+ visibility: $visibility
) {
id,
uuid,
@@ -172,7 +175,7 @@ export const EDIT_EVENT = gql`
$title: String!,
$description: String!,
$organizerActorId: Int!,
- $category: String!
+ $category: String
) {
EditEvent(title: $title, description: $description, organizerActorId: $organizerActorId, category: $category) {
uuid
diff --git a/js/src/types/event.model.ts b/js/src/types/event.model.ts
index 50f1eda79..841e092bb 100644
--- a/js/src/types/event.model.ts
+++ b/js/src/types/event.model.ts
@@ -53,7 +53,7 @@ export interface IEvent {
title: string;
slug: string;
description: string;
- category: Category;
+ category: Category|null;
beginsOn: Date;
endsOn: Date;
diff --git a/js/src/views/Event/Create.vue b/js/src/views/Event/Create.vue
index 0de44411e..2a0954ed7 100644
--- a/js/src/views/Event/Create.vue
+++ b/js/src/views/Event/Create.vue
@@ -6,6 +6,11 @@
Loading...
-
+
-