Skip to content

Commit c9052ec

Browse files
functionality is go
1 parent 9853684 commit c9052ec

File tree

7 files changed

+168
-153
lines changed

7 files changed

+168
-153
lines changed

app/config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ module.exports = {
1010
INTERNAL_SERVER_ERROR: 500,
1111
},
1212

13-
// MONGO_URL: process.env.MONGO_URL || 'mongodb://localhost:27017/fit-journal',
14-
MONGO_URL: process.env.MONGO_URL || 'mongodb:admin:"W!nner05"//ds237932.mlab.com:37932/fit-journal',
13+
MONGO_URL: process.env.MONGO_URL || 'mongodb://localhost:27017/fit-journal',
1514
TEST_MONGO_URL: process.env.TEST_MONGO_URL || 'mongodb://localhost:27017/test-fit-journal',
1615
JWT_SECRET: process.env.JWT_SECRET || 'default',
1716
JWT_EXPIRY: process.env.JWT_EXPIRY || '7d',

public/css/main.css

Lines changed: 64 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
box-sizing: border-box;
55
}
66

7-
html {
8-
font-size: 10px;
7+
html {
8+
font-size: 10px;
99
}
1010

1111
body {
12-
1312
background-color: #131313;
1413
font-family: "Proxima Nova Thin", Arial, Helvetica, sans-serif;
1514
}
@@ -39,7 +38,6 @@ h4 {
3938
main {
4039
display: flex;
4140
width: 100%;
42-
4341
margin: 0 auto;
4442
min-height: 1040px;
4543
background-color: #fff;
@@ -59,7 +57,7 @@ main {
5957

6058
.wo-container {
6159
display: flex;
62-
min-width: 800px;
60+
width: 60%;
6361
background-color: #fff;
6462
margin: 0 auto;
6563
padding-top: 30px;
@@ -113,7 +111,6 @@ main {
113111
justify-content: flex-end;
114112
text-align: right;
115113
padding-right: 40px;
116-
117114
}
118115

119116
.login {
@@ -151,7 +148,7 @@ footer {
151148
max-height: 300px;
152149
color: aliceblue;
153150
display: flex;
154-
justify-content: center;
151+
justify-content: center;
155152
border-top: #FFF 3px solid;
156153
padding: 20px;
157154
}
@@ -188,9 +185,6 @@ ul {
188185
}
189186

190187

191-
192-
193-
194188
/*LOGIN CSSS*/
195189

196190
.login-page {
@@ -208,7 +202,7 @@ ul {
208202
flex-direction: column;
209203
justify-content: center;
210204
background: #FFFFFF;
211-
width: 500px;
205+
width: 100%;
212206
height: 100%;
213207
align-items: center;
214208
margin-left: auto;
@@ -222,18 +216,18 @@ ul {
222216
.not-reg {
223217
background-color: beige;
224218
border-top: #92a2aa solid 2px;
225-
226219
}
227-
.log-logo{
220+
221+
.log-logo {
228222
display: flex;
229-
margin-top: 40px;
223+
margin-top: 40px;
230224
}
231225

232-
233-
.log-logo a:visited{
226+
.log-logo a:visited {
234227
color: #000;
235228
}
236-
.log-logo a:hover{
229+
230+
.log-logo a:hover {
237231
color: #6123a3
238232
}
239233

@@ -292,11 +286,13 @@ ul {
292286
background-color: transparent;
293287
height: 100%;
294288
justify-content: center;
295-
display:flex;
289+
display: flex;
296290
}
297-
.signup-form{
291+
292+
.signup-form {
298293
width: 100%
299294
}
295+
300296
.sign-up {
301297
padding: 10px;
302298
color: #FFF;
@@ -322,7 +318,7 @@ ul {
322318
}
323319

324320
.log-header {
325-
display: flex;
321+
display: flex;
326322
margin: 0px;
327323
height: 40px;
328324
}
@@ -360,14 +356,12 @@ ul {
360356

361357
.ex-head {
362358
display: flex;
363-
364359
width: 50%;
365360
padding-left: 10px;
366361
}
367362

368363
.ex-name {
369364
display: flex;
370-
371365
background-color: #DFDCE3;
372366
align-items: center;
373367
width: 50%;
@@ -379,9 +373,6 @@ ul {
379373
font-weight: normal;
380374
}
381375

382-
383-
384-
385376
.ex-list {
386377
width: 95%;
387378
}
@@ -540,7 +531,6 @@ ul {
540531

541532
.date-sel {
542533
min-width: 200px;
543-
544534
text-align: center;
545535
align-items: center;
546536
font-size: 1.75em;
@@ -562,7 +552,7 @@ ul {
562552
display: flex;
563553
width: 500px;
564554
min-height: 200px;
565-
background-color: #ecc309;
555+
background-color: #ecc309;
566556
padding: 30px;
567557
margin-left: auto;
568558
margin-right: auto;
@@ -606,7 +596,6 @@ ul {
606596
}
607597

608598
.search-btn {
609-
610599
height: 50px;
611600
border: 0px;
612601
background-color: #465C8b;
@@ -721,7 +710,6 @@ input[type=number]::-webkit-outer-spin-button {
721710
background-size: cover;
722711
width: 100%;
723712
min-height: 600px;
724-
725713
}
726714

727715
.home-container {
@@ -745,6 +733,7 @@ input[type=number]::-webkit-outer-spin-button {
745733
background-color: #E8B10C;
746734
justify-content: center;
747735
font-family: 'Righteous', cursive;
736+
align-items: center;
748737
}
749738

750739
.home-reg a {
@@ -759,6 +748,11 @@ input[type=number]::-webkit-outer-spin-button {
759748
color: #fff;
760749
}
761750

751+
.form-wrapper {
752+
max-width: 500px;
753+
padding: 20px;
754+
}
755+
762756
.bg-info {
763757
display: flex;
764758
padding-top: 20px;
@@ -778,7 +772,6 @@ input[type=number]::-webkit-outer-spin-button {
778772
justify-content: center;
779773
flex-direction: column;
780774
text-align: center;
781-
782775
position: absolute;
783776
top: 20%;
784777
left: 50%;
@@ -804,15 +797,20 @@ input[type=number]::-webkit-outer-spin-button {
804797
align-items: center;
805798
flex-direction: column;
806799
}
807-
#logout-btn{
800+
801+
#logout-btn {
808802
font-size: 3rem;
809803
color: #fff;
810804
text-decoration: none;
811805
}
812806

813-
#logout-btn a:hover{color:yellow}
814-
#logout-btn a:visited{color:#fff}
807+
#logout-btn a:hover {
808+
color: yellow
809+
}
815810

811+
#logout-btn a:visited {
812+
color: #fff
813+
}
816814

817815

818816
/* Splash Page Graphics */
@@ -823,7 +821,6 @@ input[type=number]::-webkit-outer-spin-button {
823821
width: 45%;
824822
background: linear-gradient(rgba(106, 17, 203, 0.45), rgba(37, 117, 252, 0.45)), url('../img/strength-act.jpg');
825823
background-size: cover;
826-
827824
flex-direction: column;
828825
padding-top: 30px;
829826
padding-left: 10px;
@@ -842,7 +839,6 @@ input[type=number]::-webkit-outer-spin-button {
842839
width: 45%;
843840
background: linear-gradient(rgba(106, 17, 203, 0.45), rgba(37, 117, 252, 0.45)), url('../img/stairs-act.jpg');
844841
background-size: cover;
845-
846842
flex-direction: column;
847843
padding-top: 30px;
848844
padding-left: 10px;
@@ -878,9 +874,11 @@ input[type=number]::-webkit-outer-spin-button {
878874
display: flex;
879875
justify-content: center;
880876
}
881-
.highlight{
877+
878+
.highlight {
882879
color: #E8B10C;
883880
}
881+
884882
.devices {
885883
background-color: rgba(106, 17, 203);
886884
display: flex;
@@ -895,7 +893,6 @@ input[type=number]::-webkit-outer-spin-button {
895893
.device-text {
896894
display: flex;
897895
flex-wrap: wrap;
898-
899896
width: 75%;
900897
padding-left: 40px;
901898
color: #fff;
@@ -917,7 +914,6 @@ input[type=number]::-webkit-outer-spin-button {
917914
max-height:
918915
}
919916

920-
921917
.divided {
922918
width: 5px;
923919
height: 80%;
@@ -929,29 +925,42 @@ input[type=number]::-webkit-outer-spin-button {
929925
margin-top: 10px;
930926
}
931927

932-
.message a:visited{
928+
.message a:visited {
933929
color: #4CA2CD;
934930
}
935-
.message a:hover{
931+
932+
.message a:hover {
936933
color: #6123a3;
937934
}
938935

936+
939937
/* MOBILE STYLING */
940938

941939
@media only screen and (max-width: 600px) {
942-
html{
943-
font-size: 7px
944-
}
945-
.set-wkout{
946-
width: 100%;
947-
}
948-
949-
.wo-container,
950-
.ex-list{ font-size: 3rem;}
951-
.log-header{ font-size: 3rem;}
952-
.ex-head{ font-size: 3rem;}
953-
.stat-labels{ font-size: 3rem;}
954-
.add-ex{
955-
font-size: 3rem;
956-
}
940+
html {
941+
font-size: 7px
942+
}
943+
.set-wkout {
944+
width: 100%;
945+
}
946+
.wo-container,
947+
.ex-list {
948+
/* font-size: 1.25rem; */
949+
}
950+
.log-header {
951+
font-size: 3rem;
952+
}
953+
.ex-head {
954+
font-size: 3rem;
955+
}
956+
.stat-labels,
957+
.log-stat-lbl {
958+
font-size: 1.5rem;
959+
}
960+
.add-ex {
961+
font-size: 3rem;
962+
}
963+
.wo-container {
964+
width: 320px;
965+
}
957966
}

public/home.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,11 @@ <h4 class="add-ex js-addEx"><a href="/search.html">Add Exercise</a></h4>
7070
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
7171
<script src="/utilities/cache.module.js"></script>
7272
<script src="/auth.page.js"></script>
73-
7473
<script src="/utilities/http.module.js"></script>
7574
<script src="/utilities/index.js"></script>
7675
<script src="/dashboard.page.js"></script>
7776
<script src="https://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.js"></script>
78-
<script src="/home.js"></script>
77+
7978

8079

8180

0 commit comments

Comments
 (0)