Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
7083459
basic html layout for add-entry and overview
nadinejuraschek Nov 2, 2019
0b05b85
readme update
LoraleeSmith Nov 2, 2019
992e687
Merge pull request #1 from Morganatic/LoraleeSmith-patch-1
LoraleeSmith Nov 2, 2019
d2fcb25
api's
LoraleeSmith Nov 3, 2019
f8cea84
added html, css, and did some initial formatting
Morganatic Nov 3, 2019
86a4da9
added som html to the discover page, just trying a few things
Morganatic Nov 3, 2019
d69294b
Merge pull request #2 from Morganatic/LoraleeSmith-patch-2
LoraleeSmith Nov 3, 2019
fd2689f
icons added
nadinejuraschek Nov 4, 2019
d4614ae
scrollbar added
nadinejuraschek Nov 4, 2019
234e826
small stylesheet changes
nadinejuraschek Nov 5, 2019
d05c1fe
added empty hrefs to cards to be edited later
nadinejuraschek Nov 5, 2019
3aa91fe
small stylesheet fixes
nadinejuraschek Nov 5, 2019
7816a25
new api
LoraleeSmith Nov 6, 2019
4bc8532
Merge pull request #3 from Morganatic/LoraleeSmith-patch-3
LoraleeSmith Nov 6, 2019
dcfe3bc
Completed Readme
LoraleeSmith Nov 6, 2019
cb9bf2f
Merge pull request #4 from Morganatic/LoraleeSmith-patch-4
LoraleeSmith Nov 6, 2019
b682af0
put everything in one form
nadinejuraschek Nov 6, 2019
e4fd308
some changes to stylesheet
nadinejuraschek Nov 6, 2019
fbc39f4
created modal to add entry
nadinejuraschek Nov 6, 2019
4cf4a8f
Official Moodsphere readme
LoraleeSmith Nov 6, 2019
99d0622
code to store answers started
nadinejuraschek Nov 6, 2019
902c344
comments will be console logged on submit
nadinejuraschek Nov 6, 2019
bd03ad7
deleted double files
nadinejuraschek Nov 6, 2019
7b0169b
deleted unnecessary files
nadinejuraschek Nov 6, 2019
d519ecd
cleaned up code a bit
nadinejuraschek Nov 6, 2019
ba295e7
deleted double files
nadinejuraschek Nov 6, 2019
a28470a
authentication link added
nadinejuraschek Nov 7, 2019
45f4d1d
tried to add code
nadinejuraschek Nov 7, 2019
2a307b2
add-entry modal code completed
nadinejuraschek Nov 7, 2019
e9db534
quote API added
nadinejuraschek Nov 7, 2019
6da272d
merged add-entry and overview through modals
nadinejuraschek Nov 8, 2019
a8a4a17
Merge pull request #5 from Morganatic/LoraleeSmith-patch-1
LoraleeSmith Nov 8, 2019
89ef3e1
Merge pull request #6 from Morganatic/log-in
nadinejuraschek Nov 8, 2019
0bc7b18
pulled homepage into master
Morganatic Nov 8, 2019
ea47779
merging
nadinejuraschek Nov 8, 2019
3c578cc
Merge pull request #8 from Morganatic/add-entry_overview
nadinejuraschek Nov 8, 2019
aa0e061
merging
nadinejuraschek Nov 8, 2019
3c34912
Merge pull request #9 from Morganatic/HomePage
nadinejuraschek Nov 8, 2019
eaf970a
trying to merge
nadinejuraschek Nov 8, 2019
91dc695
Merge pull request #10 from Morganatic/discover
nadinejuraschek Nov 8, 2019
d648e91
fixed homepage
nadinejuraschek Nov 8, 2019
8deaf20
adding to pull
Morganatic Nov 8, 2019
946da01
Merge branch 'master' of github.com:Morganatic/First-Project
Morganatic Nov 8, 2019
aa04f3f
linking seperate html files and code
nadinejuraschek Nov 8, 2019
64d6118
added logo
Morganatic Nov 8, 2019
4f03500
added some js
Morganatic Nov 8, 2019
c18640a
fixed app.js
nadinejuraschek Nov 8, 2019
d9af7fd
trying to fix homepage
nadinejuraschek Nov 8, 2019
12c5d93
discover resources added
nadinejuraschek Nov 8, 2019
4db95c3
hotline resources
LoraleeSmith Nov 8, 2019
567fc9b
login page edits
Caitlin3410 Nov 8, 2019
6ef0fee
commented out weather api, changed quote text color, added logo to ho…
LoraleeSmith Nov 9, 2019
1ea6248
Fixed logo
LoraleeSmith Nov 9, 2019
55874f3
script and link tags fixed
nadinejuraschek Nov 9, 2019
3324103
menu hover states styled
nadinejuraschek Nov 9, 2019
6e10381
small stylesheet changes
nadinejuraschek Nov 9, 2019
4bed3f9
necessary stylesheet
nadinejuraschek Nov 9, 2019
5a554a5
overview table now displays all logs and comments
nadinejuraschek Nov 9, 2019
ad3b7ed
menu moved to right
nadinejuraschek Nov 9, 2019
8c123df
navbar changed
nadinejuraschek Nov 9, 2019
bc93d01
weather api works
nadinejuraschek Nov 9, 2019
0361130
stylesheet changes
nadinejuraschek Nov 9, 2019
f14366d
add entry fixed
nadinejuraschek Nov 9, 2019
5e6fa7c
fixed login code
nadinejuraschek Nov 9, 2019
9a18d57
changed saved
nadinejuraschek Nov 9, 2019
966f5b1
stylechanges
nadinejuraschek Nov 9, 2019
d4cfe0c
added read info for discover page,working on getting the add entry li…
LoraleeSmith Nov 9, 2019
104442b
added add entry link to get it working for navigation, added articles…
LoraleeSmith Nov 9, 2019
292a671
Merge branch 'master' into new_style
nadinejuraschek Nov 9, 2019
81ba9db
Merge pull request #12 from nadinejuraschek/new_style
nadinejuraschek Nov 9, 2019
94194ba
fixed authentication: overview will only display current user's entri…
nadinejuraschek Nov 14, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
29 changes: 28 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,28 @@
# First-Project
MoodSphere
Project 1 - Mental Health Tracker - Moodsphere

Coders:
Nadine- Authentication (log in)
Morgan- Home/Welcome page Design
Caitlin- Statistics (track entries)
Loralee- API & README

Objective: Create a functioning mental health tracker app.

Motivation: Mental Health awareness is becoming more and more prevalent in today's culture, we are as a society learning that we need to focus more on mental health. As a group we all feel we can relate in some way, whether it's depression or anxiety or just stressed out. It is an important project to us and something we felt we all would use or would like to use for various reasons.

Summary: We aim to create an app that will be useful in tracking an individuals' mental health. You will be required to create a login, scoring, tracking scores over time, include resources,etc.


API’s used:
1) MetaWeather

2) Forismatic

API’s considered:
1)AccuWeather

2)RapidAPI -Universal Inspirational Quotes



48 changes: 48 additions & 0 deletions add-entry.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!DOCTYPE html>
<html>

<head>
<!-- STANDARD META -->
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />

<!-- SITE PROPERTIES -->
<title>Moodsphere - Home</title>

<!-- STYLESHEETS: SEMANTIC UI, ICONS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.css" />
<link rel="stylesheet" type="type/css"
href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/themes/material/assets/fonts/icons.woff" />
<link type="text/css" rel="stylesheet" href="https://cdn.firebase.com/libs/firebaseui/3.5.2/firebaseui.css" />
<link rel="stylesheet" href="https://unpkg.com/swiper/css/swiper.min.css" />

<!-- CUSTOM STYLESHEET -->
<link rel="stylesheet" type="text/css" href="assets/css/add-entry_overview.css" />
</head>

<body>
<!-- NAVIGATION -->
<div class="ui sticky secondary pointing menu">
<a class="active item" href="homepage.html">
Home
</a>
<a id="add-entry-btn" class="item" href="add-entry.html">
Add Entry
</a>
<a class="item" href="overview.html">
Overview
</a>
<a class="item" href="discover.html">
Discover
</a>
<div class="right menu">
<a class="ui item" id="logout-btn">
Logout
</a>
</div>
</div>

<script type="text/javascript" src="assets/javascript/add-entry_overview.js"></script>
<script type="text/javascript" src="assets/javascript/app.js"></script>
</body>
Binary file added assets/.DS_Store
Binary file not shown.
Binary file added assets/css/.DS_Store
Binary file not shown.
226 changes: 226 additions & 0 deletions assets/css/discover.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
/*****************************
COLORS
#D9532D#ff9665#F9B38D
#161E18#454E45#A9ABAA
#61afbd#8FDAE7#F5EFEA

exhilirated happy moderate sad depressed
#C1EAF1#A3E0EB#8FDAE7#76B3BE#5C8B93
*****************************/
.site {
display: flex;
min-height: 100vh;
flex-direction: column;
}

.site-content {
height: 80vw;
overflow-y: scroll;
padding: 0 5rem;
}
/*****************************
NAVIGATION
*****************************/
.app-logo {
height: 2.25rem;
margin: 0.25rem 1rem;
width: 2.25rem;
}
.ui.header.item {
font-family: "Fira Sans", sans-serif;
}
.ui.secondary.pointing.menu {
margin-bottom: 0;
}
.ui.secondary.pointing.menu .item {
color: #161e18;
}
.ui.secondary.pointing.menu .item.app-name {
padding-left: 0;
}
.ui.secondary.pointing.menu a.item:hover {
color: #61afbd;
font-weight: 700;
}
.ui.secondary.pointing.menu .active.item {
background-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border-bottom: 5px solid #61afbd;
font-weight: 700;
color: #61afbd;
}
.ui.secondary.pointing.menu a.active.item:hover {
color: #61afbd;
font-weight: 700;
border-color: #61afbd;
}
#logout-btn:hover {
background-color: #61afbd;
color: #ffffff;
font-weight: 700;
}

/*****************************
MAIN SECTION
*****************************/
.ui.card {
background-repeat: no-repeat;
background-size: cover;
border: none;
border-radius: 20px;
box-shadow: 1px 1px 2px #454e45;
height: 150px;
width: 100%;
}
.ui.card.listen {
background-image: url("../pattern/pattern1-yellow.jpg");
}
.ui.card.watch {
background-image: url("../pattern/pattern1-green.jpg");
}
.ui.card.read {
background-image: url("../pattern/pattern1-blue.jpg");
}
.discover-section {
font-size: 1.5rem;
margin: 2rem 0;
padding: 1rem 1rem;
text-transform: uppercase;
}
.card-heading {
text-transform: uppercase;
}
.card-body {
margin-top: 15px;
}
#buttons {
/* Positioning */
margin: 50px 0;
/* Typography */
text-align: center;
}

button {
/* Box-model */
width: 200px;
height: 100px;
}

.swiper-button-prev {
color: #000;
}

.swiper-button-next {
color: #000;
}

/*****************************
GRAPH
*****************************/
#graph {
border-top: 2px solid #22242615;
height: 20vw;
}

/*****************************
ADD ENTRY
*****************************/
#add-entry-modal {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
left: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: #161e18; /* Fallback color */
background-color: #161e1840; /* Black w/ opacity */
}
#mood-states {
margin: auto;
}
.column {
text-align: center;
}
.mood {
border: none;
border-radius: 50%;
box-shadow: 1px 1px 2px #a9abaa;
height: 50px;
width: 50px;
}
.button-clicked {
height: 65px;
width: 65px;
}
.mood-text {
font-size: 1.25rem;
margin-top: 1rem;
}
#exhilirated {
background-color: #c1eaf1;
}
#happy {
background-color: #a3e0eb;
}
#moderate {
background-color: #8fdae7;
}
#sad {
background-color: #76b3be;
}
#depressed {
background-color: #5c8b93;
}
.question {
font-size: 1.5rem;
margin: 1.5rem 0;
}
.answer-opt-1,
.answer-opt-2,
.answer-opt-3 {
border: 3px solid #f9b38d;
border-radius: 10px;
color: #000;
display: block;
font-size: 1.25rem;
margin: 1rem 0;
padding: 0.5rem;
width: 50%;
}
.answer-opt-1:hover,
.answer-opt-2:hover,
.answer-opt-3:hover {
background-color: #f9b38d;
}
.answer-selected {
background-color: #f9b38d;
}
.modal-btn {
background-color: #61afbd;
border: none;
border-radius: 10px;
color: #ffffff;
font-size: 1.25rem;
font-weight: 700;
margin-top: 2rem;
padding: 1rem;
text-transform: uppercase;
}
.modal-btn:hover {
background-color: #8fdae7;
}
/*****************************
OVERVIEW
*****************************/
#category {
background-color: #e7fbff;
font-size: 1.25rem;
font-weight: 700;
}
.answers,
.comment {
line-height: 2rem;
}
Loading