From f80bf346053e7287eb62e361359caebeb3a3c999 Mon Sep 17 00:00:00 2001
From: tykayn <contact@cipherbliss.com>
Date: Thu, 3 Dec 2020 15:23:41 +0100
Subject: [PATCH] light background on subscription pages steps

---
 .ncignore                                     |  1 +
 config/config.exs                             |  8 ++--
 js/src/common.scss                            | 39 +++++++++++++++++--
 .../components/Account/ProfileOnboarding.vue  |  4 +-
 js/src/variables.scss                         | 16 --------
 js/src/views/Search.vue                       |  4 +-
 js/src/views/User/ResendConfirmation.vue      |  4 +-
 js/src/views/User/SettingsOnboard.vue         |  3 +-
 8 files changed, 51 insertions(+), 28 deletions(-)
 create mode 100644 .ncignore

diff --git a/.ncignore b/.ncignore
new file mode 100644
index 000000000..3f9cfafd3
--- /dev/null
+++ b/.ncignore
@@ -0,0 +1 @@
+deps
diff --git a/config/config.exs b/config/config.exs
index 6f7490ec2..4e025669f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -13,13 +13,13 @@ config :mobilizon,
 config :mobilizon, Mobilizon.Storage.Repo, types: Mobilizon.Storage.PostgresTypes
 
 config :mobilizon, :instance,
-  name: "My Mobilizon Instance",
-  description: "Change this to a proper description of your instance",
+  name: "mobilizon du chapril",
+  description: "instance du chapril",
   hostname: "localhost",
-  registrations_open: false,
+  registrations_open: true,
   registration_email_allowlist: [],
   languages: [],
-  default_language: "en",
+  default_language: "fr",
   demo: false,
   repository: Mix.Project.config()[:source_url],
   allow_relay: true,
diff --git a/js/src/common.scss b/js/src/common.scss
index 4db69a4c1..031cd3c3a 100644
--- a/js/src/common.scss
+++ b/js/src/common.scss
@@ -8,6 +8,26 @@
 //   color: $violet-2;
 // }
 
+.title {
+  margin: 30px auto 45px;
+}
+
+.subtitle {
+  background: $secondary;
+  display: inline;
+  padding: 3px 8px;
+  margin: 15px auto 30px;
+}
+
+main > .container {
+  background: $body-background-color;
+  min-height: 70vh;
+}
+.step-content{
+  height: auto;
+}
+
+
 a.out,
 .content a,
 .ProseMirror a {
@@ -16,12 +36,25 @@ a.out,
   text-decoration-thickness: 2px;
 }
 
-// input.input {
-//   border-color: $input-border-color !important;
-// }
+main {
+  > section > .columns {
+    min-height: 50vh;
+  }
+  > section {
+    &.container {
+      min-height: 80vh;
+    }
+  }
+  > #homepage{
+    > .container{
+      min-height: 25vh;
+    }
+  }
+}
 
 .section {
   padding: 1rem 1% 4rem;
+
 }
 
 figure img.is-rounded {
diff --git a/js/src/components/Account/ProfileOnboarding.vue b/js/src/components/Account/ProfileOnboarding.vue
index 5f59e751d..de88947f9 100644
--- a/js/src/components/Account/ProfileOnboarding.vue
+++ b/js/src/components/Account/ProfileOnboarding.vue
@@ -40,8 +40,8 @@
           )
         }}
       </p>
-      <div class="has-text-centered">
-        <code>{{ `${currentActor.preferredUsername}@${domain}` }}</code>
+      <div class="has-text-centered has-text-primary has-background-success">
+        <pre>{{ `${currentActor.preferredUsername}@${domain}` }}</pre>
       </div>
     </div>
   </div>
diff --git a/js/src/variables.scss b/js/src/variables.scss
index 8013a456e..bed9ddf7d 100644
--- a/js/src/variables.scss
+++ b/js/src/variables.scss
@@ -108,11 +108,6 @@ $body-background-color: mix( $chapril_blue, #efeef4);
 $fullhd-enabled: false;
 $hero-body-padding-medium: 6rem 1.5rem;
 
-main > .container {
-  background: $body-background-color;
-  min-height: 70vh;
-}
-
 $title-color: $chapril_blue;
 $title-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
 serif;
@@ -129,17 +124,6 @@ $subtitle-size: 32px;
 $subtitle-sub-size: 30px;
 $subtitle-sup-size: 15px;
 
-.title {
-  margin: 30px auto 45px;
-}
-
-.subtitle {
-  background: $secondary;
-  display: inline;
-  padding: 3px 8px;
-  margin: 15px auto 30px;
-}
-
 //$input-border-color: #dbdbdb;
 $breadcrumb-item-color: $primary;
 $checkbox-background-color: #fff;
diff --git a/js/src/views/Search.vue b/js/src/views/Search.vue
index b175ff0d2..c28a79fc6 100644
--- a/js/src/views/Search.vue
+++ b/js/src/views/Search.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="section container">
-    <h1 class="title">{{ $t("Explore") }}</h1>
+    <h1 class="title">{{ $t("Explore") }} IN DEV MODE</h1>
     <section v-if="tag">
       <i18n path="Events tagged with {tag}">
         <b-tag slot="tag" type="is-light">{{ $t("#{tag}", { tag }) }}</b-tag>
@@ -348,6 +348,8 @@ export default class Search extends Vue {
   }
 
   get geohash(): string | undefined {
+    console.info("geohash location", this.location);
+
     if (this.location && this.location.geom) {
       const [lon, lat] = this.location.geom.split(";");
       return ngeohash.encode(lat, lon, 6);
diff --git a/js/src/views/User/ResendConfirmation.vue b/js/src/views/User/ResendConfirmation.vue
index 24b5dd54b..21a64d56e 100644
--- a/js/src/views/User/ResendConfirmation.vue
+++ b/js/src/views/User/ResendConfirmation.vue
@@ -76,11 +76,13 @@ export default class ResendConfirmation extends Vue {
     e.preventDefault();
     this.error = false;
 
+    console.log("this.credentials.email", this.credentials.email);
+    console.log("this.email", this.email);
     try {
       await this.$apollo.mutate({
         mutation: RESEND_CONFIRMATION_EMAIL,
         variables: {
-          email: this.credentials.email,
+          email: this.credentials.email || this.email,
         },
       });
     } catch (err) {
diff --git a/js/src/views/User/SettingsOnboard.vue b/js/src/views/User/SettingsOnboard.vue
index 713cda757..136c19c51 100644
--- a/js/src/views/User/SettingsOnboard.vue
+++ b/js/src/views/User/SettingsOnboard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="section container">
+  <div class="section container bg-white">
     <h1 class="title">{{ $t("Let's define a few settings") }}</h1>
     <b-steps v-model="realActualStepIndex" :has-navigation="false">
       <b-step-item step="1" :label="$t('Settings')">
@@ -87,6 +87,7 @@ export default class SettingsOnboard extends Vue {
 </script>
 <style scoped lang="scss">
 .section.container {
+  background: white;
   .has-text-centered.section.buttons {
     justify-content: center;
   }