Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sa #40

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open

sa #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
98ab2e4
Added the second screen w/stylesheets and js
lkryan Feb 18, 2021
f40730a
added both pages
lkryan Feb 18, 2021
1f9d292
added club route
Feb 18, 2021
4d91c5e
Updated placeholder
lkryan Feb 19, 2021
35f0fe7
Merge branch 'master' of https://github.com/lkryan/cogs120-clf
lkryan Feb 19, 2021
6ed9a90
added back button
lkryan Feb 19, 2021
8176197
k
lkryan Feb 19, 2021
4952700
bigger margin
Feb 21, 2021
8d4be3d
bigger margin
Feb 21, 2021
a4bfaac
Increased dimensions, made white
lkryan Feb 23, 2021
4052c53
added event page
lkryan Feb 23, 2021
10b1078
added json and calendar
f6reyes Feb 24, 2021
e2493fe
login 1
Feb 25, 2021
b29cc66
login 1
Feb 25, 2021
73a12c8
added JSON
Feb 25, 2021
3849b71
added the saved events using json
f6reyes Feb 25, 2021
ce89425
added json and calendar
f6reyes Feb 26, 2021
8ab1508
fixed button, added modal
lkryan Feb 26, 2021
6c5b23f
fixed link
Feb 26, 2021
2a55509
add link
Feb 26, 2021
7b1cb90
added json and calendar
f6reyes Feb 26, 2021
aece439
added json and calendar
f6reyes Feb 26, 2021
4e7f7b0
added diff club events
f6reyes Feb 26, 2021
f5dfb6d
fixed typo
lkryan Feb 26, 2021
7ee5d3d
fixes
Feb 26, 2021
d7e0a52
framework for heart click
lkryan Feb 26, 2021
3c23a8f
fixes
Feb 26, 2021
6c75d3c
fix login
Feb 26, 2021
8ba33c1
club description fix
Feb 26, 2021
dc7b031
added first handler
lkryan Feb 26, 2021
db3e2b2
Merge branch 'master' of https://github.com/lkryan/cogs120-clf
lkryan Feb 26, 2021
07c347d
js file
lkryan Feb 26, 2021
fc4f3b6
Added a shiton of hearts
lkryan Feb 26, 2021
e4f03bd
Finishing touches on Club screen
lkryan Feb 26, 2021
be03fd5
updates
lkryan Feb 26, 2021
c3b4ecd
club json
f6reyes Feb 26, 2021
99e79c6
more updates
lkryan Feb 26, 2021
6d340c7
admendum
lkryan Feb 26, 2021
77c799f
responsive mode & google sign-in
Mar 2, 2021
7fd4b67
combined click functions
lkryan Mar 3, 2021
877454a
Made a series of changes, couldn't figure out json fml
lkryan Mar 3, 2021
3bde8d9
Merge branch 'master' of https://github.com/lkryan/cogs120-clf
f6reyes Mar 3, 2021
2afdaf5
Merge branch 'master' of https://github.com/lkryan/cogs120-clf
f6reyes Mar 3, 2021
623ab7c
delete
lkryan Mar 3, 2021
030f194
lawn photo
lkryan Mar 4, 2021
7938bb4
added seperate clubs
lkryan Mar 4, 2021
299db8f
login new index
Mar 4, 2021
ac9b419
somework on the push
f6reyes Mar 4, 2021
dd665ad
fked up event page
f6reyes Mar 5, 2021
6f07fb7
couldnt do .get/.push
f6reyes Mar 5, 2021
46aec1d
test
Mar 5, 2021
e1b90be
test
Mar 5, 2021
00ddc94
version fix
Mar 5, 2021
5992fcb
header link
Mar 5, 2021
1f258db
Cleaned up header
lkryan Mar 8, 2021
d1b4c53
finsished the add event
lkryan Mar 11, 2021
f1a0169
css
Mar 12, 2021
7b0e4e8
Images
lkryan Mar 12, 2021
442862f
updated color
lkryan Mar 12, 2021
963d80c
updated main club page
lkryan Mar 12, 2021
088e63a
styling overhaul
Mar 12, 2021
767be69
updated blue
lkryan Mar 12, 2021
6689ca3
white
lkryan Mar 12, 2021
a350282
added some hierarchy for upcoming and calendar
f6reyes Mar 13, 2021
172539d
changes
lkryan Mar 13, 2021
09e96db
changes
lkryan Mar 13, 2021
b842537
changes
lkryan Mar 13, 2021
b07eb94
updated calendar
lkryan Mar 14, 2021
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
31 changes: 30 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,22 @@
* Module dependencies.
*/

const fs = require('fs')
var express = require('express');
var http = require('http');
var path = require('path');
var handlebars = require('express3-handlebars')

var index = require('./routes/index');
var club = require('./routes/club');
var event = require('./routes/event');
var calendar = require('./routes/calendar');
var login = require('./routes/login');
var astro = require('./routes/astro');
var acm = require('./routes/acm');
var dsgn = require('./routes/dsgn');
var beatz = require('./routes/beatz');
var upcomingEvents = require('./routes/upcomingEvents');
// Example route
// var user = require('./routes/user');

Expand All @@ -34,7 +44,26 @@ if ('development' == app.get('env')) {
app.use(express.errorHandler());
}

app.get('/', index.view);
app.get('/', login.view);
app.get('/club', club.view);
app.get('/index', index.view);
app.get('/event', event.view);
app.get('/calendar', calendar.view);
app.get('/astro', astro.view);
app.get('/acm', acm.view);
app.get('/dsgn', dsgn.view);
app.get('/beatz', beatz.view);
app.get('/saved', upcomingEvents.upload);

app.post('/addCalendar', function(req,res){
var string = JSON.stringify(req.body)
fs.writeFile('public/json/calendar.json', string, (err) => {
if (err) {
throw err;
}
console.log("JSON data is saved.");
});
});
// Example route
// app.get('/users', user.list);

Expand Down
109 changes: 109 additions & 0 deletions public/css/calendar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
body {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
font-family: Helvetica, Arial, sans-serif;
background-color: whitesmoke;
}

section {
display: flex;
width: 80%;
border: 0px solid;
border-radius: 10px;
height: 15%;
margin-top: 20px;
margin-bottom: 20px;
margin: auto;
background-color: white;
}
.main {
display: flex;
flex-wrap: wrap;
flex-direction: column;
align-items: center;
width: 505px;
height: 850px;
background-color: #f2f2f2;
overflow: visible;
}

h1 {
font-size: 24px;
font-weight: bold;
color: black;
text-align: left;
}

p {
font-size: 12px;
margin-bottom: 3px;
}

header {
display: flex;
width: 100%;
height: 10%;
border-bottom: solid 1px;
background-color: #0080ff;
}

.headerUnit {
display: flex;
justify-content: center;
align-items: center;
text-decoration: none;
text-align: center;
width: 33%;
border-right-style: solid;
border-right-width: 1px;
}

#divImg {
display: flex;
justify-content: center;
align-items: center;
margin: auto;
width: 20%;
}

.longTitle {
text-align: center;
font-weight: bold;
font-size: 16px;
color: white;
}

.sectionUnit {
margin: auto;
width: 70%;
}

.sectionUnit2 {
margin: auto;
width: 20%;
display: flex;
justify-content: center;
align-items: center;
}
.org {
margin-top: 0;
font-size: 18px;
font-style: italic;
}

.date {
padding-top: 3%;
margin: auto;
}

.event-name {
margin-top: auto;
font-weight: bold;
padding-top: 2%;
}

.label {
width: 80%;
}
92 changes: 92 additions & 0 deletions public/css/club.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
body {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
font-family: Helvetica, Arial, sans-serif;
background-color: whitesmoke;
}

.main {
display: flex;
flex-wrap: wrap;
flex-direction: column;
justify-content: space-between;
align-items: center;
width: 100%;
height: 850px;
}

.head{
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
padding: 30px;
}

.gallery{
width: 80%;
height: 20%;
background-color: white;
text-align: center;
font-size: 48px;
margin: auto;
}
.picture{
height: 100%;
width: 100%;
}

.description{
width: 80%;
height: 8%;
margin: auto;
margin-top: 2%;
}

.events{
width: 80%;
height: 16%;
margin: auto;
margin-top: 2%;
}

.board{
width: 80%;
height: 16%;
margin: auto;
margin-top: 2%;
}

.social{
width: 80%;
height: 16%;
margin: auto;
margin-top: 2%;
}
.con{
margin: auto;
display: flex;
justify-content: space-evenly;
align-items: center;
}
.e{
margin: auto;
height: 100px;
width: 40%;
text-align: center;
align-items:center;
}
.button{
background-color: lightgray;
border-radius: 5px;
}
.event_img{
width: 100%;
height: 100%;
}
.event_text{
position: absolute;
color: white;
}
118 changes: 118 additions & 0 deletions public/css/event.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
body {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
font-family: Helvetica, Arial, sans-serif;
background-color: whitesmoke;
}

section {
display: flex;
width: 80%;
border: 0px solid;
border-radius: 10px;
height: 15%;
margin-top: 20px;
margin-bottom: 20px;
background-color: white;
}

.main {
display: flex;
flex-wrap: wrap;
flex-direction: column;
align-items: center;
width: 505px;
height: 850px;
background-color: #f2f2f2;
overflow: visible;
}

h1 {
font-size: 24px;
color: black;
font-weight: bold;
text-align: left;
}

h2 {
margin-bottom: 5px;
}

p {
font-size: 12px;
}

a {
text-decoration: none;
color: black;
}

header {
display: flex;
width: 100%;
height: 10%;
border-bottom: solid 1px;
background-color: #0080ff;
}

.headerUnit {
display: flex;
justify-content: center;
align-items: center;
text-decoration: none;
text-align: center;
width: 33%;
border-right-style: solid;
border-right-width: 1px;
}

#divImg {
display: flex;
justify-content: center;
align-items: center;
margin: auto;
width: 20%;
}

.longTitle {
text-align: center;
font-weight: bold;
font-size: 16px;
color: white;
}

.sectionUnit {
margin: auto;
width: 70%;
}

.sectionUnit2 {
margin: auto;
width: 20%;
display: flex;
justify-content: center;
align-items: center;
}

.org {
margin-top: 0;
font-size: 18px;
font-style: italic;
}

.date {
padding-top: 3%;
margin: auto;
}

.event-name {
margin-top: auto;
font-weight: bold;
padding-top: 2%;
}

.label {
width: 80%;
}
Loading