fixed onboarding bugs and enabled it by default

src/config/onboarding.py

@@ -38,22 +38,26 @@ def set_config_from_onboarding(config_settings: OnboardingConfig):
 
     get = _get_val_or_none
 
+    config.reload()
+
     if get(config_settings, 'stateTarget') or not get(config_settings,
-                                                      'networkContribution'):
+                                                      'networkContrib'):
         config.set('general.security_level', 1)
 
     config.set('ui.theme', 'light')
     if get(config_settings, 'useDark'):
         config.set('ui.theme', 'dark')
 
-    if not get(config_settings,
-               'useCircles') or config.get('general.security_level') > 0:
-        config.set('plugins.disabled',
-                   config.get('plugins.disabled', []).append('flow'))
+    disabled = config.get('plugins.disabled', [])
 
-    if not get(config_settings, 'useMail'):
-        config.set('plugins.disabled',
-                   config.get('plugins.disabled', []).append('pms'))
+    if not get(config_settings, 'circles') or \
+            config.get('general.security_level') > 0:
+        disabled.append('flow')
+
+    if not get(config_settings, 'mail'):
+        disabled.append('pms')
+
+    config.set('plugins.disabled', disabled)
 
     config.set('general.store_plaintext_blocks',
                get(config_settings, 'plainContrib'))

src/etc/onionrvalues.py

@@ -53,7 +53,7 @@ MAX_NEW_PEER_QUEUE = 1000
 """Make announce take a few seconds (on average) to compute to discourage excessive node announcements"""
 ANNOUNCE_POW = 6
 """30 days is plenty of time for someone to decide to renew a block"""
-DEFAULT_EXPIRE = 300
+DEFAULT_EXPIRE = 2592000
 # Metadata header section length limits, in bytes
 BLOCK_METADATA_LENGTHS = {'meta': 1000, 'sig': 200, 'signer': 200, 'time': 10, 'pow': 1000, 'encryptType': 4, 'expire': 14}
 

static-data/default_config.json

@@ -35,7 +35,7 @@
         "verbosity": "default"
     },
     "onboarding": {
-        "done": true
+        "done": false
     },
     "peers": {
         "max_connect": 1000,
@@ -43,8 +43,8 @@
         "minimum_score": -100
     },
     "plugins": {
-        "disabled": {},
-        "enabled": {}
+        "disabled": [],
+        "enabled": []
     },
     "timers": {
         "getBlocks": 10,

static-data/www/onboarding/index.html

@@ -61,7 +61,6 @@
                 </div>
             </div>
         </div>
-        </div>
     </section>
 
     <br>
@@ -78,6 +77,8 @@
         </div>
     </div>
 
+    <div class="columns">
+        <div class="column">
             <div class="onboarding">
                 <noscript><h1>Unfortunately, this requires JavaScript. Don't worry, all scripts are open source and locally loaded.</h1></noscript>
                 <p>Welcome. There are just a few questions for you to answer before you get started.</p>
@@ -107,8 +108,9 @@
                         <div>
                             I want to...
                         </div>
-                <i class="icon fas fa-user"></i> <input type="checkbox" name="useDeterministic"> <label for="useDeterministic">Use a seed to re(generate) a user ID</label>
+                        <!--<i class="icon fas fa-user"></i> <input type="checkbox" name="useDeterministic"> <label for="useDeterministic">Use a seed to re(generate) a user ID</label>
                         <br>
+                        -->
                         <i class="icon fas fa-envelope"></i> <input type="checkbox" name="useMail" checked> <label for="useMail">Use OnionrMail</label>
                         <br>
                         <i class="icon fas fa-comments"></i> <input type="checkbox" name="useCircles" checked> <label for="useMail">Use Circles (message board system)</label>
@@ -122,6 +124,8 @@
                     <br><br>
                 </form>
             </div>
+        </div>
+    </div>
 
 </body>
 </html>

static-data/www/onboarding/onboarding.css

@@ -8,7 +8,7 @@ img{
 .onboarding{
     padding-left: 5%;
     text-align: justify;
-    font-size: 1.5em;
+    font-size: 1.8em;
 }
 
 .icon{

static-data/www/onboarding/onboarding.js

@@ -52,7 +52,7 @@ document.getElementById('onboardingForm').onsubmit = function(e){
     submitInfo.networkContrib = getCheckValue('networkContribution')
     submitInfo.plainContrib = getCheckValue('networkContributionPlain')
     submitInfo.donate = getCheckValue('donate')
-    submitInfo.deterministic = getCheckValue('useDeterministic')
+    //submitInfo.deterministic = getCheckValue('useDeterministic')
     submitInfo.mail = getCheckValue('useMail')
     submitInfo.circles = getCheckValue('useCircles')
     submitInfo.useDark = getCheckValue('useDarkTheme')

tests/runtime-result.txt

@@ -1 +1 @@
-1580689731
+1580770843