Skip to content

Commit

Permalink
yarn prettier:write
Browse files Browse the repository at this point in the history
  • Loading branch information
geoknee committed Oct 11, 2022
1 parent 3e46062 commit e7e3d42
Show file tree
Hide file tree
Showing 23 changed files with 619 additions and 468 deletions.
19 changes: 10 additions & 9 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"presets": [
["env", {
"targets": {
"browsers": ["last 2 versions", "safari >= 7"]
},
"modules": false
}]
[
"env",
{
"targets": {
"browsers": ["last 2 versions", "safari >= 7"]
},
"modules": false
}
]
],
"plugins": [
"transform-object-rest-spread"
]
"plugins": ["transform-object-rest-spread"]
}
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
extends: 'rtablada',
extends: "rtablada",

// Uncomment this for vuejs template linting
// plugins: [
// 'html',
// ],
}
};
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tmp
dist
node_modules
74 changes: 36 additions & 38 deletions Brocfile.js
Original file line number Diff line number Diff line change
@@ -1,81 +1,79 @@
'use strict';
"use strict";

/* eslint-env node */

require('dotenv').config();
const Merge = require('broccoli-merge-trees');
const Sass = require('broccoli-sass-source-maps');
const LiveReload = require('broccoli-inject-livereload');
const Autoprefixer = require('broccoli-autoprefixer');
const CssOptimizer = require('broccoli-csso');
const Rollup = require('broccoli-rollup');
const Babel = require('broccoli-babel-transpiler');
const mv = require('broccoli-stew').mv;
const rm = require('broccoli-stew').rm;
require("dotenv").config();
const Merge = require("broccoli-merge-trees");
const Sass = require("broccoli-sass-source-maps");
const LiveReload = require("broccoli-inject-livereload");
const Autoprefixer = require("broccoli-autoprefixer");
const CssOptimizer = require("broccoli-csso");
const Rollup = require("broccoli-rollup");
const Babel = require("broccoli-babel-transpiler");
const mv = require("broccoli-stew").mv;
const rm = require("broccoli-stew").rm;


const nodeResolve = require('rollup-plugin-node-resolve');
const replace = require('rollup-plugin-replace');
const builtins = require('rollup-plugin-node-builtins');
const globals = require('rollup-plugin-node-globals');
const commonjs = require('rollup-plugin-commonjs');
const nodeResolve = require("rollup-plugin-node-resolve");
const replace = require("rollup-plugin-replace");
const builtins = require("rollup-plugin-node-builtins");
const globals = require("rollup-plugin-node-globals");
const commonjs = require("rollup-plugin-commonjs");
// const vue = require('rollup-plugin-vue');

const plugins = [
replace({
'process.env.NODE_ENV': JSON.stringify(process.env.EMBER_ENV)
"process.env.NODE_ENV": JSON.stringify(process.env.EMBER_ENV),
}),
nodeResolve({ jsnext: true, main: true }),
commonjs({ include: 'node_modules/**' }),
commonjs({ include: "node_modules/**" }),
builtins(),
globals(),
// vue(),
];

let pubFiles = new LiveReload("public");

let pubFiles = new LiveReload('public');

if (process.env.EMBER_ENV === 'production') {
pubFiles = 'public';
if (process.env.EMBER_ENV === "production") {
pubFiles = "public";
}

const stylePaths = [
'app/styles',
'node_modules/font-awesome/scss',
'node_modules/normalize-css',
'node_modules/yoga-sass/assets',
"app/styles",
"node_modules/font-awesome/scss",
"node_modules/normalize-css",
"node_modules/yoga-sass/assets",
// Add any extra libs you want to import from node modules in sass here...
// 'node_modules/bulma',
];
const appNoSass = rm('app', '**/*.scss');
const appNoSass = rm("app", "**/*.scss");

const babelScript = new Babel(appNoSass);

const appScript = new Rollup(babelScript, {
rollup: {
sourceMap: true,
entry: './index.js',
entry: "./index.js",
plugins,
targets: [{ dest: 'app.js', format: 'iife', }]
}
targets: [{ dest: "app.js", format: "iife" }],
},
});

const compiledSass = new Sass(stylePaths, 'app.scss', 'app.css', {});
const compiledSass = new Sass(stylePaths, "app.scss", "app.css", {});
const optimizedCSS = new CssOptimizer(compiledSass);
const styles = new Autoprefixer(optimizedCSS);

if (process.env.EMBER_ENV === 'test') {
if (process.env.EMBER_ENV === "test") {
const testTree = new Merge([
mv(babelScript, 'app'),
mv(new Babel('tests'), 'tests'),
mv(babelScript, "app"),
mv(new Babel("tests"), "tests"),
]);

const testJs = new Rollup(testTree, {
rollup: {
entry: './tests/index-test.js',
entry: "./tests/index-test.js",
plugins,
targets: [{ dest: 'tests.js', format: 'iife', }]
}
targets: [{ dest: "tests.js", format: "iife" }],
},
});

module.exports = new Merge([pubFiles, styles, appScript, testJs]);
Expand Down
2 changes: 1 addition & 1 deletion app/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import toggleMenu from './js/toggle-menu';
import toggleMenu from "./js/toggle-menu";
toggleMenu();
14 changes: 7 additions & 7 deletions app/js/toggle-menu.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
function toggleMenu() {
const menuBtn = document.querySelector('.menu-btn');
const closeBtn = document.querySelector('.mobile-menu__close');
const mobileMenu = document.querySelector('.mobile-menu');
const menuBtn = document.querySelector(".menu-btn");
const closeBtn = document.querySelector(".mobile-menu__close");
const mobileMenu = document.querySelector(".mobile-menu");

menuBtn.addEventListener('click', () => {
mobileMenu.classList.add('mobile-menu--open');
menuBtn.addEventListener("click", () => {
mobileMenu.classList.add("mobile-menu--open");
});

closeBtn.addEventListener('click', () => {
mobileMenu.classList.remove('mobile-menu--open');
closeBtn.addEventListener("click", () => {
mobileMenu.classList.remove("mobile-menu--open");
});
}

Expand Down
4 changes: 1 addition & 3 deletions app/styles/_helpers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@media screen and (max-width: $screen-tablet) {
.level {
flex-direction: column;
margin: 0 auto 2rem;
margin: 0 auto 2rem;

> * {
width: 100%;
Expand All @@ -39,7 +39,6 @@
}
}


// Button Group
.btn-group {
display: flex;
Expand Down Expand Up @@ -69,7 +68,6 @@
}
}


// Viewport Helpers
@media screen and (min-width: $screen-md) {
.md-only {
Expand Down
4 changes: 2 additions & 2 deletions app/styles/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
flex-direction: column;
min-height: 100vh;

&__content { // enables sticky footer
&__content {
// enables sticky footer
display: flex;
flex-direction: column;
flex-grow: 1;
Expand Down Expand Up @@ -32,7 +33,6 @@
}
}


@media screen and (max-width: $screen-tablet) {
.section--lg {
padding: 3rem;
Expand Down
2 changes: 1 addition & 1 deletion app/styles/_markdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@
text-decoration: underline;
}
}
}
}
2 changes: 1 addition & 1 deletion app/styles/_resets.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body {
margin: 0;
font-family: 'Chivo', sans-serif;
font-family: "Chivo", sans-serif;
font-size: $f-rem;
color: $c-black;
background: $c-white;
Expand Down
40 changes: 17 additions & 23 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ $c-darkgrey: #707070;
$c-lightgrey: #e6e6e6;
$c-editor-bg: #f7f9fa;


// Font Sizes
$f-rem: 16px;
$f-xs: 0.875rem;
Expand All @@ -16,43 +15,38 @@ $f-small-heading: 1.25rem;
$f-subheading: 1.625rem;
$f-heading: 2.5rem;


$site-max-width: 1140px;


// Screens
$screen-md: 1000px;
$screen-tablet: 767px;
$screen-mobile: 600px;
$screen-xs: 374px;


// Transitions
$transition-speed: 200ms;

@import url("https://fonts.googleapis.com/css?family=Chivo:300,400");
@import "box-sizing";
@import "resets";
@import "typography";
@import "layout";

@import url('https://fonts.googleapis.com/css?family=Chivo:300,400');
@import 'box-sizing';
@import 'resets';
@import 'typography';
@import 'layout';

@import 'components/navbar';
@import 'components/mobile-menu';
@import 'components/callout';
@import 'components/hero';
@import 'components/list';
@import 'components/team-list';
@import 'components/footer';
@import 'components/buttons';

@import 'pages/team';
@import 'pages/standards';
@import "components/navbar";
@import "components/mobile-menu";
@import "components/callout";
@import "components/hero";
@import "components/list";
@import "components/team-list";
@import "components/footer";
@import "components/buttons";

@import 'markdown';
@import "pages/team";
@import "pages/standards";

@import 'helpers';
@import "markdown";

@import "helpers";

.flexer {
display: flex;
Expand Down
1 change: 0 additions & 1 deletion app/styles/components/callout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
}
}


@media screen and (max-width: $screen-tablet) {
.section--callout {
position: relative;
Expand Down
4 changes: 1 addition & 3 deletions app/styles/components/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
background-color: $c-blue;
opacity: 0;
transition: opacity $transition-speed;
content: '';
content: "";
}

&:hover::before {
Expand All @@ -73,7 +73,6 @@
}
}


@media screen and (max-width: $screen-md) {
.section--footer {
padding: 2rem;
Expand Down Expand Up @@ -110,5 +109,4 @@
.footer-abstract--left {
display: none;
}

}
2 changes: 0 additions & 2 deletions app/styles/components/hero.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
margin-top: 3.125rem;
}


@media screen and (max-width: $screen-md) {
.hero {
padding-top: 2.5rem;
Expand All @@ -44,7 +43,6 @@
}
}


@media screen and (max-width: $screen-tablet) {
.hero {
padding-top: 0;
Expand Down
5 changes: 2 additions & 3 deletions app/styles/components/list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
width: 2.75rem;
height: 1px;
background: currentcolor;
content: '';
content: "";
}

&__title {
Expand All @@ -32,7 +32,6 @@
}
}


@media screen and (max-width: 767px) {
.list {
margin-bottom: 2rem;
Expand All @@ -49,7 +48,7 @@
width: 100%;
height: 1px;
background: $c-lightgrey;
content: '';
content: "";
}
}
}
Loading

0 comments on commit e7e3d42

Please sign in to comment.