push

src/components/Footer.vue

@@ -67,36 +67,48 @@
       <div class="modal-card" style="width: auto">
         <header class="modal-card-head">
           <p class="modal-card-title">{{ $t("languages.title") }}</p>
-          <b-button
+          <button
-              type="is-info"
+              type="button"
               class="delete"
               @click="langModal = false"
-          ></b-button>
+          ></button>
         </header>
         <section class="modal-card-body buttons">
-          <b-button v-if="$i18n.locale !== 'en'" @click="en" class="is-large">{{
-              $t("languages.en")
-            }}</b-button>
           <b-button
-              v-if="$i18n.locale === 'en'"
+              @click="lang('en')"
-              @click="en"
+              class="is-large"
-              class="is-large is-info disabled"
+              :disabled="$i18n.locale === 'en'"
-              disabled
           >{{ $t("languages.en") }}</b-button
           >
           <b-button
-              v-if="$i18n.locale === 'wind'"
+              @click="lang('fr')"
-              @click="en"
+              class="is-large"
-              class="is-large is-info disabled"
+              :disabled="$i18n.locale === 'fr'"
-              disabled
+          >{{ $t("languages.fr") }}</b-button
-          >{{ $t("languages.wind") }}</b-button
           >
           <b-button
-              v-if="$i18n.locale === 'debug'"
+              @click="lang('ru')"
-              @click="en"
+              class="is-large"
-              class="is-large is-info disabled"
+              :disabled="$i18n.locale === 'ru'"
-              disabled
+          >{{ $t("languages.ru") }}</b-button
-          >{{ $t("languages.debug") }}</b-button
+          >
+          <b-button
+              @click="lang('nl')"
+              class="is-large"
+              :disabled="$i18n.locale === 'nl'"
+          >{{ $t("languages.nl") }}</b-button
+          >
+          <b-button
+              @click="lang('zh-cn')"
+              class="is-large"
+              :disabled="$i18n.locale === 'zh-cn'"
+          >{{ $t("languages.zh-cn") }}</b-button
+          >
+          <b-button
+              @click="lang('zh-tw')"
+              class="is-large"
+              :disabled="$i18n.locale === 'zh-tw'"
+          >{{ $t("languages.zh-tw") }}</b-button
           >
         </section>
       </div>
@@ -176,16 +188,8 @@ export default {
             this.feedback.loading = false;
           });
     },
-    en() {
+    lang(lang) {
-      this.$i18n.locale = "en";
+      this.$i18n.locale = lang;
-      this.setLang();
-    },
-    debug() {
-      this.$i18n.locale = "debug";
-      this.setLang();
-    },
-    wind() {
-      this.$i18n.locale = "wind";
       this.setLang();
     },
     setLang() {

src/components/Navbar.vue

@@ -291,7 +291,7 @@
           <div v-if="!loading">
             <b-navbar-item v-if="!$store.state.user.username" tag="div">
               <div class="buttons">
-                <b-button @click="registerModal = true" class="button is-primary">
+                <b-button tag="router-link" to="/register" class="button is-primary">
                   <strong>{{ $t("navbar.register") }}</strong>
                 </b-button>
                 <b-button @click="loginModal = true" class="button is-light">

src/locales/debug.json

@@ -1,3 +0,0 @@
-{
-  "message": "hello i18n !!"
-}

src/locales/en.json

@@ -257,7 +257,7 @@
       "devMode": "Developer Mode"
     },
     "security": {
-      "title": "Security",
+      "title": "Account & Security",
       "password": {
         "title": "Changing your password",
         "oldPassword": "Please enter your existing password",
@@ -296,7 +296,12 @@
   "languages": {
     "title": "Locale Selector",
     "en": "English",
+    "nl": "Nederlands",
     "wind": "Windspeak",
+    "fr": "Français",
+    "zh-cn": "简体中文",
+    "zh-tw": "繁體中文",
+    "ru": "русский",
     "debug": "Debug"
   },
   "admin": {
@@ -361,7 +366,8 @@
         "dark": "Dark",
         "amoled": "AMOLED",
         "highContrast": "High Contrast",
-        "theme": "Select your preferred theme:"
+        "theme": "Select your preferred theme:",
+        "themeWarning": "Themes are currently coming soon, your selected theme will apply when they are added."
       },
       "finishing": {
         "home": "Start using Kaverti"

src/locales/fr.json

@@ -144,8 +144,8 @@
   "404": {
     "title": "404 Introuvable",
     "text": "Oh non! Vous avez probablement entré l'adresse incorrectement",
-    "quoteText": "There is currently 2900 WIND quotes available", //what the fuck?
+    "quoteText": "There is currently 2900 WIND quotes available",
-    "windQuote": "WIND Quote", //what the fuck?
+    "windQuote": "WIND Quote",
     "home": "Retour à l'accueil"
   },
   "debug": {
@@ -257,7 +257,7 @@
       "devMode": "Mode développeur"
     },
     "security": {
-      "title": "Sécurité",
+      "title": "Compte et sécurité",
       "password": {
         "title": "Changement de votre mot de passe",
         "oldPassword": "Veuillez entrer votre mot de passe actuel",
@@ -339,7 +339,7 @@
   "feedback": {
     "title": "Feedback pour le site",
     "email": "Votre email:",
-    "route": "Page pour laquelle vous voulez soumettre votre avis:", // now that's something I have no idea what it means
+    "route": "Page pour laquelle vous voulez soumettre votre avis:",
     "rating": "Cote",
     "text": "Comment pouvons-nous nous améliorer?",
     "submit": "Soumettre"

src/locales/ru.json

@@ -1 +1,393 @@
-DON'T TOUCH
+{
+  "login": {
+    "title": "Login to Kaverti",
+    "login": "Login",
+    "loginPassword": "Please enter your password",
+    "loginUsername": "Please enter your username or email",
+    "doNotSaveAuth": "Do not save token to browser (will be logged out when refreshed)",
+    "register": "Don't have an account?"
+  },
+  "register": {
+    "title": "Register to Kaverti",
+    "text": "Register",
+    "username": "Please enter your username",
+    "email": "Please enter your valid email",
+    "password": "Please enter a secure password",
+    "confirm": "Please re-enter the secure password",
+    "login": "Already have a Kaverti account?",
+    "agree": "Do you agree to the "
+  },
+  "teams": {
+    "createTeam": "Create Team",
+    "joinTeam": "Join Team",
+    "join": "Join",
+    "invite": "Invite",
+    "viewPermissions": "View role permissions",
+    "devBanner": "Teams are currently in development, expect missing features.",
+    "view": "View",
+    "viewTeam": "View Team",
+    "memberRoles": "Members and Roles",
+    "members": "Members",
+    "roles": "Roles",
+    "items": "Created Items",
+    "foundedAt": "Team was founded at",
+    "teamWall": "Team Wall",
+    "teamWallText": "'s Team Wall",
+    "verified": "Verified Team",
+    "admin": {
+      "text": "Team Administration",
+      "nav": {
+        "general": "General",
+        "roles": "Roles",
+        "members": "Members",
+        "privacy": "Privacy",
+        "invites": "Invites",
+        "forum": "Forum",
+        "verification": "Verification"
+      },
+      "general": {
+        "title": "General",
+        "name": "Name",
+        "description": "Description",
+        "saveTeam": "Save Team",
+        "modifyPicture": "Modify Team avatar"
+      },
+      "roles": {
+        "title": "Roles",
+        "addRole": "Add Role",
+        "saveOrder": "Save role order",
+        "modifying": "Modifying",
+        "name": "Chosen role name",
+        "permissions": "Permissions",
+        "creating": "Creating a role"
+      },
+      "members": {
+        "title": "Members",
+        "modifyRoles": "Modify user roles",
+        "removeAllRoles": "Remove all roles from user"
+      },
+      "privacy": {
+        "title": "Team Privacy",
+        "teamWall": "Opt out of team walls",
+        "disallowForum": "Disallow anyone from viewing/creating on your Team Forum"
+      },
+      "invites": {
+        "title": "Invites",
+        "code": "Code",
+        "uses": "Uses",
+        "maxUses": "Max Uses",
+        "createdBy": "Created by",
+        "date": "Date",
+        "delete": "Delete selected",
+        "generate": "Generate invite"
+      },
+      "invite": {
+        "title": "Invite people to",
+        "amountUses": "Amount of uses (0 is Unlimited)",
+        "role": "Please select a role for the user to be auto assigned (optional)",
+        "refresh": "Refresh",
+        "inviteURL": "Invite URL",
+        "domain": "https://kaverti.com/invite/"
+      }
+    },
+    "permissionTypes": {
+      "inviteUsers": "Invite users",
+      "administrator": "Administrator",
+      "modifyRoles": "Modify roles/permissions/users",
+      "modifyTeamSettings": "Modify team settings",
+      "teamForum": "Modify team forum configuration",
+      "forumModerator": "Forum moderation permissions",
+      "forumAdmin": "Forum administrator",
+      "submitMarketplace": "Submit Marketplace items",
+      "priorityValue": "Set priority value"
+    }
+  },
+  "navbar": {
+    "home": "Home",
+    "forums": "Forums",
+    "marketplace": "Marketplace",
+    "downloads": "Downloads",
+    "games": "Games",
+    "users": "Users",
+    "teams": "Teams",
+    "dev": {
+      "title": "Developer Options",
+      "fakeUser": "Fake User Auth",
+      "debug": "Debug Page",
+      "brokenRoute": "Enable broken (disabled) routes"
+    },
+    "user": {
+      "title": "Unknown",
+      "profile": "My Profile",
+      "creations": "My Creations",
+      "downloads": "Downloads",
+      "avatar": "My Avatar",
+      "transactions": "Transactions",
+      "settings": "Settings",
+      "logout": "Logout",
+      "admin": "Admin",
+      "asset": "Item Upload",
+      "friends": "Friends"
+    },
+    "more": {
+      "title": "More",
+      "twitter": "Twitter",
+      "discord": "Discord",
+      "roadmap": "Roadmap",
+      "documentation": "API Docs",
+      "stats": "Kaverti Stats",
+      "blog": "Kaverti Blog"
+    },
+    "register": "Register",
+    "login": "Login"
+  },
+  "404": {
+    "title": "404 Not Found",
+    "text": "Oh uh! You must've entered the address wrong!",
+    "quoteText": "There is currently 2900 WIND quotes available",
+    "windQuote": "WIND Quote",
+    "home": "Go Home"
+  },
+  "debug": {
+    "title": "Debug mode enabled",
+    "authUser": "Authenticated user",
+    "state": "State dump",
+    "userState": "User state dump",
+    "token": "Auth token in state",
+    "disable": "Disable debug options",
+    "auth": "Test authentication"
+  },
+  "errors": {
+    "authFail": "Request failed, you are not authenticated. (Is API blocked?)",
+    "devBuild": "Warning: You are using a development build of Kaverti, expect instabilities.",
+    "disableDebug": "Debug mode disabled, you will no longer have access to development features until you refresh.",
+    "authSuccess": "Request successful, your token is valid, and the Kaverti server instance is running correctly.",
+    "login": "You have been logged into Kaverti.",
+    "down": "There has appeared to be an issue communicating with Kaverti, please try again later.",
+    "canaryBuild": "You are using the Canary client, if you are expecting a stable experience, please use the regular one on Kaverti.com.",
+    "logout": "You have been logged out of Kaverti.",
+    "register": "You have been registered to Kaverti, Welcome!",
+    "emailVerify": "Please verify your email to get full access to Kaverti!",
+    "outdated": "You are using an outdated version of Kaverti, please refresh.",
+    "insecure": "You are accessing Kaverti insecurely, authentication features will be disabled for security.",
+    "verifySent": "Email address verification email has been sent!"
+  },
+  "generic": {
+    "name": "Kaverti",
+    "loading": "Loading",
+    "noItemsConnection": "Please check your internet connection, or try again later.",
+    "noItemsStart": "There are no",
+    "noItemsEnd": "to display.",
+    "adminOnly": "Only users with admin are allowed to navigate to this route.",
+    "notLoggedIn": "You have to login to access this route."
+  },
+  "relationships": {
+    "pending": "Cancel Friend Request",
+    "notFriends": "Send Friend Request",
+    "pendingCanAccept": "Accept Friend Request",
+    "accepted": "Remove friend"
+  },
+  "modifyUser": {
+    "title": "Modify User",
+    "text": "Modify user badges"
+  },
+  "home": {
+    "globalWall": "Global Wall",
+    "news": "Kaverti News"
+  },
+  "badges": {
+    "admin": "Admin",
+    "bot": "Bot",
+    "add": "+",
+    "system": "System",
+    "banned": "Banned",
+    "hidden": "Hidden",
+    "booster": "Discord Booster"
+  },
+  "user": {
+    "title": "Loading",
+    "about": "About",
+    "more": "More of",
+    "posts": "Posts",
+    "threads": "Threads",
+    "inventory": "Inventory",
+    "awards": "Awards",
+    "items": "Items",
+    "wall": "User Wall",
+    "description": "Description",
+    "created": "Registered at",
+    "defaultDesc": "Hi, I'm ",
+    "marketplace": "Published items",
+    "relationships": "Friends",
+    "wearing": "Wearing",
+    "inventoryTab": {
+      "buyNow": "Buy now for ",
+      "was": "was",
+      "unavailable": "Item is unavailable",
+      "noItems": "This user doesn't have any items in their inventory yet!",
+      "onSale": "Item is on sale"
+    }
+  },
+  "stats": {
+    "title": "Stats",
+    "users": "Registered users",
+    "purchased": "Purchased items",
+    "items": "Uploaded items",
+    "posts": "Forum posts",
+    "threads": "Threads",
+    "teams": "Teams"
+  },
+  "settings": {
+    "title": "User Settings",
+    "menu": {
+      "general": "General",
+      "security": "Account & Security",
+      "experiments": "Experiments",
+      "about": "About",
+      "title": "Settings"
+    },
+    "general": {
+      "title": "General",
+      "about": "About",
+      "description": "Description",
+      "hi": "Hi, I'm",
+      "saveDesc": "Save Description",
+      "savePref": "Save Preferences",
+      "preferences": "Preferences",
+      "devMode": "Developer Mode"
+    },
+    "security": {
+      "title": "Security",
+      "password": {
+        "title": "Changing your password",
+        "oldPassword": "Please enter your existing password",
+        "newPassword": "Please enter your new desired password",
+        "newPasswordConfirm": "Please re-enter your desired password",
+        "change": "Change password (You will be logged out)"
+      },
+      "email": {
+        "title": "Change email address",
+        "newEmail": "Enter your new email address",
+        "change": "Change",
+        "verified": "Email Verified: ",
+        "verifiedTrue": "Yes",
+        "verifiedFalse": "No",
+        "current": "Your email is: "
+      },
+      "resend": {
+        "resend": "Resend Email Verification"
+      },
+      "session": {
+        "title": "Invalidate all sessions",
+        "subtitle": "Using this feature will log you out of all devices, including this one!",
+        "invalidate": "Invalidate sessions"
+      }
+    },
+    "privacy": {
+      "title": "Privacy"
+    },
+    "experiments": {
+      "title": "Experiments"
+    },
+    "about": {
+      "title": "About"
+    }
+  },
+  "languages": {
+    "title": "Locale Selector",
+    "en": "English",
+    "nl": "Nederlands",
+    "wind": "Windspeak",
+    "fr": "Français",
+    "zh-cn": "简体中文",
+    "zh-tw": "繁體中文",
+    "ru": "русский",
+    "debug": "Debug"
+  },
+  "admin": {
+    "title": "Kaverti Admin",
+    "dashboard": "Dashboard (SOON)",
+    "uploadItem": "Create Hat",
+    "executive": {
+      "title": "Executive Staff",
+      "soon": "(SOON)"
+    }
+  },
+  "marketplace": {
+    "hats": "Hats",
+    "faces": "Faces",
+    "shirts": "Shirts",
+    "pants": "Pants",
+    "collections": "Collections",
+    "moreInfo": "More info",
+    "filter": "Filters",
+    "search": "Search the Marketplace"
+  },
+  "update": {
+    "title": "Changelog for new update"
+  },
+  "marketplaceItem": {
+    "moreInfo": "Information and Stats",
+    "price": "Price",
+    "originalPrice": "Original Price",
+    "creator": "The Creator"
+  },
+  "friends": {
+    "pendingCanAccept": "Requests to you",
+    "pending": "Requests from you",
+    "accepted": "Accepted requests"
+  },
+  "feedback": {
+    "title": "Route Feedback",
+    "email": "Email we can get back to you with:",
+    "route": "Route you are providing feedback for:",
+    "rating": "Rating",
+    "text": "How can we improve?",
+    "submit": "Submit"
+  },
+  "guided": {
+    "registration": {
+      "title": "Welcome to Kaverti",
+      "desc": "Let's get started...",
+      "account": "Account",
+      "information": "Info",
+      "customization": "Customization",
+      "finish": "Finish",
+      "continue": "Continue",
+      "init": {
+        "login": "Login"
+      },
+      "info": {
+        "description": "Your chosen description:",
+        "placeholder": "Say something interesting about yourself."
+      },
+      "customize": {
+        "light": "Light",
+        "dark": "Dark",
+        "amoled": "AMOLED",
+        "highContrast": "High Contrast",
+        "theme": "Select your preferred theme:"
+      },
+      "finishing": {
+        "home": "Start using Kaverti"
+      }
+    },
+    "tCreate": {
+    }
+  },
+  "avatar": {
+    "reRender": "Re-render avatar",
+    "hats": "Hats",
+    "faces": "Faces",
+    "shirts": "Shirts",
+    "pants": "Pants",
+    "collections": "Collections",
+    "debug": "Debug"
+  },
+  "currency": "Koins",
+  "close": "Cancel",
+  "tos": "Terms of Service",
+  "gotIt": "Got it!",
+  "OK": "OK",
+  "errorModalTitle": "Something went wrong..."
+}

src/store/index.js

@@ -24,7 +24,8 @@ export default new Vuex.Store({
             development: window.location.hostname === 'dev.kaverti.flowinity' || window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1',
             secure: window.location.protocol === "https:",
             domain: window.location.hostname,
-            buildDate: process.env.VUE_APP_BUILD_DATE
+            buildDate: process.env.VUE_APP_BUILD_DATE,
+            lang: 'debug'
         },
         errors: {
             errors: null,
@@ -189,6 +190,9 @@ export default new Vuex.Store({
             state.user.koins = 0
             state.user.id = 0
         },
+        setLang(state, value) {
+            state.client.lang = value
+        }
     },
     actions: {},
     modules: {}

src/views/Home.vue

@@ -16,7 +16,6 @@
                 "
                 alt="Avatar"
                 class="is-centered"
-                width="50%"
               />
             </div>
             <div class="title">

src/views/Register.vue

@@ -86,6 +86,7 @@
             <div class="columns is-centered">
               <div class="column">
                 <div class="box">
+                  <h2 class="subtitle has-text-centered">{{ $t('guided.registration.customize.themeWarning') }}</h2>
                   <h2 class="subtitle has-text-centered">{{ $t('guided.registration.customize.theme') }}</h2>
                   <div class="buttons">
                     <b-button :loading="register.customization.loading" @click="doTheme('light')" size="is-large" expanded class="is-light">{{$t('guided.registration.customize.light')}}</b-button>