diff --git a/app/components/addon-tabs.js b/app/components/addon-tabs.js new file mode 100644 index 000000000..efe82debf --- /dev/null +++ b/app/components/addon-tabs.js @@ -0,0 +1,6 @@ +import Component from '@ember/component'; + +export default Component.extend({ + currentTab: 0, + tagName: '', +}); diff --git a/app/helpers/eq.js b/app/helpers/eq.js new file mode 100644 index 000000000..493bb75aa --- /dev/null +++ b/app/helpers/eq.js @@ -0,0 +1,7 @@ +import { helper } from '@ember/component/helper'; + +export function eq(params) { + return params[0] === params[1]; +} + +export default helper(eq); diff --git a/app/router.js b/app/router.js index 0e03494f5..1e10a3e81 100644 --- a/app/router.js +++ b/app/router.js @@ -31,6 +31,7 @@ Router.map(function() { }); this.route('security'); this.route('sponsors'); + this.route('team-redirect', { path: 'team' }); this.route('team', { path: 'teams' }); this.route('mascots', function() { diff --git a/app/routes/team-redirect.js b/app/routes/team-redirect.js new file mode 100644 index 000000000..00b185c25 --- /dev/null +++ b/app/routes/team-redirect.js @@ -0,0 +1,7 @@ +import Route from '@ember/routing/route'; + +export default Route.extend({ + redirect() { + this.transitionTo('team'); + } +}); diff --git a/app/styles/app.css b/app/styles/app.css index 760957407..b94951c20 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -1,4 +1,6 @@ +@import "components/addon-tabs.css"; @import "components/brand-logos.css"; +@import "components/ecosystem-icons.css"; @import "components/faqs.css"; @import "components/homepage-image-grid.css"; @import "components/release-timeline.css"; diff --git a/app/styles/components/addon-tabs.css b/app/styles/components/addon-tabs.css new file mode 100644 index 000000000..c26d29573 --- /dev/null +++ b/app/styles/components/addon-tabs.css @@ -0,0 +1,58 @@ +.addon-tabs { + width: 460px; + + background: rgb(52,55,62); + background: linear-gradient(0deg, rgba(52,55,62,1) 0%, rgba(66,69,77,1) 100%); + border-radius: 15px; + box-shadow: 0px 5px 15px -10px rgba(0,0,0,0.75); +} + +@media (max-width: 1007px) { + .addon-tabs { + width: 100%; + } +} + +.addon-tabs--header { + text-align: left; + display: flex; +} + +.addon-tabs--tab { + background: none; + margin: 0; + padding: 0 10px; + height: 50px; + border-width: 1px; + border-color: #54565E; + margin-left: -1px; + color: var(--color-gray-300); + text-align: left; +} + +.addon-tabs--tab.active-tab { + background-color: var(--color-button-bg); + color: var(--color-button-text); +} + +.addon-tabs--tab:first-child { + border-top-left-radius: 15px; + margin-left: 0; +} +.addon-tabs--tab:last-child { + border-top-right-radius: 15px; + flex-grow: 1; +} +.addon-tabs--content { + text-align: left; + padding: 30px; + display: none; +} +.addon-tabs--content.active-tab { + display: block; +} +.addon-tabs--code { + font-style: var(--font-family-mono); + font-size: .8em; + color: var(--color-gray-400) +} diff --git a/app/styles/components/ecosystem-icons.css b/app/styles/components/ecosystem-icons.css new file mode 100644 index 000000000..441158a92 --- /dev/null +++ b/app/styles/components/ecosystem-icons.css @@ -0,0 +1,38 @@ +.ecosystem-icons { + display: grid; + grid-template-columns: 1fr 1fr; + grid-gap: 30px; + width: 190px; + margin: auto; +} + +@media (max-width: 1007px) { + .ecosystem-icons { + grid-template-columns: repeat(auto-fill, minmax(120px, 1fr)); + width: inherit; + } + + .ecosystem-icon { + margin: auto; + } +} + +.ecosystem-icon { + position: relative; + width: 130px; + height: 130px; +} + +.ecosystem-icon .logo { + bottom: 20px; + right: 10px; + position: absolute; +} +.ecosystem-icon .logo.rotate { + transform: rotate(-9deg); +} + +.ecosystem-icon .background { + position: absolute; + left: 0; +} diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 41a87739f..45a172abf 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,7 +1,7 @@ {{head-layout}} {{title "Ember.js"}} - +
{{outlet}} diff --git a/app/templates/components/addon-tabs.hbs b/app/templates/components/addon-tabs.hbs new file mode 100644 index 000000000..3119c175b --- /dev/null +++ b/app/templates/components/addon-tabs.hbs @@ -0,0 +1,63 @@ +
+
+ + + + +
+ {{!-- template-lint-disable block-indentation --}} +
+

Ember CLI Sass wires up your app with Sass, in a single command.

+ + + 
> ember install ember-cli-sass
+
+// app.scss
+body {
+  @extend .font-serif;
+}
+ +
+
+

TODO one

+ + + 

+    
+  

+  

+    
TODO two

+
+    
+      

+    
+  

+  

+    
TODO three

+
+    
+      

+    
+  

+  {{!-- template-lint-enable block-indentation  --}}
+

\ No newline at end of file
diff --git a/app/templates/components/ecosystem-icon.hbs b/app/templates/components/ecosystem-icon.hbs
new file mode 100644
index 000000000..bfca618e6
--- /dev/null
+++ b/app/templates/components/ecosystem-icon.hbs
@@ -0,0 +1,4 @@
+

+  
+  
+

\ No newline at end of file
diff --git a/app/templates/components/ecosystem-icons.hbs b/app/templates/components/ecosystem-icons.hbs
new file mode 100644
index 000000000..c388af6bd
--- /dev/null
+++ b/app/templates/components/ecosystem-icons.hbs
@@ -0,0 +1,8 @@
+

+  
+  
+  
+  
+  
+  
+

\ No newline at end of file
diff --git a/app/templates/editions/index.hbs b/app/templates/editions/index.hbs
index d7cfab910..12ac67c28 100644
--- a/app/templates/editions/index.hbs
+++ b/app/templates/editions/index.hbs
@@ -20,7 +20,7 @@
 
   
Editions

   
    
-    
+    
       
    
         {{link-to "Octane (March 2019)" "editions.octane"}}
       
    
diff --git a/app/templates/editions/octane.hbs b/app/templates/editions/octane.hbs
index 0dbaeeee9..302e8f001 100644
--- a/app/templates/editions/octane.hbs
+++ b/app/templates/editions/octane.hbs
@@ -1,53 +1,118 @@
 {{title "Editions"}}
 {{title "Octane"}}
+
 
    
-  
    The Octane Edition of Ember
    
+  
    The Octane Edition of Ember
    
+  
    
+    It has arrived!
+    As of version 3.15 of Ember, when you generate a new app, you get everything you need to build your app using Octane.
+    You can read more about features and upgrade strategies in the
+    the official Ember blog post.
+  
    
   
    
-    The preview of Ember Octane has begun. This means that everything here is experimental and subject to change. Keep that in mind while you peruse this information!
+    Ember Octane describes a set of new features that, when taken together, represent a foundational improvement to the way you use Ember.
+    It has modern, streamlined components and state management that make it fun to build web applications.
+    With seamless interoperability for existing apps, teams can migrate at their own pace, while developers building new apps start out with the best that Ember has to offer.
   
    
-  
      
-    
+  
 
+
   
      How you can help
      
-  
      During this preview phase, we are asking the community to help us in any way they can. Try Octane out in your app. Report bugs back to us. Let us know where your pain points are. Read the guides and see if they make sense to you. It genuinely takes all parts of our community working together to make this a polished, complete project- and no contribution is too small!
      
+  
      
+    Now that Octane is available, we ask developers of all experience levels to create their own blog posts, tutorials, and videos.
+    Even if you think a topic has already been covered by someone else, it is helpful to put it in your own words.
+    For most developers, official documentation is only one piece of the learning journey.
+  
      
+
+  
      
+    If you notice any problems with Octane or the official learning resources, you can open an issue or pull request to the following repositories:
+  
      
 
-  
      We will be able to declare a stable Octane edition faster with the community's help!
      
-  
      As in all areas of Ember, there are different ways you can contribute. Visit the #st-octane channel on the Ember Discord server to get started today.
      
-  
        
-    
      • Implement Features
        • 
-    
      • Write Guides
        • 
-    
      • Review & Edit Guides
        • 
+  
 
   
        Frequently Asked Questions
        
   
        
-    
        What Happened to Module Unification?
        
+    
        Which release of Ember is Octane?
        
     
        
-      Read the full statement about Module Unification on our blog- https://blog.emberjs.com/2019/03/11/update-on-module-unification-and-octane.html
+      The Octane Edition was declared for Ember 3.15.
+    
        
+    
        Do I need to refactor my whole app in order to use Octane features?
        
+    
        
+      Good news - you do not need to change your whole app to use Octane's features! All are available for you to opt into, one piece at a time. Some features are even available in earlier versions.
+    
        
+    
        If I want to upgrade my app to Octane, do I need to make all the changes by hand?
        
+    
        
+      No, codemods and CLI tools are available to help you.
+      Visit the Octane Upgrade Guide to learn more about them.
+    
        
+    
        If I'm not ready to use Octane, does that mean I should keep my app on version 3.14?
        
+    
        
+      No, you should go ahead and update to version 3.15 or later.
+      Octane's big changes are all opt-in, meaning that you can enable them when you are ready, and in the meantime, you can keep updating your app as you normally would.
     
        
     
        I'm starting a new app at work. Should I use Octane?
        
     
        
-      Octane is in preview mode- there are bound to be rough edges, and upcoming changes. Since we don't know what we don't know just yet, we advise that Octane be used for experimentation only. We recommend that you continue to use stable versions of Ember for new production applications.
+      Yes! Octane is stable and well supported.
+      It is the present and future of Ember, so you are saving yourself some upgrade work down the line.
+      Be sure to budget some time for learning and experimentation.
+    
        
+    
        Where can I get help or ask questions?
        
+    
        
+      Visit the community page to join the forums or chat!
+      Discord has channels specifically for Octane where you can search for other people's questions too. Read the "welcome" and "setup profile" channels to learn how to get posting permissions.
+    
        
+    
        What Happened to Module Unification?
        
+    
        
+      Octane ships with "co-location," where the templates and JavaScript files for components are in the same directory.
+      This was one of the most popular aspects of Module Unification, and it's available now!
+      Read the full statement on our blog- Update on Module Unification
     
        
   
        
 
    
\ No newline at end of file
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index 006999dda..9fc443bcc 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -66,7 +66,7 @@
       
    
         
       
    
-      
    
+      
    
         
       
    
       
    
@@ -104,7 +104,7 @@
 
    
   
    
     
    
-      ember ecosystem
+      
     
    
 
     
    
@@ -115,7 +115,7 @@
     
    
 
     
    
-      ember addons
+      
     
    
 
     
    
@@ -164,6 +164,54 @@
         Ember Meetups
       
     
    
+
+    
    
+      
    
+        Our official communication channels to get in touch with the community
+      
    
+    
    
+
+    
    
+      
+        
    
+          Discussion Forum
+        
    
+        
    Post and search longer-form questions in our public forum.
    
+          
+      
+        
    
+          Discord community chat
+        
    
+        
    Join our real-time chat server to connect with other developers and get answers.
    
+          
+    
    
+
+    
    
+      Beyond our core online channels, you can dig deeper with these learning resources from the
+      community members
+    
    
+
+    
   
    
 
    
 
    
diff --git a/package-lock.json b/package-lock.json
index 4145d0ce4..2076bd5c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,9 +42,9 @@
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.335",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.335.tgz",
-          "integrity": "sha512-ngKsDGd/xr2lAZvilxTfdvfEiQKmavyXd6irlswaHnewmXoz6JgbM9FUNwgp3NFIUHHegh1F87H8f5BJ8zABxw==",
+          "version": "1.3.336",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.336.tgz",
+          "integrity": "sha512-FtazvnXAizSVMxQNPqUcTv2UElY5r3uRPQwiU1Tyg/Yc2UFr+/3wqDoLIV9ES6ablW3IrCcR8uEK2ppxaNPWhw==",
           "dev": true
         },
         "node-releases": {
@@ -202,9 +202,9 @@
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.335",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.335.tgz",
-          "integrity": "sha512-ngKsDGd/xr2lAZvilxTfdvfEiQKmavyXd6irlswaHnewmXoz6JgbM9FUNwgp3NFIUHHegh1F87H8f5BJ8zABxw==",
+          "version": "1.3.336",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.336.tgz",
+          "integrity": "sha512-FtazvnXAizSVMxQNPqUcTv2UElY5r3uRPQwiU1Tyg/Yc2UFr+/3wqDoLIV9ES6ablW3IrCcR8uEK2ppxaNPWhw==",
           "dev": true
         },
         "node-releases": {
@@ -2667,9 +2667,9 @@
           }
         },
         "electron-to-chromium": {
-          "version": "1.3.335",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.335.tgz",
-          "integrity": "sha512-ngKsDGd/xr2lAZvilxTfdvfEiQKmavyXd6irlswaHnewmXoz6JgbM9FUNwgp3NFIUHHegh1F87H8f5BJ8zABxw==",
+          "version": "1.3.336",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.336.tgz",
+          "integrity": "sha512-FtazvnXAizSVMxQNPqUcTv2UElY5r3uRPQwiU1Tyg/Yc2UFr+/3wqDoLIV9ES6ablW3IrCcR8uEK2ppxaNPWhw==",
           "dev": true
         },
         "ember-cli-babel": {
@@ -7069,9 +7069,9 @@
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.335",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.335.tgz",
-          "integrity": "sha512-ngKsDGd/xr2lAZvilxTfdvfEiQKmavyXd6irlswaHnewmXoz6JgbM9FUNwgp3NFIUHHegh1F87H8f5BJ8zABxw==",
+          "version": "1.3.336",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.336.tgz",
+          "integrity": "sha512-FtazvnXAizSVMxQNPqUcTv2UElY5r3uRPQwiU1Tyg/Yc2UFr+/3wqDoLIV9ES6ablW3IrCcR8uEK2ppxaNPWhw==",
           "dev": true
         },
         "node-releases": {
@@ -11312,9 +11312,9 @@
           }
         },
         "electron-to-chromium": {
-          "version": "1.3.335",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.335.tgz",
-          "integrity": "sha512-ngKsDGd/xr2lAZvilxTfdvfEiQKmavyXd6irlswaHnewmXoz6JgbM9FUNwgp3NFIUHHegh1F87H8f5BJ8zABxw==",
+          "version": "1.3.336",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.336.tgz",
+          "integrity": "sha512-FtazvnXAizSVMxQNPqUcTv2UElY5r3uRPQwiU1Tyg/Yc2UFr+/3wqDoLIV9ES6ablW3IrCcR8uEK2ppxaNPWhw==",
           "dev": true
         },
         "ember-cli-babel": {
@@ -11821,9 +11821,9 @@
       }
     },
     "ember-styleguide": {
-      "version": "4.0.0-7",
-      "resolved": "https://registry.npmjs.org/ember-styleguide/-/ember-styleguide-4.0.0-7.tgz",
-      "integrity": "sha512-5nEZ7wN6XyNYJiyt3vvCAQN59BFgdYVKIEJQB28xUofN9kS5B11M2dZ9KXr45SOw2x11xPrQN617Yq+jtH0MFQ==",
+      "version": "4.0.0-8",
+      "resolved": "https://registry.npmjs.org/ember-styleguide/-/ember-styleguide-4.0.0-8.tgz",
+      "integrity": "sha512-U3cX/Js02HAVpySQqRxERJgg8Q1AwY910RVj9DwpSmF5x8sv7oAekBTFjrnz3nXkKSD3tutJsRVkCTpQLdWQeA==",
       "dev": true,
       "requires": {
         "@ember/render-modifiers": "^1.0.0",
@@ -17316,9 +17316,9 @@
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.335",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.335.tgz",
-          "integrity": "sha512-ngKsDGd/xr2lAZvilxTfdvfEiQKmavyXd6irlswaHnewmXoz6JgbM9FUNwgp3NFIUHHegh1F87H8f5BJ8zABxw==",
+          "version": "1.3.336",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.336.tgz",
+          "integrity": "sha512-FtazvnXAizSVMxQNPqUcTv2UElY5r3uRPQwiU1Tyg/Yc2UFr+/3wqDoLIV9ES6ablW3IrCcR8uEK2ppxaNPWhw==",
           "dev": true
         },
         "node-releases": {
diff --git a/package.json b/package.json
index 619e21d79..04c9ed257 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "ember-qunit": "^4.4.1",
     "ember-resolver": "^5.0.1",
     "ember-source": "~3.10.0",
-    "ember-styleguide": "^4.0.0-7",
+    "ember-styleguide": "^4.0.0-8",
     "ember-template-lint": "^1.3.0",
     "ember-tether": "^1.0.0",
     "eslint-plugin-ember": "^6.2.0",
diff --git a/public/images/addons.svg b/public/images/addons.svg
deleted file mode 100644
index f3f4f127e..000000000
--- a/public/images/addons.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-    
-    Code
-    Created with Sketch.
-    
-        
-            
-            
-        
-        
-        
-            
-            
-            
-        
-        
-            
-            
-            
-        
-    
-    
-        
-            
-                
-            
-            
-                
-                
-                
-            
-            
-            
-            
-            
-            
-            
-                Ember CLI Sass wires up your app with Sass, in a 
-                single command.
-            
-            
-                > ember install ember-cli-sass
-                
-                // app.scss
-                body {
-                	@extend .font-serif;
-                }
-            
-            
-                CLI Sass
-            
-            
-                SVG Jar
-            
-            
-                Percy
-            
-            
-                CLI Deploy
-            
-        
-    
-
\ No newline at end of file
diff --git a/public/images/ecosystem.svg b/public/images/ecosystem.svg
deleted file mode 100644
index da38ad1d9..000000000
--- a/public/images/ecosystem.svg
+++ /dev/null
@@ -1,186 +0,0 @@
-
-
-    
-    Group 14
-    Created with Sketch.
-    
-        
-        
-            
-            
-            
-            
-            
-            
-            
-                
-                
-            
-        
-        
-        
-            
-            
-            
-            
-            
-            
-            
-                
-                
-            
-        
-        
-        
-            
-            
-            
-            
-            
-            
-            
-                
-                
-            
-        
-        
-        
-            
-            
-            
-            
-            
-            
-            
-                
-                
-            
-        
-        
-        
-            
-            
-            
-            
-            
-            
-            
-                
-                
-            
-        
-        
-        
-            
-            
-            
-            
-            
-            
-            
-                
-                
-            
-        
-    
-    
-        
-            
-                
-                    
-                    
-                
-                
-                    JS
-                
-            
-            
-                
-                    
-                    
-                
-                
-                    T
-                    S
-                
-            
-            
-                
-                    
-                    
-                
-                
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                
-            
-            
-                
-                    
-                    
-                
-                
-                    
-                
-            
-            
-                
-                    
-                    
-                
-                
-                    
-                
-            
-            
-                
-                    
-                    
-                
-                
-            
-        
-    
-
\ No newline at end of file
diff --git a/public/images/home/logos/babel.svg b/public/images/home/logos/babel.svg
new file mode 100644
index 000000000..5fac97214
--- /dev/null
+++ b/public/images/home/logos/babel.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/images/home/logos/background.svg b/public/images/home/logos/background.svg
new file mode 100644
index 000000000..65d353570
--- /dev/null
+++ b/public/images/home/logos/background.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/images/home/logos/code.svg b/public/images/home/logos/code.svg
new file mode 100644
index 000000000..5991ae39d
--- /dev/null
+++ b/public/images/home/logos/code.svg
@@ -0,0 +1 @@
+
diff --git a/public/images/home/logos/js.svg b/public/images/home/logos/js.svg
new file mode 100644
index 000000000..7a945407b
--- /dev/null
+++ b/public/images/home/logos/js.svg
@@ -0,0 +1 @@
+JS
diff --git a/public/images/home/logos/prettier.svg b/public/images/home/logos/prettier.svg
new file mode 100644
index 000000000..5f707ce8e
--- /dev/null
+++ b/public/images/home/logos/prettier.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/images/home/logos/ts.svg b/public/images/home/logos/ts.svg
new file mode 100644
index 000000000..35c7e583f
--- /dev/null
+++ b/public/images/home/logos/ts.svg
@@ -0,0 +1,10 @@
+
+  
+    
+      T
+    
+    
+      S
+    
+  
+
diff --git a/public/images/home/logos/yarn.svg b/public/images/home/logos/yarn.svg
new file mode 100644
index 000000000..eaec971b9
--- /dev/null
+++ b/public/images/home/logos/yarn.svg
@@ -0,0 +1 @@
+
\ No newline at end of file