Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history 
relates #116
  • Loading branch information
@LawEKS
LawEKS committed May 17, 2018
2 parents 42401ef + 951b7be commit f4290aa
Show file tree
Hide file tree
Showing 32 changed files with 1,077 additions and 176 deletions.
97 changes: 94 additions & 3 deletions public/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,49 @@ body {
color: #F2F2F2;
font-weight: 300;
margin: 2rem; }
@media (min-width: 900px) {
body {
max-width: 48rem;
margin: 2rem auto; } }

a {
color: #F6A17F; }

.is-hidden {
display: none; }

.text--is-orange {
color: #F6A17F; }

.avatar--is-small {
max-width: .5rem; }

.avatar--is-medium {
max-width: 1.2rem; }

.avatar--is-large {
max-width: 5rem;
max-height: 5rem; }

.remove-list-style {
list-style: none;
margin: 0;
padding: 0; }

.is-horizontally-spaced {
display: flex; }

p {
margin: 0; }

.profile__card {
background-color: #F2F2F2;
color: #223241;
padding: 2rem;
padding: 1.8rem;
margin: 1rem 0; }

.sg-main-heading {
margin: 0;
font-weight: 900;
font-size: 2rem; }

Expand All @@ -46,7 +67,9 @@ a {
font-weight: 700;
text-transform: uppercase;
letter-spacing: .08rem;
font-size: .7rem; }
font-size: .7rem;
background-color: transparent;
border: none; }

.sg-title {
font-weight: 700;
Expand All @@ -56,7 +79,75 @@ a {

.sg-subtext {
font-weight: 400;
font-size: .6rem; }
font-size: .8rem; }

.sg-button {
background-color: #F6A17F;
padding: .8rem 2rem;
border-radius: .7rem;
color: #223241;
font-weight: 700;
box-shadow: none;
border: none;
font-size: 1rem; }
.sg-button:hover {
opacity: .85; }

.sg-node {
background-color: #223241;
padding: 1rem 2rem;
border-radius: .7rem;
color: #F2F2F2;
font-size: 1rem; }

.sg-node-remove {
border: none;
background-color: transparent;
color: #F6A17F;
font-weight: 900;
font-size: 1rem;
margin-right: .2rem; }

.sg-input-text {
background-color: #E9E3E3;
padding: .8rem 1.2rem;
border-radius: .7rem;
width: 100%;
font-size: 1rem;
border: none;
outline: none;
font-weight: 300; }

.sg-dropdown {
width: 100%;
box-shadow: none;
border-radius: 0;
padding: .8rem 1.2rem;
background-color: #E9E3E3;
border: 1px solid #223241; }
.sg-dropdown select {
box-shadow: none;
border-radius: 0;
background-color: #E9E3E3;
border: none;
width: 100%;
height: 100%;
font-size: 1rem;
font-weight: 300; }
.sg-dropdown select:focus {
outline: none; }

.sg-close {
color: #F6A17F;
font-size: 3rem;
background-color: transparent;
border: none;
position: absolute;
top: 3rem;
right: 2rem;
padding: 0;
margin: 0;
line-height: 1rem; }

.profile__avatar {
width: 30%; }
Expand Down
98 changes: 98 additions & 0 deletions public/dom/allmembers.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // define __esModule on exports
/******/ __webpack_require__.r = function(exports) {
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 5);
/******/ })
/************************************************************************/
/******/ ({

/***/ 5:
/***/ (function(module, exports, __webpack_require__) {

"use strict";


/* eslint wrap-iife: 0 */

var allUsers = document.getElementsByClassName('profile__card');
var allUserIds = Array.from(allUsers).map(function (card) {
return card.id;
});

allUserIds.forEach(function (cardId) {
var userCard = document.getElementById(cardId);
userCard.addEventListener('click', function (e) {
// currently directing to profile page when you click their gitter link (needs fixing)
e.stopPropagation();
window.location.assign('/myprofile/' + cardId);
});
});

/***/ })

/******/ });
97 changes: 96 additions & 1 deletion public/dom/home.js
View file
Original file line number Diff line number Diff line change
@@ -1 +1,96 @@
!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:r})},n.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=1)}([,function(e,t,n){"use strict";document.getElementById("js-signup")}]);
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // define __esModule on exports
/******/ __webpack_require__.r = function(exports) {
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 3);
/******/ })
/************************************************************************/
/******/ ({

/***/ 3:
/***/ (function(module, exports, __webpack_require__) {

"use strict";


/* eslint no-var: 0 */
/* eslint prefer-arrow-callback: 0 */
/* eslint func-names: 0 */
/* eslint no-undef: 0 */

var signupButton = document.getElementById('js-signup');

// signupButton.addEventListener('click', function (e) {
// e.preventDefault();
// clientRequest('GET', '/auth/github/signup', null, function (response) {
// console.log(response);
// });
// });

/***/ })

/******/ });
Loading

0 comments on commit f4290aa

Please sign in to comment.