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

Registration form #8

Open
wants to merge 120 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
de50652
Added all files, initialized
origilad Nov 1, 2016
acba843
adding routes
nhasjim Nov 2, 2016
ad48597
Created Links for Home, AA, Travel Log
nhasjim Nov 3, 2016
a4cdf7f
added the links for travel log, adv ana, and home page
nhasjim Nov 3, 2016
2a7b2a0
Fixed package.json to compile
nhasjim Nov 3, 2016
d9290c9
added map to the map page
origilad Nov 3, 2016
de52a07
just specified certain paths
nhasjim Nov 3, 2016
d0df4c3
added marker to map
origilad Nov 3, 2016
c6ed147
added route for homepage
nhasjim Nov 3, 2016
539db6a
Merge branch 'master' of https://github.com/origilad/basic-express-si…
origilad Nov 3, 2016
08f9f49
Merge pull request #1 from origilad/addMap
origilad Nov 3, 2016
ec25d06
Merge branch 'master' of https://github.com/origilad/basic-express-si…
nhasjim Nov 3, 2016
d5d3f15
added homepage reroute
nhasjim Nov 3, 2016
ea6c552
played with a test json file on TravelLog. Put a data folder to conta…
nhasjim Nov 3, 2016
a9ad401
test
origilad Nov 4, 2016
a19284c
added reading from data/json into the map
origilad Nov 4, 2016
aa8c115
Merge pull request #2 from origilad/addMap
origilad Nov 4, 2016
34035c7
current progress
origilad Nov 4, 2016
703ee22
Merge pull request #3 from origilad/addAdventure
origilad Nov 4, 2016
12c0e23
nothing
nhasjim Nov 4, 2016
ca96f52
ADDED LOGIN PAGE
nhasjim Nov 4, 2016
3c0df1a
LOGIN PAGE WORKS
nhasjim Nov 4, 2016
ade3613
Merge pull request #4 from origilad/login
origilad Nov 4, 2016
3da6bd7
Test
origilad Nov 4, 2016
f668a16
Merge branch 'master' of https://github.com/origilad/basic-express-si…
origilad Nov 4, 2016
1afe25e
added hidden password
nhasjim Nov 4, 2016
96f68f1
password works
nhasjim Nov 4, 2016
8a78cca
Merge pull request #5 from origilad/login
nhasjim Nov 4, 2016
c709d75
add marker
origilad Nov 4, 2016
57cffa5
Merge pull request #6 from origilad/addAdventure
origilad Nov 4, 2016
2ce5af1
updated package.json
origilad Nov 4, 2016
ab505fd
Merge pull request #7 from origilad/addAdventure
origilad Nov 4, 2016
93f0133
Create master branch via GitHub
origilad Nov 4, 2016
dde0ce1
redid bahari's changes that i removed
origilad Nov 4, 2016
48c64bf
Merge pull request #8 from origilad/addAdventure
origilad Nov 4, 2016
2694884
Lol travel Log
nhasjim Nov 4, 2016
e71afae
Travel Log loll
nhasjim Nov 4, 2016
e5ad4c0
added adventure analytics page
origilad Nov 4, 2016
c67a6b8
Merge pull request #9 from origilad/addAdventure
origilad Nov 4, 2016
c75f816
added text onto Travel Log
nhasjim Nov 4, 2016
9a1adbb
Travel Log Text
nhasjim Nov 4, 2016
cb4dbd2
added images folder
origilad Nov 4, 2016
7b5bf8e
Merge pull request #10 from origilad/addAdventure
origilad Nov 4, 2016
001bb80
Travel Log Fix
nhasjim Nov 4, 2016
b552704
Switched to pug
nhasjim Nov 4, 2016
70162d8
Merge pull request #11 from origilad/pug
nhasjim Nov 4, 2016
3bd3b20
saving changes
origilad Nov 4, 2016
0bd1d93
Merge branch 'master' of https://github.com/origilad/basic-express-si…
origilad Nov 4, 2016
ae3cd54
fixed pug
nhasjim Nov 4, 2016
d68662f
Merge pull request #12 from origilad/pug
nhasjim Nov 4, 2016
e31b4e3
make clickable
davidmoll Nov 4, 2016
39d6ad2
Merge pull request #13 from origilad/images-clickable
davidmoll Nov 4, 2016
3ac2b65
Added dummy page for adventures
davidmoll Nov 4, 2016
ccfedcb
Merge pull request #14 from origilad/images-clickable
davidmoll Nov 4, 2016
db0b45e
reverting changes
davidmoll Nov 4, 2016
65a292b
Merge pull request #15 from origilad/images-clickable
davidmoll Nov 4, 2016
a2104c1
reverting changes
davidmoll Nov 4, 2016
23e81c8
Merge pull request #16 from origilad/images-clickable
davidmoll Nov 4, 2016
3451efb
added description
nhasjim Nov 4, 2016
e86363f
added names to the logged-adventure page and changed input to numbers
nhasjim Nov 6, 2016
f229029
added dynamic Travel Log reading. If you add a location on the map, y…
nhasjim Nov 9, 2016
13d2441
Just added a few comments to the json reading/writing
nhasjim Nov 9, 2016
9d58ee6
We can write inputted adventures to a big list of adventures stored i…
davidmoll Nov 9, 2016
db46d2d
Merge pull request #17 from origilad/save-form-input
davidmoll Nov 9, 2016
1d93608
Merge branch 'master' of https://github.com/origilad/basic-express-si…
origilad Nov 9, 2016
0417faf
basic login functionality
davidmoll Nov 10, 2016
7f5f9db
Merge pull request #18 from origilad/save-form-input
davidmoll Nov 10, 2016
dded18f
Merge branch 'master' of https://github.com/origilad/basic-express-si…
origilad Nov 10, 2016
ca8b763
Some errors still exist
origilad Nov 10, 2016
6deb4cd
removed test data
origilad Nov 10, 2016
73e3b9d
removed test data
origilad Nov 10, 2016
6868a07
Merge pull request #19 from origilad/addAdventure
origilad Nov 10, 2016
9096be3
fixed stupid error
origilad Nov 10, 2016
5956f43
Merge pull request #20 from origilad/addAdventure
origilad Nov 10, 2016
6ece5c2
added new route to the adventure you just created. Created random ima…
nhasjim Nov 10, 2016
5dcf52b
resolve merges
nhasjim Nov 10, 2016
236508a
made a fuckton of changes, sorry for the scrappiness of all of it. Ad…
origilad Nov 10, 2016
f967334
Merge pull request #21 from origilad/addAdventure
origilad Nov 10, 2016
cffb90a
Added a page for each adventure
nhasjim Nov 10, 2016
1ecd7fa
Added user fields
origilad Nov 10, 2016
be9d389
Updated user fielding
origilad Nov 10, 2016
551fce6
Merge pull request #22 from origilad/addAdventure
origilad Nov 10, 2016
b861525
using the new data structure
nhasjim Nov 10, 2016
34796c4
fixed merges
nhasjim Nov 10, 2016
4d2726f
fixing adventure pages
nhasjim Nov 10, 2016
f2e160d
Site is fully functional and linking properly
origilad Nov 10, 2016
9f65cd8
prettified login
davidmoll Nov 10, 2016
f9ad7d8
Add link for sign up
davidmoll Nov 10, 2016
89b6ac7
Tweaked several button things
davidmoll Nov 10, 2016
cf3d4e0
Merge pull request #23 from origilad/prettify-login
davidmoll Nov 10, 2016
b56a2f4
Add ui for registration
davidmoll Nov 10, 2016
35f4202
changed a lot of things
origilad Nov 10, 2016
0d4ee29
Merge branch 'master' of https://github.com/origilad/basic-express-si…
origilad Nov 10, 2016
cb4b1e5
Merge pull request #24 from origilad/registration-form
origilad Nov 10, 2016
92413c1
idk
nhasjim Nov 10, 2016
641099b
merges
nhasjim Nov 10, 2016
4d2699a
Finalized layout changes
origilad Nov 10, 2016
87e342d
nothing
nhasjim Nov 10, 2016
6caef79
Updated log adventure page
origilad Nov 10, 2016
03f53d8
nothing
nhasjim Nov 10, 2016
76e63b5
formatting adventure page
nhasjim Nov 10, 2016
127d29f
Added analytics - graph shows on every page, past week isn't complete
origilad Nov 11, 2016
dd71c40
fixed errors, rerouted analyticstabs.pug
origilad Nov 11, 2016
f483921
trying to fix this
origilad Nov 11, 2016
ba23377
added includes folder
origilad Nov 11, 2016
70995fd
changed path
origilad Nov 11, 2016
fe57bb2
pre pull reg form
davidmoll Nov 11, 2016
9ff1326
reg form post pull
davidmoll Nov 11, 2016
e3fa196
fixed layout.css conflict
davidmoll Nov 11, 2016
384f9e3
fixed layout.css conflict again
davidmoll Nov 11, 2016
2defaf8
Merge pull request #25 from origilad/registration-form
davidmoll Nov 11, 2016
5094955
fixed error and changed redirection
origilad Nov 11, 2016
c4c70a7
added edit feature for adventures
origilad Nov 11, 2016
3814b15
added editing to adventures, preset text
origilad Nov 11, 2016
3013896
fixing login issue
origilad Nov 11, 2016
2493b4a
fixing login issue
origilad Nov 11, 2016
71cb7f7
changed button name
origilad Nov 11, 2016
f7c545c
Add cancel button to logging adventure page
davidmoll Nov 14, 2016
7189d92
Add picture uploading functionality
davidmoll Nov 14, 2016
4157f4f
Update image linking for travelogue
davidmoll Nov 14, 2016
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
Prev Previous commit
Next Next commit
added marker to map
origilad committed Nov 3, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit d0df4c3b04f5230cccf2049a5aecabece20eefb1
1 change: 1 addition & 0 deletions views/homepage.jade
Original file line number Diff line number Diff line change
@@ -8,5 +8,6 @@ block content
script(src='http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.js')
script.
var map = L.map("map").setView([51.505, -0.09], 13);
var marker = L.marker([51.5, -0.09]).addTo(map);
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'}).addTo(map);