From b92e8693f07b85946e60a77b10567a4871ca1392 Mon Sep 17 00:00:00 2001 From: Gabe Rogan Date: Thu, 17 Nov 2016 14:32:59 -0500 Subject: [PATCH] all cleaned up :). a few remnants for demo purposes --- app/app.js | 13 +- app/app.route.js | 65 ++---- app/pages/404/ctrl.js | 7 +- app/pages/404/view.html | 2 + .../style.styl => categories/anotherCtrl.js} | 0 app/pages/categories/ctrl.js | 7 + .../style.styl | 0 app/pages/categories/view.html | 2 + app/pages/community/ctrl.js | 5 - app/pages/community/style.styl | 2 - app/pages/competitions/ctrl.js | 31 --- app/pages/competitions/style.styl | 15 -- app/pages/competitions/view.html | 29 --- app/pages/dashboard/ctrl-comps.js | 4 - app/pages/dashboard/ctrl-dash.js | 4 - app/pages/dashboard/ctrl-featured.js | 4 - app/pages/dashboard/ctrl-news.js | 4 - app/pages/dashboard/ctrl-users.js | 4 - .../view.html => food/anotherCtrl.js} | 0 app/pages/food/ctrl.js | 7 + app/{sandbox => pages/food}/style.styl | 0 app/pages/food/view.html | 2 + app/pages/login/anotherCtrl.js | 0 app/pages/login/ctrl.js | 7 + app/pages/login/style.styl | 0 app/pages/login/view.html | 2 + app/pages/news/ctrl.js | 5 - app/pages/single-competition/ctrl.js | 4 - app/pages/single-competition/view.html | 8 - app/{root-view => root}/_footer.kit | 0 app/{root-view => root}/_header.kit | 2 +- app/{root-view => root}/_nav.kit | 8 +- app/{root-view => root}/index.kit | 0 app/root/root-ctrl.js | 10 + app/{root-view => root}/root.styl | 12 +- .../view.html => sandbox/competition.html} | 0 app/sandbox/ctrl.js | 12 ++ .../news/view.html => sandbox/news.html} | 0 app/sandbox/scrap.html | 10 - .../news/style.styl => sandbox/whatever.styl} | 17 ++ assets/css/main.css | 181 ++++++++--------- assets/js/bundle.js | 185 ++++++------------ assets/styl/reset.styl | 4 + gulpfile.js | 4 +- index.html | 10 +- 45 files changed, 274 insertions(+), 414 deletions(-) rename app/pages/{dashboard/style.styl => categories/anotherCtrl.js} (100%) create mode 100644 app/pages/categories/ctrl.js rename app/pages/{single-competition => categories}/style.styl (100%) create mode 100644 app/pages/categories/view.html delete mode 100644 app/pages/community/ctrl.js delete mode 100644 app/pages/community/style.styl delete mode 100644 app/pages/competitions/ctrl.js delete mode 100644 app/pages/competitions/style.styl delete mode 100644 app/pages/competitions/view.html delete mode 100644 app/pages/dashboard/ctrl-comps.js delete mode 100644 app/pages/dashboard/ctrl-dash.js delete mode 100644 app/pages/dashboard/ctrl-featured.js delete mode 100644 app/pages/dashboard/ctrl-news.js delete mode 100644 app/pages/dashboard/ctrl-users.js rename app/pages/{dashboard/view.html => food/anotherCtrl.js} (100%) create mode 100644 app/pages/food/ctrl.js rename app/{sandbox => pages/food}/style.styl (100%) create mode 100644 app/pages/food/view.html create mode 100644 app/pages/login/anotherCtrl.js create mode 100644 app/pages/login/ctrl.js create mode 100644 app/pages/login/style.styl create mode 100644 app/pages/login/view.html delete mode 100644 app/pages/news/ctrl.js delete mode 100644 app/pages/single-competition/ctrl.js delete mode 100644 app/pages/single-competition/view.html rename app/{root-view => root}/_footer.kit (100%) rename app/{root-view => root}/_header.kit (96%) rename app/{root-view => root}/_nav.kit (86%) rename app/{root-view => root}/index.kit (100%) create mode 100644 app/root/root-ctrl.js rename app/{root-view => root}/root.styl (86%) rename app/{pages/community/view.html => sandbox/competition.html} (100%) rename app/{pages/news/view.html => sandbox/news.html} (100%) rename app/{pages/news/style.styl => sandbox/whatever.styl} (86%) diff --git a/app/app.js b/app/app.js index 4c1d1b3..f176306 100644 --- a/app/app.js +++ b/app/app.js @@ -1,13 +1,4 @@ var app = angular.module('app', ['ngRoute']); -// Root controller -app.controller('root', ['$scope', '$location', function ($scope, $location) { - $scope.page = { - 'title' : 'Root', - 'id' : 'root', - 'blackNav' : false - }; - $scope.go = function ( path ) { - $location.path( path ); - }; -}]); +// Root controllers in /root/ folder +// Page controllers in /pages/[your-page] folder diff --git a/app/app.route.js b/app/app.route.js index 35e7d6c..e27597c 100644 --- a/app/app.route.js +++ b/app/app.route.js @@ -1,68 +1,37 @@ app.config( function ($routeProvider, $locationProvider) { $routeProvider .when('/', { - templateUrl: 'app/pages/news/view.html', - controller: 'NewsCtrl' + templateUrl: 'app/pages/food/view.html', + controller: 'FoodCtrl' }) - // Sandbox - .when('/email', { - templateUrl: 'app/sandbox/email.html', - controller: 'EmailController' + .when('/login', { + templateUrl: 'app/pages/login/view.html', + controller: 'LoginCtrl' }) - // Sandbox - .when('/todo', { - templateUrl: 'app/sandbox/todo.html', - controller: 'TodoController' + .when('/categories', { + templateUrl: 'app/pages/categories/view.html', + controller: 'CategoryCtrl' }) - .when('/news', { - templateUrl: 'app/pages/news/view.html', - controller: 'NewsCtrl' + .when('/food', { + templateUrl: 'app/pages/food/view.html', + controller: 'FoodCtrl' }) - .when('/community', { - templateUrl: 'app/pages/community/view.html', - controller: 'CommunityCtrl' + // Sandbox Demo + .when('/news', { + templateUrl: 'app/sandbox/news.html', + controller: 'NewsCtrl' }) + // Sandbox Demo .when('/competitions', { - templateUrl: 'app/pages/competitions/view.html', + templateUrl: 'app/sandbox/competition.html', controller: 'CompetitionCtrl' }) - .when('/c/:id', { - templateUrl: 'app/pages/single-competition/view.html', - controller: 'SingleCompetitionCtrl' - }) - - // Dashboard ======Below This Point======= - .when('/dashboard', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardCtrl' - }) - - .when('/dashboard/news', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardNewsCtrl' - }) - - .when('/dashboard/competitions', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardCompetitionCtrl' - }) - - .when('/dashboard/featured-user', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardFeatureCtrl' - }) - - .when('/dashboard/users', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardUserCtrl' - }) - // 404 Not Found .otherwise({ templateUrl: 'app/pages/404/view.html', diff --git a/app/pages/404/ctrl.js b/app/pages/404/ctrl.js index dbec9a8..ced7d2d 100644 --- a/app/pages/404/ctrl.js +++ b/app/pages/404/ctrl.js @@ -1,4 +1,7 @@ app.controller('404Ctrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; + $scope.page.title = '404'; + $scope.page.id = '404'; + $scope.page.yourVar = "globalStuff"; + + $scope.var2 = "localStuff"; }]); diff --git a/app/pages/404/view.html b/app/pages/404/view.html index e69de29..640e8c2 100644 --- a/app/pages/404/view.html +++ b/app/pages/404/view.html @@ -0,0 +1,2 @@ +
+

You've reached pages/404/view.html by going to an invalid link.

diff --git a/app/pages/dashboard/style.styl b/app/pages/categories/anotherCtrl.js similarity index 100% rename from app/pages/dashboard/style.styl rename to app/pages/categories/anotherCtrl.js diff --git a/app/pages/categories/ctrl.js b/app/pages/categories/ctrl.js new file mode 100644 index 0000000..38bbe26 --- /dev/null +++ b/app/pages/categories/ctrl.js @@ -0,0 +1,7 @@ +app.controller('CategoryCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Categories'; + $scope.page.id = 'cat'; + $scope.page.yourVar = "globalStuff"; + + $scope.var2 = "localStuff"; +}]); diff --git a/app/pages/single-competition/style.styl b/app/pages/categories/style.styl similarity index 100% rename from app/pages/single-competition/style.styl rename to app/pages/categories/style.styl diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html new file mode 100644 index 0000000..0481886 --- /dev/null +++ b/app/pages/categories/view.html @@ -0,0 +1,2 @@ +
+

You've reached pages/categories/view.html.

diff --git a/app/pages/community/ctrl.js b/app/pages/community/ctrl.js deleted file mode 100644 index 8b7faca..0000000 --- a/app/pages/community/ctrl.js +++ /dev/null @@ -1,5 +0,0 @@ -app.controller('CommunityCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Community'; - $scope.page.id = 'comm'; - $scope.page.blackNav = true; -}]); diff --git a/app/pages/community/style.styl b/app/pages/community/style.styl deleted file mode 100644 index 65c7174..0000000 --- a/app/pages/community/style.styl +++ /dev/null @@ -1,2 +0,0 @@ -// .asdf - // @extend .competition-cards diff --git a/app/pages/competitions/ctrl.js b/app/pages/competitions/ctrl.js deleted file mode 100644 index c7e342f..0000000 --- a/app/pages/competitions/ctrl.js +++ /dev/null @@ -1,31 +0,0 @@ -app.controller('CompetitionCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Competitions'; - $scope.page.id = 'comps'; - $scope.page.blackNav = true; -}]); - - -/* if timeToView | timeToVote -Show DOM image grid. Load with images - -if timeToVote -Add vote buttons -vote onClick: fill(heartUI). Add {username: true} to photo/votes -firebase/comps/Time/votes { - myUsername { -- rule: limit count here to 5 - userID-I-VotedFor: true - } -} - -if timeToEnter -Show enter DOM -upload onSubmit, add pic to firebase storage && firebase/competitions/Time/photos -firebase/comps/Time/photos { - myUsername { - photoURL: firebaseStorageurl.com/asdf -- write rule, only write to your id -} -} - -if id-not-found in firebaseObject -Show DOM template: "Sorry, no competition with that name" -*/ diff --git a/app/pages/competitions/style.styl b/app/pages/competitions/style.styl deleted file mode 100644 index 480371c..0000000 --- a/app/pages/competitions/style.styl +++ /dev/null @@ -1,15 +0,0 @@ -.spacer - height: 80px - -.competition-cards - display: flex - flex-flow: row wrap - justify-content: space-around - padding: 6em 2em - .card.small - flex: 0 400px - height: auto - margin: 1.5em .5em - .img - height: 200px - background-size: cover diff --git a/app/pages/competitions/view.html b/app/pages/competitions/view.html deleted file mode 100644 index db77b32..0000000 --- a/app/pages/competitions/view.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
-
-
- Card Title -
-
- -
-
-
- Card Title -
-
- -
-
-
- Card Title -
-
- -
-
-
- Card Title -
-
-
diff --git a/app/pages/dashboard/ctrl-comps.js b/app/pages/dashboard/ctrl-comps.js deleted file mode 100644 index c628543..0000000 --- a/app/pages/dashboard/ctrl-comps.js +++ /dev/null @@ -1,4 +0,0 @@ -app.controller('DashboardCompetitionCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); diff --git a/app/pages/dashboard/ctrl-dash.js b/app/pages/dashboard/ctrl-dash.js deleted file mode 100644 index 80838e6..0000000 --- a/app/pages/dashboard/ctrl-dash.js +++ /dev/null @@ -1,4 +0,0 @@ -app.controller('DashboardCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); diff --git a/app/pages/dashboard/ctrl-featured.js b/app/pages/dashboard/ctrl-featured.js deleted file mode 100644 index 8fe25a8..0000000 --- a/app/pages/dashboard/ctrl-featured.js +++ /dev/null @@ -1,4 +0,0 @@ -app.controller('DashboardFeatureCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); diff --git a/app/pages/dashboard/ctrl-news.js b/app/pages/dashboard/ctrl-news.js deleted file mode 100644 index fc780d1..0000000 --- a/app/pages/dashboard/ctrl-news.js +++ /dev/null @@ -1,4 +0,0 @@ -app.controller('DashboardNewsCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); diff --git a/app/pages/dashboard/ctrl-users.js b/app/pages/dashboard/ctrl-users.js deleted file mode 100644 index 15c5aef..0000000 --- a/app/pages/dashboard/ctrl-users.js +++ /dev/null @@ -1,4 +0,0 @@ -app.controller('DashboardUserCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); diff --git a/app/pages/dashboard/view.html b/app/pages/food/anotherCtrl.js similarity index 100% rename from app/pages/dashboard/view.html rename to app/pages/food/anotherCtrl.js diff --git a/app/pages/food/ctrl.js b/app/pages/food/ctrl.js new file mode 100644 index 0000000..199a701 --- /dev/null +++ b/app/pages/food/ctrl.js @@ -0,0 +1,7 @@ +app.controller('FoodCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Food'; + $scope.page.id = 'food'; + $scope.page.yourVar = "globalStuff"; + + $scope.var2 = "localStuff"; +}]); diff --git a/app/sandbox/style.styl b/app/pages/food/style.styl similarity index 100% rename from app/sandbox/style.styl rename to app/pages/food/style.styl diff --git a/app/pages/food/view.html b/app/pages/food/view.html new file mode 100644 index 0000000..f45f070 --- /dev/null +++ b/app/pages/food/view.html @@ -0,0 +1,2 @@ +
+

You've reached pages/food/view.html.

diff --git a/app/pages/login/anotherCtrl.js b/app/pages/login/anotherCtrl.js new file mode 100644 index 0000000..e69de29 diff --git a/app/pages/login/ctrl.js b/app/pages/login/ctrl.js new file mode 100644 index 0000000..d8e34b5 --- /dev/null +++ b/app/pages/login/ctrl.js @@ -0,0 +1,7 @@ +app.controller('LoginCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Login'; + $scope.page.id = 'login'; + $scope.page.yourVar = "globalStuff"; + + $scope.var2 = "localStuff"; +}]); diff --git a/app/pages/login/style.styl b/app/pages/login/style.styl new file mode 100644 index 0000000..e69de29 diff --git a/app/pages/login/view.html b/app/pages/login/view.html new file mode 100644 index 0000000..182622f --- /dev/null +++ b/app/pages/login/view.html @@ -0,0 +1,2 @@ +
+

You've reached pages/login/view.html.

diff --git a/app/pages/news/ctrl.js b/app/pages/news/ctrl.js deleted file mode 100644 index 3b1400f..0000000 --- a/app/pages/news/ctrl.js +++ /dev/null @@ -1,5 +0,0 @@ -app.controller('NewsCtrl', ['$scope', function ($scope) { - $scope.page.title = 'News'; - $scope.page.id = 'news'; - $scope.page.blackNav = false; -}]); diff --git a/app/pages/single-competition/ctrl.js b/app/pages/single-competition/ctrl.js deleted file mode 100644 index dce26ea..0000000 --- a/app/pages/single-competition/ctrl.js +++ /dev/null @@ -1,4 +0,0 @@ -app.controller('SingleCompetitionCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); diff --git a/app/pages/single-competition/view.html b/app/pages/single-competition/view.html deleted file mode 100644 index ce0de8d..0000000 --- a/app/pages/single-competition/view.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/app/root-view/_footer.kit b/app/root/_footer.kit similarity index 100% rename from app/root-view/_footer.kit rename to app/root/_footer.kit diff --git a/app/root-view/_header.kit b/app/root/_header.kit similarity index 96% rename from app/root-view/_header.kit rename to app/root/_header.kit index c30bdcd..433acc8 100644 --- a/app/root-view/_header.kit +++ b/app/root/_header.kit @@ -21,6 +21,6 @@ - {{page.title}} | Flash + {{page.title}} | F2E diff --git a/app/root-view/_nav.kit b/app/root/_nav.kit similarity index 86% rename from app/root-view/_nav.kit rename to app/root/_nav.kit index c76d989..3c3f200 100644 --- a/app/root-view/_nav.kit +++ b/app/root/_nav.kit @@ -1,4 +1,4 @@ -
+
@@ -10,9 +10,11 @@
@@ -27,6 +29,8 @@
+ +
    diff --git a/app/root-view/index.kit b/app/root/index.kit similarity index 100% rename from app/root-view/index.kit rename to app/root/index.kit diff --git a/app/root/root-ctrl.js b/app/root/root-ctrl.js new file mode 100644 index 0000000..ba900f4 --- /dev/null +++ b/app/root/root-ctrl.js @@ -0,0 +1,10 @@ +app.controller('root', ['$scope', '$location', function ($scope, $location) { + $scope.page = { + 'title' : 'Root', + 'id' : 'root', + 'blackNav' : false + }; + $scope.go = function ( path ) { + $location.path( path ); + }; +}]); diff --git a/app/root-view/root.styl b/app/root/root.styl similarity index 86% rename from app/root-view/root.styl rename to app/root/root.styl index bfae0e7..7b019be 100644 --- a/app/root-view/root.styl +++ b/app/root/root.styl @@ -1,9 +1,14 @@ /* Table of Contents: + Spacer Main Nav Footer */ + +.spacer + height: 80px + // Main Nav .nav-main display: flex @@ -14,8 +19,8 @@ Table of Contents: height: navh = 4.5em width: 100% z-index: 10 - &.scroll, &.scrollStuck - background-color: rgba(0,0,0,.8) + // &.scroll, &.scrollStuck + background-color: rgba(0,0,0,.8) .left-nav display: flex @@ -52,6 +57,7 @@ Table of Contents: .tabs height: auto .tab + min-width: 80px // temporary height: navh line-height: navh .indicator @@ -64,7 +70,7 @@ Table of Contents: a.btn display: none .tabs - width: 23.5em + min-width: 35em // used to be width: 23.5em position: relative right: 7em diff --git a/app/pages/community/view.html b/app/sandbox/competition.html similarity index 100% rename from app/pages/community/view.html rename to app/sandbox/competition.html diff --git a/app/sandbox/ctrl.js b/app/sandbox/ctrl.js index d552628..c58d1d0 100644 --- a/app/sandbox/ctrl.js +++ b/app/sandbox/ctrl.js @@ -1,3 +1,15 @@ +app.controller('NewsCtrl', ['$scope', function ($scope) { + $scope.page.title = 'News'; + $scope.page.id = 'news'; + $scope.page.blackNav = false; +}]); + +app.controller('CompetitionCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Competitions'; + $scope.page.id = 'comps'; + $scope.page.blackNav = true; +}]); + app.controller('TodoController', ['$scope', function ($scope) { $scope.todos = [ { name: 'Master HTML/CSS/Javascript', completed: true }, diff --git a/app/pages/news/view.html b/app/sandbox/news.html similarity index 100% rename from app/pages/news/view.html rename to app/sandbox/news.html diff --git a/app/sandbox/scrap.html b/app/sandbox/scrap.html index 6f51404..0f5f52a 100644 --- a/app/sandbox/scrap.html +++ b/app/sandbox/scrap.html @@ -1,13 +1,3 @@ - - diff --git a/app/pages/news/style.styl b/app/sandbox/whatever.styl similarity index 86% rename from app/pages/news/style.styl rename to app/sandbox/whatever.styl index 11169eb..90472a6 100644 --- a/app/pages/news/style.styl +++ b/app/sandbox/whatever.styl @@ -5,6 +5,7 @@ Table of Contents: Header buttons News Featured User + --Competition page */ @@ -100,3 +101,19 @@ header.label margin: 0 0 1rem 0 p display: none + + + + +.competition-cards + display: flex + flex-flow: row wrap + justify-content: space-around + padding: 6em 2em + .card.small + flex: 0 400px + height: auto + margin: 1.5em .5em + .img + height: 200px + background-size: cover diff --git a/assets/css/main.css b/assets/css/main.css index 8597a19..21f8d3c 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,6 +1,9 @@ a { cursor: pointer; } +::-webkit-scrollbar { + display: none; +} [ng:cloak], [ng-cloak], [data-ng-cloak], @@ -21,20 +24,88 @@ ul.tabs .tab a:hover { .spacer { height: 80px; } -.competition-cards { +.nav-main { display: flex; - flex-flow: row wrap; - justify-content: space-around; - padding: 6em 2em; + justify-content: space-between; + color: #fff; + position: fixed; + top: 0; + height: 4.5em; + width: 100%; + z-index: 10; + background-color: rgba(0,0,0,0.8); } -.competition-cards .card.small { - flex: 0 400px; +.nav-main .left-nav { + display: flex; + height: 4.5em; + align-items: center; +} +.nav-main .left-nav * { + display: inline; +} +.nav-main .left-nav i { + font-size: 6rem; +} +.nav-main .left-nav h4 { + font-size: 2.6rem; + font-weight: 500; + margin: 0; +} +.nav-main .right-nav { + display: flex; + align-items: center; +} +.nav-main a.btn { + padding: 0; + min-width: 7em; + width: 10em; + margin-right: 1em; +} +.nav-main a.btn.blue { + margin-left: 1em; +} +.nav-main .profile-btn { + position: fixed; + top: 0.5em; + right: 0.5em; + border-radius: 100px; +} +.nav-main .profile-btn img { + border-radius: 100px; + width: 5.7em; +} +.nav-main .tabs { height: auto; - margin: 1.5em 0.5em; } -.competition-cards .card.small .img { - height: 200px; - background-size: cover; +.nav-main .tabs .tab { + min-width: 80px; + height: 4.5em; + line-height: 4.5em; +} +.nav-main .tabs .indicator { + background-color: #fff; + top: 0; + height: 5px; +} +.nav-main:not(.signedIn) a.profile-btn { + display: none; +} +.nav-main.signedIn a.btn { + display: none; +} +.nav-main.signedIn .tabs { + min-width: 35em; + position: relative; + right: 7em; +} +footer { + display: flex; + align-items: center; + justify-content: center; + padding: 2em; +} +footer * { + margin: 0 1em; } .hero { height: 70vh; @@ -142,88 +213,18 @@ header.label i { font-size: 60px; } } -.nav-main { - display: flex; - justify-content: space-between; - color: #fff; - position: fixed; - top: 0; - height: 4.5em; - width: 100%; - z-index: 10; -} -.nav-main.scroll, -.nav-main.scrollStuck { - background-color: rgba(0,0,0,0.8); -} -.nav-main .left-nav { - display: flex; - height: 4.5em; - align-items: center; -} -.nav-main .left-nav * { - display: inline; -} -.nav-main .left-nav i { - font-size: 6rem; -} -.nav-main .left-nav h4 { - font-size: 2.6rem; - font-weight: 500; - margin: 0; -} -.nav-main .right-nav { +.competition-cards { display: flex; - align-items: center; -} -.nav-main a.btn { - padding: 0; - min-width: 7em; - width: 10em; - margin-right: 1em; -} -.nav-main a.btn.blue { - margin-left: 1em; -} -.nav-main .profile-btn { - position: fixed; - top: 0.5em; - right: 0.5em; - border-radius: 100px; -} -.nav-main .profile-btn img { - border-radius: 100px; - width: 5.7em; + flex-flow: row wrap; + justify-content: space-around; + padding: 6em 2em; } -.nav-main .tabs { +.competition-cards .card.small { + flex: 0 400px; height: auto; + margin: 1.5em 0.5em; } -.nav-main .tabs .tab { - height: 4.5em; - line-height: 4.5em; -} -.nav-main .tabs .indicator { - background-color: #fff; - top: 0; - height: 5px; -} -.nav-main:not(.signedIn) a.profile-btn { - display: none; -} -.nav-main.signedIn a.btn { - display: none; -} -.nav-main.signedIn .tabs { - width: 23.5em; - position: relative; - right: 7em; -} -footer { - display: flex; - align-items: center; - justify-content: center; - padding: 2em; -} -footer * { - margin: 0 1em; +.competition-cards .card.small .img { + height: 200px; + background-size: cover; } diff --git a/assets/js/bundle.js b/assets/js/bundle.js index 11b6be7..15eff6c 100644 --- a/assets/js/bundle.js +++ b/assets/js/bundle.js @@ -1,82 +1,42 @@ var app = angular.module('app', ['ngRoute']); -// Root controller -app.controller('root', ['$scope', '$location', function ($scope, $location) { - $scope.page = { - 'title' : 'Root', - 'id' : 'root', - 'blackNav' : false - }; - $scope.go = function ( path ) { - $location.path( path ); - }; -}]); +// Root controllers in /root/ folder +// Page controllers in /pages/[your-page] folder app.config( function ($routeProvider, $locationProvider) { $routeProvider .when('/', { - templateUrl: 'app/pages/news/view.html', - controller: 'NewsCtrl' + templateUrl: 'app/pages/food/view.html', + controller: 'FoodCtrl' }) - // Sandbox - .when('/email', { - templateUrl: 'app/sandbox/email.html', - controller: 'EmailController' + .when('/login', { + templateUrl: 'app/pages/login/view.html', + controller: 'LoginCtrl' }) - // Sandbox - .when('/todo', { - templateUrl: 'app/sandbox/todo.html', - controller: 'TodoController' + .when('/categories', { + templateUrl: 'app/pages/categories/view.html', + controller: 'CategoryCtrl' }) - .when('/news', { - templateUrl: 'app/pages/news/view.html', - controller: 'NewsCtrl' + .when('/food', { + templateUrl: 'app/pages/food/view.html', + controller: 'FoodCtrl' }) - .when('/community', { - templateUrl: 'app/pages/community/view.html', - controller: 'CommunityCtrl' + // Sandbox Demo + .when('/news', { + templateUrl: 'app/sandbox/news.html', + controller: 'NewsCtrl' }) + // Sandbox Demo .when('/competitions', { - templateUrl: 'app/pages/competitions/view.html', + templateUrl: 'app/sandbox/competition.html', controller: 'CompetitionCtrl' }) - .when('/c/:id', { - templateUrl: 'app/pages/single-competition/view.html', - controller: 'SingleCompetitionCtrl' - }) - - // Dashboard ======Below This Point======= - .when('/dashboard', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardCtrl' - }) - - .when('/dashboard/news', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardNewsCtrl' - }) - - .when('/dashboard/competitions', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardCompetitionCtrl' - }) - - .when('/dashboard/featured-user', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardFeatureCtrl' - }) - - .when('/dashboard/users', { - templateUrl: 'app/pages/dashboard/view.html', - controller: 'DashboardUserCtrl' - }) - // 404 Not Found .otherwise({ templateUrl: 'app/pages/404/view.html', @@ -86,6 +46,29 @@ app.config( function ($routeProvider, $locationProvider) { // $locationProvider.html5Mode(true); }); +app.controller('root', ['$scope', '$location', function ($scope, $location) { + $scope.page = { + 'title' : 'Root', + 'id' : 'root', + 'blackNav' : false + }; + $scope.go = function ( path ) { + $location.path( path ); + }; +}]); + +app.controller('NewsCtrl', ['$scope', function ($scope) { + $scope.page.title = 'News'; + $scope.page.id = 'news'; + $scope.page.blackNav = false; +}]); + +app.controller('CompetitionCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Competitions'; + $scope.page.id = 'comps'; + $scope.page.blackNav = true; +}]); + app.controller('TodoController', ['$scope', function ($scope) { $scope.todos = [ { name: 'Master HTML/CSS/Javascript', completed: true }, @@ -103,80 +86,36 @@ app.controller('EmailController', ['$scope', function ($scope) { }]); app.controller('404Ctrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); + $scope.page.title = '404'; + $scope.page.id = '404'; + $scope.page.yourVar = "globalStuff"; -app.controller('CommunityCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Community'; - $scope.page.id = 'comm'; - $scope.page.blackNav = true; + $scope.var2 = "localStuff"; }]); -app.controller('DashboardCompetitionCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); -app.controller('DashboardCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); +app.controller('FoodCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Food'; + $scope.page.id = 'food'; + $scope.page.yourVar = "globalStuff"; -app.controller('DashboardFeatureCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; + $scope.var2 = "localStuff"; }]); -app.controller('DashboardNewsCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; -}]); -app.controller('DashboardUserCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; +app.controller('CategoryCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Categories'; + $scope.page.id = 'cat'; + $scope.page.yourVar = "globalStuff"; + + $scope.var2 = "localStuff"; }]); -app.controller('CompetitionCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Competitions'; - $scope.page.id = 'comps'; - $scope.page.blackNav = true; -}]); - - -/* if timeToView | timeToVote -Show DOM image grid. Load with images -if timeToVote -Add vote buttons -vote onClick: fill(heartUI). Add {username: true} to photo/votes -firebase/comps/Time/votes { - myUsername { -- rule: limit count here to 5 - userID-I-VotedFor: true - } -} - -if timeToEnter -Show enter DOM -upload onSubmit, add pic to firebase storage && firebase/competitions/Time/photos -firebase/comps/Time/photos { - myUsername { - photoURL: firebaseStorageurl.com/asdf -- write rule, only write to your id -} -} - -if id-not-found in firebaseObject -Show DOM template: "Sorry, no competition with that name" -*/ - -app.controller('NewsCtrl', ['$scope', function ($scope) { - $scope.page.title = 'News'; - $scope.page.id = 'news'; - $scope.page.blackNav = false; -}]); +app.controller('LoginCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Login'; + $scope.page.id = 'login'; + $scope.page.yourVar = "globalStuff"; -app.controller('SingleCompetitionCtrl', ['$scope', function ($scope) { - $scope.test = "Title"; - $scope.test2 = "xxdddd"; + $scope.var2 = "localStuff"; }]); diff --git a/assets/styl/reset.styl b/assets/styl/reset.styl index 587b072..08d47b2 100644 --- a/assets/styl/reset.styl +++ b/assets/styl/reset.styl @@ -2,6 +2,10 @@ a cursor: pointer +::-webkit-scrollbar + display: none + + // Angular Resets [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { display: none !important; diff --git a/gulpfile.js b/gulpfile.js index a759326..840bb8c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -36,7 +36,7 @@ gulp.src(['app/app.js', 'app/**/!(app).js']) // Kit ////////////////////////////// gulp.task('kit', function () { -gulp.src('app/root-view/index.kit') +gulp.src('app/root/index.kit') .pipe(plumber({errorHandler: notify.onError({ title: 'Kit Error', message: '<%= error.message %>'})})) @@ -65,7 +65,7 @@ gulp.task('browser-sync', function () { // Watch ////////////////////////////// gulp.task('watch', function () { - gulp.watch(['app/**/*.styl', 'assets/styl/**/*.styl', 'app/root-view/*.styl'], ['styles']); + gulp.watch(['app/**/*.styl', 'assets/styl/**/*.styl', 'app/root/*.styl'], ['styles']); gulp.watch('app/**/*.js', ['scripts']); gulp.watch('app/**/*.kit', ['kit']); gulp.watch('app/**/*.html', ['html-reload']); diff --git a/index.html b/index.html index a68672e..efb6fb2 100644 --- a/index.html +++ b/index.html @@ -23,14 +23,14 @@ - {{page.title}} | Flash + {{page.title}} | F2E -
    +
    @@ -42,9 +42,11 @@
    @@ -59,6 +61,8 @@
    + +