Cursor pointer

docs/mvp.md

@@ -0,0 +1,17 @@
+# MVP
+
+## Users can log in and sign out
+
+## Users can like or pass and browse profiles
+
+## Users can match with other users based on likes
+
+## Users can set preferences
+
+## Users can edit their profile
+
+## Users can message with the matches
+
+
+## Users can register and create an account/profile*
+

docs/project-description.md

@@ -0,0 +1,16 @@
+# Project Description
+
+### Title 
+- Keen
+
+### Description
+- A dating app for everyone
+
+### Target Audience
+- Anyone but mostly 18 - 35
+
+### Team Members
+- Phil Yoo, Ava Kuang, Denis Krutetskii
+
+### Wireframe
+- https://www.figma.com/file/6kh9WnCO1SFSV8ycjo6UsZ/mock-up-design?node-id=6%3A121

docs/routes.md

@@ -0,0 +1,75 @@
+## Routes and states
+
+### all after login
+
+props.matches = map = create chatrooms
+current view = chat with id 5
+filter api/users/:id/messages (props.messages) to_id: 5 
+
+#### url : / 
+api: api/users, api/users/:id, api/users/:id/messages, api/user/:id/matching/, ??api/user/:id/matching/:id/messages?? (from_user_id)
+states:  -->
+const [state, setState] = useState({
+  user: you
+  users: []
+  messages: [{your messages}]
+  likedBy: [5] get: api/user/:id/matching/ -> select * from matching where to_id = your id
+  matches: [5] put/patch: api/user/:id/matching/ -> update columns in matching where your_id 
+  blocked: [id1, id2, id3]
+  matching: []
+})
+const [like, setLike] = useState()
+
+matching = {
+  id,
+  from_user_id - always your id
+  to_id
+  like_value
+  seen
+}
+
+see a user (id: 3)
+<!-- you swipe left - setLike({user[dislikedUserID]: like})
+you swipe right - setLike({user[likedUserID]: like}) -->
+
+you swipe left ==> matching[seen]: true // matching[like_value] :false
+you swipe right ==> matching[seen]: true // matching[like_value] :true
+
+
+displayed: users[] - this is where swiping happens
+
+
+#### url: /matches (api/users/:id/messages)
+api: Websockets function 
+states: props.user, props.matches, props.messages
+feature: emoji table, GIPHY(stretch)
+
+#### urls: /preferences (can be accessed from /matches and /profile)
+api: none needed
+states: props.user  
+*need to pass it back up after saves
+
+#### url: /profile
+api: none needed atm
+states: props.user
+*need to pass it back up after saves
+
+#### Stretch: external APIs
+Video call: WebRTC?
+GIPHY API: feature in chat
+Spotify: allow user to set a song AND/OR list top fav listend artists (shown in their profile)
+Location: Start with hardcode -> maybe maps api after
+
+
+<!-- params id
+
+axios.get('/api/data')
+
+
+
+states:  -->
+
+
+
+
+<!-- / api to users -->

docs/user_stories.md

@@ -0,0 +1,58 @@
+# User Stories
+
+### User comes to log in page (/)
+### User can login if they signed up
+- user authenication (email and pass match)
+- cookies
+
+### User is redirected to "/index" which is basically swiping section
+
+### User can like or pass on profiles on home page (/index)
+- Start with buttons, swiping as stretch
+
+### Matches will be shown in shuffle mode
+- After any preferences that are set
+- User won't see profiles that they passed on, previously matched or blocked(stretch)
+
+### Match logic: if user.liked.includes(user.id) = the user you liked, will show up in msg/match section.
+- This should also show some kind of sign on nav button to indicate new change(stretch)
+
+### User has access to preferences, msgs/matches, and dropdown for user specific actions (edit profile, settings, sign out)
+
+### Matches page: user can see list of matches
+- matchListItem has: thumbnail, name, msg preview, and last update time
+
+### Matches page: user can select a matchListItem and start messaging
+- If user clicks on the name of currentMessageItem, they can see the match's profile
+- Messages will have time sent and its content (styling like smartphone)
+- User can click on phone and video call optins beside match's name
+- User can click to block besides ^ buttons
+- User can select emojis
+- User can select gifs (GIPHY API) - stretch
+
+### User will see preferences page when clicked on
+- User can select gender, age, distance, any user properties (if applicable)
+- If user clicks on one of the properties, new screen will follow where user can change their preferences and save or cancel which will go back to preferences page 
+
+### User can click on Profile link and will see its own profile and have a button to edit
+- User can switch between view and edit mode. user will have to save if any changes are made to see the change reflected on view mode and other matches.
+- Images will be stored via URLs - maybe for stretch we can have them stored in cloud
+
+### User will see settings page when clicked on 
+- On settings page, user can see user's account details such as their email. 
+- User will see links for privacy, ToS, Tips, Code of conduct etc. STRETCH - these details can be filled for stretch
+
+### User can click on sign out button and sign out, will be redirected to (/) home page which is a login page.
+- Basically no access to any of the sites for visitors.
+
+
+## Stretch
+- "Premium" User has another page where they can see (one at a time, like in the swiping section) who has liked their profile and swipe based on the list
+
+- User can swipe left to pass or right to like a profile
+
+- More Stretch to come....
+
+
+
+

express-back-end/.gitignore

@@ -1,2 +1,2 @@
 node_modules/
-.env
+.env

express-back-end/db/database.js

@@ -0,0 +1,20 @@
+// psql connection config
+require('dotenv').config();
+const pg = require('pg');
+const Pool = pg.Pool;
+
+const config = {
+  host: process.env.PGHOST,
+  port: process.env.PGPORT,
+  user: process.env.PGUSER,
+  password: process.env.PGPASSWORD,
+  database: process.env.PGDATABASE
+};
+
+const db = new Pool(config);
+
+db.connect(() => {
+  console.log('connected to database');
+})
+
+module.exports = db;

express-back-end/db/queries/01_test.sql

@@ -0,0 +1,6 @@
+-- INSERT INTO messages (from_user_id, to_user_id, message, message_seen, date_sent) 
+-- VALUES 
+-- (4, 1, '4----1 hey from id.1 to id.2', false, CURRENT_TIMESTAMP),
+-- (1, 4, '1----4 hey from id.2 to id.1', false, CURRENT_TIMESTAMP),
+-- (4, 1, '4----1 hey again from id.1 to id.5', true, CURRENT_TIMESTAMP),
+-- (4, 1, '4-----1 hey again from id.1 to id.4', true, CURRENT_TIMESTAMP);

express-back-end/db/queries/02_seeds.sql

@@ -0,0 +1,84 @@
+INSERT INTO users (name, email, password, bio, age, gender_id, location, height_in_cm, education,
+ occupation, drink_id, exercise_id, dating_goal_id, is_active)
+VALUES
+  ('Brennan Padilla','[email protected]', '1111', 'I have never seen a straight banana.', 25, 1, 'Vancouver', 180 , 'high school', 'student', 3, 3, 2, true),
+  ('Belle Hendrick','[email protected]', '1111', 'lorem bio', 30, 0, 'Toronto', 155 , 'University', 'Barista', 1, 2, 1, true),
+  ('dfasdf Hendrick','[email protected]', '1111', 'lorem bio', 22, 1, 'Vancouver', 145 , 'high school', 'student', 1, 2, 1, true),
+  ('new person','[email protected]', '1111', 'lorem bio', 50, 1, 'Vancouver', 199 , 'high school', 'Plumber', 1, 2, 1, true),
+  ('New User 5','[email protected]', '1111', 'lorem bio', 22, 1, 'Vancouver', 145 , 'high school', 'student', 1, 2, 1, true);
+
+
+INSERT INTO user_photos (user_id, url, is_profile)
+VALUES 
+(1, 'https://images.genius.com/51f5c16c628a0d96dd7285f7fdf26348.1000x1000x1.jpg', true),
+(1, 'https://pbs.twimg.com/media/ENLQQLJVUAATN8a.jpg', false),
+(2, 'http://d17zbv0kd7tyek.cloudfront.net/wp-content/uploads/2015/06/leonardo-dicaprio-fb.jpg', true),
+(2, 'https://d1jyxxz9imt9yb.cloudfront.net/person/1571/detail_image/mobile/LDC-High-Res-Headshot.jpg', false),
+(3, 'https://www.xtrafondos.com/wallpapers/vertical/ana-de-armas-en-photoshoot-5501.jpg', true),
+(3, 'https://www.xtrafondos.com/wallpapers/vertical/ana-de-armas-2020-6113.jpg', false),
+(3, 'https://images.hola.com/us/images/025b-0ee0dbb57971-3e4d042ce881-1000/vertical-800/ana-de-armas-luciendo-sus-looks-de-cabello-oscuro.jpg', false),
+(4, 'https://www.xtrafondos.com/wallpapers/vertical/ana-de-armas-en-photoshoot-5501.jpg', false),
+(4, 'https://www.xtrafondos.com/wallpapers/vertical/ana-de-armas-2020-6113.jpg', true),
+(4, 'https://images.hola.com/us/images/025b-0ee0dbb57971-3e4d042ce881-1000/vertical-800/ana-de-armas-luciendo-sus-looks-de-cabello-oscuro.jpg', false),
+(5, 'https://media.vogue.co.uk/photos/5e81ba5e138bdd00089677d9/2:3/w_2560%2Cc_limit/shutterstock_editorial_10576430d.jpg', true),
+(5, 'https://media.glamour.com/photos/617ed8cd81d28bb722b6812b/master/pass/1194078278', false);
+
+
+INSERT INTO messages (from_user_id, to_user_id, message, message_seen, date_sent) 
+VALUES 
+(1, 2, 'hey - seen by id2', true, CURRENT_TIMESTAMP),
+(2, 1, 'hey back - seen by id1', true, CURRENT_TIMESTAMP),
+(1, 2, 'hey - seen by id2', true, CURRENT_TIMESTAMP),
+(2, 1, 'hey - seen by id1', true, CURRENT_TIMESTAMP),
+(1, 2, 'hey - seen by id2', true, CURRENT_TIMESTAMP),
+(2, 1, 'set seen true', false, CURRENT_TIMESTAMP),
+
+(1, 4, 'hey - seen by id4', true, CURRENT_TIMESTAMP),
+(4, 1, 'hey back - seen by id1', true, CURRENT_TIMESTAMP),
+(1, 4, 'hey - seen by id4', true, CURRENT_TIMESTAMP),
+(4, 1, 'hey - seen by id1', true, CURRENT_TIMESTAMP),
+(1, 4, 'read from list, received has not seen', false, CURRENT_TIMESTAMP),
+
+(1, 5, 'hey - seen by id5', true, CURRENT_TIMESTAMP),
+(5, 1, 'hey back - seen by id1', true, CURRENT_TIMESTAMP),
+(1, 5, 'hey - seen by id5', true, CURRENT_TIMESTAMP),
+(5, 1, 'hey - seen by id1', true, CURRENT_TIMESTAMP),
+(1, 5, 'hey - seen by id5', true, CURRENT_TIMESTAMP),
+(5, 1, 'set seen true', false, CURRENT_TIMESTAMP);
+
+
+INSERT INTO matchings (from_user_id, to_user_id, like_value, seen, matched_date) 
+VALUES 
+(1, 2, true, true, CURRENT_TIMESTAMP),
+(2, 1, true, true, CURRENT_TIMESTAMP),
+(1, 4, true, true, CURRENT_TIMESTAMP),
+(4, 1, true, true, CURRENT_TIMESTAMP),
+(1, 5, true, true, CURRENT_TIMESTAMP),
+(5, 1, true, true, CURRENT_TIMESTAMP),
+
+(3, 1, true, false, CURRENT_TIMESTAMP);
+
+INSERT INTO genders (value) 
+VALUES 
+  ('Woman'), ('Man'), ('Everyone');
+
+INSERT INTO drinks (value) 
+VALUES 
+  ('Never'), ('Sometimes'), ('Socially'), ('Yes');
+
+INSERT INTO exercises (value) 
+VALUES 
+  ('Never'), ('Sometimes'), ('Often'), ('Everyday');
+
+INSERT INTO dating_goals (value) 
+VALUES 
+  ('Not sure yet'), ('Short-term / Casual'), ('Long-term'), ('Life partner');
+
+
+  INSERT INTO preferences 
+  (user_id, gender_id, drink_id, exercise_id, dating_goal_id) 
+VALUES 
+(1, 1, 1, 1, 1),
+(2,2,2,2,2),
+(3,3,3,3,3),
+(4,1,1,1,1);

express-back-end/db/schema/01_DB_layout.sql

@@ -0,0 +1,98 @@
+DROP TABLE IF EXISTS users CASCADE;
+DROP TABLE IF EXISTS user_photos CASCADE;
+DROP TABLE IF EXISTS messages CASCADE;
+DROP TABLE IF EXISTS matchings CASCADE;
+DROP TABLE IF EXISTS block_users CASCADE;
+DROP TABLE IF EXISTS preferences CASCADE;
+DROP TABLE IF EXISTS genders CASCADE;
+DROP TABLE IF EXISTS drinks CASCADE;
+DROP TABLE IF EXISTS exercises CASCADE;
+DROP TABLE IF EXISTS dating_goals CASCADE;
+
+SET timezone = 'America/Los_Angeles';
+
+CREATE TABLE users (
+  id SERIAL PRIMARY KEY NOT NULL,
+  name VARCHAR(255) NOT NULL,
+  email VARCHAR(255) NOT NULL,
+  password VARCHAR(20) NOT NULL,
+  bio TEXT NOT NULL,
+  age INTEGER NOT NULL,
+  gender_id INTEGER NOT NULL,
+  location VARCHAR(255) NOT NULL,
+  height_in_cm INTEGER NOT NULL,
+  education VARCHAR(255) NOT NULL,
+  occupation VARCHAR(255) NOT NULL,
+  drink_id INTEGER NOT NULL,
+  exercise_id INTEGER NOT NULL, 
+  dating_goal_id INTEGER NOT NULL, 
+  --  {dont know yet, short-term, long-term, life-partner,}
+  is_active BOOLEAN NOT NULL DEFAULT true
+);
+
+
+
+CREATE TABLE genders (
+  id SERIAL PRIMARY KEY NOT NULL,
+  value TEXT NOT NULL 
+);
+
+CREATE TABLE drinks (
+  id SERIAL PRIMARY KEY NOT NULL,
+  value TEXT NOT NULL
+);
+
+CREATE TABLE exercises (
+  id SERIAL PRIMARY KEY NOT NULL, 
+  value TEXT NOT NULL 
+);
+
+CREATE TABLE dating_goals (
+  id SERIAL PRIMARY KEY NOT NULL, 
+  value TEXT NOT NULL 
+);
+
+CREATE TABLE user_photos (
+  id SERIAL PRIMARY KEY NOT NULL,
+  user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+  url TEXT NOT NULL,
+  is_profile BOOLEAN NOT NULL DEFAULT false
+);
+
+CREATE TABLE messages (
+  id SERIAL PRIMARY KEY NOT NULL,
+  from_user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+  to_user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+  message VARCHAR(255) NOT NULL,
+  message_seen BOOLEAN NOT NULL DEFAULT false,
+  date_sent TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE matchings (
+  id SERIAL PRIMARY KEY NOT NULL,
+  from_user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+  to_user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+  like_value BOOLEAN DEFAULT NULL,
+  seen BOOLEAN NOT NULL DEFAULT false,
+  matched_date TIMESTAMP
+ );
+
+CREATE TABLE block_users (
+  id SERIAL PRIMARY KEY NOT NULL,
+  blocked_by_user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+  blocked_user_id INTEGER REFERENCES users(id) ON DELETE CASCADE
+ );
+
+CREATE TABLE preferences (
+  id SERIAL PRIMARY KEY NOT NULL,
+  user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+  min_age INTEGER DEFAULT 18,
+  max_age INTEGER DEFAULT 80,
+  location TEXT DEFAULT 'Earth',
+  min_height_in_cm INTEGER DEFAULT 130,
+  max_height_in_cm INTEGER DEFAULT 200,
+  gender_id INTEGER REFERENCES genders(id) ON DELETE CASCADE DEFAULT 1,
+  drink_id INTEGER REFERENCES drinks(id) ON DELETE CASCADE DEFAULT 1,
+  exercise_id INTEGER REFERENCES exercises(id) ON DELETE CASCADE DEFAULT 1,
+  dating_goal_id INTEGER REFERENCES dating_goals(id) ON DELETE CASCADE DEFAULT 1
+);