Switch off of unwalled.garden drive types

Author: pfrazee

app/bg/browser.js

@@ -89,7 +89,7 @@ export async function setup () {
   if (!defaultUser) {
     let drive = await hyper.drives.createNewDrive({
       title: 'Anonymous',
-      type: 'unwalled.garden/person'
+      type: 'user'
     })
     await drive.pda.writeFile('/thumb.jpg', await jetpack.cwd(__dirname).cwd('assets/img').readAsync('default-user-thumb.jpg', 'buffer'), 'binary')
     await users.add(drive.url, true)

app/bg/ui/tab-manager.js

@@ -272,7 +272,7 @@ class Tab {
   }
 
   get canFollow () {
-    return this.datInfo && this.datInfo.type === 'unwalled.garden/person' && !this.isMyProfile
+    return this.datInfo && !this.isMyProfile
   }
 
   get canInstall () {

app/bg/web-apis/bg/users.js

@@ -80,7 +80,7 @@ export default {
 
     // create new drive
     var drive = await hyper.drives.createNewDrive({
-      type: 'unwalled.garden/person',
+      type: 'user',
       title: opts.title,
       description: opts.description
     })
@@ -102,7 +102,7 @@ export default {
 
     // create new drive
     var drive = await hyper.drives.createNewDrive({
-      type: 'unwalled.garden/person',
+      type: 'user',
       title: 'Temporary User',
       description: 'Created ' + (new Date()).toLocaleString()
     })

app/lib/fs-template/.settings/type-registry.json

@@ -2,16 +2,16 @@
   "type": "type-registry",
   "driveTypes": [
     {
-      "id": "unwalled.garden/person",
-      "title": "Person"
+      "id": "user",
+      "title": "User"
     },
     {
       "id": "webterm.sh/cmd-pkg",
       "title": "Command Package"
     }
   ],
   "defaultDriveHandlers": {
-    "unwalled.garden/person": "system",
+    "user": "system",
     "webterm.sh/cmd-pkg": "system",
     "default": "system"
   }

app/userland/app-stdlib/js/strings.js

@@ -123,15 +123,15 @@ export function changeURLScheme (url = '', scheme = '') {
 
 export function toNiceDriveType (type = '') {
   if (!type) return 'files drive'
-  if (type === 'unwalled.garden/person') return 'beaker user'
-  if (type === 'unwalled.garden/template') return 'template'
+  if (type === 'webterm.sh/cmd-pkg') return 'webterm command'
   return type
 }
 
 export function getDriveTypeIcon (type = '') {
   switch (type) {
-    case 'unwalled.garden/person': return 'fas fa-user'
-    case 'unwalled.garden/template': return 'fas fa-drafting-compass'
+    case 'user': return 'fas fa-user'
+    case 'template': return 'fas fa-drafting-compass'
+    case 'webterm.sh/cmd-pkg': return 'fas fa-terminal'
     case 'module': return 'fas fa-cube'
     case 'website': return 'fas fa-desktop'
     default: return 'far fa-folder-open'

app/userland/explorer/js/com/sidebar/drive-info.js

@@ -50,7 +50,7 @@ export class DriveInfo extends LitElement {
           ${this.renderType()}
           ${this.renderSize()}
         </p>
-        ${this.driveInfo.type === 'unwalled.garden/person' ? html`
+        ${this.driveInfo.type === 'user' ? html`
           <div class="bottom-ctrls">
             ${this.driveInfo.url !== this.userUrl ? '' : html`
               <span class="label verified"><span class="fas fa-fw fa-check-circle"></span> My profile</span>
@@ -82,11 +82,11 @@ export class DriveInfo extends LitElement {
   }
 
   renderType () {
-    if (this.driveInfo.type === 'unwalled.garden/person') {
-      return html`<span><span class="fas fa-fw fa-user-circle"></span> Person</span>`
+    if (this.driveInfo.type === 'user') {
+      return html`<span><span class="fas fa-fw fa-user-circle"></span> User</span>`
     }
-    if (this.driveInfo.type === 'unwalled.garden/website') {
-      return html`<span><span class="far fa-fw fa-file-alt"></span> Website</span>`
+    if (this.driveInfo.type === 'website') {
+      return html`<span><span class="far fa-fw fa-desktop"></span> Website</span>`
     }
   }
 

app/userland/explorer/js/lib/files.js

@@ -8,18 +8,13 @@ const ICONS = {
     '/library/documents': 'fas fa-file-word',
     '/library/media': 'fas fa-photo-video',
     '/library/projects': 'fas fa-coffee',
-    '/system': 'fas fa-cog',
-    '/system/drives': 'fas fa-hdd',
-    '/system/templates': 'fas fa-drafting-compass',
-    '/system/webterm': 'fas fa-terminal'
+    '/system': 'fas fa-cog'
   },
-  person: {
+  common: {
     '/comments': 'fas fa-comment',
     '/follows': 'fas fa-user-friends',
     '/posts': 'fa fa-rss',
     '/votes': 'fas fa-vote-yea'
-  },
-  common: {
   }
 }
 
@@ -54,7 +49,7 @@ export function toSemanticItemGroups (items) {
   for (let i of items) {
     if (i.stat.mount && i.stat.mount.key) {
       switch (i.mount.type) {
-        case 'unwalled.garden/person': add('users', 'Users', i); break
+        case 'user': add('users', 'Users', i); break
         case 'website': add('websites', 'Websites', i); break
         case 'application': add('applications', 'Applications', i); break
         case 'webterm.sh/cmd-pkg': add('commands', 'Webterm Commands', i); break
@@ -80,8 +75,8 @@ export function toSemanticItemGroups (items) {
 export function getSubicon (driveKind, item) {
   if (driveKind === 'root') {
     return ICONS.root[item.realPath] || ICONS.common[item.realPath]
-  } else if (driveKind === 'person') {
-    return ICONS.person[item.realPath] || ICONS.common[item.realPath]
+  } else {
+    return ICONS.common[item.realPath] || ICONS.common[item.realPath]
   }
 }
 

app/userland/explorer/js/main.js

@@ -267,7 +267,7 @@ export class ExplorerApp extends LitElement {
   async readDirectory (drive) {
     let driveKind = ''
     if (this.currentDriveInfo.url === navigator.filesystem.url) driveKind = 'root'
-    if (this.currentDriveInfo.type === 'unwalled.garden/person') driveKind = 'person'
+    else driveKind = 'common'
 
     var items = await this.attempt(
       `Reading directory (${location.pathname})`,