diff --git a/website/client/assets/images/community-guidelines/backCorner.png b/website/client/assets/images/community-guidelines/backCorner.png new file mode 100755 index 0000000000..bcbeca3a43 Binary files /dev/null and b/website/client/assets/images/community-guidelines/backCorner.png differ diff --git a/website/client/assets/images/community-guidelines/beingHabitican.png b/website/client/assets/images/community-guidelines/beingHabitican.png new file mode 100755 index 0000000000..dc4d7c810c Binary files /dev/null and b/website/client/assets/images/community-guidelines/beingHabitican.png differ diff --git a/website/client/assets/images/community-guidelines/consequences.png b/website/client/assets/images/community-guidelines/consequences.png new file mode 100755 index 0000000000..211607a511 Binary files /dev/null and b/website/client/assets/images/community-guidelines/consequences.png differ diff --git a/website/client/assets/images/community-guidelines/contributing.png b/website/client/assets/images/community-guidelines/contributing.png new file mode 100755 index 0000000000..8e8a34c088 Binary files /dev/null and b/website/client/assets/images/community-guidelines/contributing.png differ diff --git a/website/client/assets/images/community-guidelines/github.gif b/website/client/assets/images/community-guidelines/github.gif new file mode 100755 index 0000000000..4f4326217d Binary files /dev/null and b/website/client/assets/images/community-guidelines/github.gif differ diff --git a/website/client/assets/images/community-guidelines/infractions.png b/website/client/assets/images/community-guidelines/infractions.png new file mode 100755 index 0000000000..2a839083af Binary files /dev/null and b/website/client/assets/images/community-guidelines/infractions.png differ diff --git a/website/client/assets/images/community-guidelines/intro.png b/website/client/assets/images/community-guidelines/intro.png new file mode 100644 index 0000000000..9c364f41cd Binary files /dev/null and b/website/client/assets/images/community-guidelines/intro.png differ diff --git a/website/client/assets/images/community-guidelines/moderators.png b/website/client/assets/images/community-guidelines/moderators.png new file mode 100644 index 0000000000..de6a8ce514 Binary files /dev/null and b/website/client/assets/images/community-guidelines/moderators.png differ diff --git a/website/client/assets/images/community-guidelines/publicGuilds.png b/website/client/assets/images/community-guidelines/publicGuilds.png new file mode 100755 index 0000000000..e783fb88de Binary files /dev/null and b/website/client/assets/images/community-guidelines/publicGuilds.png differ diff --git a/website/client/assets/images/community-guidelines/publicSpaces.png b/website/client/assets/images/community-guidelines/publicSpaces.png new file mode 100755 index 0000000000..13662443ff Binary files /dev/null and b/website/client/assets/images/community-guidelines/publicSpaces.png differ diff --git a/website/client/assets/images/community-guidelines/restoration.png b/website/client/assets/images/community-guidelines/restoration.png new file mode 100755 index 0000000000..0a2db14d8b Binary files /dev/null and b/website/client/assets/images/community-guidelines/restoration.png differ diff --git a/website/client/assets/images/community-guidelines/staff.png b/website/client/assets/images/community-guidelines/staff.png new file mode 100644 index 0000000000..1a870ae056 Binary files /dev/null and b/website/client/assets/images/community-guidelines/staff.png differ diff --git a/website/client/assets/images/community-guidelines/tavern.png b/website/client/assets/images/community-guidelines/tavern.png new file mode 100755 index 0000000000..dc5b879483 Binary files /dev/null and b/website/client/assets/images/community-guidelines/tavern.png differ diff --git a/website/client/assets/images/community-guidelines/trello.png b/website/client/assets/images/community-guidelines/trello.png new file mode 100755 index 0000000000..402f7f7edd Binary files /dev/null and b/website/client/assets/images/community-guidelines/trello.png differ diff --git a/website/client/assets/images/community-guidelines/wiki.png b/website/client/assets/images/community-guidelines/wiki.png new file mode 100755 index 0000000000..0aaa3121f5 Binary files /dev/null and b/website/client/assets/images/community-guidelines/wiki.png differ diff --git a/website/client/assets/images/marketing/android_iphone.png b/website/client/assets/images/marketing/android_iphone.png new file mode 100644 index 0000000000..3256b4a668 Binary files /dev/null and b/website/client/assets/images/marketing/android_iphone.png differ diff --git a/website/client/assets/images/marketing/animals.png b/website/client/assets/images/marketing/animals.png new file mode 100644 index 0000000000..ecae556c6e Binary files /dev/null and b/website/client/assets/images/marketing/animals.png differ diff --git a/website/client/assets/images/marketing/challenge.png b/website/client/assets/images/marketing/challenge.png new file mode 100644 index 0000000000..1b83b16b0f Binary files /dev/null and b/website/client/assets/images/marketing/challenge.png differ diff --git a/website/client/assets/images/marketing/devices.png b/website/client/assets/images/marketing/devices.png new file mode 100644 index 0000000000..8981ff8875 Binary files /dev/null and b/website/client/assets/images/marketing/devices.png differ diff --git a/website/client/assets/images/marketing/drops.png b/website/client/assets/images/marketing/drops.png new file mode 100644 index 0000000000..2324e26eac Binary files /dev/null and b/website/client/assets/images/marketing/drops.png differ diff --git a/website/client/assets/images/marketing/education.png b/website/client/assets/images/marketing/education.png new file mode 100644 index 0000000000..b8c330419f Binary files /dev/null and b/website/client/assets/images/marketing/education.png differ diff --git a/website/client/assets/images/marketing/gear.png b/website/client/assets/images/marketing/gear.png new file mode 100644 index 0000000000..ef6bad6beb Binary files /dev/null and b/website/client/assets/images/marketing/gear.png differ diff --git a/website/client/assets/images/marketing/guild.png b/website/client/assets/images/marketing/guild.png new file mode 100644 index 0000000000..bbd66b3020 Binary files /dev/null and b/website/client/assets/images/marketing/guild.png differ diff --git a/website/client/assets/images/marketing/guild_small.png b/website/client/assets/images/marketing/guild_small.png new file mode 100644 index 0000000000..28ab8fbea3 Binary files /dev/null and b/website/client/assets/images/marketing/guild_small.png differ diff --git a/website/client/assets/images/marketing/integration.png b/website/client/assets/images/marketing/integration.png new file mode 100644 index 0000000000..290c5dc302 Binary files /dev/null and b/website/client/assets/images/marketing/integration.png differ diff --git a/website/client/assets/images/marketing/lefnire.png b/website/client/assets/images/marketing/lefnire.png new file mode 100644 index 0000000000..657dc1eaf5 Binary files /dev/null and b/website/client/assets/images/marketing/lefnire.png differ diff --git a/website/client/assets/images/marketing/screenshot.png b/website/client/assets/images/marketing/screenshot.png new file mode 100644 index 0000000000..eb3ba9a385 Binary files /dev/null and b/website/client/assets/images/marketing/screenshot.png differ diff --git a/website/client/assets/images/marketing/social_competitive.png b/website/client/assets/images/marketing/social_competitive.png new file mode 100644 index 0000000000..3243a9d762 Binary files /dev/null and b/website/client/assets/images/marketing/social_competitive.png differ diff --git a/website/client/assets/images/marketing/vice3.png b/website/client/assets/images/marketing/vice3.png new file mode 100644 index 0000000000..afc5020526 Binary files /dev/null and b/website/client/assets/images/marketing/vice3.png differ diff --git a/website/client/assets/images/marketing/wellness.png b/website/client/assets/images/marketing/wellness.png new file mode 100644 index 0000000000..c91d295fc2 Binary files /dev/null and b/website/client/assets/images/marketing/wellness.png differ diff --git a/website/client/assets/scss/static.scss b/website/client/assets/scss/static.scss new file mode 100644 index 0000000000..ef542c8b7d --- /dev/null +++ b/website/client/assets/scss/static.scss @@ -0,0 +1,26 @@ +@import '~client/assets/scss/colors.scss'; + +.container-fluid { + margin: 5em 2em 0 2em; +} + +h1, h2 { + margin-top: 0.5em; + color: $purple-200; +} + +h3, h4 { + color: $purple-200; +} + +li, p { + font-size: 16px; +} + +.media img { + margin: 1em; +} + +.strong { + font-weight: bold; +} diff --git a/website/client/components/static/clearBrowserData.vue b/website/client/components/static/clearBrowserData.vue index 50edf7230b..e420858c7f 100644 --- a/website/client/components/static/clearBrowserData.vue +++ b/website/client/components/static/clearBrowserData.vue @@ -1,37 +1,55 @@ + + diff --git a/website/client/components/static/communityGuidelines.vue b/website/client/components/static/communityGuidelines.vue index 1eb3245a4f..4d11d3ebac 100644 --- a/website/client/components/static/communityGuidelines.vue +++ b/website/client/components/static/communityGuidelines.vue @@ -1,114 +1,75 @@ - diff --git a/website/client/components/static/features.vue b/website/client/components/static/features.vue index 861c0d61c7..a052168e3c 100644 --- a/website/client/components/static/features.vue +++ b/website/client/components/static/features.vue @@ -1,105 +1,115 @@ + + + + diff --git a/website/client/components/static/header.vue b/website/client/components/static/header.vue new file mode 100644 index 0000000000..ba1bd42ef8 --- /dev/null +++ b/website/client/components/static/header.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/website/common/locales/en/communityGuidelines.json b/website/common/locales/en/communityGuidelines.json index 7d040a6d1c..e36e3327d4 100644 --- a/website/common/locales/en/communityGuidelines.json +++ b/website/common/locales/en/communityGuidelines.json @@ -15,7 +15,7 @@ "commGuideList01D": "A Respectful Manner. We all have different backgrounds, different skill sets, and different opinions. That's part of what makes our community so wonderful! Habiticans respect these differences and celebrate them. Stick around, and soon you will have friends from all walks of life.", "commGuideHeadingMeet": "Meet the Staff and Mods!", - "commGuidePara006": "Habitica has some tireless knight-errants who join forces with the staff members to keep the community calm, contented, and free of trolls. Each has a specific domain, but will sometimes be called to serve in other social spheres. Staff and Mods will often precede official statements with the words \"Mod Talk\" or \"Mod Hat On\".", + "commGuidePara006": "Habitica has some tireless knights-errant who join forces with the staff members to keep the community calm, contented, and free of trolls. Each has a specific domain, but will sometimes be called to serve in other social spheres. Staff and Mods will often precede official statements with the words \"Mod Talk\" or \"Mod Hat On\".", "commGuidePara007": "Staff have purple tags marked with crowns. Their title is \"Heroic\".", "commGuidePara008": "Mods have dark blue tags marked with stars. Their title is \"Guardian\". The only exception is Bailey, who, as an NPC, has a black and green tag marked with a star.", "commGuidePara009": "The current Staff Members are (from left to right):", @@ -97,7 +97,7 @@ "commGuideList04H": "Ensuring that wiki content is relevant to the whole site of Habitica and not pertaining to a particular guild or party (such information can be moved to the forums)", "commGuidePara049": "The following people are the current wiki administrators:", "commGuidePara049A": "The following moderators can make emergency edits in situations where a moderator is needed and the above admins are unavailable:", - "commGuidePara018": "Wiki Administrators Emeritus are", + "commGuidePara018": "Wiki Administrators Emeritus are:", "commGuideHeadingInfractionsEtc": "Infractions, Consequences, and Restoration", "commGuideHeadingInfractions": "Infractions", "commGuidePara050": "Overwhelmingly, Habiticans assist each other, are respectful, and work to make the whole community fun and friendly. However, once in a blue moon, something that a Habitican does may violate one of the above guidelines. When this happens, the Mods will take whatever actions they deem necessary to keep Habitica safe and comfortable for everyone.", @@ -175,7 +175,7 @@ "commGuidePara068": "Now go forth, brave adventurer, and slay some Dailies!", "commGuideHeadingLinks": "Useful Links", "commGuidePara069": "The following talented artists contributed to these illustrations:", - "commGuideLink01": "Habitica Help: Ask a Question ", + "commGuideLink01": "Habitica Help: Ask a Question", "commGuideLink01description": "a guild for any players to ask questions about Habitica!", "commGuideLink02": "The Back Corner Guild", "commGuideLink02description": "a guild for the discussion of long or sensitive topics.", @@ -192,5 +192,5 @@ "commGuideLink08": "The Quest Trello", "commGuideLink08description": "for submitting quest writing.", - "lastUpdated": "Last updated" + "lastUpdated": "Last updated:" } diff --git a/website/common/locales/en/front.json b/website/common/locales/en/front.json index 63f2b4f5b0..59ee89836a 100644 --- a/website/common/locales/en/front.json +++ b/website/common/locales/en/front.json @@ -26,7 +26,7 @@ "communityForum": "Forum", "communityKickstarter": "Kickstarter", "communityReddit": "Reddit", - "companyAbout": "How it Works", + "companyAbout": "How It Works", "companyBlog": "Blog", "devBlog": "Developer Blog", "companyDonate": "Donate", @@ -78,12 +78,8 @@ "irishfeet123Quote": "I've had horrible habits with clearing my place completely after meals and leaving cups all over the place. [Habitica] has cured that!", "joinOthers": "Join <%= userCount %> people making it fun to achieve goals!", "kazuiQuote": "Before [Habitica], I was stuck with my thesis, as well as dissatisfied with my personal discipline regarding housework and things like learning vocabulary and studying Go theory. It turns out breaking down these tasks into smaller manageable checklists is quite the thing to keep me motivated and constantly working.", - "landingadminlink": "administrative packages", "landingend": "Not convinced yet?", - "landingend2": "See a more detailed list of", - "landingend3": ". Are you looking for a more private approach? Check out our", - "landingend4": "which are perfect for families, teachers, support groups, and businesses.", - "landingfeatureslink": "our features", + "landingend2": "See a more detailed list of [our features](/static/overview). Are you looking for a more private approach? Check out our [administrative packages](/static/plans), which are perfect for families, teachers, support groups, and businesses.", "landingp1": "The problem with most productivity apps on the market is that they provide no incentive to continue using them. Habitica fixes this by making habit building fun! By rewarding you for your successes and penalizing you for slip-ups, Habitica provides external motivation for completing your day-to-day activities.", "landingp2": "Whenever you reinforce a positive habit, complete a daily task, or take care of an old to-do, Habitica immediately rewards you with experience points and gold. As you gain experience, you can level up, increasing your stats and unlocking more features, like classes and pets. Gold can be spent on in-game items that change your experience or personalized rewards you've created for motivation. When even the smallest successes provide you with an immediate reward, you're less likely to procrastinate.", "landingp2header": "Instant Gratification", @@ -98,19 +94,23 @@ "loginGoogleAlt": "Sign in with Google", "logout": "Log Out", "marketing1Header": "Improve Your Habits by Playing a Game", + "marketing1Lead1Title": "Your Life, the Role Playing Game", "marketing1Lead1": "Habitica is a video game to help you improve real life habits. It \"gamifies\" your life by turning all your tasks (habits, dailies, and to-dos) into little monsters you have to conquer. The better you are at this, the more you progress in the game. If you slip up in life, your character starts backsliding in the game.", - "marketing1Lead2": "Get Sweet Gear. Improve your habits to build up your avatar. Show off the sweet gear you've earned!", "marketing1Lead2Title": "Get Sweet Gear", - "marketing1Lead3": "Find Random Prizes. For some, it's the gamble that motivates them: a system called \"stochastic rewards.\" Habitica accommodates all reinforcement and punishment styles: positive, negative, predictable, and random.", + "marketing1Lead2": "Improve your habits to build up your avatar. Show off the sweet gear you've earned!", "marketing1Lead3Title": "Find Random Prizes", + "marketing1Lead3": "For some, it's the gamble that motivates them: a system called \"stochastic rewards.\" Habitica accommodates all reinforcement and punishment styles: positive, negative, predictable, and random.", "marketing2Header": "Compete With Friends, Join Interest Groups", + "marketing2Lead1Title": "Social Productivity", "marketing2Lead1": "While you can play Habitica solo, the lights really turn on when you start collaborating, competing, and holding each other accountable. The most effective part of any self-improvement program is social accountability, and what better an environment for accountability and competition than a video game?", - "marketing2Lead2": "Fight Bosses. What's a Role Playing Game without battles? Fight bosses with your party. Bosses are \"super accountability mode\" - a day you miss the gym is a day the boss hurts everyone.", - "marketing2Lead2Title": "Bosses", - "marketing2Lead3": "Challenges let you compete with friends and strangers. Whoever does the best at the end of a challenge wins special prizes.", + "marketing2Lead2Title": "Fight Monsters", + "marketing2Lead2": "What's a Role Playing Game without battles? Fight monsters with your party. Monsters are \"super accountability mode\" - a day you miss the gym is a day the monster hurts *everyone!*", + "marketing2Lead3Title": "Challenge Each Other", + "marketing2Lead3": "Challenges let you compete with friends and strangers. Whoever does the best at the end of a challenge wins special prizes.", "marketing3Header": "Apps and Extensions", - "marketing3Lead1": "The iPhone & Android apps let you take care of business on the go. We realize that logging into the website to click buttons can be a drag.", - "marketing3Lead2": " Other 3rd Party Tools tie Habitica into various aspects of your life. Our API provides easy integration for things like the Chrome Extension, for which you lose points when browsing unproductive websites, and gain points when on productive ones. See more here", + "marketing3Lead1": "The **iPhone & Android** apps let you take care of business on the go. We realize that logging into the website to click buttons can be a drag.", + "marketing3Lead2Title": "Integrations", + "marketing3Lead2": "Other **3rd Party Tools** tie Habitica into various aspects of your life. Our API provides easy integration for things like the [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US), for which you lose points when browsing unproductive websites, and gain points when on productive ones. [See more here](http://habitica.wikia.com/wiki/Extensions,_Add-Ons,_and_Customizations).", "marketing4Header": "Organizational Use", "marketing4Lead1": "Education is one of the best sectors for gamification. We all know how glued to phones and games students are these days; harness that power! Pit your students against each other in friendly competition. Reward good behavior with rare prizes. Watch their grades and behavior soar.", "marketing4Lead1Title": "Gamification In Education",