Merge pull request #10 from smallhacks/dev

Major update
smallhacks · Jul 31, 2019 · ecaf04c · ecaf04c
2 parents 4ad2cdb + 7c735a5
commit ecaf04c
Show file tree

Hide file tree

Showing 54 changed files with 734 additions and 471 deletions.
diff --git a/build/beekee-v0.1-arm-v6.tar.gz b/build/beekee-v0.1-arm-v6.tar.gz
diff --git a/build/beekee-v0.1-arm-v7.tar.gz b/build/beekee-v0.1-arm-v7.tar.gz
diff --git a/src/.meteor/packages b/src/.meteor/packages
@@ -57,3 +57,4 @@ teamon:tinymce
 tomi:upload-jquery@=2.2.3
 tomi:upload-server
 chrismbeckett:toastr
+reywood:iron-router-ga
diff --git a/src/.meteor/versions b/src/.meteor/versions
@@ -96,6 +96,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+reywood:[email protected]
 [email protected]
 ryanswapp:[email protected]
 rzymek:[email protected]

diff --git a/src/client/stylesheets/custom.css b/src/client/stylesheets/custom.css
@@ -3,6 +3,19 @@ custom.css
 */
 
 
+/* ----- Fonts ----- */
+
+@font-face {
+  font-family: 'Raleway Regular';
+  src: url('/fonts/Raleway-Regular.eot'); /* IE9 Compat Modes */
+  src: url('/fonts/Raleway-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/fonts/Raleway-Regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('/fonts/Raleway-Regular.woff') format('woff'), /* Pretty Modern Browsers */
+       url('/fonts/Raleway-Regular.ttf')  format('truetype'), /* Safari, Android, iOS */
+       url('/fonts/Raleway-Regular.svg#svgFontName') format('svg'); /* Legacy iOS */
+}
+
+
 /* ----- Global ----- */
 
 html {
@@ -11,6 +24,7 @@ html {
 
 body {
 	background-color: #fafafa;
+	font-family: Raleway, 'Raleway Regular', sans-serif;
 	overflow: auto;
 	height: 100% !important;
 }
@@ -19,13 +33,47 @@ a, button {
   outline: none;
 }
 
+a {
+	color: #1da1f2;
+}
+
+a.link-white {
+	color:white;
+	text-decoration: underline;
+	font-weight: bold;
+}
+
+a.link-white:hover {
+	color:#0056b3;
+}
+
+h6 {
+	font-weight: bold;
+}
+
 .wrapper {
 	overflow-y: scroll;
     overflow: -moz-scrollbars-vertical; 
 }
 
 .bg-beekee {
-	background-color: #ffff66;
+	background-color: rgb(66, 164, 224);
+}
+
+.text-primary {
+	color: rgb(66, 164, 224) !important;
+}
+
+.btn-outline-primary {
+	border: solid 2px rgb(66, 164, 224) !important;
+	border-radius: 20px;
+	color: rgb(66, 164, 224) !important;
+}
+
+.btn-outline-primary:hover {
+	background-color: rgb(66, 164, 224) !important;
+	border-color: rgb(66, 164, 224) !important;
+	color: white !important;
 }
 
 .btn-icon {
@@ -72,6 +120,11 @@ a, button {
 	min-height: 100% !important;
 }
 
+.card {
+	border: solid 1px #efefef;
+	box-shadow: 0 30px 10px -32px rgba(50,50,93,.08), 0 18px 36px -18px rgba(0,0,0,.05), 0 -12px 36px -8px rgba(0,0,0,.0015);
+}
+
 .card-header {
 	padding: 0.5rem 1.25rem !important;
 	font-weight: 500 !important;
@@ -102,6 +155,15 @@ a, button {
 
 }
 
+@media (max-width: 991.98px) { 
+	.row {
+/*		margin-left:0px;
+		margin-right:0px;
+				padding-left:0px;
+		padding-right:0px;*/
+	}
+}
+
 input.error {
  	background-color:rgb(255, 231, 231);
  }
@@ -128,20 +190,12 @@ and (max-device-width : 568px) {*/
 }
 
 
-/* ----- Sidebar ----- */
-
-.space-sidebar--menu-collapse[aria-expanded="false"] .fa:before {  
-  content: "\f0d8";
-}
+/* ----- Index Student ----- */
 
-.space-sidebar--menu-collapse[aria-expanded="true"] .fa:before {
-  content: "\f0d7";
+.index-student {
+	background-color: #1da1f2;
 }
 
-.space-sidebar--filter-category > :nth-child(3) { display:none; }
-
-.space-sidebar--filter-category:hover > :nth-child(3) { display:inline; }
-
 
 /* ----- Post item ----- */
 
@@ -182,6 +236,20 @@ and (max-device-width : 568px) {*/
 }
 
 
+/* ----- Live Feed Post Submit ----- */
+
+.live-feed-post-submit {
+	border:solid 1px rgb(204, 232, 255);
+	padding:10px;
+	border-radius: 0.25rem 0.25rem 0.25rem 0.25rem !important;
+	background:#f2f9ff;
+}
+
+#live-feed-post-submit--form .card-img-top {
+	width:50%;
+}
+
+
 /* ----- File upload ----- */
 
 .file-upload--input-file {
@@ -190,6 +258,7 @@ and (max-device-width : 568px) {*/
 }
 
 .file-upload--input-file-icon {
+	color: rgb(66, 164, 224);
 	cursor: pointer;
 }
 

diff --git a/src/client/stylesheets/sidebar.css b/src/client/stylesheets/sidebar.css
@@ -20,21 +20,61 @@ sidebar.css
 /*    box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.2); */
 }
 
+.sidebar-item {
+    padding-left:6px;
+}
+
 .sidebar-item:hover {
-    background-color: white;
+    background-color: rgb(233, 247, 255);
+    border-radius: 15px;
 }
 
-.menu-item--selected {
-    background-color: white;
+.sidebar-item:hover > a{
+    color:rgb(66, 164, 224) !important;
+    font-weight: bold !important;
+}
+
+a.menu-item {
+    color: #676767;
+}
+
+.sidebar--submenu {
+    border-left:solid 1px #cce8ff;
+    margin-left:15px;
+    padding-left:4px;
+}
+
+a.space-sidebar--menu-collapse {
+    color: #afafaf !important;
+    font-weight: bold;
+}
+
+.sidebar--submenu a, .sidebar--submenu i {
+    font-size:0.75em;
+    color: #727980;
+}
+
+a.menu-item--selected {
+    color: rgb(66, 164, 224);
+    font-weight: bold;
+}
+
+.menu-item--selected .menu-item {
+    color: rgb(66, 164, 224);
 }
 
 @media (max-width: 991.98px) { 
     .menu-item--selected {
         background-color: #cccccc;
     }
 
+    .sidebar-item {
+        width:100%;
+    }
+
     .sidebar-item:hover {
-    background-color: #cccccc;
+        border-radius:0px;
+        background-color: #cccccc;
     }
 }
 
@@ -88,6 +128,33 @@ sidebar.css
     transform: translateY(-50%);
 }
 
+.space-sidebar--menu-collapse[aria-expanded="false"] .fa:before {  
+    content: "\f0d7";
+}
+
+.space-sidebar--menu-collapse[aria-expanded="true"] .fa:before {
+    content: "\f0d8";
+}
+
+.space-sidebar--filter-category > :nth-child(3) { display:none; }
+
+.space-sidebar--filter-category:hover > :nth-child(3) { display:inline; }
+
+.space-sidebar--live-feed-category-edit i {
+    font-size:1.1em;
+}
+
+.space-sidebar--credits {
+    margin-top:40px;
+    font-size: 0.7em;
+    color: #b7b7b7;
+    padding-top: 12px;
+}
+
+a.sidebar--add {
+    color: #1da1f2;
+}
+
 
 /* ----- Content ----- */
 

diff --git a/src/client/templates/account/reset-password.html b/src/client/templates/account/reset-password.html
@@ -1,19 +1,22 @@
 <template name="resetPassword">
     <div class="reset-password">
-        <div class="page-title">{{_ 'reset-password--page-title'}}</div>
-        <form id="login--form" class="login--form">        
-            <div class="login--wrapper">
-                <label><b>{{_ 'reset-password--new-password'}}</b></label><br />
-                <input type="password" name="" class="form-control" id="password" value=""><br />
-            </div> 
-            <div class="login--button-wrapper">
-                <button type="submit" class="button button-primary reset-password--button-submit">{{_ 'reset-password--button-submit'}}</button>
-            </div>   
-        </form>
-        <div class="login--register-link-wrapper">
-            <span>{{_ 'login--register'}}<br /><br />
-                <a href="{{pathFor 'register'}}"> {{_ 'login--register-link'}}</a> !
-            </span>
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-sm-12 col-lg-8 pt-4 pl-4 pr-4 pb-3 text-center">
+                    <h1 class="mb-5">{{_ 'reset-password--page-title'}}</h1>
+                    <div class="text-justify">
+                       <form id="login--form" class="login--form">        
+                            <div class="login--wrapper">
+                                <label><b>{{_ 'reset-password--new-password'}}</b></label><br />
+                                <input type="password" name="" class="form-control" id="password" value=""><br />
+                            </div> 
+                            <div class="login--button-wrapper">
+                                <button type="button" class="btn btn-primary w-100 reset-password--button-submit">{{_ 'reset-password--button-submit'}}</button>
+                            </div>   
+                        </form>                 
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
diff --git a/src/client/templates/account/reset-password.js b/src/client/templates/account/reset-password.js
@@ -1,3 +1,10 @@
+Template.resetPassword.onRendered(function () {
+
+    // Enable autofocus
+    $('#password').focus();
+});
+
+
 Template.resetPassword.events({
 
     'submit form': function(e) {

diff --git a/src/client/templates/account/user_settings.html b/src/client/templates/account/user_settings.html
@@ -2,7 +2,7 @@
 	{{> backHeader}}
 	<div class="container h-100">
 		<div class="row justify-content-center min-h-100">
-    		<div class="col-sm-12 col-lg-8 bg-white border-left border-right min-h-100 pt-4 pl-4 pr-4">
+    		<div class="col-sm-12 col-lg-8 min-h-100 pt-4 pl-4 pr-4">
                 <h5 class="text-center mb-5">{{_ 'user-settings--page-title'}}</h5>
                 <div class="list-group w-100">
                 	<a href="#" class="list-group-item list-group-item-action d-flex user-settings--change-password"><span>{{_ 'user-settings--change-password'}}</span><span class="ml-auto"></span></a>

diff --git a/src/client/templates/admin/admin.html b/src/client/templates/admin/admin.html
@@ -109,13 +109,6 @@ <h3>{{_ 'admin--page-title'}}</h3>
 				</div>
 			</div>
 		</div>
-		{{#if isBox}}
-			<div class="row justify-content-center mb-4">
-				<div class="col-sm-12 col-lg-8 text-center">
-					<button type="button" class="btn btn-outline-secondary admin--shutdown"><i class="fa fa-power-off"></i><br><span>{{_ 'index-teacher--shutdown'}}</span></button>
-				</div>
-			</div>
-		{{/if}}
 	</div>
 	{{> adminSpaceSubmit}}
 	{{> adminCreateAccount}}

diff --git a/src/client/templates/admin/admin_space_submit.js b/src/client/templates/admin/admin_space_submit.js
@@ -5,7 +5,7 @@ Template.adminSpaceSubmit.onRendered(function () {
             "spaceName": {
                 required: true,
                 minlength: 3,
-                maxlength: 20
+                maxlength: 35
             }
         }
     }); 
@@ -20,7 +20,8 @@ Template.adminSpaceSubmit.events({
 		 e.preventDefault();
 
 		var space = {
-			title: $('#spaceName').val().trim()
+			title: $('#spaceName').val().trim(),
+			lang: Session.get('lang')
 		};
 
 		Meteor.call('spaceInsert', space, function(error, result) {

diff --git a/src/client/templates/headers/back_header.html b/src/client/templates/headers/back_header.html
@@ -1,9 +1,9 @@
 <template name="backHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:52px;line-height:52px;">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
 				<div class="col-4 col-lg-3" style="">
-					<a href="#" class="btn-link back-header--button-back"><i class="fas fa-chevron-left fa-lg"></i><span> {{_ 'header--back'}}</span></a>
+					<a href="#" class="back-header--button-back"><i class="fas fa-chevron-left fa-lg"></i><span> {{_ 'header--back'}}</span></a>
 				</div>
 				<div class="col-8">
 				</div>

diff --git a/src/client/templates/headers/index_student_header.html b/src/client/templates/headers/index_student_header.html
@@ -1,14 +1,14 @@
 <template name="indexStudentHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:52px;line-height:52px;">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
 				<div class="col-4 col-lg-3" style="">
                 	<a class="menu-item h-100" href="#">
-						<img style="height: 35px; padding: 0px 10px 5px 0;" alt="logo" src="/img/logo_header.png">
+						<img style="height: 55px; padding: 0px 10px 5px 0;" alt="logo" src="/img/logo_black.svg">
 					</a>
 				</div>
 				<div class="col-8 text-right">
-					<a href="{{pathFor 'indexTeacher'}}" class="btn-link">{{_ 'header--admin-access'}}</a>
+					<a href="{{pathFor 'indexTeacher'}}" class="">{{_ 'header--admin-access'}}</a>
 				</div>
 			</div>
 		</div>